Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2026-01-16 18:06:48 +00:00
committed by GitHub
77 changed files with 9881 additions and 1226 deletions
+7
View File
@@ -22274,6 +22274,13 @@
githubId = 44014925;
name = "Rexx Larsson";
};
reylak = {
name = "Joaquin Lopez";
email = "elreylak@proton.me";
github = "Reylak-dev";
githubId = 178049808;
matrix = "@reylak:unredacted.org";
};
rgnns = {
email = "jglievano@gmail.com";
github = "rgnns";
@@ -20,6 +20,8 @@
- [reaction](https://reaction.ppom.me/), a daemon that scans program outputs for repeated patterns, and takes action. A common usage is to scan ssh and webserver logs, and to ban hosts that cause multiple authentication errors. A modern alternative to fail2ban. Available as [services.reaction](#opt-services.reaction.enable).
- [qui](https://github.com/autobrr/qui), a modern alternative webUI for qBittorrent, with multi-instance support. Written in Go/React. Available as [services.qui](#opt-services.qui.enable).
- [LibreChat](https://www.librechat.ai/), open-source self-hostable ChatGPT clone with Agents and RAG APIs. Available as [services.librechat](#opt-services.librechat.enable).
- [nohang](https://github.com/hakavlad/nohang), a daemon for Linux that prevents out of memory (OOM) situations from affecting system responsiveness. Available as [services.nohang](#opt-services.nohang.enable)
+1
View File
@@ -1551,6 +1551,7 @@
./services/torrent/opentracker.nix
./services/torrent/peerflix.nix
./services/torrent/qbittorrent.nix
./services/torrent/qui.nix
./services/torrent/rtorrent.nix
./services/torrent/torrentstream.nix
./services/torrent/transmission.nix
+9 -9
View File
@@ -51,6 +51,12 @@ let
''
+ script;
# We need to collect all the ACME webroots to grant them write
# access in the systemd service.
webroots = lib.remove null (
lib.unique (map (certAttrs: certAttrs.webroot) (lib.attrValues config.security.acme.certs))
);
# There are many services required to make cert renewals work.
# They all follow a common structure:
# - They inherit this commonServiceConfig
@@ -69,7 +75,9 @@ let
ReadWritePaths = [
"/var/lib/acme"
lockdir
];
]
# Prevent runtime breakage by only adding non-overlapping paths.
++ (lib.filter (x: !(lib.strings.hasPrefix "/var/lib/acme/" x)) webroots);
PrivateTmp = true;
WorkingDirectory = "/tmp";
@@ -299,12 +307,6 @@ let
++ data.extraLegoRenewFlags
);
# We need to collect all the ACME webroots to grant them write
# access in the systemd service.
webroots = lib.remove null (
lib.unique (map (certAttrs: certAttrs.webroot) (lib.attrValues config.security.acme.certs))
);
certificateKey = if data.csrKey != null then "${data.csrKey}" else "certificates/${keyName}.key";
in
{
@@ -469,8 +471,6 @@ let
"acme/.lego/accounts/${accountHash}"
];
ReadWritePaths = commonServiceConfig.ReadWritePaths ++ webroots;
# Needs to be space separated, but can't use a multiline string because that'll include newlines
BindPaths = [
"${accountDir}:/tmp/accounts"
+191
View File
@@ -0,0 +1,191 @@
{
config,
lib,
pkgs,
...
}:
let
inherit (lib)
getExe
maintainers
mkEnableOption
mkIf
mkOption
mkPackageOption
;
inherit (lib.types)
bool
path
port
str
submodule
;
cfg = config.services.qui;
stateDir = "/var/lib/qui";
configFormat = pkgs.formats.toml { };
configFile = configFormat.generate "qui.toml" cfg.settings;
in
{
options = {
services.qui = {
enable = mkEnableOption "qui";
package = mkPackageOption pkgs "qui" { };
user = mkOption {
type = str;
default = "qui";
description = "User to run qui as.";
};
group = mkOption {
type = str;
default = "qui";
example = "torrents";
description = "Group to run qui as.";
};
openFirewall = mkOption {
type = bool;
default = false;
description = "Whether or not to open ports in the firewall for qui.";
};
secretFile = mkOption {
type = path;
example = "/run/secrets/qui-session.txt";
description = ''
Path to a file that contains the session secret. The session secret
can be generated with `openssl rand -hex 32`.
'';
};
settings = mkOption {
default = { };
example = {
port = 7777;
logLevel = "DEBUG";
metricsEnabled = true;
};
type = submodule {
freeformType = configFormat.type;
options = {
host = mkOption {
type = str;
default = "127.0.0.1";
description = "The host address qui listens on.";
};
port = mkOption {
type = port;
default = 7476;
description = "The port qui listens on.";
};
};
};
description = ''
qui configuration options.
Refer to the [template config](https://github.com/autobrr/qui/blob/main/internal/config/config.go)
in the source code for the available options.
The documentation contains the available [environment variables](https://getqui.com/docs/configuration/environment/),
this can be used to get an overview.
'';
};
};
};
config = mkIf cfg.enable {
assertions = [
{
assertion = !(cfg.settings ? sessionSecret);
message = ''
Session secrets should not be passed via settings, as
these are stored in the world-readable nix store.
Use the secretFile option instead.'';
}
];
systemd.services.qui = {
description = "qui: alternative qBittorrent webUI";
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "simple";
User = cfg.user;
Group = cfg.group;
LoadCredential = "sessionSecret:${cfg.secretFile}";
Environment = [ "QUI__SESSION_SECRET_FILE=%d/sessionSecret" ];
StateDirectory = "qui";
ExecStartPre = ''
${pkgs.coreutils}/bin/install -m 600 '${configFile}' '%S/qui/config.toml'
'';
ExecStart = "${getExe cfg.package} serve --config-dir %S/qui";
Restart = "on-failure";
# Based on qbittorrent and nemorosa hardening settings
# Similar to what systemd hardening helper suggests
CapabilityBoundingSet = "";
LockPersonality = true;
MemoryDenyWriteExecute = true;
NoNewPrivileges = true;
PrivateDevices = true;
PrivateNetwork = false;
PrivateTmp = true;
PrivateUsers = true;
ProcSubset = "pid";
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = "yes";
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
# This should allow for hardlinking to torrent client files
ProtectSystem = "full";
RemoveIPC = true;
RestrictAddressFamilies = [
"AF_INET"
"AF_INET6"
"AF_NETLINK"
"AF_UNIX"
];
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
SystemCallArchitectures = "native";
SystemCallFilter = [ "@system-service" ];
};
};
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.settings.port ];
};
users = {
users = mkIf (cfg.user == "qui") {
qui = {
group = cfg.group;
description = "qui user";
isSystemUser = true;
home = stateDir;
};
};
groups = mkIf (cfg.group == "qui") {
qui = { };
};
};
};
meta.maintainers = with maintainers; [ undefined-landmark ];
}
+1
View File
@@ -1332,6 +1332,7 @@ in
qtile = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./qtile/default.nix;
qtile-extras = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./qtile-extras/default.nix;
quake3 = runTest ./quake3.nix;
qui = runTest ./qui.nix;
quicktun = runTest ./quicktun.nix;
quickwit = runTest ./quickwit.nix;
rabbitmq = runTest ./rabbitmq.nix;
+47
View File
@@ -0,0 +1,47 @@
{ lib, ... }:
{
name = "qui";
meta.maintainers = with lib.maintainers; [ undefined-landmark ];
nodes.machine =
{ pkgs, ... }:
let
# We create this secret in the Nix store (making it readable by everyone).
# DO NOT DO THIS OUTSIDE OF TESTS!!
testSecretFile = pkgs.writeText "session_secret" "not-secret";
in
{
services.qui = {
enable = true;
secretFile = testSecretFile;
};
# Use port other than default to test if settings options work.
specialisation.settingsPort.configuration = {
services.qui = {
enable = true;
secretFile = testSecretFile;
settings.port = 7777;
};
};
};
testScript =
{ nodes, ... }:
let
settingsPort = "${nodes.machine.system.build.toplevel}/specialisation/settingsPort";
in
# python
''
def test_webui(port):
machine.wait_for_unit("qui.service")
machine.wait_for_open_port(port)
machine.wait_until_succeeds(f"curl --fail http://localhost:{port}")
test_webui(7476)
machine.succeed("${settingsPort}/bin/switch-to-configuration test")
test_webui(7777)
'';
}
@@ -1,11 +1,11 @@
{
"packageVersion": "146.0.1-1",
"packageVersion": "147.0-1",
"source": {
"rev": "146.0.1-1",
"hash": "sha256-MYp0PEAbUSJwrvaXYaie7eXj3XRw/EyGrQvsFdVT/Y0="
"rev": "147.0-1",
"hash": "sha256-LZE4d1z4djtGSrnFsh1i9GXvFbK55RQMcqyID9ui0Ng="
},
"firefox": {
"version": "146.0.1",
"hash": "sha512-rpW4bkg/6/jf7INHdI3ZBI7X1/hFJQ4HqoBI4rNR2mH288X4O7DQxy4adexhtg5Zu+aWOfDzNTKRD/i/XKBzlA=="
"version": "147.0",
"hash": "sha512-rJAXsaLaey8Tk5LDlMNjQf00duPU6ho8fl578QDcMNGFEy75JWvn5rD52/xpI0rFceofxtudhFQ7FXcvTshRYQ=="
}
}
@@ -436,13 +436,13 @@
"vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA="
},
"gitlabhq_gitlab": {
"hash": "sha256-9NYlkXiUbUtTbaa4K2Ft+khPx6NlSQs9ZnzUf3Ms0K8=",
"hash": "sha256-iBgACKVMJmfDLlIU6TZZiED+eEG7c4CMSkfEjU1Dmiw=",
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
"owner": "gitlabhq",
"repo": "terraform-provider-gitlab",
"rev": "v18.7.0",
"rev": "v18.8.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-TPyvNpTwTMcysG4kGeRuu+H5hR3/By69vyNuWodnKVg="
"vendorHash": "sha256-a2y8bnbQr8RNN3hJZFupUHvrIrV8HkAvZQn+7MIod0U="
},
"go-gandi_gandi": {
"hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=",
@@ -643,13 +643,13 @@
"vendorHash": "sha256-ssmAveYUVI8z/1UWNeaMX0qdUewowCHNufJIFMirdVg="
},
"hashicorp_random": {
"hash": "sha256-tdTVqSJmQ6Ht3kdoYMxhoRN+XJqvu8BPVB0VQghcDVs=",
"hash": "sha256-pt36xl5drR1YtXZ6IRqvvO14iINwb/m7MEAAw7RwQTA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/random",
"owner": "hashicorp",
"repo": "terraform-provider-random",
"rev": "v3.7.2",
"rev": "v3.8.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-jyfzk3vbgZwHlyiFFw1mhD+us/7WNatUQTGN4WsrfgE="
"vendorHash": "sha256-GlkqFg9Bgs+Hi59PYAxqq3YW9ji1qeuX4vz59wQ4pRw="
},
"hashicorp_tfe": {
"hash": "sha256-U58uWRmLMI9XfYT89wfNuwhok+PaWCanz23RjQYyL98=",
@@ -778,13 +778,13 @@
"vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg="
},
"jianyuan_sentry": {
"hash": "sha256-/OzoGlUaL7o4O5DejTdEeAJctB85udOCy4BntSTYJLo=",
"hash": "sha256-AH7Ef3G1C0jQX4Wprc8J9rP34u+xifzhclqtmVCQmAI=",
"homepage": "https://registry.terraform.io/providers/jianyuan/sentry",
"owner": "jianyuan",
"repo": "terraform-provider-sentry",
"rev": "v0.14.7",
"rev": "v0.14.8",
"spdx": "MIT",
"vendorHash": "sha256-wbU9RTNvUVJbLkoTGMeGxh9ilZQMKc9tpBkldMdfReA="
"vendorHash": "sha256-owQrunW0X87DVdA/A/Pl5MWsVfx8kPL1L/xJYWS5ptI="
},
"joneshf_openwrt": {
"hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=",
@@ -896,13 +896,13 @@
"vendorHash": "sha256-I8yMdS+yOk5doWGU9VPdl5ITGNrPhs5tGwluwXSrnI0="
},
"metio_migadu": {
"hash": "sha256-vkQANcTx4SNaQJj0QwC+jzFTa7XFo2mXoFDBaoIvaV0=",
"hash": "sha256-rAf+q/zNANhW8cFSJR3TtA0yYqiG5mjCStyBFG0U3tg=",
"homepage": "https://registry.terraform.io/providers/metio/migadu",
"owner": "metio",
"repo": "terraform-provider-migadu",
"rev": "2025.12.11",
"rev": "2026.1.15",
"spdx": "0BSD",
"vendorHash": "sha256-4zPD20KNAsXf6tKwzN97rH9Dt+lKm+GGET/6YMf5hfY="
"vendorHash": "sha256-j9QQjoPh9bvrRCvNbItlN65kWaP5my5aed/YNFItAFI="
},
"mongey_kafka": {
"hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=",
@@ -1130,13 +1130,13 @@
"vendorHash": "sha256-33NOGIvqLpgndG68GxAeoiISjWV7ApR4jmvqyZHjPKo="
},
"rootlyhq_rootly": {
"hash": "sha256-v/CdJiEmMmmtQ0EhDxg6IT3FGWs3jeuZ/BKhmcHi9XM=",
"hash": "sha256-fXL/MwbXz1SVtro4hf5oy/1yvCkwH81Q58A9dxk7y0A=",
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
"owner": "rootlyhq",
"repo": "terraform-provider-rootly",
"rev": "v5.2.2",
"rev": "v5.3.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-H0ohTNvSeFYEhHFIJoY37asNWwe+s2RKsDzYbx1CkJw="
"vendorHash": "sha256-UyfCHBSdGKCulExhUdYfvEab8cVjaHGDfgslRS0d1Co="
},
"rundeck_rundeck": {
"hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "all-the-package-names";
version = "2.0.2321";
version = "2.0.2328";
src = fetchFromGitHub {
owner = "nice-registry";
repo = "all-the-package-names";
tag = "v${version}";
hash = "sha256-wkgVhmzfI15GFZ1YDI0MYGdfFIzyfd3ob949kyWA8N4=";
hash = "sha256-6+rb7eNPkifuIMsFs2YO0v27CY6RNWnHrzHYoVhtYCw=";
};
npmDepsHash = "sha256-mikgLEfjusRvmOMjdeENRtC+Vi+yV9zwBIqu3IbLY8A=";
npmDepsHash = "sha256-Q0vdon6Qbt5FOjKZJqB5ufiLcG18DPgL4EN9PSkoXDE=";
passthru.updateScript = nix-update-script { };
+13 -1
View File
@@ -3,6 +3,7 @@
stdenv,
fetchgit,
jdk_headless,
jre_minimal,
gradle_8,
makeWrapper,
bashNonInteractive,
@@ -10,6 +11,17 @@
let
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
gradle = gradle_8;
jre = jre_minimal.override {
modules = [
"java.base"
"java.compiler"
"java.logging"
"java.naming"
"java.security.jgss"
"java.sql"
"jdk.unsupported"
];
};
in
stdenv.mkDerivation rec {
pname = "apksigner";
@@ -53,7 +65,7 @@ stdenv.mkDerivation rec {
mv apksigner $out/opt
mkdir -p $out/bin
makeWrapper $out/opt/apksigner/bin/apksigner $out/bin/apksigner \
--set JAVA_HOME ${jdk_headless.home}
--set JAVA_HOME ${jre.home}
runHook postInstall
'';
+12 -2
View File
@@ -3,10 +3,20 @@
stdenv,
fetchurl,
makeWrapper,
jdk_headless,
jre_minimal,
aapt,
}:
let
jre = jre_minimal.override {
modules = [
"java.base"
"java.desktop"
"java.logging"
"java.xml"
];
};
in
stdenv.mkDerivation rec {
pname = "apktool";
version = "2.12.1";
@@ -28,7 +38,7 @@ stdenv.mkDerivation rec {
installPhase = ''
install -D ${src} "$out/libexec/apktool/apktool.jar"
mkdir -p "$out/bin"
makeWrapper "${jdk_headless}/bin/java" "$out/bin/apktool" \
makeWrapper "${jre}/bin/java" "$out/bin/apktool" \
--add-flags "-jar $out/libexec/apktool/apktool.jar" \
--prefix PATH : ${lib.getBin aapt}
'';
+3 -3
View File
@@ -28,18 +28,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bcachefs-tools";
version = "1.34.0";
version = "1.35.0";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
tag = "v${finalAttrs.version}";
hash = "sha256-u9RMI1EP+2yhoHtu0Lf1/4RZPrwSFsVc/DgdFJ9xZsA=";
hash = "sha256-mKyoV92+VJESHDRENXLFU+Ug2fFr+xJrleckvxfZ6sY=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-v17x6/ojK4fGqgBBCKKARYOs/8ECT2FXp7ZgGGAUSss=";
hash = "sha256-5z86H/LGI5aSg3vBoXlvm0f2DmumsKu3EN7Bn5UHbr4=";
};
postPatch = ''
+3 -3
View File
@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "better-commits";
version = "1.18.1";
version = "1.18.3";
src = fetchFromGitHub {
owner = "Everduin94";
repo = "better-commits";
tag = "v${version}";
hash = "sha256-tkGLlvOldKKpoFswo1UzUhNJHstKISRpCDGFrL/W7ZI=";
hash = "sha256-2g9sYTy34estLBLAaHNbjNzv6+rzyocgqMBlVlJUyT4=";
};
npmDepsHash = "sha256-lPJ50DYnANJZ3IowE3kOCyAx9peq7Donh72jk1eQnBs=";
npmDepsHash = "sha256-vtUtdgOJEQk9PzxOz7AlwOxWS6PTjAtrjAugXRXo89c=";
passthru.updateScript = nix-update-script { };
+3 -3
View File
@@ -6,16 +6,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "binsider";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "orhun";
repo = "binsider";
rev = "v${version}";
hash = "sha256-k40mnDRbvwWJmcT02aVWdwwEiDCuL4hQnvnPitrW8qA=";
hash = "sha256-ZfLFZXLnH5nBg/5ufOfwMG8c8n+BDex3j7da+Hvh1fw=";
};
cargoHash = "sha256-hysp7AeYJ153AC0ERcrRzf4ujmM+V9pgAxOvOlG/2aE=";
cargoHash = "sha256-HnJBeqZhzDT0XfZ5UDg+lWMaX8tP7Q4iXrAz84XM3QE=";
buildNoDefaultFeatures = !stdenv.hostPlatform.isLinux;
+2 -2
View File
@@ -10,11 +10,11 @@
stdenvNoCC.mkDerivation rec {
pname = "camunda-modeler";
version = "5.43.0";
version = "5.43.1";
src = fetchurl {
url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
hash = "sha256-NR1UXnIU0Wf2WeiagqijEXz9qUShFbM1umenFFETOJI=";
hash = "sha256-ruYpMFL/7UK4AF7Zp4OhopClfUqEuWPIMA+cM3PJ9FI=";
};
sourceRoot = "camunda-modeler-${version}-linux-x64";
+2 -2
View File
@@ -6,13 +6,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "coconutbattery";
version = "4.0.4,166";
version = "4.2.0,192";
src = fetchzip {
url = "https://coconut-flavour.com/downloads/coconutBattery_${
lib.replaceStrings [ "." "," ] [ "" "_" ] finalAttrs.version
}.zip";
hash = "sha256-ZbxO6pR752pjaBocA/wqyjPCZaUxV051MaHz1gqQjSg=";
hash = "sha256-pzfg+RAlCbEaBHiU/ZQcBf0Tg0BCfs0UHh62dFQVbz0=";
};
installPhase = ''
@@ -9,13 +9,13 @@
}:
rustPlatform.buildRustPackage {
pname = "cosmic-ext-applet-caffeine";
version = "0-unstable-2025-11-04";
version = "0-unstable-2026-01-11";
src = fetchFromGitHub {
owner = "tropicbliss";
repo = "cosmic-ext-applet-caffeine";
rev = "1a4ab86d1db1ef294b2cfb24a07f068da0f715ae";
hash = "sha256-8bu9a7CNAtxXV7VKw232ZwgMGOLwvPKVXWoVtX7RKKc=";
rev = "f101f568c5e6bd5c1acbd1f32a09026898cd5a4c";
hash = "sha256-tnuNOuTUdwGnS3mIHs5K4ByA6C9uymDTqYDwevJVNFw=";
};
cargoHash = "sha256-9EUrO8JNU0FPrqT6WDE+jfVgQSgODK8rbNZLgUb26EQ=";
+3 -3
View File
@@ -11,13 +11,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cspell";
version = "9.5.0";
version = "9.6.0";
src = fetchFromGitHub {
owner = "streetsidesoftware";
repo = "cspell";
tag = "v${finalAttrs.version}";
hash = "sha256-O8CwJZfFSKmPP8tE5KcpW1bC3kUKjjjHS7QAKBc79qc=";
hash = "sha256-S5E51eNiF78TLQeL9aztC/YyhGZ0RvPZVVHtUWL9z/Y=";
};
pnpmWorkspaces = [ "cspell..." ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
;
pnpm = pnpm_10;
fetcherVersion = 2;
hash = "sha256-DBCwysotJBsM8GYro2NTwMe+t29zooX8yAr1FyPR3Ek=";
hash = "sha256-6Mf0aCUIBYrMZVF0Jp8GCDnj5PhGSde+QS67lKzCV1c=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "files-cli";
version = "2.15.178";
version = "2.15.191";
src = fetchFromGitHub {
repo = "files-cli";
owner = "files-com";
rev = "v${version}";
hash = "sha256-03dADzK1LgD3IqYdDqUtZO1yOIya85cefA1cd0/70qQ=";
hash = "sha256-jObw+/lHjk7pm/RNsgeXBfQkK2lBrjCc1LlpM3re82M=";
};
vendorHash = "sha256-5ONoYzrULR2Z3x/EPwkBgxOm78XBdlCosWSKhZYlKco=";
vendorHash = "sha256-BRiLBXHeSFvzCi7i9kmXfuHjtorG72IIcUz3z3thg+8=";
ldflags = [
"-s"
+77
View File
@@ -0,0 +1,77 @@
{
lib,
fetchFromGitHub,
flutter335,
alsa-lib,
libdisplay-info,
libXpresent,
libXScrnSaver,
libepoxy,
mpv-unwrapped,
targetFlutterPlatform ? "web",
baseUrl ? null,
}:
let
flutter = flutter335;
media_kit_hash = "sha256-oJQ9sRQI4HpAIzoS995yfnzvx5ZzIubVANzbmxTt6LE=";
in
flutter.buildFlutterApplication rec {
pname = "fladder";
version = "0.9.0";
src = fetchFromGitHub {
owner = "DonutWare";
repo = "Fladder";
tag = "v${version}";
hash = "sha256-IX3qbIgfi9d8rP24yIGlBzi5l28YQWnvLD+dD+7uIZc=";
};
inherit targetFlutterPlatform;
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
media_kit = media_kit_hash;
media_kit_video = media_kit_hash;
media_kit_libs_linux = media_kit_hash;
media_kit_libs_video = media_kit_hash;
media_kit_libs_android_video = media_kit_hash;
media_kit_libs_ios_video = media_kit_hash;
media_kit_libs_macos_video = media_kit_hash;
media_kit_libs_windows_video = media_kit_hash;
};
buildInputs = [
alsa-lib
libdisplay-info
mpv-unwrapped
libXpresent
libXScrnSaver
]
++ lib.optionals (targetFlutterPlatform == "linux") [
libepoxy
];
postInstall = lib.optionalString (targetFlutterPlatform == "web") (
''
sed -i 's;base href="/";base href="$out";' $out/index.html
''
+ lib.optionalString (baseUrl != null) ''
echo '{"baseUrl": "${baseUrl}"}' > $out/assets/config/config.json
''
);
meta = {
description = "Simple Jellyfin Frontend built on top of Flutter";
homepage = "https://github.com/DonutWare/Fladder";
downloadPage = "https://github.com/DonutWare/Fladder/releases";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ ratcornu ];
mainProgram = "Fladder";
};
}
File diff suppressed because it is too large Load Diff
+3 -5
View File
@@ -1,9 +1,7 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchFromGitLab,
runCommand,
cargo,
meson,
ninja,
@@ -25,19 +23,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flare";
version = "0.17.5";
version = "0.18.0";
src = fetchFromGitLab {
domain = "gitlab.com";
owner = "schmiddi-on-mobile";
repo = "flare";
tag = finalAttrs.version;
hash = "sha256-mmw1g1MG1oNGYmQOsnLZgdMFuZSiWehZ7ltPrQxQLys=";
hash = "sha256-YXUXUaFAsqeFtnvAxkSeBGAq8Oll/dMJlb3A0yKus94=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-m1IlDGCelklgXNCm0nsDczuUUMM+A6TyWkQiOo/JVVU=";
hash = "sha256-3n1UyrlfGlJxe6TE5rex0XXA/P7ItycuZWIrKH14t3A=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -7,12 +7,12 @@
}:
let
pname = "flexoptix-app";
version = "5.54.0-latest";
version = "5.57.0-latest";
src = fetchurl {
name = "${pname}-${version}.AppImage";
url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";
hash = "sha256-RTzVtAd134cKIlHWgP9Yyhu3FgdDSe1fKDGMsctO3x8=";
hash = "sha256-wTrvteIXiCMk4y2JnXodn5o89XJrLGHxOpHmma4SQXY=";
};
udevRules = fetchurl {
File diff suppressed because it is too large Load Diff
+84
View File
@@ -0,0 +1,84 @@
{
buildNpmPackage,
bun,
concurrently,
fetchFromGitLab,
lib,
nodejs_22,
patch-package,
stdenv,
versionCheckHook,
}:
buildNpmPackage (finalAttrs: {
pname = "gitlab-duo";
version = "8.57.1";
# DOCS https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp#node-version
nodejs = nodejs_22;
src = fetchFromGitLab {
group = "gitlab-org";
owner = "editor-extensions";
repo = "gitlab-lsp";
tag = "v${finalAttrs.version}";
hash = "sha256-IofCSh9ja3C8WEiksp0pFJ6LZOu86o4VHnwiIUHHgLI=";
};
patches = [
# HACK https://github.com/NixOS/nixpkgs/issues/408720
# Fix packages locked but without hash, or even missing
./missing-hashes.patch
];
# PATCH: Only build for the current platform, not all targets
postPatch = ''
substituteInPlace packages/cli/scripts/compile_executables.sh \
--replace-fail \
'SUPPORTED_TARGETS="bun-linux-x64 bun-linux-arm64 bun-windows-x64 bun-darwin-arm64 bun-darwin-x64"' \
"SUPPORTED_TARGETS=bun-$TARGET"
'';
npmFlags = [ "--install-links" ];
npmDepsHash = "sha256-dj4TrKMdXgUZr7/0NLT7h8jT3VjobB9KFO8tl/+47rk=";
npmBuildScript = "build:binary";
npmWorkspace = "@gitlab/duo-cli";
nativeBuildInputs = [
bun
concurrently
patch-package
];
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "true";
env.PUPPETEER_SKIP_DOWNLOAD = "true";
env.TARGET = "${stdenv.targetPlatform.node.platform}-${stdenv.targetPlatform.node.arch}";
postConfigure = ''
patchShebangs --build ./packages/cli/scripts
npmBuildScript=build:bundle runHook npmBuildHook
'';
installPhase = ''
runHook preInstall
install -Dm755 packages/cli/bin/duo-$TARGET $out/bin/duo
runHook postInstall
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
passthru.updateScript = ./update.sh;
meta = {
broken = stdenv.hostPlatform.isDarwin;
changelog = "https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp/-/blob/main/CHANGELOG.md";
description = "CLI for GitLab AI assistant";
downloadPage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp";
homepage = "https://about.gitlab.com/gitlab-duo/";
license = lib.licenses.mit;
mainProgram = "duo";
maintainers = with lib.maintainers; [ yajo ];
};
})
+55
View File
@@ -0,0 +1,55 @@
#! /usr/bin/env nix-shell
#! nix-shell -I nixpkgs=./. -i bash -p git jaq prefetch-npm-deps nix-update npm-lockfile-fix
set -euo pipefail
# Get new Gitlab Duo release
nix-update --src-only "$UPDATE_NIX_ATTR_PATH"
# Clone new sources
dir="$(mktemp -d --suffix="$UPDATE_NIX_PNAME")"
git clone --depth 1 \
--branch "$(nix-instantiate --eval --raw -E "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.tag")" \
"$(nix-instantiate --eval --raw -E "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.gitRepoUrl")" \
"$dir"
pushd "$dir"
# HACK https://github.com/npm/cli/issues/4460
# Different dependencies require different versions of esbuild. Vite's lacks
# some integrity hashes. We add a dummy "extra-deps" package to the workspace
# to force recording those hashes.
esbuild_version=$(jaq -r '.packages["node_modules/vite/node_modules/esbuild"].version' ./package-lock.json)
mkdir packages/extra-deps
cat > packages/extra-deps/package.json <<EOF
{
"devDependencies": {
"only-allow": "*"
},
"optionalDependencies": {
"esbuild": "$esbuild_version"
}
}
EOF
jaq -i '.devDependencies["extra-deps"]="workspace:*"' ./package.json
# HACK https://github.com/npm/cli/issues/6787
# Commander requires a higher version than the one locked, so we remove it from the lock
commander_version=$(jaq -r '.packages["packages/cli"].devDependencies.commander' ./package-lock.json)
# Remove ^ prefix
commander_version="${commander_version/^}"
# Sync locked version and remove URL and hash, so they are fixed later
jaq -i --arg ver "$commander_version" \
'.packages["packages/cli/node_modules/commander"].version = $ver | del(.packages["packages/cli/node_modules/commander"].integrity, .packages["packages/cli/node_modules/commander"].resolved)' \
./package-lock.json
npm install --package-lock-only --ignore-scripts
npm-lockfile-fix package-lock.json
npmDepsHash="$(prefetch-npm-deps package-lock.json)"
git add -A
patch="$(git diff --cached)"
popd
# Update nix expression with new hashes
pushd "$(dirname "${BASH_SOURCE[0]}")"
echo "$patch" > missing-hashes.patch
sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i package.nix
popd
@@ -0,0 +1,44 @@
{
lib,
stdenv,
fetchFromGitHub,
bankstown-lv2,
lsp-plugins,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gpd-pocket-4-pipewire";
version = "0.0.1";
src = fetchFromGitHub {
owner = "Manawyrm";
repo = "gpd-pocket-4-pipewire";
tag = finalAttrs.version;
hash = "sha256-FNnEfY1a3CeFCH+dRwb7NyOeDPeHDnwacw/8jLawDK0=";
};
postPatch = ''
substituteInPlace pipewire.conf.d/sink-gpd-pocket-4.conf \
--replace-fail /usr/share/pipewire/pipewire.conf.d $out/share/pipewire/pipewire.conf.d
'';
installPhase = ''
install -dDm0755 "$out/share/pipewire/pipewire.conf.d/"
install -v -D -m0644 "pipewire.conf.d/gpd-pocket-4-mp-48k-l.wav" "$out/share/pipewire/pipewire.conf.d/gpd-pocket-4-mp-48k-l.wav"
install -v -D -m0644 "pipewire.conf.d/gpd-pocket-4-mp-48k-r.wav" "$out/share/pipewire/pipewire.conf.d/gpd-pocket-4-mp-48k-r.wav"
install -v -D -m0644 "pipewire.conf.d/sink-gpd-pocket-4.conf" "$out/share/pipewire/pipewire.conf.d/sink-gpd-pocket-4.conf"
'';
passthru.requiredLv2Packages = [
bankstown-lv2
lsp-plugins
];
meta = {
description = "Pipewire audio DSP for internal speakers of GPD Pocket 4";
license = lib.licenses.mit;
homepage = "https://github.com/Manawyrm/gpd-pocket-4-pipewire/";
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ marcel ];
};
})
+3 -3
View File
@@ -23,13 +23,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "h2o";
version = "2.3.0-rolling-2026-01-06";
version = "2.3.0-rolling-2026-01-16";
src = fetchFromGitHub {
owner = "h2o";
repo = "h2o";
rev = "2e62ee29c98ef70e9f1749884557229fd255a8e5";
hash = "sha256-fzP95nV1uxjdknsf8BIKerybkmPmlmRF1/m498MSqyk=";
rev = "ccea64b17ade832753db933658047ede9f31a380";
hash = "sha256-47oNCbOGqNNNUkoP6Bj5F8Zv5QAN0+MGOIGo5jXGtf4=";
};
outputs = [
@@ -12,23 +12,23 @@
buildNpmPackage (finalAttrs: {
pname = "homebridge-config-ui-x";
version = "5.8.0";
version = "5.14.0";
src = fetchFromGitHub {
owner = "homebridge";
repo = "homebridge-config-ui-x";
tag = "v${finalAttrs.version}";
hash = "sha256-pbE3s1MzZM8r29oJsZjHTCahRNuWExsvGfERue4RQv4=";
hash = "sha256-CAdzkFuVuJtHoUUDBIRRzxRJiOtGUJFzS/lczYXTfRw=";
};
# Deps hash for the root package
npmDepsHash = "sha256-L7sC/4iHSGE9H562pbtESkFpty6eGdmkU60dpUWPQaQ=";
npmDepsHash = "sha256-73Xt2R3COL0WPgtqn3ZwGTmOHrNqHONrX3hQCU/v5y0=";
# Deps src and hash for ui subdirectory
npmDeps_ui = fetchNpmDeps {
name = "npm-deps-ui";
src = "${finalAttrs.src}/ui";
hash = "sha256-Yhk7cplZlmcChKPmwoI192MJujuq+v8+JXT08rwfL3Q=";
hash = "sha256-xtXAeTBryQt4FMvK3oXHJ3DdB/3umrSrmqZ3IIDgq2s=";
};
# Need to also run npm ci in the ui subdirectory
+9 -3
View File
@@ -5,16 +5,22 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "impala";
version = "0.6.0";
version = "0.7.2";
src = fetchFromGitHub {
owner = "pythops";
repo = "impala";
rev = "v${finalAttrs.version}";
hash = "sha256-FU/8g2zTTHm3Sdbxt9761Z+a0zaJMdAMdHrJIwjUrYs=";
hash = "sha256-kDXf+zrCfsYv+5P69BiZDBqaw9SM3JPCXV7KzpIEJn0=";
};
cargoHash = "sha256-dpTLVlDxc9eK7GwbweODoJlrBZeYwVcv1fQ2UtYbg7k=";
cargoHash = "sha256-Zs3x7wWbO0LL1BjEAWb1UbztJJ6K6hXxgMBynHLri8A=";
# fix for compilation of musl builds on aarch64
# see https://github.com/NixOS/nixpkgs/issues/145726
postPatch = ''
rm .cargo/config.toml
'';
meta = {
description = "TUI for managing wifi";
-315
View File
@@ -1,315 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "addr2line"
version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c"
dependencies = [
"gimli",
]
[[package]]
name = "adler32"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d"
[[package]]
name = "ansi_term"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
dependencies = [
"winapi",
]
[[package]]
name = "atty"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi",
"libc",
"winapi",
]
[[package]]
name = "backtrace"
version = "0.3.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c"
dependencies = [
"addr2line",
"cfg-if",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
]
[[package]]
name = "bitflags"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
[[package]]
name = "byteorder"
version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
[[package]]
name = "cfg-if"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]]
name = "clap"
version = "2.33.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
dependencies = [
"ansi_term",
"atty",
"bitflags",
"strsim",
"textwrap",
"unicode-width",
"vec_map",
]
[[package]]
name = "either"
version = "1.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
[[package]]
name = "exitfailure"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ff5bd832af37f366c6c194d813a11cd90ac484f124f079294f28e357ae40515"
dependencies = [
"failure",
]
[[package]]
name = "failure"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
dependencies = [
"backtrace",
"failure_derive",
]
[[package]]
name = "failure_derive"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
"proc-macro2",
"quote",
"syn",
"synstructure",
]
[[package]]
name = "gimli"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c"
[[package]]
name = "hermit-abi"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
dependencies = [
"libc",
]
[[package]]
name = "itm"
version = "0.4.0"
source = "git+https://github.com/rust-embedded/itm#5dd476d03de0738062a876fd3845900ab04833a4"
dependencies = [
"byteorder",
"either",
"thiserror",
]
[[package]]
name = "itm-tools"
version = "0.1.0"
dependencies = [
"clap",
"exitfailure",
"failure",
"itm",
"rustc-demangle",
"xmas-elf",
]
[[package]]
name = "libc"
version = "0.2.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
[[package]]
name = "miniz_oxide"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
dependencies = [
"adler32",
]
[[package]]
name = "object"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
[[package]]
name = "proc-macro2"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
dependencies = [
"unicode-xid",
]
[[package]]
name = "quote"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rustc-demangle"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
[[package]]
name = "strsim"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "syn"
version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
dependencies = [
"proc-macro2",
"quote",
"unicode-xid",
]
[[package]]
name = "synstructure"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
dependencies = [
"proc-macro2",
"quote",
"syn",
"unicode-xid",
]
[[package]]
name = "textwrap"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
dependencies = [
"unicode-width",
]
[[package]]
name = "thiserror"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "unicode-width"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
[[package]]
name = "unicode-xid"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
[[package]]
name = "vec_map"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "xmas-elf"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22678df5df766e8d1e5d609da69f0c3132d794edf6ab5e75e7abcd2270d4cf58"
dependencies = [
"zero",
]
[[package]]
name = "zero"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f1bc8a6b2005884962297587045002d8cfb8dcec9db332f4ca216ddc5de82c5"
-46
View File
@@ -1,46 +0,0 @@
{
lib,
fetchFromGitHub,
rustPlatform,
pkg-config,
}:
rustPlatform.buildRustPackage {
pname = "itm-tools";
version = "0-unstable-2019-11-15";
src = fetchFromGitHub {
owner = "japaric";
repo = "itm-tools";
rev = "e94155e44019d893ac8e6dab51cc282d344ab700";
sha256 = "19xkjym0i7y52cfhvis49c59nzvgw4906cd8bkz8ka38mbgfqgiy";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"itm-0.4.0" = "sha256-T61f1WvxEMhI5bzp8FuMYWiG1YOPJvWuBJfK/gjuNKI=";
};
};
nativeBuildInputs = [ pkg-config ];
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
doCheck = false;
meta = {
description = "Tools for analyzing ITM traces";
homepage = "https://github.com/japaric/itm-tools";
license = with lib.licenses; [
asl20
mit
];
maintainers = with lib.maintainers; [
hh
sb0
];
};
}
+3 -2
View File
@@ -24,7 +24,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "komikku";
version = "1.99.0";
version = "1.100.0";
pyproject = false;
src = fetchFromGitea {
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "valos";
repo = "Komikku";
tag = "v${version}";
hash = "sha256-JKPAY6vfoU0FIXW8BDjUimeDkqp6K1/DG81wNWBGLbY=";
hash = "sha256-rHOXRvUm/Wc5oQpp8+rg3szHxuko+R0oap4S/9rmHMk=";
};
nativeBuildInputs = [
@@ -61,6 +61,7 @@ python3.pkgs.buildPythonApplication rec {
brotli
colorthief
dateparser
ebooklib
emoji
keyring
lxml
+6 -18
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
glfw,
enableShared ? !stdenv.hostPlatform.isStatic,
@@ -11,31 +10,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mlx42";
version = "2.4.1";
version = "2.4.2";
src = fetchFromGitHub {
owner = "codam-coding-college";
repo = "MLX42";
tag = "v${finalAttrs.version}";
hash = "sha256-/HCP6F7N+J97n4orlLxg/4agEoq4+rJdpeW/3q+DI1I=";
hash = "sha256-IMwDdWtbu882N43oTr/c6Fq34TduCuUt34Vh2Hx/TJY=";
};
patches = [
# clang no longer allows using -Ofast
# see: https://github.com/codam-coding-college/MLX42/issues/147
(fetchpatch {
name = "replace-ofast-with-o3.patch";
url = "https://github.com/codam-coding-college/MLX42/commit/ce254c3a19af8176787601a2ac3490100a5c4c61.patch";
hash = "sha256-urL/WVOXinf7hWR5kH+bAVTcAzldkkWfY0+diSf7jHE=";
})
];
postPatch = ''
patchShebangs --build ./tools
''
+ lib.optionalString enableShared ''
substituteInPlace CMakeLists.txt \
--replace-fail "mlx42 STATIC" "mlx42 SHARED"
'';
strictDeps = true;
@@ -44,7 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ glfw ];
cmakeFlags = [ (lib.cmakeBool "DEBUG" enableDebug) ];
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
(lib.cmakeBool "DEBUG" enableDebug)
];
postInstall = ''
mkdir -p $out/lib/pkgconfig
@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "npm-check-updates";
version = "19.1.0";
version = "19.3.1";
src = fetchFromGitHub {
owner = "raineorshine";
repo = "npm-check-updates";
tag = "v${version}";
hash = "sha256-I9X98vqQgLgWt7q9Tr+0b+IlpTsPZDBQd+PVZlgpzyE=";
hash = "sha256-VcZB4NIFvGgTL55AbIpaWwrYNEtVJPgKobPbtL/B28s=";
};
npmDepsHash = "sha256-cb8EgKRBKK3h+aP7MChwNoM5zMd5Ok/bjlx5bONDhdE=";
npmDepsHash = "sha256-u1B+tD6ciObPwgsdhDHR200/vMeDLi7qLCwTd5Auksg=";
postPatch = ''
sed -i '/"prepare"/d' package.json
+3 -3
View File
@@ -19,14 +19,14 @@
}:
stdenv.mkDerivation rec {
version = "2025-11-23";
version = "2026-01-14";
pname = "oh-my-zsh";
src = fetchFromGitHub {
owner = "ohmyzsh";
repo = "ohmyzsh";
rev = "beadd56dd75e8a40fe0a7d4a5d63ed5bf9efcd48";
sha256 = "sha256-e3zTM3rj4z6RwDai9i7KKrz6imTGmZiSAqcS9Mw2LZU=";
rev = "ec14da72fbf8b5016bb1533d4af3ff3bb2ac7a19";
sha256 = "sha256-ML9s5t26DTbrSxQLP1CEC7GWUdRYAy8IhMraMHqOc50=";
};
strictDeps = true;
-69
View File
@@ -1,69 +0,0 @@
{
buildGoModule,
fetchFromGitLab,
fetchzip,
ffmpeg,
installShellFiles,
lib,
makeWrapper,
}:
buildGoModule rec {
pname = "olaris-server";
version = "unstable-2022-06-11";
src = fetchFromGitLab {
owner = "olaris";
repo = "olaris-server";
rev = "bdb2aeb1595c941210249164a97c12404c1ae0d8";
hash = "sha256-Uhnh6GC85ORKnfHeYNtbSA40osuscxXDF5/kXJrF2Cs=";
};
preBuild =
let
olaris-react = fetchzip {
url = "https://gitlab.com/api/v4/projects/olaris%2Folaris-react/jobs/artifacts/v${version}/download?job=build";
extension = "zip";
hash = "sha256-MkxBf/mGvtiOu0e79bMpd9Z/D0eOxhzPE+bKic//viM=";
};
in
''
# cannot build olaris-react https://github.com/NixOS/nixpkgs/issues/203708
cp -r ${olaris-react} react/build
make generate
'';
ldflags = [
"-s"
"-w"
"-X gitlab.com/olaris/olaris-server/helpers.Version=${version}"
];
vendorHash = "sha256-bw8zvDGFBci9bELsxAD0otpNocBnO8aAcgyohLZ3Mv0=";
nativeBuildInputs = [
installShellFiles
makeWrapper
];
# integration tests require network access
doCheck = false;
postInstall = ''
installShellCompletion --cmd olaris-server \
--bash <($out/bin/olaris-server completion bash) \
--fish <($out/bin/olaris-server completion fish) \
--zsh <($out/bin/olaris-server completion zsh)
wrapProgram $out/bin/olaris-server --prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
'';
meta = {
# Marked broken 2025-11-28 because it has failed on Hydra for at least one year.
broken = true;
description = "Media manager and transcoding server";
homepage = "https://gitlab.com/olaris/olaris-server";
changelog = "https://gitlab.com/olaris/olaris-server/-/releases/v${version}";
license = lib.licenses.gpl3Only;
maintainers = [ ];
};
}
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "pocketbase";
version = "0.35.0";
version = "0.36.0";
src = fetchFromGitHub {
owner = "pocketbase";
repo = "pocketbase";
rev = "v${version}";
hash = "sha256-rvEchQfJr4frFOmuKPRcV2dwl97u36tgayJvbm3X7ks=";
hash = "sha256-sl3OsGV6J1kxCW8ter71ACk7BkPZjImIKdcGJOtoEmg=";
};
vendorHash = "sha256-dNkpHGMtnR0sL9+Fl+NOfyQLJ9AXxgsnV5X9ieAVcao=";
vendorHash = "sha256-2nLjbIqjxFNd/epJfi+3C9HHlKYipv9HbqNKgtgH6H8=";
# This is the released subpackage from upstream repo
subPackages = [ "examples/base" ];
-38
View File
@@ -1,38 +0,0 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "popura";
version = "0.4.6";
src = fetchFromGitHub {
owner = "popura-network";
repo = "popura";
rev = "v${version}";
hash = "sha256-iCu6/vD4vgn7aGdwK+OB8ib/QwUwoFuxDUs7vqbTZQc=";
};
vendorHash = "sha256-9lQC35yt1S2uch3qgwNfa/1FHy+Qi1D5Jo7DWNMgU9w=";
ldflags =
let
pkgSrc = "github.com/yggdrasil-network/yggdrasil-go/src/version";
in
[
"-s"
"-w"
"-X=${pkgSrc}.buildName=yggdrasil"
"-X=${pkgSrc}.buildVersion=${version}"
];
meta = {
description = "Alternative Yggdrasil network client";
homepage = "https://github.com/popura-network/popura";
license = lib.licenses.lgpl3Only;
maintainers = [ ];
mainProgram = "yggdrasil";
};
}
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "pscale";
version = "0.269.0";
version = "0.270.0";
src = fetchFromGitHub {
owner = "planetscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-fs4MXuC4CLxoApgimmHNOoxyhck2ZV/IE4rGoAKr7Lk=";
sha256 = "sha256-oqfefPcGav1TwCq5F+r1eg/hx0CZoyc21rULg9cYquA=";
};
vendorHash = "sha256-HxvjFM1o14L2EVToDaqdvnnm/UeOy5BQ73ge1xx815k=";
vendorHash = "sha256-1rBQdT2bSQxOL3vWWWSwaMH8K9op6x7t5asj+qJM/sA=";
ldflags = [
"-s"
+9 -5
View File
@@ -3,6 +3,7 @@
buildGoModule,
fetchFromGitHub,
stdenvNoCC,
nixosTests,
nix-update-script,
nodejs,
pnpm_9,
@@ -72,11 +73,14 @@ buildGoModule (finalAttrs: {
versionCheckProgramArg = "version";
doInstallCheck = true;
passthru.updateScript = nix-update-script {
extraArgs = [
"--subpackage"
"qui-web"
];
passthru = {
updateScript = nix-update-script {
extraArgs = [
"--subpackage"
"qui-web"
];
};
tests.testService = nixosTests.qui;
};
meta = {
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "reindeer";
version = "2026.01.05.00";
version = "2026.01.12.00";
src = fetchFromGitHub {
owner = "facebookincubator";
repo = "reindeer";
tag = "v${version}";
hash = "sha256-QbpNbiRWKbJlA3qM7RBjmjQb3Jrlwcpakb+bSdl4jA4=";
hash = "sha256-c5O1oJ4DEhOHU9b/nHj+TqTFkFRtPuh79wqzGSBP95w=";
};
cargoHash = "sha256-GeRXwE6QqWaPxRTMIIvcIGE1NdWVSSjfxy6wq3pKieM=";
cargoHash = "sha256-oCB8hV9+ZGiJ7SllVzZhq0Bg6eMua5njYJV+Mb6UpP0=";
nativeBuildInputs = [ pkg-config ];
+3 -3
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation {
pname = "slade";
version = "3.2.10-unstable-2026-01-06";
version = "3.2.10-unstable-2026-01-13";
src = fetchFromGitHub {
owner = "sirjuddington";
repo = "SLADE";
rev = "41967633f73a507181b44a1b52694547dcd534d5";
hash = "sha256-6HnhsO9EuZia2ox7edVIade1RZ4ES6zWZkLNwA0PqZ0=";
rev = "da2bf4fd868062ea69111077c6631b26860ad5e3";
hash = "sha256-PmTRseccN9ZyyFKWAJyDitDhWIKyTEJi77H5/CdNzbY=";
};
nativeBuildInputs = [
+159
View File
@@ -0,0 +1,159 @@
{
lib,
stdenv,
libGLU,
libGL,
libglut,
libX11,
plib,
openal,
freealut,
libXrandr,
xorgproto,
libXext,
libSM,
libICE,
libXi,
libXt,
libXrender,
libXxf86vm,
openscenegraph,
expat,
libpng12,
zlib,
bash,
SDL2,
SDL2_mixer,
enet,
libjpeg,
cmake,
pkg-config,
libvorbis,
runtimeShell,
curl,
fetchgit,
cjson,
minizip,
rhash,
copyDesktopItems,
}:
stdenv.mkDerivation rec {
version = "2.4.2";
pname = "speed-dreams";
src = fetchgit {
url = "https://forge.a-lec.org/speed-dreams/speed-dreams-code.git";
rev = "v${version}";
sha256 = "sha256-ZY/0tf0wFbepEUNqpaBA4qgkWDij/joqPtbiF/48oN4=";
fetchSubmodules = true;
};
NIX_CFLAGS_COMPILE = "-I${src}/src/libs/tgf -I${src}/src/libs/tgfdata -I${src}/src/interfaces -I${src}/src/libs/math -I${src}/src/libs/portability";
postInstall = ''
mkdir -p "$out/bin"
# Wrapper for main executable
cat > "$out/bin/speed-dreams" <<EOF
#!${runtimeShell}
export LD_LIBRARY_PATH="$out/lib/games/speed-dreams-2/lib:$out/lib:${
lib.makeLibraryPath [
libGL
libGLU
libglut
libX11
plib
openal
freealut
libXrandr
libXext
libSM
libICE
libXi
libXt
libXrender
libXxf86vm
openscenegraph
expat
libpng12
zlib
SDL2
SDL2_mixer
enet
libjpeg
libvorbis
curl
cjson
minizip
rhash
stdenv.cc.cc.lib
]
}"
if [ -e "${libGL}/lib/libGL.so.1" ]; then
export LD_PRELOAD="${libGL}/lib/libGL.so.1''${LD_PRELOAD:+:$LD_PRELOAD}"
fi
export SDL_VIDEODRIVER="x11"
exec "$out/games/speed-dreams-2" "$@"
EOF
chmod a+x "$out/bin/speed-dreams"
# Symlink for desktop icon
mkdir -p $out/share/pixmaps/
ln -s "$out/share/games/speed-dreams-2/data/icons/icon.png" "$out/share/pixmaps/speed-dreams-2.png"
substituteInPlace "$out/share/applications/speed-dreams.desktop" \
--replace-fail "Exec=$out/games/speed-dreams-2" "Exec=$out/bin/speed-dreams" \
--replace-fail "Icon=/build/speed-dreams-code/speed-dreams-data/data/data/icons/icon.png" "Icon=$out/share/pixmaps/speed-dreams-2.png"
'';
# RPATH of binary /nix/store/.../lib64/games/speed-dreams-2/drivers/shadow_sc/shadow_sc.so contains a forbidden reference to /build/
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
nativeBuildInputs = [
pkg-config
cmake
copyDesktopItems
];
buildInputs = [
libpng12
libGLU
libGL
libglut
libX11
plib
openal
freealut
libXrandr
xorgproto
libXext
libSM
libICE
libXi
libXt
libXrender
libXxf86vm
zlib
bash
expat
SDL2
SDL2_mixer
enet
libjpeg
openscenegraph
libvorbis
curl
cjson
minizip
rhash
];
meta = {
description = "Car racing game - TORCS fork with more experimental approach";
homepage = "https://www.speed-dreams.net/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ raskin ];
platforms = lib.platforms.linux;
mainProgram = "speed-dreams";
};
}
+48
View File
@@ -0,0 +1,48 @@
{
stdenv,
fetchFromGitea,
cmake,
ninja,
qt6,
lib,
}:
stdenv.mkDerivation {
pname = "sqlauncher";
version = "0.0.0-unstable-2025-12-30";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "ItsZariep";
repo = "SQLauncher";
rev = "4a82d0f5d1394f3ff850297939b62357f7f3ce0f";
hash = "sha256-9yMdJn+aMJQrkreEWkaTw0ZAtmNtTw50n2pXu3d9m6w=";
};
nativeBuildInputs = [
qt6.wrapQtAppsHook
cmake
ninja
];
buildInputs = [
qt6.qtbase
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp sqlauncher $out/bin
runHook postInstall
'';
meta = with lib; {
description = "Simple QT6 Program Launcher";
homepage = "https://codeberg.org/ItsZariep/SQLauncher";
license = licenses.gpl3Only;
mainProgram = "sqlauncher";
platforms = platforms.linux;
maintainers = [ maintainers.reylak ];
};
}
@@ -42,13 +42,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "stable-diffusion-cpp";
version = "master-445-860a78e";
version = "master-468-885e62e";
src = fetchFromGitHub {
owner = "leejet";
repo = "stable-diffusion.cpp";
rev = "master-445-860a78e";
hash = "sha256-G/f0X+kxKAr/jDKDKpAppAsfsnmuq1/xMFFyUHB+3iI=";
rev = "master-468-885e62e";
hash = "sha256-KGbHKUZ1YbANB5RQl2cGq3MkHANLosloia3ntLhIS+o=";
fetchSubmodules = true;
};
@@ -1,4 +1,4 @@
From f89d1d20a773cff73dd5856af4c84bccaea549ac Mon Sep 17 00:00:00 2001
From 6cb38146684743fda3e86f7c64c38f3455dacf0b Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 8 Nov 2025 15:18:44 +0800
Subject: [PATCH 1/2] nix: read timestamp from SOURCE_DATE_EPOCH
@@ -31,5 +31,5 @@ index 142abf3..3935272 100644
\ No newline at end of file
+}
--
2.51.0
2.51.2
@@ -1,21 +1,22 @@
From cbf623903a0efdbd9b105f24aae6ac9ce0a4d21e Mon Sep 17 00:00:00 2001
From d16cf03e5cbaa35e74285098cfd95197415f8cfd Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 8 Nov 2025 15:22:08 +0800
Subject: [PATCH 2/2] nix: use easytier from nix input
---
build.rs | 3 ++-
src/easytier/executable_impl.rs | 31 +++----------------------------
2 files changed, 5 insertions(+), 29 deletions(-)
src/easytier/executable_impl.rs | 32 +++-----------------------------
src/main.rs | 1 -
3 files changed, 5 insertions(+), 31 deletions(-)
diff --git a/build.rs b/build.rs
index dc6e117..df454d9 100644
index dfbcc4b..d716f28 100644
--- a/build.rs
+++ b/build.rs
@@ -12,7 +12,8 @@ fn main() {
@@ -11,7 +11,8 @@ use std::{
fn main() {
println!("cargo::rerun-if-changed=Cargo.toml");
println!("cargo::rerun-if-changed=.easytier");
- download_easytier();
+ // Use easytier from nix
+ // download_easytier();
@@ -23,12 +24,19 @@ index dc6e117..df454d9 100644
sevenz_rust2::compress_to_path(
"web",
diff --git a/src/easytier/executable_impl.rs b/src/easytier/executable_impl.rs
index 4444060..c534360 100644
index 81ba374..b9894cb 100644
--- a/src/easytier/executable_impl.rs
+++ b/src/easytier/executable_impl.rs
@@ -16,12 +16,6 @@ use std::{
time::Duration,
@@ -1,6 +1,5 @@
use crate::easytier::argument::{Argument, PortForward};
use crate::ports::PortRequest;
-use crate::EASYTIER_DIR;
use parking_lot::Mutex;
use std::ffi::OsString;
use std::fmt::Write;
@@ -17,12 +16,6 @@ use std::{
};
use crate::easytier::{EasyTierMember, NatType};
-static EASYTIER_ARCHIVE: (&str, &str, &[u8]) = (
- include_str!(env!("TERRACOTTA_ET_ENTRY_CONF")),
@@ -37,12 +45,12 @@ index 4444060..c534360 100644
-);
-
lazy_static::lazy_static! {
pub static ref FACTORY: EasytierFactory = create();
static ref FACTORY: EasytierFactory = create_factory();
}
@@ -38,32 +32,13 @@ pub struct Easytier {
@@ -42,32 +35,13 @@ pub struct EasyTier {
}
fn create() -> EasytierFactory {
fn create_factory() -> EasytierFactory {
- let _ = fs::create_dir_all(&*EASYTIER_DIR);
-
logging!(
@@ -75,6 +83,18 @@ index 4444060..c534360 100644
EasytierFactory { exe, cli }
}
diff --git a/src/main.rs b/src/main.rs
index c40b991..a3aecaf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -132,7 +132,6 @@ lazy_static! {
))
};
static ref LOGGING_FILE: std::path::PathBuf = WORKING_DIR.join("application.log");
- static ref EASYTIER_DIR: std::path::PathBuf = WORKING_DIR.join("embedded-easytier");
}
#[derive(Debug, PartialEq)]
--
2.51.0
2.51.2
+484 -183
View File
File diff suppressed because it is too large Load Diff
+16 -4
View File
@@ -3,21 +3,21 @@
stdenv,
rustPlatform,
fetchFromGitHub,
callPackage,
easytier,
replaceVars,
imagemagick,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "terracotta";
version = "0.3.14";
version = "0.4.1";
src = fetchFromGitHub {
owner = "burningtnt";
repo = "Terracotta";
tag = "v${finalAttrs.version}";
hash = "sha256-zp3Ax0A7Vc6LnZiWu2pWzQTWvYH9NRmqSfmxK756qA8=";
hash = "sha256-AlbztRTHnrEqJCcNeRNssu2M0QHicdRlGCVHOvYglTw=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -40,6 +40,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
];
postPatch = ''
# remove android-specific git dependency
sed -i '/EasyTier.git/d' Cargo.toml
ln -s ${./Cargo.lock} Cargo.lock
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -50,6 +53,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
nativeBuildInputs = [ imagemagick ];
cargoBuildFlags = [
"--bin"
"terracotta"
];
cargoTestFlags = [
"--bin"
"terracotta"
];
cargoLock.lockFile = ./Cargo.lock;
env = {
@@ -90,7 +102,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '@TERRACOTTA_BIN@' "$out/bin/terracotta"
'';
passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; };
passthru.updateScript = lib.getExe (callPackage ./update.nix { });
meta = {
description = "Terracotta provides out-of-the-box multiplayer support for Minecraft";
+47
View File
@@ -0,0 +1,47 @@
{
writeShellApplication,
curl,
jq,
common-updater-scripts,
cargo,
}:
writeShellApplication {
name = "update-terracotta";
runtimeInputs = [
curl
jq
common-updater-scripts
cargo
];
text = ''
get_latest_release() {
curl --fail ''${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \
-s "https://api.github.com/repos/burningtnt/Terracotta/releases/latest" | jq -r ".tag_name"
}
version=$(get_latest_release)
version="''${version#v}"
if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
echo "Already up to date!"
exit 0
fi
tmp=$(mktemp -d)
trap 'rm -rf "$tmp"' EXIT
update-source-version terracotta "$version"
cp -r "$(nix-build --no-link -A terracotta.src)" "$tmp/src"
chmod -R +w "$tmp/src"
pushd "$tmp/src"
sed -i '/EasyTier.git/d' Cargo.toml
cargo generate-lockfile
popd
cp "$tmp/src/Cargo.lock" "pkgs/by-name/te/terracotta/Cargo.lock"
'';
}
+6 -3
View File
@@ -11,7 +11,7 @@
python3Packages.buildPythonApplication rec {
pname = "turtle";
version = "0.13.3";
version = "0.14";
pyproject = true;
src = fetchFromGitLab {
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
owner = "philippun1";
repo = "turtle";
tag = version;
hash = "sha256-bfoo2xWBr4jR5EX5H8hiXl6C6HSpNJ93icDg1gwWXqE=";
hash = "sha256-+XDDscw5xBUp39tbZLqZWK+wsRDi401mRDjx+VR6Cu0=";
};
postPatch = ''
@@ -58,7 +58,10 @@ python3Packages.buildPythonApplication rec {
dontWrapPythonPrograms = true;
postFixup = ''
makeWrapperArgs+=(''${gappsWrapperArgs[@]})
makeWrapperArgs+=(
''${gappsWrapperArgs[@]}
--prefix PATH : ${lib.makeBinPath [ meld ]}
)
wrapPythonPrograms
''
# Dialogs are not imported, but executed. The same does
+3 -3
View File
@@ -24,13 +24,13 @@
}:
let
version = "2.0.0-beta.7";
version = "2.0.0-beta.8";
src = fetchFromGitHub {
owner = "Wox-launcher";
repo = "Wox";
tag = "v${version}";
hash = "sha256-uKnuzuR+Qd5yP45kPJELBz8v+LrZEMIHl9I07nNPZpE=";
hash = "sha256-eucyQKNuzJCLwAnyQVE/64gth+uVrCgyHLAJNfrUxvk=";
};
metaCommon = {
@@ -79,7 +79,7 @@ let
;
pnpm = pnpm_9;
fetcherVersion = 2;
hash = "sha256-BO3QsybMxbyBhwM6XVmS6s5jGJljyxE1PRUSAreE17Y=";
hash = "sha256-8EovIVJ+uAo9XJIIgRrpkQrcmNkKC2Ruja2md7NFZ4A=";
};
buildPhase = ''
+82 -92
View File
@@ -114,21 +114,21 @@
"dependency": "transitive",
"description": {
"name": "cross_file",
"sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
"sha256": "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.3.4+2"
"version": "0.3.5+1"
},
"crypto": {
"dependency": "transitive",
"description": {
"name": "crypto",
"sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
"sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.6"
"version": "3.0.7"
},
"dbus": {
"dependency": "transitive",
@@ -264,11 +264,11 @@
"dependency": "direct main",
"description": {
"name": "file_picker",
"sha256": "7872545770c277236fd32b022767576c562ba28366204ff1a5628853cf8f2200",
"sha256": "d974b6ba2606371ac71dd94254beefb6fa81185bde0b59bdc1df09885da85fde",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.3.7"
"version": "10.3.8"
},
"fixnum": {
"dependency": "transitive",
@@ -300,11 +300,11 @@
"dependency": "direct main",
"description": {
"name": "flutter_code_editor",
"sha256": "52da5d30f14b58ebd49a7ffa9f281430899b8bd02c12bf63a68756206470d99e",
"sha256": "9af48ba8e3558b6ea4bb98b84c5eb1649702acf53e61a84d88383eeb79b239b0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.3.4"
"version": "0.3.5"
},
"flutter_highlight": {
"dependency": "direct main",
@@ -336,25 +336,35 @@
"source": "hosted",
"version": "6.0.0"
},
"flutter_math_fork": {
"dependency": "transitive",
"description": {
"name": "flutter_math_fork",
"sha256": "6d5f2f1aa57ae539ffb0a04bb39d2da67af74601d685a161aff7ce5bda5fa407",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.4"
},
"flutter_plugin_android_lifecycle": {
"dependency": "transitive",
"description": {
"name": "flutter_plugin_android_lifecycle",
"sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
"sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.30"
"version": "2.0.33"
},
"flutter_svg": {
"dependency": "direct main",
"description": {
"name": "flutter_svg",
"sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678",
"sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.1"
"version": "2.2.3"
},
"flutter_test": {
"dependency": "direct dev",
@@ -382,11 +392,21 @@
"dependency": "direct main",
"description": {
"name": "get",
"sha256": "c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425",
"sha256": "5ed34a7925b85336e15d472cc4cfe7d9ebf4ab8e8b9f688585bf6b50f4c3d79a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.7.2"
"version": "4.7.3"
},
"gpt_markdown": {
"dependency": "direct main",
"description": {
"name": "gpt_markdown",
"sha256": "9b88dfaffea644070b648c204ca4a55745a49f4ad0b58ed0ab70913ad593c7a1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.5"
},
"highlight": {
"dependency": "direct main",
@@ -462,11 +482,11 @@
"dependency": "transitive",
"description": {
"name": "http",
"sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
"sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.5.0"
"version": "1.6.0"
},
"http_parser": {
"dependency": "transitive",
@@ -552,21 +572,21 @@
"dependency": "direct main",
"description": {
"name": "logger",
"sha256": "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c",
"sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.6.1"
"version": "2.6.2"
},
"lottie": {
"dependency": "direct main",
"description": {
"name": "lottie",
"sha256": "c5fa04a80a620066c15cf19cc44773e19e9b38e989ff23ea32e5903ef1015950",
"sha256": "8ae0be46dbd9e19641791dc12ee480d34e1fd3f84c749adc05f3ad9342b71b95",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.3.1"
"version": "3.3.2"
},
"lpinyin": {
"dependency": "direct main",
@@ -588,26 +608,6 @@
"source": "hosted",
"version": "1.9.0"
},
"markdown": {
"dependency": "transitive",
"description": {
"name": "markdown",
"sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.3.0"
},
"markdown_widget": {
"dependency": "direct main",
"description": {
"name": "markdown_widget",
"sha256": "b52c13d3ee4d0e60c812e15b0593f142a3b8a2003cde1babb271d001a1dbdc1c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.2+8"
},
"matcher": {
"dependency": "transitive",
"description": {
@@ -629,14 +629,14 @@
"version": "0.11.1"
},
"math_expressions": {
"dependency": "direct overridden",
"dependency": "direct main",
"description": {
"name": "math_expressions",
"sha256": "218dc65bed4726562bb31c53d8daa3cc824664b26fb72d77bc592757edf74ba0",
"sha256": "2e1ceb974c2b1893c809a68c7005f1b63f7324db0add800a0e792b1ac8ff9f03",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.7.0"
"version": "3.1.0"
},
"meta": {
"dependency": "transitive",
@@ -668,6 +668,16 @@
"source": "hosted",
"version": "1.0.4"
},
"nested": {
"dependency": "transitive",
"description": {
"name": "nested",
"sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.0"
},
"path": {
"dependency": "direct main",
"description": {
@@ -702,21 +712,21 @@
"dependency": "transitive",
"description": {
"name": "path_provider_android",
"sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
"sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.18"
"version": "2.2.22"
},
"path_provider_foundation": {
"dependency": "transitive",
"description": {
"name": "path_provider_foundation",
"sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd",
"sha256": "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.2"
"version": "2.5.1"
},
"path_provider_linux": {
"dependency": "transitive",
@@ -752,11 +762,11 @@
"dependency": "transitive",
"description": {
"name": "petitparser",
"sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
"sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.1.0"
"version": "7.0.1"
},
"platform": {
"dependency": "transitive",
@@ -848,15 +858,15 @@
"source": "hosted",
"version": "0.2.0"
},
"scroll_to_index": {
"provider": {
"dependency": "transitive",
"description": {
"name": "scroll_to_index",
"sha256": "b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176",
"name": "provider",
"sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.1"
"version": "6.1.5+1"
},
"scrollable_positioned_list": {
"dependency": "transitive",
@@ -884,16 +894,6 @@
"source": "hosted",
"version": "1.10.1"
},
"sprintf": {
"dependency": "transitive",
"description": {
"name": "sprintf",
"sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.0.0"
},
"stack_trace": {
"dependency": "transitive",
"description": {
@@ -1088,41 +1088,41 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
"sha256": "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e",
"sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.20"
"version": "6.3.28"
},
"url_launcher_ios": {
"dependency": "transitive",
"description": {
"name": "url_launcher_ios",
"sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7",
"sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.4"
"version": "6.3.6"
},
"url_launcher_linux": {
"dependency": "transitive",
"description": {
"name": "url_launcher_linux",
"sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
"sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.1"
"version": "3.2.2"
},
"url_launcher_macos": {
"dependency": "transitive",
"description": {
"name": "url_launcher_macos",
"sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f",
"sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.3"
"version": "3.2.5"
},
"url_launcher_platform_interface": {
"dependency": "transitive",
@@ -1148,21 +1148,21 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_windows",
"sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
"sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.4"
"version": "3.1.5"
},
"uuid": {
"dependency": "direct main",
"description": {
"name": "uuid",
"sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
"sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.5.1"
"version": "4.5.2"
},
"vector_graphics": {
"dependency": "transitive",
@@ -1204,25 +1204,15 @@
"source": "hosted",
"version": "2.2.0"
},
"visibility_detector": {
"dependency": "transitive",
"description": {
"name": "visibility_detector",
"sha256": "dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.4.0+2"
},
"vm_service": {
"dependency": "transitive",
"description": {
"name": "vm_service",
"sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
"sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "15.0.0"
"version": "15.0.2"
},
"web": {
"dependency": "transitive",
@@ -1258,11 +1248,11 @@
"dependency": "transitive",
"description": {
"name": "win32",
"sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
"sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.14.0"
"version": "5.15.0"
},
"win32_registry": {
"dependency": "transitive",
@@ -1288,15 +1278,15 @@
"dependency": "transitive",
"description": {
"name": "xml",
"sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
"sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.5.0"
"version": "6.6.1"
}
},
"sdks": {
"dart": ">=3.8.0 <4.0.0",
"dart": ">=3.9.0 <4.0.0",
"flutter": ">=3.35.1"
}
}
@@ -0,0 +1,41 @@
{
fetchFromGitHub,
gradle_9,
jdk25,
lib,
stdenv,
rsync,
pandoc,
runCommand,
testers,
}:
let
corretto = import ./mk-corretto.nix rec {
inherit
lib
stdenv
rsync
runCommand
testers
;
jdk = jdk25;
gradle = gradle_9;
version = "25.0.1.9.1";
src = fetchFromGitHub {
owner = "corretto";
repo = "corretto-25";
rev = version;
hash = "sha256-eAjepqxp5LVQgP/HcxwwdjbXxy5jUOJC4HYntcHNX0o=";
};
extraNativeBuildInputs = [ pandoc ];
};
in
corretto.overrideAttrs (
final: prev: {
patches = (prev.patches or [ ]) ++ [
# See patches in openjdk/generic.nix.
./remove_removal_of_wformat_during_test_compilation.patch
];
}
)
@@ -6,6 +6,7 @@
stdenv,
gradle,
extraConfig ? [ ],
extraNativeBuildInputs ? [ ],
rsync,
runCommand,
testers,
@@ -29,11 +30,14 @@ jdk.overrideAttrs (
finalAttrs: oldAttrs: {
inherit pname version src;
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [
jdk
gradle
rsync
];
nativeBuildInputs =
oldAttrs.nativeBuildInputs
++ [
jdk
gradle
rsync
]
++ extraNativeBuildInputs;
dontConfigure = true;
@@ -41,11 +45,25 @@ jdk.overrideAttrs (
let
extra_config = builtins.concatStringsSep " " extraConfig;
in
''
(oldAttrs.postPatch or "")
+ ''
# The rpm/deb task definitions require a Gradle plugin which we don't
# have and so the build fails. We'll simply remove them here because
# they are not needed anyways.
rm -rf installers/linux/universal/{rpm,deb}
# have and so the build fails. We'll simply empty them here because
# they are not needed anyways. The directories are kept because Gradle
# still expects them.
rm -rf installers/linux/universal/{rpm,deb}/{*,.*}
# These fixes are necessary as long as we use Gradle 9 to build
# Corretto but upstream is not yet using it. I.e. as long as upstream
# hasn't fixed compatibility with Gradle 9 issues.
find /build/source/installers -type d -exec cp /build/source/version.txt {}/version.txt \;
find /build/source/installers -name 'build.gradle' -exec sed -i '/fileMode =/d' {} \;
for d in source pre-build; do
# These subprojects (see settings.gradle) don't exist. Create them
# here so that Gradle doesn't complain.
mkdir /build/source/$d
cp /build/source/version.txt /build/source/$d/version.txt
done
# `/usr/bin/rsync` is invoked to copy the source tree. We don't have that.
for file in $(find installers -name "build.gradle"); do
@@ -74,6 +92,7 @@ jdk.overrideAttrs (
file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz')
tar -xzf $file -C $dir
mv $dir/amazon-corretto-* $dir/jdk
chmod +x $dir/jdk/bin/*
''
+ oldAttrs.postBuild or "";
@@ -0,0 +1,13 @@
diff --git a/make/common/TestFilesCompilation.gmk b/make/common/TestFilesCompilation.gmk
index fd1c54eaf..c1e240a19 100644
--- a/make/common/TestFilesCompilation.gmk
+++ b/make/common/TestFilesCompilation.gmk
@@ -112,7 +112,7 @@ define SetupTestFilesCompilationBody
CXXFLAGS := $$(TEST_CFLAGS) $$($1_CFLAGS) $$($1_CFLAGS_$$(name)), \
LD_SET_ORIGIN := $$($1_LD_SET_ORIGIN), \
LDFLAGS := $$($1_LDFLAGS) $$($1_LDFLAGS_$$(name)), \
- DISABLED_WARNINGS_gcc := format undef unused-but-set-variable \
+ DISABLED_WARNINGS_gcc := undef unused-but-set-variable \
unused-const-variable unused-function unused-value \
unused-variable, \
DISABLED_WARNINGS_clang := format-nonliteral \
@@ -6,6 +6,7 @@
flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { };
flutter_vodozemac = callPackage ./flutter_vodozemac { };
flutter_volume_controller = callPackage ./flutter_volume_controller { };
fvp = callPackage ./fvp { };
handy_window = callPackage ./handy-window { };
hotkey_manager_linux = callPackage ./hotkey_manager_linux { };
matrix = callPackage ./matrix { };
@@ -0,0 +1,26 @@
{
stdenv,
mdk-sdk,
}:
{ version, src, ... }:
stdenv.mkDerivation rec {
pname = "fvp";
inherit version src;
inherit (src) passthru;
postPatch = ''
sed -i 's|.*libc++.so.1.*|${mdk-sdk}/lib/libc++.so.1|' ./linux/CMakeLists.txt
substituteInPlace ./linux/CMakeLists.txt \
--replace-fail "fvp_setup_deps()" "include(${mdk-sdk}/lib/cmake/FindMDK.cmake)"
'';
installPhase = ''
runHook preInstall
cp -r . $out
runHook postInstall
'';
}
@@ -1,73 +1,73 @@
{
"version": "3.38.5",
"engineVersion": "1527ae0ec577a4ef50e65f6fefcfc1326707d9bf",
"version": "3.38.7",
"engineVersion": "78fc3012e45889657f72359b005af7beac47ba3d",
"engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
"engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
"channel": "stable",
"engineHashes": {
"aarch64-linux": {
"aarch64-linux": "sha256-7eYbNWoKY9JYMAAJ+5cYPXnn15Mvahm6OeL0QVlhtXs=",
"x86_64-linux": "sha256-7eYbNWoKY9JYMAAJ+5cYPXnn15Mvahm6OeL0QVlhtXs="
"aarch64-linux": "sha256-bsC6dzVGf9JsfwGjn7FRC4EqjgBl6VDzpHDlgDTTZuI=",
"x86_64-linux": "sha256-bsC6dzVGf9JsfwGjn7FRC4EqjgBl6VDzpHDlgDTTZuI="
},
"x86_64-linux": {
"aarch64-linux": "sha256-qrOzazP0ZrrzBpkt5dDJIFrHDvoLYcXOR6BqKxgr+h8=",
"x86_64-linux": "sha256-qrOzazP0ZrrzBpkt5dDJIFrHDvoLYcXOR6BqKxgr+h8="
"aarch64-linux": "sha256-Bl3xaFAWNj93Vxz6lM1g7mkU30eK9X+5aiO/Wj5wj5A=",
"x86_64-linux": "sha256-Bl3xaFAWNj93Vxz6lM1g7mkU30eK9X+5aiO/Wj5wj5A="
}
},
"dartVersion": "3.10.4",
"dartVersion": "3.10.7",
"dartHash": {
"x86_64-linux": "sha256-ZePB4yLGh5TJVrgXPTv6EY1l5uHhpnD6j8AaErWVP8c=",
"aarch64-linux": "sha256-ALgFAnqBXK9NalTnypszhEz+yoUdW8nWU2IN6gWyOBI=",
"x86_64-darwin": "sha256-d3Q0hxTu5Q0i3XxKc7HMvq1X8gpHm744Q8HCh/E6JS8=",
"aarch64-darwin": "sha256-ha0VitYy4MIZE3U+Vy3bbZiH+0BAetH8CmPMmV8RRUQ="
"x86_64-linux": "sha256-PZPskpxD0ZsEgKGOov9maZmHbTp+AtnHW46RjLEJ+qs=",
"aarch64-linux": "sha256-IRcX1PBPzOhNcdcp9Ppa5S7lpsvaQwElQb014rRXDkQ=",
"x86_64-darwin": "sha256-L5zxNiNlUmv0jlehqWbKiIU2ckpcUR9lzby36L15VHU=",
"aarch64-darwin": "sha256-HdZWlVSDaohuTUnzN+H8q2kPssj7omxt6sWch/kkL+o="
},
"flutterHash": "sha256-qIvmxEUHtahABuPFUR+JWfg6yHgNK/i//tnDCZ/aFTE=",
"flutterHash": "sha256-rxAvZ1UdrP17nURjdm3ixkDwqLuCa0uAQKs/X/fcgpg=",
"artifactHashes": {
"android": {
"aarch64-darwin": "sha256-G3wi3eSoTKsiLw/GanLX62xMwjT5hVhbDZhhAUe9J7Q=",
"aarch64-linux": "sha256-uCtzsKrJtL6USbTS8z3xizoUJmxJuLq1fBDAT/exzOQ=",
"x86_64-darwin": "sha256-G3wi3eSoTKsiLw/GanLX62xMwjT5hVhbDZhhAUe9J7Q=",
"x86_64-linux": "sha256-uCtzsKrJtL6USbTS8z3xizoUJmxJuLq1fBDAT/exzOQ="
"aarch64-darwin": "sha256-KzBx+xKhW6emToEmxbQjuOlSTK1NMYpcL7Uuuc4gvik=",
"aarch64-linux": "sha256-hmpOFNtR8DiC8Fo77L1GDO+07nxolmLkYARoyC+yLVo=",
"x86_64-darwin": "sha256-KzBx+xKhW6emToEmxbQjuOlSTK1NMYpcL7Uuuc4gvik=",
"x86_64-linux": "sha256-hmpOFNtR8DiC8Fo77L1GDO+07nxolmLkYARoyC+yLVo="
},
"fuchsia": {
"aarch64-darwin": "sha256-nEcdKKVAWMFjY3HkrHp1/oPDW347DXtdtWy6A/oBZxo=",
"aarch64-linux": "sha256-nEcdKKVAWMFjY3HkrHp1/oPDW347DXtdtWy6A/oBZxo=",
"x86_64-darwin": "sha256-nEcdKKVAWMFjY3HkrHp1/oPDW347DXtdtWy6A/oBZxo=",
"x86_64-linux": "sha256-nEcdKKVAWMFjY3HkrHp1/oPDW347DXtdtWy6A/oBZxo="
"aarch64-darwin": "sha256-RRs/AyOAGH14/dIi21X33brN4rlL6XdoiwcoACjm2QY=",
"aarch64-linux": "sha256-RRs/AyOAGH14/dIi21X33brN4rlL6XdoiwcoACjm2QY=",
"x86_64-darwin": "sha256-RRs/AyOAGH14/dIi21X33brN4rlL6XdoiwcoACjm2QY=",
"x86_64-linux": "sha256-RRs/AyOAGH14/dIi21X33brN4rlL6XdoiwcoACjm2QY="
},
"ios": {
"aarch64-darwin": "sha256-CCN8JVZ1yIn1H6QtOs4XmkIg6CzzO6wMS8Qe7ziNnoo=",
"aarch64-linux": "sha256-CCN8JVZ1yIn1H6QtOs4XmkIg6CzzO6wMS8Qe7ziNnoo=",
"x86_64-darwin": "sha256-CCN8JVZ1yIn1H6QtOs4XmkIg6CzzO6wMS8Qe7ziNnoo=",
"x86_64-linux": "sha256-CCN8JVZ1yIn1H6QtOs4XmkIg6CzzO6wMS8Qe7ziNnoo="
"aarch64-darwin": "sha256-CVVwxlJf4RHxTgyuQnRm/LCUeJmOPBgWNyuDomHSctw=",
"aarch64-linux": "sha256-CVVwxlJf4RHxTgyuQnRm/LCUeJmOPBgWNyuDomHSctw=",
"x86_64-darwin": "sha256-CVVwxlJf4RHxTgyuQnRm/LCUeJmOPBgWNyuDomHSctw=",
"x86_64-linux": "sha256-CVVwxlJf4RHxTgyuQnRm/LCUeJmOPBgWNyuDomHSctw="
},
"linux": {
"aarch64-darwin": "sha256-AzRBBnfcJ/AipXsvX3DO+D2bSy7dzooWXvAEOsj4Jsw=",
"aarch64-linux": "sha256-AzRBBnfcJ/AipXsvX3DO+D2bSy7dzooWXvAEOsj4Jsw=",
"x86_64-darwin": "sha256-IFHSkU99MKm9WSMCtR+uDfYX/UdgxzF3kYRdyHzAEO8=",
"x86_64-linux": "sha256-IFHSkU99MKm9WSMCtR+uDfYX/UdgxzF3kYRdyHzAEO8="
"aarch64-darwin": "sha256-O6fIR0wKUpHMFBxTFjzEws6u9vwZ3P5oWBdeM18IFlo=",
"aarch64-linux": "sha256-O6fIR0wKUpHMFBxTFjzEws6u9vwZ3P5oWBdeM18IFlo=",
"x86_64-darwin": "sha256-ZGAR+bjdAXrAxo0GJj5NYGb+uzPk1BV0n+JDwlpMltA=",
"x86_64-linux": "sha256-ZGAR+bjdAXrAxo0GJj5NYGb+uzPk1BV0n+JDwlpMltA="
},
"macos": {
"aarch64-darwin": "sha256-BZuho0vvpWHCBxlf5bqcpV0CxwgD1JkQlumCgOSir/A=",
"aarch64-linux": "sha256-BZuho0vvpWHCBxlf5bqcpV0CxwgD1JkQlumCgOSir/A=",
"x86_64-darwin": "sha256-BZuho0vvpWHCBxlf5bqcpV0CxwgD1JkQlumCgOSir/A=",
"x86_64-linux": "sha256-BZuho0vvpWHCBxlf5bqcpV0CxwgD1JkQlumCgOSir/A="
"aarch64-darwin": "sha256-HQeMgmuBcZemxDgG2ykqmENj7I2kjp82pCwGIGW1ES4=",
"aarch64-linux": "sha256-HQeMgmuBcZemxDgG2ykqmENj7I2kjp82pCwGIGW1ES4=",
"x86_64-darwin": "sha256-HQeMgmuBcZemxDgG2ykqmENj7I2kjp82pCwGIGW1ES4=",
"x86_64-linux": "sha256-HQeMgmuBcZemxDgG2ykqmENj7I2kjp82pCwGIGW1ES4="
},
"universal": {
"aarch64-darwin": "sha256-/hyLfGgHWAHE5W7IM533RMmqRLceSKBOEsC3t71cSQA=",
"aarch64-linux": "sha256-you7n+Z1uhZ1ZP1abSFGaUPZIcNstdz9Q6omn5F15z4=",
"x86_64-darwin": "sha256-wp5rokG074cPBFV5hzEpCumeatZ7Zsrp49b9imSNTyQ=",
"x86_64-linux": "sha256-8Sf61AZe+lMiXi2+R039tYKG9Y3/s5NxZIO65AehymU="
"aarch64-darwin": "sha256-+bCK5vVzOwe49nMQ8fnLvjVOl9eoLuK9kGUYIn+M45g=",
"aarch64-linux": "sha256-Bm2ts/9S1LFka5GzmpzcOXc6PtW9wUKuKf/vIb5dOE8=",
"x86_64-darwin": "sha256-/VhgsmG5TxPi/GN01nUWM1gn75pUSnOxF9jgbucDOrQ=",
"x86_64-linux": "sha256-5r3cTuUkTwZNcQ0I/Erf7c22qek9gM/glhAX4H6DK1M="
},
"web": {
"aarch64-darwin": "sha256-HT5EyBvHhOpR7OS2XQRSRsLH7AQQAo1u4Stn7NELnEU=",
"aarch64-linux": "sha256-HT5EyBvHhOpR7OS2XQRSRsLH7AQQAo1u4Stn7NELnEU=",
"x86_64-darwin": "sha256-HT5EyBvHhOpR7OS2XQRSRsLH7AQQAo1u4Stn7NELnEU=",
"x86_64-linux": "sha256-HT5EyBvHhOpR7OS2XQRSRsLH7AQQAo1u4Stn7NELnEU="
"aarch64-darwin": "sha256-zig2dDj0duSJjEgMJw4FqKFp9tSoCsp4UfjFxJXOo7I=",
"aarch64-linux": "sha256-zig2dDj0duSJjEgMJw4FqKFp9tSoCsp4UfjFxJXOo7I=",
"x86_64-darwin": "sha256-zig2dDj0duSJjEgMJw4FqKFp9tSoCsp4UfjFxJXOo7I=",
"x86_64-linux": "sha256-zig2dDj0duSJjEgMJw4FqKFp9tSoCsp4UfjFxJXOo7I="
},
"windows": {
"x86_64-darwin": "sha256-NkkcN9NTL8fQQqBldg0BDZvmg3f+BBMqyMq+X3SZaq0=",
"x86_64-linux": "sha256-NkkcN9NTL8fQQqBldg0BDZvmg3f+BBMqyMq+X3SZaq0="
"x86_64-darwin": "sha256-GcIW0ulTqFgnHKqkcQynhbsSQ4HKdDTtjc3SKCuOJL8=",
"x86_64-linux": "sha256-GcIW0ulTqFgnHKqkcQynhbsSQ4HKdDTtjc3SKCuOJL8="
}
},
"pubspecLock": {
+39 -24
View File
@@ -1,4 +1,9 @@
{ callPackage, fetchpatch2 }:
{
callPackage,
fetchpatch2,
gcc14Stdenv,
gfortran14,
}:
let
juliaWithPackages = callPackage ../../julia-modules { };
@@ -27,12 +32,12 @@ in
);
julia_111-bin = wrapJulia (
callPackage (import ./generic-bin.nix {
version = "1.11.7";
version = "1.11.8";
sha256 = {
x86_64-linux = "aa5924114ecb89fd341e59aa898cd1882b3cb622ca4972582c1518eff5f68c05";
aarch64-linux = "f97f80b35c12bdaf40c26f6c55dbb7617441e49c9e6b842f65e8410a388ca6f4";
x86_64-darwin = "b2c11315df39da478ab0fa77fb228f3fd818f1eaf42dc5cc1223c703f7122fe5";
aarch64-darwin = "74df9d4755a7740d141b04524a631e2485da9d65065d934e024232f7ba0790b6";
x86_64-linux = "26ad9031b0c9857cde8c89aced86990d1842a551940bfb275e8372108e57cc50";
aarch64-linux = "54c8f866e1317fa249df47bde535fb4dda7c620863e8f877a1c91d6ed241f11a";
x86_64-darwin = "b54fd6e6d06fc8ae138dbd556d34d6bf89d91025b725349ab88c83bf958f8557";
aarch64-darwin = "c54daf1eea4c66d831d29ff0c40d629891474bc57391db3b3a2e56d06390bc38";
};
}) { }
);
@@ -48,26 +53,36 @@ in
}) { }
);
julia_110 = wrapJulia (
callPackage (import ./generic.nix {
version = "1.10.10";
hash = "sha256-/NTIGLlcNu4sI1rICa+PS/Jn+YnWi37zFBcbfMnv3Ys=";
patches = [
# Revert https://github.com/JuliaLang/julia/pull/55354
# [build] Some improvements to the LLVM build system
# Related: https://github.com/JuliaLang/julia/issues/55617
(fetchpatch2 {
url = "https://github.com/JuliaLang/julia/commit/0be37db8c5b5a440bd9a11960ae9c998027b7337.patch";
revert = true;
hash = "sha256-gXC3LE3AuHMlSdA4dW+rbAhJpSB6ZMaz9X1qrHDPX7Y=";
})
];
}) { }
callPackage
(import ./generic.nix {
version = "1.10.10";
hash = "sha256-/NTIGLlcNu4sI1rICa+PS/Jn+YnWi37zFBcbfMnv3Ys=";
patches = [
# Revert https://github.com/JuliaLang/julia/pull/55354
# [build] Some improvements to the LLVM build system
# Related: https://github.com/JuliaLang/julia/issues/55617
(fetchpatch2 {
url = "https://github.com/JuliaLang/julia/commit/0be37db8c5b5a440bd9a11960ae9c998027b7337.patch";
revert = true;
hash = "sha256-gXC3LE3AuHMlSdA4dW+rbAhJpSB6ZMaz9X1qrHDPX7Y=";
})
];
})
{
stdenv = gcc14Stdenv;
gfortran = gfortran14;
}
);
julia_111 = wrapJulia (
callPackage (import ./generic.nix {
version = "1.11.7";
hash = "sha256-puluy9YAV8kdx6mfwbN1F7Nhot+P0cRv/a0dm86Jln0=";
}) { }
callPackage
(import ./generic.nix {
version = "1.11.8";
hash = "sha256-ACblvJzyoRlzaWMZL/1ieF4izdNuhCvYgxvPrtCyJBo=";
})
{
stdenv = gcc14Stdenv;
gfortran = gfortran14;
}
);
julia_112 = wrapJulia (
callPackage (import ./generic.nix {
@@ -406,8 +406,8 @@ in
};
ruby_4_0 = generic {
version = rubyVersion "4" "0" "0" "";
hash = "sha256-LoOJyMByy2WMk6E3JzLZ6shAgsiLBldQ2x5SpaxjAnE=";
version = rubyVersion "4" "0" "1" "";
hash = "sha256-OSS+LQXbMPTjX4Wb8Ci+hfS33QFxQUL9gj5K9d4vr50=";
cargoHash = "sha256-z7NwWc4TaR042hNx0xgRkh/BQEpEJtE53cfrN0qNiE0=";
};
@@ -0,0 +1,37 @@
{
buildDunePackage,
crowbar,
hxd,
miou,
mirage-crypto-rng-miou-unix,
ohex,
ptime,
rresult,
tls,
x509,
}:
buildDunePackage {
pname = "tls-miou-unix";
inherit (tls) src version;
propagatedBuildInputs = [
miou
tls
x509
];
doCheck = true;
checkInputs = [
crowbar
hxd
mirage-crypto-rng-miou-unix
ohex
ptime
rresult
];
meta = tls.meta // {
description = "Transport Layer Security purely in OCaml, Miou+Unix layer";
};
}
@@ -87,6 +87,6 @@ buildPythonPackage rec {
# The package requires either CUDA or ROCm.
# It doesn't work without either, nor with both.
broken = cudaSupport != rocmSupport;
broken = cudaSupport == rocmSupport;
};
}
@@ -204,9 +204,15 @@ buildPythonPackage rec {
"frictionless/formats/spss"
# Console CLI tests fail due to typer/Click CliRunner output capture issues
# result.stdout is empty when error messages are expected
# All 1690 functional tests pass (including duckdb adapter tests)
"frictionless/console/__spec__/test_console.py"
"frictionless/console/commands/__spec__/test_summary.py"
# We're well-ahead of requirements for duckdb and sqlalchemy
# https://github.com/frictionlessdata/frictionless-py/blob/be08dcf491781a565d230f47e08707e703292d85/pyproject.toml#L84
"frictionless/formats/sql/__spec__/duckdb/test_adapter.py"
"frictionless/formats/sql/__spec__/duckdb/test_parser.py"
"frictionless/indexer/__spec__/test_resource.py::test_resource_index_sqlite[duckdb_url]"
"frictionless/indexer/__spec__/test_resource.py::test_resource_index_sqlite_with_metadata[duckdb_url]"
"frictionless/indexer/__spec__/test_resource.py::test_resource_index_sqlite_on_progress[duckdb_url]"
];
pythonImportsCheck = [
@@ -1,5 +1,6 @@
{
lib,
fetchpatch,
buildPythonPackage,
fetchFromGitHub,
setuptools,
@@ -18,6 +19,14 @@ buildPythonPackage rec {
hash = "sha256-0p8FW9alcWCSdi66wanS/F9IgO714WIRQIXvg3f9op8=";
};
patches = [
(fetchpatch {
name = "allow-install-python314";
url = "https://github.com/jazzband/geojson/commit/2584c0de5651bd694499449f9da5321b15597270.patch";
hash = "sha256-64LPEwC1qc83wF48878fH31CVFn2txTmSxxr0cnQbRg=";
})
];
build-system = [ setuptools ];
pythonImportsCheck = [ "geojson" ];
@@ -30,5 +39,6 @@ buildPythonPackage rec {
description = "Python bindings and utilities for GeoJSON";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ oxzi ];
teams = [ lib.teams.geospatial ];
};
}
@@ -57,16 +57,16 @@
hf-xet,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "transformers";
version = "4.57.3";
version = "4.57.6";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "transformers";
tag = "v${version}";
hash = "sha256-QqlNE2UJqn5ylVhSX5qak62ooda5IQbsc1F7SYU8Kjw=";
tag = "v${finalAttrs.version}";
hash = "sha256-a78ornUAYlOpr30iFdq1oUiWQTm6GeT0iq8ras5i3DQ=";
};
build-system = [ setuptools ];
@@ -194,7 +194,7 @@ buildPythonPackage rec {
homepage = "https://github.com/huggingface/transformers";
description = "Natural Language Processing for TensorFlow 2.0 and PyTorch";
mainProgram = "transformers-cli";
changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}";
changelog = "https://github.com/huggingface/transformers/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
@@ -202,4 +202,4 @@ buildPythonPackage rec {
happysalada
];
};
}
})
@@ -1,69 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
jdk8,
ant,
python3,
watchman,
bash,
makeWrapper,
}:
stdenv.mkDerivation rec {
pname = "buck";
version = "2022.05.05.01";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
sha256 = "15v4sk1l43pgd5jxr5lxnh0ks6vb3xk5253n66s7vvsnph48j14q";
};
patches = [ ./pex-mtime.patch ];
postPatch = ''
grep -l -r '/bin/bash' --null | xargs -0 sed -i -e "s!/bin/bash!${bash}/bin/bash!g"
'';
nativeBuildInputs = [
makeWrapper
python3
jdk8
ant
watchman
];
buildPhase = ''
# Set correct version, see https://github.com/facebook/buck/issues/2607
echo v${version} > .buckrelease
ant
PYTHONDONTWRITEBYTECODE=true ./bin/buck build -c buck.release_version=${version} buck
'';
installPhase = ''
install -D -m755 buck-out/gen/*/programs/buck.pex $out/bin/buck
wrapProgram $out/bin/buck \
--prefix PATH : "${
lib.makeBinPath [
jdk8
watchman
python3
]
}"
'';
meta = {
homepage = "https://buck.build/";
description = "High-performance build tool";
mainProgram = "buck";
maintainers = [ lib.maintainers.jgertm ];
license = lib.licenses.asl20;
platforms = lib.platforms.all;
# https://github.com/facebook/buck/issues/2666
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
};
}
@@ -1,13 +0,0 @@
diff --git a/third-party/py/pex/pex/common.py b/third-party/py/pex/pex/common.py
index 76459ce23..eff411b20 100644
--- a/third-party/py/pex/pex/common.py
+++ b/third-party/py/pex/pex/common.py
@@ -328,4 +328,7 @@ class Chroot(object):
def zip(self, filename, mode='wb'):
with contextlib.closing(zipfile.ZipFile(filename, mode)) as zf:
for f in sorted(self.files()):
- zf.write(os.path.join(self.chroot, f), arcname=f, compress_type=zipfile.ZIP_DEFLATED)
+ path = os.path.join(self.chroot, f)
+ instant = 615532801
+ os.utime(path, (instant, instant))
+ zf.write(path, arcname=f, compress_type=zipfile.ZIP_DEFLATED)
@@ -1,8 +1,8 @@
{ lib, fetchFromGitHub }:
let
version = "3.12.0";
vendorHash = "sha256-TXQ53G+YGIcURZvJtkvGU66dlQx0NxMTeRkrmReCDU8=";
nodeModulesHash = "sha256-Mx5Q9Zdv4sJGRDs3dYio7IfktFvauLJqZxGBhOOjdo4=";
version = "3.13.0";
vendorHash = "sha256-EkOg1D+zeEbVBPr4fpCPI31CvMnTD7FZ2hhQW7UzN8A=";
nodeModulesHash = "sha256-wORM+24nE771llb1Q7bn6iDtlJpm3kOqO3wTLUQmjyQ=";
in
{
inherit version vendorHash nodeModulesHash;
@@ -11,7 +11,7 @@ in
owner = "woodpecker-ci";
repo = "woodpecker";
tag = "v${version}";
hash = "sha256-TaFAQa8QlogqzhznKeveaCiDbpk1Bl+aPSMGxiaE2ko=";
hash = "sha256-EeND2L5l37fo3JBlFORR4m0tXQWlJ2qqIXIdQ1vJdgM=";
};
postInstall = ''
-157
View File
@@ -1,157 +0,0 @@
{
fetchurl,
lib,
stdenv,
libGLU,
libGL,
libglut,
libX11,
plib,
openal,
freealut,
libXrandr,
xorgproto,
libXext,
libSM,
libICE,
libXi,
libXt,
libXrender,
libXxf86vm,
openscenegraph,
expat,
libpng,
zlib,
bash,
SDL2,
SDL2_mixer,
enet,
libjpeg,
cmake,
pkg-config,
libvorbis,
runtimeShell,
curl,
copyDesktopItems,
makeDesktopItem,
}:
let
version = "2.3.0-r8786";
shortVersion = builtins.substring 0 5 version;
in
stdenv.mkDerivation rec {
inherit version;
pname = "speed-dreams";
src = fetchurl {
url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-base-${version}.tar.xz";
sha256 = "sha256-DUyMs9Hr1PYgmNVwBY/e6snVeGl9GX0AnZ7S+TFABKQ=";
};
cars-and-tracks = fetchurl {
url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-hq-cars-and-tracks-${version}.tar.xz";
sha256 = "sha256-WT+W6uuw4BRSbF1Cw123q3v9qSCvBQ7TcQ/Y0RV/7Js=";
};
more-cars-and-tracks = fetchurl {
url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-more-hq-cars-and-tracks-${version}.tar.xz";
sha256 = "sha256-psApv+Z1HDFvh5bzt125mo/ZvO5rjee/KhOf45iKnKk=";
};
wip-cars-and-tracks = fetchurl {
url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-wip-cars-and-tracks-${version}.tar.xz";
sha256 = "sha256-OEAbqFfO2PzHP7+eAtPNn3Ql6fYNTKzzQW8lHe9KDXM=";
};
sourceRoot = ".";
postUnpack = ''
echo Unpacking data
tar -xf ${cars-and-tracks}
tar -xf ${more-cars-and-tracks}
tar -xf ${wip-cars-and-tracks}
'';
preBuild = ''
make -C src/libs/portability
make -C src/libs/portability portability.o
ar -rv "$(echo lib*/games/speed-dreams*/lib)"/libportability_static.a src/libs/portability/CMakeFiles/portability.dir/portability.cpp.o
export NIX_LDFLAGS="$NIX_LDFLAGS -L$(echo $PWD/lib*/games/speed-dreams*/lib) -lexpat"
echo "libportability_static.a built"
'';
postInstall = ''
mkdir "$out/bin"
for i in "$out"/games/*; do
echo '#!${runtimeShell}' >> "$out/bin/$(basename "$i")"
echo "$i"' "$@"' >> "$out/bin/$(basename "$i")"
chmod a+x "$out/bin/$(basename "$i")"
done
mkdir -p $out/share/pixmaps/
ln -s "$out/share/games/speed-dreams-2/data/icons/icon.png" "$out/share/pixmaps/speed-dreams-2.png"
'';
desktopItems = [
(makeDesktopItem {
name = "Speed Dreams 2";
exec = "speed-dreams-2";
icon = "speed-dreams-2.png";
desktopName = "speed-dreams-2";
comment = "The Open Racing Car Simulator Fork";
categories = [
"Application"
"Game"
];
})
];
# RPATH of binary /nix/store/.../lib64/games/speed-dreams-2/drivers/shadow_sc/shadow_sc.so contains a forbidden reference to /build/
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];
nativeBuildInputs = [
pkg-config
cmake
copyDesktopItems
];
buildInputs = [
libpng
libGLU
libGL
libglut
libX11
plib
openal
freealut
libXrandr
xorgproto
libXext
libSM
libICE
libXi
libXt
libXrender
libXxf86vm
zlib
bash
expat
SDL2
SDL2_mixer
enet
libjpeg
openscenegraph
libvorbis
curl
];
meta = {
description = "Car racing game - TORCS fork with more experimental approach";
homepage = "https://speed-dreams.sourceforge.net/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ raskin ];
platforms = lib.platforms.linux;
hydraPlatforms = [ ];
};
}
+6
View File
@@ -64,6 +64,12 @@ rustPlatform.buildRustPackage rec {
"--skip=scheduled_tasks::tests::test_nodeinfo_lemmy_ml"
];
# This gets installed automatically by cargoInstallHook,
# but we don't actually need it, and it leaks a reference to rustc.
postInstall = ''
rm $out/lib/libhtml2md.so
'';
passthru.updateScript = ./update.py;
passthru.tests.lemmy-server = nixosTests.lemmy;
+4
View File
@@ -385,6 +385,7 @@ mapAliases {
breath-theme = throw "'breath-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
brogue = warnAlias "Use 'brogue-ce' instead of 'brogue' for updated releases" brogue-ce; # Added 2025-10-04
btanks = throw "'btanks' has been removed as it's been unmaintained since 2010 and fails to build"; # Added 2025-11-29
buck = throw "'buck' has been removed has it was deprecated and archived upstream. Consider moving to buck2"; # Added 2026-01-16
buildBowerComponents = throw "buildBowerComponents has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
buildGo123Module = throw "Go 1.23 is end-of-life, and 'buildGo123Module' has been removed. Please use a newer builder version."; # Added 2025-08-13
buildPlatform = warnAlias "'buildPlatform' has been renamed to/replaced by 'stdenv.buildPlatform'" stdenv.buildPlatform; # Converted to warning 2025-10-28
@@ -806,6 +807,7 @@ mapAliases {
isl_0_24 = throw "isl_0_24 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-10-18
iso-flags-png-320x420 = throw "'iso-flags-png-320x420' has been renamed to/replaced by 'iso-flags-png-320x240'"; # Converted to throw 2025-10-27
itktcl = throw "'itktcl' has been renamed to/replaced by 'tclPackages.itktcl'"; # Converted to throw 2025-10-27
itm-tools = throw "'itm-tools' has been removed because it was deprecated and archived upstream."; # Added 2026-01-15
itpp = throw "itpp has been removed, as it was broken"; # Added 2025-08-25
jack_rack = throw "'jack_rack' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
jami-client = throw "'jami-client' has been renamed to/replaced by 'jami'"; # Converted to throw 2025-10-27
@@ -1262,6 +1264,7 @@ mapAliases {
obliv-c = throw "obliv-c has been removed from Nixpkgs, as it has been unmaintained upstream for 4 years and does not build with supported GCC versions"; # Added 2025-08-18
oclgrind = throw "oclgrind has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
oil = throw "'oil' has been renamed to/replaced by 'oils-for-unix'"; # Converted to throw 2025-10-27
olaris-server = throw "'olaris-server' has been removed as it failed to build since 2024"; # Added 2026-01-15
onevpl-intel-gpu = throw "'onevpl-intel-gpu' has been renamed to/replaced by 'vpl-gpu-rt'"; # Converted to throw 2025-10-27
onlyoffice-bin = throw "'onlyoffice-bin' has been renamed to/replaced by 'onlyoffice-desktopeditors'"; # Converted to throw 2025-10-27
onlyoffice-bin_latest = throw "'onlyoffice-bin_latest' has been renamed to/replaced by 'onlyoffice-bin'"; # Converted to throw 2025-10-27
@@ -1376,6 +1379,7 @@ mapAliases {
polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18
polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
poppler_utils = throw "'poppler_utils' has been renamed to/replaced by 'poppler-utils'"; # Converted to throw 2025-10-27
popura = throw "'popura' is abandoned upstream and in nixpkgs and has been removed"; # Added 2026-01-15
posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19
postgres-lsp = warnAlias "'postgres-lsp' has been renamed to 'postgres-language-server'" postgres-language-server; # Added 2025-10-28
+1 -10
View File
@@ -4151,6 +4151,7 @@ with pkgs;
corretto11 = javaPackages.compiler.corretto11;
corretto17 = javaPackages.compiler.corretto17;
corretto21 = javaPackages.compiler.corretto21;
corretto25 = javaPackages.compiler.corretto25;
inherit (callPackage ../development/compilers/crystal { })
crystal_1_14
@@ -5945,10 +5946,6 @@ with pkgs;
black-macchiato = with python3Packages; toPythonApplication black-macchiato;
buck = callPackage ../development/tools/build-managers/buck {
python3 = python311;
};
build2 = callPackage ../development/tools/build-managers/build2 {
# Break cycle by using self-contained toolchain for bootstrapping
build2 = buildPackages.callPackage ../development/tools/build-managers/build2/bootstrap.nix { };
@@ -12598,12 +12595,6 @@ with pkgs;
tibia = pkgsi686Linux.callPackage ../games/tibia { };
speed_dreams = callPackage ../games/speed-dreams {
# Torcs wants to make shared libraries linked with plib libraries (it provides static).
# i686 is the only platform I know than can do that linking without plib built with -fPIC
libpng = libpng12;
};
ultrastar-creator = libsForQt5.callPackage ../tools/misc/ultrastar-creator { };
ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
+1
View File
@@ -47,6 +47,7 @@ in
corretto11 = callPackage ../development/compilers/corretto/11.nix { };
corretto17 = callPackage ../development/compilers/corretto/17.nix { };
corretto21 = callPackage ../development/compilers/corretto/21.nix { };
corretto25 = callPackage ../development/compilers/corretto/25.nix { };
openjdk8 = mkOpenjdk "8";
openjdk11 = mkOpenjdk "11";
+2
View File
@@ -2090,6 +2090,8 @@ let
tls-lwt = callPackage ../development/ocaml-modules/tls/lwt.nix { };
tls-miou-unix = callPackage ../development/ocaml-modules/tls/miou-unix.nix { };
tls-mirage = callPackage ../development/ocaml-modules/tls/mirage.nix { };
toml = callPackage ../development/ocaml-modules/toml { };