Merge staging-next into staging
This commit is contained in:
@@ -4843,13 +4843,6 @@
|
||||
github = "Ciflire";
|
||||
githubId = 39668077;
|
||||
};
|
||||
cig0 = {
|
||||
name = "Martín Cigorraga";
|
||||
email = "cig0.github@gmail.com";
|
||||
github = "cig0";
|
||||
githubId = 394089;
|
||||
keys = [ { fingerprint = "1828 B459 DB9A 7EE2 03F4 7E6E AFBE ACC5 5D93 84A0"; } ];
|
||||
};
|
||||
cigrainger = {
|
||||
name = "Christopher Grainger";
|
||||
email = "chris@amplified.ai";
|
||||
@@ -7372,12 +7365,6 @@
|
||||
name = "Daniel Ebbert";
|
||||
keys = [ { fingerprint = "E765 FCA3 D9BF 7FDB 856E AD73 47BC 1559 27CB B9C7"; } ];
|
||||
};
|
||||
ebzzry = {
|
||||
email = "ebzzry@ebzzry.io";
|
||||
github = "ebzzry";
|
||||
githubId = 7875;
|
||||
name = "Rommel Martinez";
|
||||
};
|
||||
ecklf = {
|
||||
email = "ecklf@icloud.com";
|
||||
github = "ecklf";
|
||||
@@ -11557,12 +11544,6 @@
|
||||
github = "j0hax";
|
||||
githubId = 3802620;
|
||||
};
|
||||
j0lol = {
|
||||
name = "Jo";
|
||||
email = "me@j0.lol";
|
||||
github = "j0lol";
|
||||
githubId = 24716467;
|
||||
};
|
||||
j0xaf = {
|
||||
email = "j0xaf@j0xaf.de";
|
||||
name = "Jörn Gersdorf";
|
||||
|
||||
@@ -2,14 +2,13 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.glance;
|
||||
|
||||
inherit (lib)
|
||||
catAttrs
|
||||
concatMapStrings
|
||||
getExe
|
||||
mkEnableOption
|
||||
mkIf
|
||||
@@ -18,17 +17,8 @@ let
|
||||
types
|
||||
;
|
||||
|
||||
inherit (builtins)
|
||||
concatLists
|
||||
isAttrs
|
||||
isList
|
||||
attrNames
|
||||
getAttr
|
||||
;
|
||||
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
settingsFile = settingsFormat.generate "glance.yaml" cfg.settings;
|
||||
mergedSettingsFile = "/run/glance/glance.yaml";
|
||||
settingsFile = "/run/glance/glance.yaml";
|
||||
in
|
||||
{
|
||||
options.services.glance = {
|
||||
@@ -180,41 +170,16 @@ in
|
||||
requires = [
|
||||
"nss-user-lookup.target"
|
||||
];
|
||||
path = [ pkgs.replace-secret ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStartPre =
|
||||
let
|
||||
findSecrets =
|
||||
data:
|
||||
if isAttrs data then
|
||||
if data ? _secret then
|
||||
[ data ]
|
||||
else
|
||||
concatLists (map (attr: findSecrets (getAttr attr data)) (attrNames data))
|
||||
else if isList data then
|
||||
concatLists (map findSecrets data)
|
||||
else
|
||||
[ ];
|
||||
secretPaths = catAttrs "_secret" (findSecrets cfg.settings);
|
||||
mkSecretReplacement = secretPath: ''
|
||||
replace-secret ${
|
||||
lib.escapeShellArgs [
|
||||
"_secret: ${secretPath}"
|
||||
secretPath
|
||||
mergedSettingsFile
|
||||
]
|
||||
}
|
||||
'';
|
||||
secretReplacements = concatMapStrings mkSecretReplacement secretPaths;
|
||||
in
|
||||
# Use "+" to run as root because the secrets may not be accessible to glance
|
||||
"+"
|
||||
+ pkgs.writeShellScript "glance-start-pre" ''
|
||||
install -m 600 -o $USER ${settingsFile} ${mergedSettingsFile}
|
||||
${secretReplacements}
|
||||
${utils.genJqSecretsReplacementSnippet cfg.settings settingsFile}
|
||||
chown $USER ${settingsFile}
|
||||
'';
|
||||
ExecStart = "${getExe cfg.package} --config ${mergedSettingsFile}";
|
||||
ExecStart = "${getExe cfg.package} --config ${settingsFile}";
|
||||
Restart = "on-failure";
|
||||
WorkingDirectory = "/var/lib/glance";
|
||||
EnvironmentFile = cfg.environmentFile;
|
||||
@@ -245,5 +210,7 @@ in
|
||||
};
|
||||
|
||||
meta.doc = ./glance.md;
|
||||
meta.maintainers = [ ];
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
gepbird
|
||||
];
|
||||
}
|
||||
|
||||
@@ -24,10 +24,7 @@ let
|
||||
lib.filterAttrs (
|
||||
device: _:
|
||||
lib.any (
|
||||
e:
|
||||
e.fsType == "zfs"
|
||||
&& (utils.fsNeededForBoot e)
|
||||
&& (e.device == device || lib.hasPrefix "${device}/" e.device)
|
||||
e: e.fsType == "zfs" && (e.device == device || lib.hasPrefix "${device}/" e.device)
|
||||
) config.system.build.fileSystems
|
||||
) config.boot.initrd.clevis.devices
|
||||
);
|
||||
@@ -217,7 +214,7 @@ let
|
||||
if poolImported "${pool}"; then
|
||||
${lib.optionalString config.boot.initrd.clevis.enable (
|
||||
lib.concatMapStringsSep "\n" (
|
||||
elem: "clevis decrypt < /etc/clevis/${elem}.jwe | zfs load-key ${elem} || true "
|
||||
elem: "clevis decrypt < /etc/clevis/${elem}.jwe | zfs load-key -L prompt ${elem} || true "
|
||||
) (lib.filter (p: (lib.elemAt (lib.splitString "/" p) 0) == pool) clevisDatasets)
|
||||
)}
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ in
|
||||
{ ... }:
|
||||
{
|
||||
virtualisation = {
|
||||
diskSize = 4000;
|
||||
diskSize = 8000;
|
||||
docker.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -11,10 +11,8 @@
|
||||
zlib,
|
||||
glib,
|
||||
gtk3,
|
||||
gtk2,
|
||||
libXtst,
|
||||
jdk,
|
||||
jdk8,
|
||||
gsettings-desktop-schemas,
|
||||
webkitgtk_4_1 ? null, # for internal web browser
|
||||
buildEnv,
|
||||
@@ -22,10 +20,12 @@
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
# use ./update.sh to help with updating for each quarterly release
|
||||
# ./update.sh fully automates updating for each quarterly release. you can run
|
||||
# it manually, or wait for https://nix-community.github.io/nixpkgs-update/ to do
|
||||
# so.
|
||||
#
|
||||
# then, to test:
|
||||
# for e in cpp dsl embedcpp modeling platform sdk java jee committers rcp; do for s in pkgs pkgsCross.aarch64-multiplatform; do echo; echo $s $e; nix-build -A ${s}.eclipses.eclipse-${e} -o eclipse-${s}-${e}; done; done
|
||||
# then, to test (on x86_64):
|
||||
# for e in $(cat pkgs/applications/editors/eclipse/eclipses.json | jq '.eclipses | keys | .[] | ascii_downcase' -r); do for s in pkgs pkgsCross.aarch64-multiplatform; do echo; echo $s $e; nix-build -A ${s}.eclipses.eclipse-${e} -o eclipse-${s}-${e}; done; done
|
||||
|
||||
let
|
||||
eclipses = lib.trivial.importJSON ./eclipses.json;
|
||||
|
||||
@@ -1,90 +1,90 @@
|
||||
{
|
||||
"platform_major": "4",
|
||||
"platform_minor": "37",
|
||||
"version": "4.37",
|
||||
"platform_minor": "38",
|
||||
"version": "4.38",
|
||||
"year": "2025",
|
||||
"month": "09",
|
||||
"buildmonth": "09",
|
||||
"dayHourMinute": "050730",
|
||||
"month": "12",
|
||||
"buildmonth": "12",
|
||||
"dayHourMinute": "010920",
|
||||
"eclipses": {
|
||||
"cpp": {
|
||||
"description": "Eclipse IDE for C/C++ Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-La+sX7ouIfvgbXPNIlmkpDzwwiT5VJfkl4ma4eFKjqw=",
|
||||
"aarch64": "sha256-U1kFulGX7apNrlY3WPeu/FqQqu3SoxfsHHErbAscFtE="
|
||||
"x86_64": "sha256-wlYGwfxKnF26qMSrUl0fsTDbECgXIL+ZIAr1BzwnK1Y=",
|
||||
"aarch64": "sha256-xuTi++OZzj+jh7edNi3WQN0ie0HJB0Zrg023MT3px/c="
|
||||
}
|
||||
},
|
||||
"dsl": {
|
||||
"description": "Eclipse IDE for Java and DSL Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-8zXSMxKKTPnL8rqW7YT+6Gtud1pyHFmcLKOSihJWjCA=",
|
||||
"aarch64": "sha256-7nsn3iWBp9N/mdcpyPH7j5tfV+sL/jCTuhvpDHmKx8I="
|
||||
"x86_64": "sha256-I6AcXthzv/uLlO5+Y27ZsbeftA3zzvUlApISsquS0sY=",
|
||||
"aarch64": "sha256-j0gj5Tcfbyj3sQ6gHEexee6d4SNbOYMODTeZDbKbUBo="
|
||||
}
|
||||
},
|
||||
"embedcpp": {
|
||||
"description": "Eclipse IDE for Embedded C/C++ Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-48cEpt11ndShjxUCQDX2ObI+cx9frGloJ7EICjmErC8=",
|
||||
"aarch64": "sha256-zSMDR+Y4JIdu+PoYFyk+FPNKcYbRiika2TeGg3g88pg="
|
||||
"x86_64": "sha256-sPyqRadyBQ24oO38bEy4VP4dTj6V+FwMVjxyniyTn5o=",
|
||||
"aarch64": "sha256-CahsB9yBC8bLzwdfOOaidsP1VXXiELoot+DN8Zz2QqU="
|
||||
}
|
||||
},
|
||||
"modeling": {
|
||||
"description": "Eclipse Modeling Tools",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-9Qq5ziLa2vjX6bJjZ67qwF4nVNdqTQ80kz9GANtJCIw=",
|
||||
"aarch64": "sha256-6//g6G3U1fC5mGgOci6Zgxx3YTJEZQ2pMBVjbJ9/mPE="
|
||||
"x86_64": "sha256-jw1Ij7HG8J9usWT6cKXeZbZDxQTWp2pBZtG2BdU2Guw=",
|
||||
"aarch64": "sha256-e4ieVltHzhBLGEh3NNKrKcfOyUQd0avIrhUB1CYbQls="
|
||||
}
|
||||
},
|
||||
"platform": {
|
||||
"description": "Eclipse Platform ${year}-${month}",
|
||||
"dropUrl": true,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-C8P9x7C0tMYFQwJiBlF5JycWvWcF71ZWsDEwXPl1K34=",
|
||||
"aarch64": "sha256-8qpNqHpi1BEHQt3nkFbeLzQccPSwu0op2THyWulhnLU="
|
||||
"x86_64": "sha256-gicPSSoWyisPTUQXu3ndWrcNiCTgIaCnVCZbTFWp6Cc=",
|
||||
"aarch64": "sha256-WSs9Y7iwhd+Wd4RQ/DMFGqIR4RjlceJgPCE2BSa55so="
|
||||
}
|
||||
},
|
||||
"SDK": {
|
||||
"description": "Eclipse ${year}-${month} Classic",
|
||||
"dropUrl": true,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-Kx9WEpu4UbCeeKfmWV0iIyAd09xh9ffHm39dahlIlW8=",
|
||||
"aarch64": "sha256-MWI2KpZQPTbw7Ro0+3Ab+nnIzbSTPGwqjhBfeu4tmE8="
|
||||
"x86_64": "sha256-Vx8mnR81KpikZZikNwaHCz+KEfWd3Jvkzf9A6Chc0TE=",
|
||||
"aarch64": "sha256-VMcPmucV+hZ88nnhdsklXqrrUFG5lrZLeYmC1XC5Wo4="
|
||||
}
|
||||
},
|
||||
"java": {
|
||||
"description": "Eclipse IDE for Java Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-L5vqC+jboYQAR+CtNAEXgDACxEG0r1rlx4ruc264cUc=",
|
||||
"aarch64": "sha256-xxZjwmF24CbKeK7IQXkgylFTTGIHo1Wz6FnL/EUmCaQ="
|
||||
"x86_64": "sha256-Us5HNoQOt9OaTVAhVlFPMqAXD8hZkLs0IGppSpj2UuY=",
|
||||
"aarch64": "sha256-SHgHlicA30Q7W6yNTGUgaovMYXIHohbhksbJKIRSFGk="
|
||||
}
|
||||
},
|
||||
"jee": {
|
||||
"description": "Eclipse IDE for Enterprise Java and Web Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-bFCbFLRtltZ/GJwAoFd3MH/FknDF6hnvX9LQHQs9eKg=",
|
||||
"aarch64": "sha256-DXw/dt4Gjz0e7szjJUaKB3wsUdnNj3wCX8cVpMlYkCc="
|
||||
"x86_64": "sha256-z0nj/7dmlqjEE+PQEjJngf3GmTIc6O8F8TJm7yBFrQE=",
|
||||
"aarch64": "sha256-MDBT9OJWBRd0twY5XoBukQaBTG1IP3xKE0g9kc86a/8="
|
||||
}
|
||||
},
|
||||
"committers": {
|
||||
"description": "Eclipse IDE for Eclipse Committers and Eclipse Platform Plugin Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-HF1RuiuDGFxwxFQrXXUcpssA4SnioTYGSjQrF0H/F2Q=",
|
||||
"aarch64": "sha256-ZZ7Wy6Nua4sKPlFv/LaiM+pRrF23PEuUVK4I5rA40Sk="
|
||||
"x86_64": "sha256-meelcKp5AgfVCi13scA0TbPgkK9XsPvtS8HkyAYcUZs=",
|
||||
"aarch64": "sha256-c/FxP0Snx70bkhZ+owkg/DFXu3AWdJtrPCKyqIqKfPs="
|
||||
}
|
||||
},
|
||||
"rcp": {
|
||||
"description": "Eclipse IDE for RCP and RAP Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-jxLIw4MaLqAi+b6l6lf56cb9z7J8NBUJYbbxhv65uSc=",
|
||||
"aarch64": "sha256-A+3dk2FZaXBO/pb9F/33imO0Fk6j4zszLfnDsP+znG4="
|
||||
"x86_64": "sha256-0OgiJ11wMGeR1UjoLd3yoApDMhy3oZ1y4P2OxSJyRQA=",
|
||||
"aarch64": "sha256-IywPOyQlZXTrJdjiRDVAKwlxMZ1+FvN/uxYYoJ++ez8="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,8 +58,19 @@ for id in $(cat $ECLIPSES_JSON | jq -r '.eclipses | keys | .[]'); do
|
||||
url="https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-${id}-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
|
||||
fi
|
||||
|
||||
echo "prefetching ${id} ${arch}";
|
||||
h=$(nix store prefetch-file --json "$url" | jq -r .hash);
|
||||
# sometimes a mirror is down; retrying a few times should eventually get us redirected to a working mirror
|
||||
for try in $(seq 1 5); do
|
||||
echo "prefetching ${id} ${arch} (try ${try})";
|
||||
h=$(nix store prefetch-file --json "$url" | jq -r .hash);
|
||||
|
||||
if [ "$h" != "" ]; then break; fi
|
||||
done
|
||||
|
||||
if [ "$h" == "" ]; then
|
||||
echo "unable to prefetch and hash ${id} for ${arch} from ${url}";
|
||||
echo "see above output for errors";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
t=$(mktemp);
|
||||
cat $ECLIPSES_JSON | jq -r ".eclipses.${id}.hashes.${arch} = \"${h}\"" > $t;
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame2003-plus";
|
||||
version = "0-unstable-2025-12-10";
|
||||
version = "0-unstable-2025-12-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame2003-plus-libretro";
|
||||
rev = "26cc26baf1357a581581ea5b3b6978391373d0a8";
|
||||
hash = "sha256-J+EOHXdkPDYGgXgGJ4y4I6fRIv8lg4SqOCt14X6foTo=";
|
||||
rev = "b235c48df0698bca32d941ecc0d046cfe6eb7eef";
|
||||
hash = "sha256-/QFg5Ns6csHfGIHMm50x8j0Twq44/VETFavJd5WVKZU=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame2003";
|
||||
version = "0-unstable-2025-10-21";
|
||||
version = "0-unstable-2025-12-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame2003-libretro";
|
||||
rev = "3570605767a447c13b087a5946189bcbafe11e1d";
|
||||
hash = "sha256-BcPiNYEi6uE8aSpPDNgZ8vmzSnZJUparEM3CEdexbPo=";
|
||||
rev = "6c32fa9fc005d7e924909c6ff4684da9abb00ceb";
|
||||
hash = "sha256-NPPwLruxafBUwKYy+DuLrTZa5QlbneWQSvCRN6ispdM=";
|
||||
};
|
||||
|
||||
# Fix build with GCC 14
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "2048";
|
||||
version = "0-unstable-2024-12-27";
|
||||
version = "0-unstable-2025-12-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-2048";
|
||||
rev = "86e02d3c2dd76858db7370f5df1ccfc33b3abee1";
|
||||
hash = "sha256-k3te3XZCw86NkqXpjZaYWi4twUvh9UBkiPyqposLTEs=";
|
||||
rev = "e70c3f82d2b861c64943aaff7fcc29a63013997d";
|
||||
hash = "sha256-ZNJUaXIQi9VnmmCikhCtXfhbTZ7rfJ1wm/582gaZCmk=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -813,7 +813,7 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "143.0.7499.109",
|
||||
"version": "143.0.7499.146",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "e2bb3cd55899346cc68bbfd5139e59c9d85a6984",
|
||||
@@ -825,16 +825,16 @@
|
||||
"hash": "sha256-kIPhfuJBQSISdRjloe0N2JrqvuVrEkNijb92/9zSE9I="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "143.0.7499.109-1",
|
||||
"hash": "sha256-IiIQqo6U0yqBxamrlQ56FSViQ0mPUoM1yGZkVAur8is="
|
||||
"rev": "143.0.7499.146-1",
|
||||
"hash": "sha256-GHJ/xdEaaNdXJzn3XdY9xoVPYH5HxH1T7kPgvrdi+9s="
|
||||
},
|
||||
"npmHash": "sha256-HF6B4abJJJ9JDVbovtAdaHIvqE1zHJZ2a+g2Cudx8Pw="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "71a0dbd6672e2ccb6d1008376cbb7acd315cb8d6",
|
||||
"hash": "sha256-K7HzC+M7WIMsyB4Wuy04WvGAX+QsTN5daOhkox1wxnA=",
|
||||
"rev": "c1224fc40c96e7f17f0cdeb87a8f4c64b93c0d74",
|
||||
"hash": "sha256-Sn4j7vs7g/D9GnL+BMCyg73iEeGn7Miq0k42mV6Z3hM=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -944,8 +944,8 @@
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "e1ce227ebf75378c5f60a9d531579982bcdd93ee",
|
||||
"hash": "sha256-RqGCh/InZagPemqMRnR/ziaxDm3ruS4dtnj87mBmIjc="
|
||||
"rev": "479f62d2194fd6e44c37d07654ca6e41c42bd332",
|
||||
"hash": "sha256-rzZn9l0EFcir6k8Xv2svIrhRPwe/rq48H7CX/3yfgFE="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
@@ -1589,8 +1589,8 @@
|
||||
},
|
||||
"src/third_party/webrtc": {
|
||||
"url": "https://webrtc.googlesource.com/src.git",
|
||||
"rev": "1788a81407183acc98163a4e1507c5c63fb175cc",
|
||||
"hash": "sha256-7FIcH5MG7kNHmN2FE00Qyd1NlfYzb1xKmVDX7MCNyXQ="
|
||||
"rev": "4e31d1a1ff41bb1b79609c83f998458a111a149c",
|
||||
"hash": "sha256-3tfB6jNsTLYozYqBfAmYNmq94wQ3OFxBSlOfRaj6wxc="
|
||||
},
|
||||
"src/third_party/wuffs/src": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
@@ -1619,8 +1619,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "beee9f5cafde91bbd086077a11db16cb9768e62a",
|
||||
"hash": "sha256-q1gVbNGls2izSDb3KZmteZQvcc6M0JyPuZFPfG4FIAs="
|
||||
"rev": "326f5f8cad3f0e436c8ea8f82a6894936a32e860",
|
||||
"hash": "sha256-crTEZnN5iWTXOxpAkvIDPQ6hyfF54F1/ImoKrdmO2K4="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1165,11 +1165,11 @@
|
||||
"vendorHash": "sha256-WDyULPLN+uZ5OaE/j3FgurHbXKRU93S3nbXk8mW5dc4="
|
||||
},
|
||||
"sap_btp": {
|
||||
"hash": "sha256-TLMEHDmjdS9zqU+WdUc9YUt7IwYmEBr3pizVDxAH1YA=",
|
||||
"hash": "sha256-jN/tvfzVnzJTLpAriT68F2HwAS5lxL+iMU1yGR6P8ww=",
|
||||
"homepage": "https://registry.terraform.io/providers/SAP/btp",
|
||||
"owner": "SAP",
|
||||
"repo": "terraform-provider-btp",
|
||||
"rev": "v1.18.0",
|
||||
"rev": "v1.18.1",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-f3b4NULINH8XworCn46fiz4GmBM31ROdAJy1j4GKkx4="
|
||||
},
|
||||
|
||||
@@ -106,9 +106,6 @@ let
|
||||
description = "Torrent client";
|
||||
homepage = "https://deluge-torrent.org";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
ebzzry
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -36,13 +36,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "advanced-scene-switcher";
|
||||
version = "1.32.4";
|
||||
version = "1.32.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WarmUpTill";
|
||||
repo = "SceneSwitcher";
|
||||
rev = version;
|
||||
hash = "sha256-OgvR37w7ol/8zCP6MLNYGYP4fq0upzbhfXYnOPCaE34=";
|
||||
hash = "sha256-MoOakwxyDlhB4YFXWR5Q2jLb0k3wuj87tOO5f0Xy5Vg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -83,6 +83,8 @@ lib.makeOverridable (
|
||||
# run operations between the checkout completing and deleting the .git
|
||||
# directory.
|
||||
preFetch ? "",
|
||||
# Shell code executed after `git checkout` and before .git directory removal/sanitization.
|
||||
postCheckout ? "",
|
||||
# Shell code executed after the file has been fetched
|
||||
# successfully. This can do things like check or transform the file.
|
||||
postFetch ? "",
|
||||
@@ -191,6 +193,7 @@ lib.makeOverridable (
|
||||
deepClone
|
||||
branchName
|
||||
preFetch
|
||||
postCheckout
|
||||
postFetch
|
||||
fetchTags
|
||||
rootDir
|
||||
@@ -251,6 +254,10 @@ lib.makeOverridable (
|
||||
|
||||
inherit preferLocalBuild meta;
|
||||
|
||||
env = {
|
||||
NIX_PREFETCH_GIT_CHECKOUT_HOOK = finalAttrs.postCheckout;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
gitRepoUrl = url;
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ fetchSubmodules=
|
||||
fetchLFS=
|
||||
builder=
|
||||
fetchTags=
|
||||
fetchTagsCompat=
|
||||
branchName=$NIX_PREFETCH_GIT_BRANCH_NAME
|
||||
|
||||
# ENV params
|
||||
@@ -116,11 +117,17 @@ for arg; do
|
||||
fi
|
||||
done
|
||||
|
||||
# `deepClone` used to effectively imply `fetchTags`.
|
||||
# We avoid such behaviour to enhance the `postCheckout` reproducibility,
|
||||
# while keeping the old behaviour for `.git` for backward compatibility purposes.
|
||||
if [[ -n "$deepClone" ]] && [[ -z "$leaveDotGit" ]]; then
|
||||
fetchTagsCompat=true
|
||||
fi
|
||||
|
||||
if test -z "$url"; then
|
||||
usage
|
||||
fi
|
||||
|
||||
|
||||
init_remote(){
|
||||
local url=$1
|
||||
clean_git init --initial-branch=master
|
||||
@@ -181,9 +188,30 @@ checkout_hash(){
|
||||
hash=$(hash_from_ref "$ref")
|
||||
fi
|
||||
|
||||
[[ -z "$deepClone" ]] && \
|
||||
clean_git fetch ${builder:+--progress} --depth=1 origin "$hash" || \
|
||||
clean_git fetch -t ${builder:+--progress} origin || return 1
|
||||
local -a fetchTagsArgs
|
||||
if [[ -n "$fetchTags" ]]; then
|
||||
fetchTagsArgs=(--tags)
|
||||
else
|
||||
fetchTagsArgs=(--no-tags)
|
||||
fi
|
||||
local -a fetchTargetArgs
|
||||
if [[ -n "$deepClone" ]]; then
|
||||
fetchTargetArgs=(origin)
|
||||
else
|
||||
fetchTargetArgs=(--depth=1 origin "$hash")
|
||||
fi
|
||||
if ! clean_git fetch "${fetchTagsArgs[@]}" ${builder:+--progress} "${fetchTargetArgs[@]}"; then
|
||||
echo "ERROR: \`git fetch' failed." >&2
|
||||
# Git remotes using the "dumb" protocol does not support shallow fetch;
|
||||
# fall back to deep fetch if shallow fetch failed.
|
||||
# TODO(@ShamrockLee): Determine whether the transfer protocol is smart reliably.
|
||||
if [[ -z "$deepClone" ]] || [[ -z "$fetchTags" ]]; then
|
||||
echo "This might be due to the dumb transfer protocol not supporting shallow fetch or no-tag cloning. Trying with \`--tags' and without \`--depth=1'..." >&2
|
||||
clean_git fetch --tags ${builder:+--progress} origin || return 1
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
|
||||
local object_type=$(git cat-file -t "$hash")
|
||||
if [[ "$object_type" == "commit" || "$object_type" == "tag" ]]; then
|
||||
@@ -253,11 +281,19 @@ clone(){
|
||||
)
|
||||
|
||||
# Fetch all tags if requested
|
||||
if test -n "$fetchTags"; then
|
||||
# The fetched tags are potentially non-reproducible, as tags are mutable parts of the Git tree.
|
||||
if [[ -n "$fetchTags" ]] || [[ -n "$fetchTagsCompat" ]]; then
|
||||
echo "fetching all tags..." >&2
|
||||
clean_git fetch origin 'refs/tags/*:refs/tags/*' || echo "warning: failed to fetch some tags" >&2
|
||||
fi
|
||||
|
||||
# Name "$ref" to make `git describe` work reproducibly in `NIX_PREFETCH_GIT_CHECKOUT_HOOK`.
|
||||
# Name only when not leaving `.git` for compatibility purposes.
|
||||
if [[ -n "$ref" ]] && [[ -z "$leaveDotGit" ]]; then
|
||||
echo "refer to FETCH_HEAD as its original name $ref"
|
||||
clean_git update-ref "$ref" FETCH_HEAD
|
||||
fi
|
||||
|
||||
# Checkout linked sources.
|
||||
if test -n "$fetchSubmodules"; then
|
||||
init_submodules
|
||||
|
||||
@@ -17,6 +17,33 @@
|
||||
sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";
|
||||
};
|
||||
|
||||
collect-rev = testers.invalidateFetcherByDrvHash fetchgit {
|
||||
name = "collect-rev-nix-source";
|
||||
url = "https://github.com/NixOS/nix";
|
||||
rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
|
||||
hash = "sha256-AUTX1K7J5+fojvKYJacXYVV5kio3hrWYz5MCekO6h68=";
|
||||
postCheckout = ''
|
||||
git -C "$out" rev-parse HEAD | tee "$out/revision.txt"
|
||||
'';
|
||||
};
|
||||
|
||||
simple-tag = testers.invalidateFetcherByDrvHash fetchgit {
|
||||
name = "simple-tag-nix-source";
|
||||
url = "https://github.com/NixOS/nix";
|
||||
tag = "2.3.15";
|
||||
hash = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";
|
||||
};
|
||||
|
||||
describe-tag = testers.invalidateFetcherByDrvHash fetchgit {
|
||||
name = "describe-tag-nix-source";
|
||||
url = "https://github.com/NixOS/nix";
|
||||
tag = "2.3.15";
|
||||
hash = "sha256-y7l+46lVP2pzJwGON5qEV0EoxWofRoWAym5q9VXvpc8=";
|
||||
postCheckout = ''
|
||||
{ git -C "$out" describe || echo "git describe failed"; } | tee "$out"/describe-output.txt
|
||||
'';
|
||||
};
|
||||
|
||||
sparseCheckout = testers.invalidateFetcherByDrvHash fetchgit {
|
||||
name = "sparse-checkout-nix-source";
|
||||
url = "https://github.com/NixOS/nix";
|
||||
@@ -77,6 +104,20 @@
|
||||
postFetch = "rm -r $out/.git";
|
||||
};
|
||||
|
||||
submodule-revision-count = testers.invalidateFetcherByDrvHash fetchgit {
|
||||
name = "submodule-revision-count-source";
|
||||
url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule";
|
||||
rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a";
|
||||
hash = "sha256-ok1e6Pb0fII5TF8HXF8DXaRGSoq7kgRCoXqSEauh1wk=";
|
||||
fetchSubmodules = true;
|
||||
deepClone = true;
|
||||
leaveDotGit = false;
|
||||
postCheckout = ''
|
||||
{ git -C "$out" rev-list --count HEAD || echo "git rev-list failed"; } | tee "$out/revision_count.txt"
|
||||
{ git -C "$out/nix-test-repo-submodule" rev-list --count HEAD || echo "git rev-list failed"; } | tee "$out/nix-test-repo-submodule/revision_count.txt"
|
||||
'';
|
||||
};
|
||||
|
||||
submodule-leave-git-deep = testers.invalidateFetcherByDrvHash fetchgit {
|
||||
name = "submodule-leave-git-deep-source";
|
||||
url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule";
|
||||
|
||||
@@ -1,6 +1,16 @@
|
||||
source "$NIX_ATTRS_SH_FILE"
|
||||
source $mirrorsFile
|
||||
|
||||
# Normalize `curlOpts` as a string.
|
||||
# If defined as a list (deprecated), it would be a bash array.
|
||||
if [[ "$(declare -p curlOpts 2&>/dev/null || true)" =~ ^"declare -a" ]]; then
|
||||
unset _temp
|
||||
_temp="${curlOpts[*]}"
|
||||
unset curlOpts
|
||||
curlOpts=$_temp
|
||||
unset _temp
|
||||
fi
|
||||
|
||||
curlVersion=$(curl -V | head -1 | cut -d' ' -f2)
|
||||
|
||||
# Curl flags to handle redirects, not use EPSV, handle cookies for
|
||||
@@ -23,17 +33,23 @@ if ! [ -f "$SSL_CERT_FILE" ]; then
|
||||
curl+=(--insecure)
|
||||
fi
|
||||
|
||||
curl+=("${curlOptsList[@]}")
|
||||
# NOTE:
|
||||
# `netrcPhase` should not attempt to access builder.sh implementation details (e.g., the `${curl[@]}` array),
|
||||
# The implementation detail could change in any Nixpkgs revision, including backports.
|
||||
if [[ -n "${netrcPhase-}" ]]; then
|
||||
runPhase netrcPhase
|
||||
curl+=(--netrc-file "$PWD/netrc")
|
||||
fi
|
||||
|
||||
curl+=(
|
||||
${curlOpts[*]}
|
||||
"${curlOptsList[@]}"
|
||||
$curlOpts
|
||||
$NIX_CURL_FLAGS
|
||||
)
|
||||
|
||||
downloadedFile="$out"
|
||||
if [ -n "$downloadToTemp" ]; then downloadedFile="$TMPDIR/file"; fi
|
||||
|
||||
|
||||
tryDownload() {
|
||||
local url="$1"
|
||||
local target="$2"
|
||||
|
||||
@@ -333,15 +333,6 @@ lib.extendMkDerivation {
|
||||
|
||||
inherit preferLocalBuild;
|
||||
|
||||
postHook =
|
||||
if netrcPhase == null then
|
||||
null
|
||||
else
|
||||
''
|
||||
${netrcPhase}
|
||||
curlOpts="$curlOpts --netrc-file $PWD/netrc"
|
||||
'';
|
||||
|
||||
inherit meta;
|
||||
passthru = {
|
||||
inherit url resolvedUrl;
|
||||
|
||||
@@ -1,11 +1,93 @@
|
||||
{
|
||||
lib,
|
||||
testers,
|
||||
fetchurl,
|
||||
writeShellScriptBin,
|
||||
jq,
|
||||
moreutils,
|
||||
emptyFile,
|
||||
...
|
||||
}:
|
||||
let
|
||||
testFlagAppending =
|
||||
args:
|
||||
testers.invalidateFetcherByDrvHash
|
||||
(fetchurl.override (previousArgs: {
|
||||
curl = (
|
||||
writeShellScriptBin "curl" ''
|
||||
set -eu -o pipefail
|
||||
hasFoo=
|
||||
hasBar=
|
||||
echo "curl-mock-expecting-flags: get flags: $*" >&2
|
||||
for arg; do
|
||||
case "$arg" in
|
||||
-V|--version)
|
||||
${lib.getExe previousArgs.curl} "$arg"
|
||||
exit "$?"
|
||||
;;
|
||||
--foo)
|
||||
echo "curl-mock-expecting-flags: \`--foo' found in the argument list passed to \`curl'." >&2
|
||||
hasFoo=1
|
||||
;;
|
||||
--bar)
|
||||
echo "curl-mock-expecting-flags: \`--bar' found in the argument list passed to \`curl'." >&2
|
||||
hasBar=1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
if [[ -z "$hasFoo" ]]; then
|
||||
echo "ERROR: curl-mock-expecting-flags: \`--foo' missing in the argument list passed to \`curl'." >&2
|
||||
fi
|
||||
if [[ -z "$hasBar" ]]; then
|
||||
echo "ERROR: curl-mock-expecting-flags: \`--bar' missing in the argument list passed to \`curl'." >&2
|
||||
fi
|
||||
if [[ -n "$hasFoo" ]] && [[ -n "$hasBar" ]]; then
|
||||
touch $out
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
''
|
||||
);
|
||||
}))
|
||||
(
|
||||
{
|
||||
url = "https://www.example.com/source";
|
||||
hash = emptyFile.outputHash;
|
||||
recursiveHash = true; # aligned with emptyFile
|
||||
}
|
||||
// args
|
||||
);
|
||||
in
|
||||
{
|
||||
flag-appending-curlOpts = testFlagAppending {
|
||||
name = "test-fetchurl-flag-appending-curlOpts";
|
||||
curlOpts = "--foo --bar";
|
||||
};
|
||||
|
||||
flag-appending-curlOptsList = testFlagAppending {
|
||||
name = "test-fetchurl-flag-appending-curlOptsList";
|
||||
curlOptsList = [
|
||||
"--foo"
|
||||
"--bar"
|
||||
];
|
||||
};
|
||||
|
||||
flag-appending-netrcPhase-curlOpts = testFlagAppending {
|
||||
name = "test-fetchurl-flag-appending-netrcPhase-curlOpts";
|
||||
netrcPhase = ''
|
||||
touch netrc
|
||||
curlOpts="$curlOpts --foo --bar"
|
||||
'';
|
||||
};
|
||||
|
||||
flag-appending-netrcPhase-curlOptsList = testFlagAppending {
|
||||
name = "test-fetchurl-flag-appending-netrcPhase-curlOptsList";
|
||||
netrcPhase = ''
|
||||
touch netrc
|
||||
curlOptsList+=("--foo" "--bar")
|
||||
'';
|
||||
};
|
||||
|
||||
# Tests that we can send custom headers with spaces in them
|
||||
header =
|
||||
let
|
||||
|
||||
@@ -223,18 +223,19 @@ lib.extendMkDerivation {
|
||||
GOTOOLCHAIN = "local";
|
||||
|
||||
CGO_ENABLED = args.env.CGO_ENABLED or go.CGO_ENABLED;
|
||||
};
|
||||
|
||||
GOFLAGS =
|
||||
GOFLAGS
|
||||
++
|
||||
lib.warnIf (lib.any (lib.hasPrefix "-mod=") GOFLAGS)
|
||||
"use `proxyVendor` to control Go module/vendor behavior instead of setting `-mod=` in GOFLAGS"
|
||||
(lib.optional (!finalAttrs.proxyVendor) "-mod=vendor")
|
||||
++
|
||||
lib.warnIf (builtins.elem "-trimpath" GOFLAGS)
|
||||
"`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true"
|
||||
(lib.optional (!finalAttrs.allowGoReference) "-trimpath");
|
||||
GOFLAGS = toString (
|
||||
GOFLAGS
|
||||
++
|
||||
lib.warnIf (lib.any (lib.hasPrefix "-mod=") GOFLAGS)
|
||||
"use `proxyVendor` to control Go module/vendor behavior instead of setting `-mod=` in GOFLAGS"
|
||||
(lib.optional (!finalAttrs.proxyVendor) "-mod=vendor")
|
||||
++
|
||||
lib.warnIf (builtins.elem "-trimpath" GOFLAGS)
|
||||
"`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true"
|
||||
(lib.optional (!finalAttrs.allowGoReference) "-trimpath")
|
||||
);
|
||||
};
|
||||
|
||||
inherit enableParallelBuilding;
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ANTs";
|
||||
version = "2.6.3";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ANTsX";
|
||||
repo = "ANTs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AaurwFIDVKhAp8+Gu3TUlGJP33ChQ6flPTYWe/cVK0w=";
|
||||
hash = "sha256-c2a73OpRE/kCq8gq2DlwTQVZdTfKBuUQN/VeOZEkGIc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "api-linter";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "api-linter";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-psyv/J1/7H8s34qqZD4s7Ls1mn2lht5VbNxZrXPC0iw=";
|
||||
hash = "sha256-oaSWp1FmanCWMRYk3Dm1WZ+MnxooXqT9rom25JeFrTg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IpL9RIhO9ivXKHczca4m6R6jmcNEn5KXqNxWmtU30qE=";
|
||||
vendorHash = "sha256-X5/UH8dX89nTPlYMbVuyG82WrDmU/dP7LiZfMoN6c4A=";
|
||||
|
||||
subPackages = [ "cmd/api-linter" ];
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ast-grep";
|
||||
version = "0.40.0";
|
||||
version = "0.40.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-tbN8MiesWWIHew5/2STNhXu+3eXjMLRrcm8+9cZf+tM=";
|
||||
hash = "sha256-kSaDSXhE5PDQj2taQnYUttEbc3dm9VlqwIelApPlpsI=";
|
||||
};
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm .cargo/config.toml
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-+wetHwdURcNPLa9TGZmS4HlyYcQHSpLnXbrNXS/JckM=";
|
||||
cargoHash = "sha256-mz3+483vEL31kQ2oyM0GrwkFVxvPnORalQEaEBQ6/Js=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -19,22 +19,23 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "atuin-desktop";
|
||||
version = "0.2.5";
|
||||
# TODO When updating the version, check if the version-mismatch workaround in preBuild is still needed
|
||||
version = "0.2.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atuinsh";
|
||||
repo = "desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VDIC1BGgaFTiTnydJdEhVeUgVrH43MzpF4VkfgQ+Nas=";
|
||||
hash = "sha256-tVIT3GUJ1qcv6HSvO+nqAz+VMfd8g9AjgaqE6+GSa+I=";
|
||||
};
|
||||
|
||||
cargoRoot = "./.";
|
||||
cargoHash = "sha256-gYYmtxMWst0ZB/YzJf/0FGOedoVpMgTq5qq+3m2R7T8=";
|
||||
cargoHash = "sha256-T3cPvwph71lpqlGcugAO4Ua8Y5TNZSySbQatxcvoT4E=";
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-Tdcdghhc4cH+cYIeUy3inChgPfb1i9E7F1mpxxWoW4Q=";
|
||||
hash = "sha256-XqKGAx2Q9cWO1oG4mP1cKM2Y9Pib5haFYEaq0PAfAdQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -68,6 +69,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
tauriBuildFlags+=(
|
||||
"--config"
|
||||
"$tauriConfPath"
|
||||
# Skips the version mismatch check (and accepts the consequences)
|
||||
# ref: https://github.com/atuinsh/desktop/issues/313
|
||||
"--ignore-version-mismatches"
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "boxflat";
|
||||
version = "1.35.2";
|
||||
version = "1.35.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lawstorant";
|
||||
repo = "boxflat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7JIIFti8LHBIDBr+GywImlP2l3Ct/hq4pb5+2/q+F0k=";
|
||||
hash = "sha256-ayreXC73OLNpnwNuJe0ImC/ch5W+O0lnkuD31ztTqso=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "carl";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "b1rger";
|
||||
repo = "carl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4k08iwuZjnsd2EjqnslrJa3ugPOgUvUzbY3/9mxegkQ=";
|
||||
hash = "sha256-lH4qHS3CjES3uZfRxIHOcnqxEXIxyAnho7xpi5rmLOM=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
cargoHash = "sha256-1tqg/VJfgf7Y/5yM+iKYd7Vn2YCnH7RwmVPb+aO9KxY=";
|
||||
cargoHash = "sha256-ss/sGT2d4K8K9I5/G3UMRnv50O9JlB0tz9oS7sMylwI=";
|
||||
|
||||
meta = {
|
||||
description = "cal(1) with more features and written in rust";
|
||||
|
||||
@@ -2,26 +2,38 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "certgraph";
|
||||
version = "20220513";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lanrat";
|
||||
repo = "certgraph";
|
||||
rev = version;
|
||||
sha256 = "sha256-7tvPiJHZE9X7I79DFNF1ZAQiaAkrtrXiD2fY7AkbWMk=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WlNrKmny4fODnSEkP8HUF+VzMX1/LKYMdSnm7DON8Po=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ErTn7pUCtz6ip2kL8FCe+3Rhs876xtqto+z5nZqQ6cI=";
|
||||
vendorHash = "sha256-4wj96eDibGB3oX56yIr01CYLZCYMFnfoaPWaNdFH7IE=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
"-X=main.version=${version}"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Intelligence tool to crawl the graph of certificate alternate names";
|
||||
mainProgram = "certgraph";
|
||||
homepage = "https://github.com/lanrat/certgraph";
|
||||
license = with lib.licenses; [ gpl2Only ];
|
||||
changelog = "https://github.com/lanrat/certgraph/releases/tag/${src.tag}";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "certgraph";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudfox";
|
||||
version = "1.15.0";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BishopFox";
|
||||
repo = "cloudfox";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YLZSrBAEf0SXECAdnF2CQAlEd15DJ1Iv+x+RebM5tw4=";
|
||||
hash = "sha256-AdfG0Vb4wUV8iShdaXSTwrKb8pa39ovwmvGTyfz1YDw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MQ1yoJjAWNx95Eafcarp/JNYq06xu9P05sF2QTW03NY=";
|
||||
vendorHash = "sha256-mAYuquSkfYSUcTBPFJp+zwv5xCT5eqBmR7DDZjXx9YY=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "contact";
|
||||
version = "1.4.4";
|
||||
version = "1.4.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdxlocations";
|
||||
repo = "contact";
|
||||
tag = version;
|
||||
hash = "sha256-YLg4+AxtF0ZZe5nJMOcg1pPetdcKRnQlpADyYROP/EY=";
|
||||
hash = "sha256-Mnb4SMU+pUWyyhacANG6MOz3u3FOZaVJZQbRCENR/U8=";
|
||||
};
|
||||
|
||||
dependencies = [ python3Packages.meshtastic ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
container-structure-test,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
version = "1.22.0";
|
||||
version = "1.22.1";
|
||||
pname = "container-structure-test";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "container-structure-test";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-I5HFGUzDJdqqJbZ05lAfDTFOghLgiwadINBbABwtpXA=";
|
||||
sha256 = "sha256-iNJH5mrDRlwS4qry0OyT/MRlGjHbKjWZbppkbTX6ksI=";
|
||||
};
|
||||
vendorHash = "sha256-pBq76HJ+nluOMOs9nqBKp1mr1LuX2NERXo48g8ezE9k=";
|
||||
|
||||
|
||||
@@ -71,11 +71,11 @@ in
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "copyparty${nameSuffix}";
|
||||
version = "1.19.21";
|
||||
version = "1.19.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/9001/copyparty/releases/download/v${version}/copyparty-${version}.tar.gz";
|
||||
hash = "sha256-RHI6gj8hjlKq7GB1aVlzp1uGY8kgLID9c/SOUsYazUI=";
|
||||
hash = "sha256-LQxdEmyi9LeMQK5NA8rBkVJtmOUHL0rOEhYB0q9A488=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvc4";
|
||||
repo = "cvc4";
|
||||
repo = "cvc4-archived";
|
||||
rev = version;
|
||||
sha256 = "1rhs4pvzaa1wk00czrczp58b2cxfghpsnq534m0l3snnya2958jp";
|
||||
};
|
||||
|
||||
@@ -23,13 +23,13 @@ let
|
||||
in
|
||||
buildDartApplication rec {
|
||||
pname = "dart-sass";
|
||||
version = "1.95.0";
|
||||
version = "1.96.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "dart-sass";
|
||||
tag = version;
|
||||
hash = "sha256-riN4Tlf8XknoDA3/8rb4kDU2ybqsytDHeWgR2fPeYac=";
|
||||
hash = "sha256-ikNbYzZxWQrJ0PHZ2bEZtvQmFnqIsalnoEFc+YGHb4o=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
@@ -754,11 +754,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "watcher",
|
||||
"sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
|
||||
"sha256": "f52385d4f73589977c80797e60fe51014f7f2b957b5e9a62c3f6ada439889249",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.4"
|
||||
"version": "1.2.0"
|
||||
},
|
||||
"web": {
|
||||
"dependency": "transitive",
|
||||
|
||||
@@ -36,7 +36,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/vedatechnologiesinc/deco";
|
||||
description = "Simple root image setter";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.ebzzry ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "deco";
|
||||
};
|
||||
|
||||
@@ -47,7 +47,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://www.nongnu.org/devilspie2/";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.ebzzry ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "devilspie2";
|
||||
};
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dgop";
|
||||
version = "0.1.11";
|
||||
version = "0.1.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AvengeMedia";
|
||||
repo = "dgop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QhzRn7pYN35IFpKjjxJAj3GPJECuC+VLhoGem3ezycc=";
|
||||
hash = "sha256-ei6JMAai5azTy4iYLGp6vDd+ADMej+ysrZhlRv491g4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kO8b/eV5Vm/Fwzyzb0p8N9SkNlhkJLmEiPYmR2m5+po=";
|
||||
vendorHash = "sha256-MssJTtlKWzn+toNmE+QkXvLXtR7pR21cknXj89CSbwI=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dgraph";
|
||||
version = "25.0.0";
|
||||
version = "25.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgraph-io";
|
||||
repo = "dgraph";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8Lh/urzHGIepXQCXawNvJVe8IOzYs4huDOgw2m/oYiM=";
|
||||
sha256 = "sha256-0i3i0XPOS7v2DsO/tPJQSWJ3Yf8uz8aR1j+Mgm/QJUs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eArYiLfb8rsFGnPFAoRPQzONifNjds3lahIDRwqz/h0=";
|
||||
vendorHash = "sha256-3OwXBt0EwMk3jVny2Cs1NbGdeUy8MxDntZAn+mceKC8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -26,13 +26,13 @@ buildGoModule (
|
||||
in
|
||||
{
|
||||
pname = "dms-shell";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AvengeMedia";
|
||||
repo = "DankMaterialShell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rWjWYu5rs3ZOJ4YJpvIscBZSYu74thJHc0VYyYKJTUc=";
|
||||
hash = "sha256-IT21E2XX83IlO6/dW0YmUdY2JW//+ZBHLqpKPGd6tx8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/core";
|
||||
|
||||
@@ -25,14 +25,14 @@ let
|
||||
);
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.10.0.post4";
|
||||
version = "0.10.0.post5";
|
||||
pname = "dolfinx";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fenics";
|
||||
repo = "dolfinx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vzP5vBZpUR4HW6yJw1wFtbo/TiZ/k02TXV2Zk42b5aQ=";
|
||||
hash = "sha256-CK7YEtJtrx/Mto72RHT4Qjg5StO28Et+FeCYxk5T+8s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dpp";
|
||||
version = "10.1.3";
|
||||
version = "10.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brainboxdotcc";
|
||||
repo = "DPP";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-G2v0xMYj89AK5PklQl7i0/YuVTtpBYSM3EaMJrmYdME=";
|
||||
hash = "sha256-+H9mU+3j54iRR0Nhz1WxxIwGs+BRgAFX6tIiy33v/Vo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,11 +20,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dropbear";
|
||||
version = "2025.88";
|
||||
version = "2025.89";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2";
|
||||
sha256 = "sha256-eD9Q6iexfBbaiVePr9tt7PpEu49lkOVpik5NNnLcU9Q=";
|
||||
sha256 = "sha256-DR98pxHPwzbcioXmcsq5z9giOgL+LaCkp661jJ4RNjQ=";
|
||||
};
|
||||
|
||||
CFLAGS = lib.pipe (lib.attrNames dflags) [
|
||||
|
||||
@@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Trivial Markdown to HTML converter";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
license = lib.licenses.epl10;
|
||||
maintainers = [ lib.maintainers.ebzzry ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "emem";
|
||||
};
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gcsfuse";
|
||||
version = "3.5.4";
|
||||
version = "3.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlecloudplatform";
|
||||
repo = "gcsfuse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+FMVAFiOH6LH5CODp7XwCbB98vRmDTNcfSy0qTQbuOI=";
|
||||
hash = "sha256-Nfrbs46F7a+oELxnUWpi3v/KKSUGFhp4Xy7bLBur3z8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gC7ngmy4xIkEp2lHOfGyDaZNqy/J4Uy8ox8F2uP7P/0=";
|
||||
vendorHash = "sha256-v+71MA4x+WUj6ROuIbuhP1S+f8UbKFjkS8XpFFM3qyk=";
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gelly";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fingel";
|
||||
repo = "gelly";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fZrSfxbWkHX5yUwC4NkDmXcNDTvsdwceEBkmUmxWcoQ=";
|
||||
hash = "sha256-jcIBYZPEC0Bry1TG1hFsgzFnKDaAxU/j+MLxIBwdLuQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vnFbRvq+EPIcJ4w+QKpkXrl5BLr/KbELbmpRGQwcaUE=";
|
||||
cargoHash = "sha256-MPdCS1rsioCKu6dAYtMWbno/DotlsDBlVGYuRyt6/sQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "gemini-cli";
|
||||
version = "0.20.0";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-gemini";
|
||||
repo = "gemini-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6+fT9/npYrngAPeAP7pA6DYNuCVWm1lKpSVP4Ux4ddw=";
|
||||
hash = "sha256-WhQbEgr1NhReexVbCxOv11mcP+gftl1J7/FJVdiADXA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-wbr/9IitwQxBVFskCyGZfWy6FmIGZAVYLbF/sMJ2X+s=";
|
||||
npmDepsHash = "sha256-Q6mtA+Y3k4VoazJ4+uKIFbaC/lUTQFSpXxfXoP7i6Lc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gibo";
|
||||
version = "3.0.14";
|
||||
version = "3.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonwhitaker";
|
||||
repo = "gibo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-6w+qhwOHkfKt0hgKO98L6Si0RNJN+CXOOFzGlvxFjcA=";
|
||||
sha256 = "sha256-7bRgJjhCFXWuuHG6XpuGuBW577GGNFiZVJZkQDnl9aw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pD+7yvBydg1+BQFP0G8rRYTCO//Wg/6pzY19DLs42Gk=";
|
||||
vendorHash = "sha256-DnOAVZYFXX8982HvQmNpYrvDHfrNvJu+ner5YRfx754=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
zlib,
|
||||
runtimeShell,
|
||||
}:
|
||||
let
|
||||
romkatv_libgit2 = callPackage ./romkatv_libgit2.nix { };
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gitstatus";
|
||||
version = "1.5.5";
|
||||
@@ -28,8 +31,8 @@ stdenv.mkDerivation rec {
|
||||
);
|
||||
|
||||
buildInputs = [
|
||||
romkatv_libgit2
|
||||
zlib
|
||||
(callPackage ./romkatv_libgit2.nix { })
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -115,6 +118,10 @@ stdenv.mkDerivation rec {
|
||||
wait $!
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit romkatv_libgit2;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "10x faster implementation of `git status` command";
|
||||
longDescription = ''
|
||||
|
||||
@@ -1,6 +1,17 @@
|
||||
{ fetchFromGitHub, libgit2, ... }:
|
||||
|
||||
libgit2.overrideAttrs (oldAttrs: {
|
||||
pname = "romkatv_libgit2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romkatv";
|
||||
repo = "libgit2";
|
||||
rev = "tag-2ecf33948a4df9ef45a66c68b8ef24a5e60eaac6";
|
||||
hash = "sha256-Bm3Gj9+AhNQMvkIqdrTkK5D9vrZ1qq6CS8Wrn9kfKiw=";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
|
||||
cmakeFlags = oldAttrs.cmakeFlags ++ [
|
||||
"-DBUILD_CLAR=OFF"
|
||||
"-DBUILD_SHARED_LIBS=OFF"
|
||||
@@ -13,16 +24,7 @@ libgit2.overrideAttrs (oldAttrs: {
|
||||
"-DZERO_NSEC=ON"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romkatv";
|
||||
repo = "libgit2";
|
||||
rev = "tag-2ecf33948a4df9ef45a66c68b8ef24a5e60eaac6";
|
||||
hash = "sha256-Bm3Gj9+AhNQMvkIqdrTkK5D9vrZ1qq6CS8Wrn9kfKiw=";
|
||||
};
|
||||
|
||||
# this is a heavy fork of the original libgit2
|
||||
# the original checkPhase does not work for this fork
|
||||
doCheck = false;
|
||||
|
||||
patches = [ ];
|
||||
})
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.17.84";
|
||||
version = "0.17.85";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "gqlgen";
|
||||
@@ -16,10 +16,10 @@ buildGoModule {
|
||||
owner = "99designs";
|
||||
repo = "gqlgen";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5Bz9iJJfDqzhuQbIbcpqCKTrSy4v8jpmjm8R1nn17R4=";
|
||||
hash = "sha256-U2qbOjWUE1MfrMJTVaB59Osax8B6CKMlk6uqGioVgBk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1837pdV4pnwHjogdZqzBR2Ab3gZNW2stvbwvd6MQoBc=";
|
||||
vendorHash = "sha256-9rBdr1fP5LKioz2c6lAZEdcDnG2JL2CO1VXK5+MwGEs=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "harlequin";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tconbeer";
|
||||
repo = "harlequin";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-W/Za/k/XusZmPLiX4ER9XaQWG4jdkrIh7JualHeeqZM=";
|
||||
hash = "sha256-7CUY7tCYYdNBFg1HX3csNTR46paIaHlJPKtK3xqvkAQ=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
pname = "jp2a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Talinx";
|
||||
repo = "jp2a";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GcwwzVgF7BK2N8TL8z/7R7Ry1e9pmGiXUrOAQQmPIBo=";
|
||||
hash = "sha256-GvPRLYrqZyzk24RmJJ1VcnXo6uda50qqqRA/pioPm5Q=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "kanata";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtroo";
|
||||
repo = "kanata";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-IicVuJZBHzBv9SNGQuWIIaLq2qpWfn/jMFh9KPvAThs=";
|
||||
sha256 = "sha256-jzTK/ZK9UrXTP/Ow662ENBv3cim6klA8+DQv4DLVSNU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2DTL1u17jUFiRoVe7973L5/352GtKte/vakk01SSRwY=";
|
||||
cargoHash = "sha256-qYFt/oHokR+EznugEaE/ZEn26IFVLXePgoYGxoPRi+g=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
(writeShellScriptBin "sw_vers" ''
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
python3,
|
||||
@@ -93,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
passthru.tests = lib.mapAttrs (_: v: v.override { libgit2 = finalAttrs.finalPackage; }) {
|
||||
inherit libgit2-glib;
|
||||
inherit (python3Packages) pygit2;
|
||||
inherit gitstatus;
|
||||
inherit (gitstatus) romkatv_libgit2;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libphonenumber";
|
||||
version = "9.0.20";
|
||||
version = "9.0.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "libphonenumber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-naIlf09phlgFS4GqNSLLqzQwM3DGp3bBu3cFinrUYFA=";
|
||||
hash = "sha256-2YiTjudHEKl3JJMF4jV/DpQFZbBEb4z6WZxU+jdGVx0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -21,14 +21,14 @@ rustPlatform.buildRustPackage rec {
|
||||
pname = "libsignal-ffi";
|
||||
# must match the version used in mautrix-signal
|
||||
# see https://github.com/mautrix/signal/issues/401
|
||||
version = "0.86.4";
|
||||
version = "0.86.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
fetchSubmodules = true;
|
||||
owner = "signalapp";
|
||||
repo = "libsignal";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-f2f2AY4PYs+HcaordHAIXHhvyfgZ9D3GrfW5wC06/h4=";
|
||||
hash = "sha256-+GFuwS4y8yr86ETVIjlz/6HocAamASmBOIjkTLtCIag=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
|
||||
env.BORING_BSSL_PATH = "${boringssl-wrapper}";
|
||||
env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
|
||||
|
||||
cargoHash = "sha256-JKFO/+t++3WEsqnCEsI/S4wpNUFiCIIudiRbjrT/i6k=";
|
||||
cargoHash = "sha256-uiMct9ygg1c1rQb6RsM2AoibuKCExPy9P75C7jDX8Cs=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
||||
@@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/rakshasa/libtorrent";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
ebzzry
|
||||
codyopel
|
||||
thiagokokada
|
||||
];
|
||||
|
||||
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
pSub
|
||||
ebzzry
|
||||
];
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@@ -74,13 +74,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "7356";
|
||||
version = "7445";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-zrdnjiwM0gdy1wSWSR0AA6uZHYW1deVG3yRFlalAAZc=";
|
||||
hash = "sha256-oHQtfGu1altWwHUl4z2ApLVp8ISfd+l9t+k5NqtbWgA=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
@@ -186,6 +186,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
dit7ya
|
||||
philiptaron
|
||||
xddxdd
|
||||
yuannan
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
badPlatforms = optionals (cudaSupport || openclSupport) lib.platforms.darwin;
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lobtui";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pythops";
|
||||
repo = "lobtui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ig/KdCuQZYSiCydouN29IsIRKh8qngtzcOknTozDRRM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Cj6hf/dizIv2pKbQvyRqqIz5k3AW3cdfpCaIHvk8G9o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "TUI for lobste.rs website";
|
||||
homepage = "https://github.com/pythops/lobtui";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
matthiasbeyer
|
||||
];
|
||||
mainProgram = "lobtui";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lua-language-server";
|
||||
version = "3.16.0";
|
||||
version = "3.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luals";
|
||||
repo = "lua-language-server";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-SMSBUn6PtsdvK4u/UlWr82/YDoGK4MwA+bI9jgisHHA=";
|
||||
hash = "sha256-HYtnTJYII548+/tp+1UjRgsBaTuDz27AIc2MvBjBh8o=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ludtwig";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MalteJanz";
|
||||
repo = "ludtwig";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3E1W6AlGQ9AhMzLvTV5KBjlKiWXyi7rFwHOdU3CIp60=";
|
||||
hash = "sha256-V0T+yinjTVkAXA604bfEGDzpCd0saNt5S71XFaFqdxg=";
|
||||
};
|
||||
|
||||
checkType = "debug";
|
||||
|
||||
cargoHash = "sha256-00JHtrDffFl3h3IOH+h491qGOSfXIJH9NBmaqqUtQ6k=";
|
||||
cargoHash = "sha256-qR7V7fvWsDsLDRwfvM5UV7iKLGxE722eXvYrZTBtGpQ=";
|
||||
|
||||
meta = {
|
||||
description = "Linter / Formatter for Twig template files which respects HTML and your time";
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "lue";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superstarryeyes";
|
||||
repo = "lue";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-D1y7nu3WIsnShy2ruyF06iVusD8leuaAUi0M8I1hVqQ=";
|
||||
hash = "sha256-T7uh9PSCTkT+jYxQYC4ebPkabDz3pc6JjCGtgNatIAM=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
openssl,
|
||||
}:
|
||||
let
|
||||
version = "1.0.0";
|
||||
version = "1.2.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "markuplinkchecker";
|
||||
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "becheran";
|
||||
repo = "mlc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Bj1Yf+lrKwMvYnE/YVb+KC8tZtRr2OkWoYxQChLINyY=";
|
||||
hash = "sha256-6v4tRCtoABbb0bwOagEGHk2QoUs3u/AnME5g7vhbkI4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-r3LGWJ5RsvWRXNVXWIM83quC3AT8T+WDfSJnD3sVoOM=";
|
||||
cargoHash = "sha256-W4aOrKnRDAvHC4c+7e/XYSOgB/wFExqQhimaPJNiJk8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -20,14 +20,14 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-signal";
|
||||
version = "25.11";
|
||||
tag = "v0.2511.0";
|
||||
version = "25.12";
|
||||
tag = "v0.2512.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "signal";
|
||||
inherit tag;
|
||||
hash = "sha256-ynHJcVoSDFOulIE5Z5qmLGgmqGYtcAc2r+NhJ+THdHU=";
|
||||
hash = "sha256-qD3kehVZINfAg6ZitYlkabo19Zfn7X//5BoMbub9Y60=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@@ -44,7 +44,7 @@ buildGoModule rec {
|
||||
|
||||
CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ];
|
||||
|
||||
vendorHash = "sha256-oz/rCeA/UgwmIZhHxbcty5XWiIecBmHs1M1lavugZ24=";
|
||||
vendorHash = "sha256-zfe3mdM3azHe+NssRKJqjaP7A0wrvHyIVnqUWJMsylw=";
|
||||
|
||||
ldflags = [
|
||||
"-X"
|
||||
|
||||
@@ -14,22 +14,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-whatsapp";
|
||||
version = "25.11";
|
||||
tag = "v0.2511.0";
|
||||
version = "25.12";
|
||||
tag = "v0.2512.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "whatsapp";
|
||||
inherit tag;
|
||||
hash = "sha256-0Jpod9/mZ9eGFvPxki6Yz0KL1XQ4HTtZ7Zv7WvamuC0=";
|
||||
hash = "sha256-gVQSACXQ384MYOptRKGSIzCjOgyWW+8/YrxKCaCqhuA=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional (!withGoolm) olm;
|
||||
tags = lib.optional withGoolm "goolm";
|
||||
|
||||
vendorHash = "sha256-n25j2uM3e5/5PYs2jwH+iclaU/p/MhctCAhPninz2HI=";
|
||||
|
||||
doCheck = false;
|
||||
vendorHash = "sha256-eyukS+rEysjhaywxzgqKP11IJF2SY9FSluQIOESZ6mk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -75,7 +75,6 @@ buildGoModule rec {
|
||||
mainProgram = "minikube";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
ebzzry
|
||||
vdemeester
|
||||
atkinschang
|
||||
Chili-Man
|
||||
|
||||
@@ -38,7 +38,6 @@ stdenv.mkDerivation {
|
||||
description = "Flexible Linux input device translator, geared for gamepads";
|
||||
mainProgram = "moltengamepad";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ebzzry ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
|
||||
@@ -122,12 +122,15 @@ stdenv.mkDerivation rec {
|
||||
"ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}"
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
env.NIX_CFLAGS_COMPILE = toString (
|
||||
[
|
||||
"-std=gnu17"
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-error=implicit-function-declaration"
|
||||
"-Wno-error=incompatible-function-pointer-types"
|
||||
];
|
||||
};
|
||||
]
|
||||
);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nats-server";
|
||||
version = "2.12.2";
|
||||
version = "2.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = "nats-server";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-03BtUlCf1GxrtQGz6gDxfqVeZy9rSxCTqZLZeMQhbWw=";
|
||||
hash = "sha256-VLNo2XuTBUYR/zzgtjO4uzzOFaqpm8p0iW2mjCxvVSA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ydo4pRRcQo2R1Bc9BGPvAMwgbMG3ZhbislK3FlejqdY=";
|
||||
vendorHash = "sha256-Ik3RYk9GjEkKyp/Uu89rbiSnX6dN/ukpVVFU8tu3C5o=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nginx-sso";
|
||||
version = "0.27.4";
|
||||
version = "0.27.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Luzifer";
|
||||
repo = "nginx-sso";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fNMCskS8uXAykl2Zu4ZZqtIS2F5w7HV7C8hyPaWnav4=";
|
||||
hash = "sha256-yiwKnOv/4Zy9bBvQZiIp8cH1XvgV88m9t4ptqQp1LG8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-J3CObmSbrAn0D5MOaclRvlnqLqUYfQCkfD6om/tNKac=";
|
||||
vendorHash = "sha256-KflzlrjOOTDZQq2yP0zQsDgULrbnoeRRxOVHxKINsYw=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
|
||||
@@ -8,16 +8,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nnd";
|
||||
version = "0.64";
|
||||
version = "0.65";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "al13n321";
|
||||
repo = "nnd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/9bPn4oPwAnZM868viZoMeVEdqMfwpvni89zD7ktzVQ=";
|
||||
hash = "sha256-fOCPxNkQKHVfaumds4G4+0GL8CtBa5UyuG2IzllUS3Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1pT0/ZW8Is/rKaywYFvKbbVfpMBKeJTrROwwszzAqb4=";
|
||||
cargoHash = "sha256-bNlC8yHiA6EBX2TK4QBvSp01+FjxRFr1/pSm1T/SFNU=";
|
||||
|
||||
meta = {
|
||||
description = "Debugger for Linux";
|
||||
|
||||
@@ -50,8 +50,6 @@ let
|
||||
homepage = "https://notesnook.com";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
cig0
|
||||
j0lol
|
||||
keysmashes
|
||||
];
|
||||
platforms = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-circle";
|
||||
version = "25.11.15";
|
||||
version = "25.12.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = "numix-icon-theme-circle";
|
||||
rev = version;
|
||||
sha256 = "sha256-+JV+2PEcXjIUxKTHV+jIejem/oANiMwytzwUPMa2zkc=";
|
||||
sha256 = "sha256-Eul4ulMasoY4DNzqeGDxU1trmH3Mrn9Z15gmiFUtM18=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
||||
@@ -39,7 +39,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/ebzzry/pell";
|
||||
description = "Simple host availability monitor";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ebzzry ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "pell";
|
||||
};
|
||||
|
||||
@@ -120,13 +120,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pike";
|
||||
version = "8.0.2038";
|
||||
version = "9.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pikelang";
|
||||
repo = "Pike";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aaU9kSmdN/zMFTnqkp8renuMxTj1WwAQIudPy6ahm1M=";
|
||||
hash = "sha256-J+IWYF2FvL395/+Aat4yGioxUi6vIhNjzLMPV7EvPtw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "pixi";
|
||||
version = "0.61.0";
|
||||
version = "0.62.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prefix-dev";
|
||||
repo = "pixi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BMHZcsFU9aYEiUJ1WfS2hve7pCHknOKpsNJ7VPUmuwU=";
|
||||
hash = "sha256-UHaLFzlz0aRl+CTtYURNhJAOd0sQOjhXgOOO+sZw4EE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RIw5wAxick23kK16Pvc8U4uSSWe/VxE/9NmIP8X9Ruw=";
|
||||
cargoHash = "sha256-eQQLIdck8C6lLoXcTK/zUw6L9IUAnp7gRrMBlFGMEVg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "alertmanager";
|
||||
version = "0.29.0";
|
||||
version = "0.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prometheus";
|
||||
repo = "alertmanager";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2uP4JCbQEe7/en5sBq/k73kqK6YVmuLvfiUy1fqPitw=";
|
||||
hash = "sha256-103Jb2CA/Zz+MBIJei3vhqcPyg7e5JkpFKqh1hjAhLc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bN1iV2JrrjwiiIXr5lp389HvEoQGteJQD94cug0/048=";
|
||||
vendorHash = "sha256-LgGsXaJ97uXtqHHicsLOaMNx3PzlVPhz/xG+KvO4nLI=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/alertmanager"
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "protonvpn-gui";
|
||||
version = "4.12.0";
|
||||
version = "4.13.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "proton-vpn-gtk-app";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-pDTzqTiGAisVEHwez526z9C9GzNkMWl6Cui8E6siIXo=";
|
||||
hash = "sha256-1T8gh0aKYiVnkr4SLg2a5Hcc8FQn8llofCXxeZGwd8I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,7 +16,6 @@ bundlerApp {
|
||||
homepage = "http://www.github.com/raul/pt";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
ebzzry
|
||||
manveru
|
||||
nicknovitski
|
||||
];
|
||||
|
||||
@@ -169,7 +169,6 @@ python3.pkgs.buildPythonApplication {
|
||||
platforms = if enableWideVine then [ "x86_64-linux" ] else qt6Packages.qtwebengine.meta.platforms;
|
||||
maintainers = with lib.maintainers; [
|
||||
rnhmjoj
|
||||
ebzzry
|
||||
dotlambda
|
||||
];
|
||||
};
|
||||
|
||||
@@ -81,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "rtorrent";
|
||||
maintainers = with lib.maintainers; [
|
||||
ebzzry
|
||||
codyopel
|
||||
thiagokokada
|
||||
];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2025-12-08";
|
||||
version = "2025-12-15";
|
||||
|
||||
cargoHash = "sha256-ChsaWQ4gfBuucdab1uRw7tCZJcqDn9drwyAqQ6b4Dac=";
|
||||
|
||||
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
hash = "sha256-nG76b87rkaDzibWbnB5bYDm6a52b78A+fpm+03pqYIw=";
|
||||
hash = "sha256-OepmesaROt1QloBXDm+goBqjrbrJ+rtOBIF3m7+A5eA=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "saucectl";
|
||||
version = "0.197.3";
|
||||
version = "0.197.4";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -14,7 +14,7 @@ buildGoModule {
|
||||
owner = "saucelabs";
|
||||
repo = "saucectl";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VVsQfDv8JNXpagXA6JhO47A14AS5pesZqDmitv0WDzE=";
|
||||
hash = "sha256-vhVgrwZ+CXKDkJTQ0eCZM83FjvmNI6cxcRcxTspHtCE=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
autoconf,
|
||||
bison,
|
||||
boost,
|
||||
@@ -70,6 +71,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gputils
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix build with gcc15
|
||||
# https://sourceforge.net/p/sdcc/bugs/3846/
|
||||
(fetchpatch {
|
||||
name = "sdcc-fix-aslink-elf-signature.patch";
|
||||
url = "https://src.fedoraproject.org/rpms/sdcc/raw/4a7c2a7e32369461eb451fc6f4d678a010135afc/f/sdcc-4.4.0-aslink.patch";
|
||||
hash = "sha256-xGilNetecPBj2VV3ebmln5BKqs3OoWFf6y2S3TBTHMQ=";
|
||||
})
|
||||
];
|
||||
|
||||
# sdcc 4.5.0 massively rewrote sim/ucsim/Makefile.in, and lost the `.PHONY`
|
||||
# rule in the process. As a result, on macOS (which uses a case-insensitive
|
||||
# filesystem), the INSTALL file keeps the `install` target in the ucsim
|
||||
|
||||
@@ -288,10 +288,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more";
|
||||
mainProgram = "soh";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [
|
||||
j0lol
|
||||
matteopacini
|
||||
];
|
||||
maintainers = with lib.maintainers; [ matteopacini ];
|
||||
license = with lib.licenses; [
|
||||
# OTRExporter, OTRGui, ZAPDTR, libultraship
|
||||
mit
|
||||
|
||||
@@ -13,19 +13,19 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "silver-platter";
|
||||
version = "0.6.1";
|
||||
version = "0.8.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jelmer";
|
||||
repo = "silver-platter";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-b7EYDLoFP77bLk6kodRH4beRLZBnarEZDv3uNg8kFW4=";
|
||||
hash = "sha256-/GFTM/VF+b0I8cDY4vkHzSxCBbvpMiLBVVEPFHcn1/Q=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-nab0Kkn7JrlnrChnC/WERnhyZEywzZ0LP/bmaAu/G4s=";
|
||||
hash = "sha256-Y16OnSBC4v21NcCeWAwwGoFYJMQq/se25QqvpMyblmk=";
|
||||
};
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "slackdump";
|
||||
version = "3.1.10";
|
||||
version = "3.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rusq";
|
||||
repo = "slackdump";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sbin16iMz5ePXWE8KdpdbY+VaqgnpGH4xyyD2pq1kbo=";
|
||||
hash = "sha256-p9d7BGWNssOwYERwWs8jer/um+wMLkMwvQcOg1pJ2eg=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
|
||||
@@ -32,7 +32,7 @@ buildGoModule rec {
|
||||
"-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-7ySux+c4cun8dm7JhJpjSsFekru6emV6GCta3KL6m34=";
|
||||
vendorHash = "sha256-ny+cIpmMqRbrMT65GCpVRTWlxVEcKS6D+roO+Qbq47U=";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "snowemu";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twvd";
|
||||
repo = "snow";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-m3CPKswOB2j2r/BTf9RzCvwPVq3gbKemtk11HKS1nHk=";
|
||||
hash = "sha256-oBMzkN4cHk0KywIiKLcjE58T/9lOIM6fRbCZOR6zON8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
cargoHash = "sha256-+FS5785F8iWPt6Db+IKRbOFAYNEfHC+jvPVdwkLZ5YI=";
|
||||
cargoHash = "sha256-cuxbjyjdQNkluRfPQtro9OPr4V/trT1VqgbHjfZUScQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ssh-vault";
|
||||
version = "1.1.5";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ssh-vault";
|
||||
repo = "ssh-vault";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-po0Zb52TVfqHxqlHPmBCqr5zgj49Ks5n0rZDiOvixcM=";
|
||||
hash = "sha256-d4XhH9i43AkgZR/6XE6iR8pSC5xSuWiX8VghJsC8Ek4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pd52vYtN4JmOyDstNBX7ssJk/IpiGnekc7L+knf+RzQ=";
|
||||
cargoHash = "sha256-7IOX69MIrSLU6vit0/rg7IRbz9Dn0rSN5RuM4dJ49/A=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -48,7 +48,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/stumpwm/stumpwm-contrib";
|
||||
description = "STUMPwm Interactive SHell";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.ebzzry ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "stumpish";
|
||||
};
|
||||
|
||||
@@ -12,24 +12,25 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "sudo-rs";
|
||||
version = "0.2.10";
|
||||
version = "0.2.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trifectatechfoundation";
|
||||
repo = "sudo-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DGoEHeVs7EbzpfbmJQEIsL/eWXBvUCbaSPAGD65Op7k=";
|
||||
hash = "sha256-F1JwVP2GDzKCfiJXh8PXTBghNwWeD8a+TMiEaPx6wGg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fn97cKdaIsbozI794CAeWQooC7evTErRJOg6cEjzvjY=";
|
||||
cargoHash = "sha256-6NhyPdOAk2va8Vibsfpfq3xGLIzDBRmqxj4bZhQT9bY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = [ pam ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace build.rs \
|
||||
--replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
substituteInPlace src/system/audit.rs \
|
||||
--replace-fail '/usr/share/zoneinfo' '/etc/zoneinfo' \
|
||||
--replace-fail '/usr/share/lib/zoneinfo' '${tzdata}/share/zoneinfo'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
@@ -62,6 +63,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"system::interface::test::test_unix_user"
|
||||
"system::tests::test_get_user_and_group_by_id"
|
||||
|
||||
# Store paths are not owned by root in the build sandbox, so the zoneinfo path
|
||||
# doesn't pass the validations done by sudo-rs.
|
||||
# This is not an issue at runtime, since there the zoneinfo path is owned by root.
|
||||
"sudo::env::environment::tests::test_tzinfo"
|
||||
|
||||
# Unsure why those are failing
|
||||
"env::tests::test_environment_variable_filtering"
|
||||
"su::context::tests::invalid_shell"
|
||||
@@ -79,11 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex=^v([0-9]+\\.[0-9]+\\.[0-9])$"
|
||||
];
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
tests = nixosTests.sudo-rs;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tbls";
|
||||
version = "1.92.0";
|
||||
version = "1.92.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k1LoW";
|
||||
repo = "tbls";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Z+X7OUT38OB7559s+bOlraL9F2qSnhpzpQTYt07DYD0=";
|
||||
hash = "sha256-78YEBMwizGax6V88r9f6FI03GagI3znTnGHh1C0VAVc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3Y3GsVMImo0oCigAyQ2SPOucllrfkD9oj9o3ESk47eA=";
|
||||
vendorHash = "sha256-mQE1ZGNKbD9XQMoVBU3JVBjEIt0V0+PiC5yps4aj+kQ=";
|
||||
|
||||
excludedPackages = [ "scripts/jsonschema" ];
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
cmake,
|
||||
libtirpc,
|
||||
ncurses,
|
||||
@@ -11,17 +11,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "teapot";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "museoa";
|
||||
repo = "teapot";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-38XFjRzOGasr030f+mRYT+ptlabpnVJfa+1s7ZAjS+k=";
|
||||
src = fetchzip {
|
||||
url = "https://www.syntax-k.de/projekte/teapot/teapot-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-wzAwZwOMeTsuR5LhfjspGdejT6X1V8YJ8B7v9pcbxaY=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
cd src
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# include a local file in order to make cc happy
|
||||
./001-fix-warning.patch
|
||||
@@ -42,10 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||
NIX_LDFLAGS = [ "-ltirpc" ];
|
||||
|
||||
cmakeConfigureFlags = [
|
||||
"-DENABLE_HELP=OFF"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
|
||||
@@ -78,8 +68,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "teapot";
|
||||
homepage = "https://github.com/museoa/teapot";
|
||||
changelog = "https://github.com/museoa/teapot/releases/tag/${finalAttrs.version}";
|
||||
homepage = "https://www.syntax-k.de/projekte/teapot/";
|
||||
changelog = "https://www.syntax-k.de/projekte/teapot/";
|
||||
};
|
||||
})
|
||||
# TODO: patch/fix FLTK building
|
||||
|
||||
@@ -19,16 +19,16 @@ let
|
||||
television = rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "television";
|
||||
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexpasmantier";
|
||||
repo = "television";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-3xzgLG4iHd4SvBgMu3MgpOPD0saVDaC8gXy+Y/wJ4q4=";
|
||||
hash = "sha256-PBWadCAGfCgYcNZpkQhY9g7mrKQgkJ9UhqMjAcM/IuU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3Ttar63EffTmU4pnwgZb/Zl9zIN9T9hAcV/uFUjypeQ=";
|
||||
cargoHash = "sha256-aa+XV1QUHjL2AjO+0AkMYimJeB7bNdb7ShrgNwevJc8=";
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -78,7 +78,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://tinyscheme.sourceforge.net/CHANGES";
|
||||
license = lib.licenses.bsdOriginal;
|
||||
mainProgram = "tinyscheme";
|
||||
maintainers = [ lib.maintainers.ebzzry ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.soimort.org/translate-shell";
|
||||
description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ ebzzry ];
|
||||
mainProgram = "trans";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "http://tthsum.devs.nu/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.ebzzry ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "tthsum";
|
||||
};
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "uni";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arp242";
|
||||
repo = "uni";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LSmQtndWBc7wCYBnyaeDb4Le4PQPcSO8lTp+CSC2jbc=";
|
||||
hash = "sha256-+n+QExNCk5QsavO0Kj/e12v4xFJDnXprJGjyk2i/ioY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4w5L5Zg0LJX2v4mqLLjAvEdh3Ad69MLa97SR6RY3fT4=";
|
||||
vendorHash = "sha256-8nl7iFMmoGuC3pEVi6HqXdwFCKvCDi3DMwRQFjfBC7Y=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user