mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-22 16:41:08 +00:00
Compare commits
270 Commits
haskell-up
...
staging
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e9f5fbea62 | ||
|
|
b0b780a4ae | ||
|
|
e51f60deb2 | ||
|
|
585b17062b | ||
|
|
ea1d43ed8a | ||
|
|
cd0985e91d | ||
|
|
0266997b60 | ||
|
|
5e992c1204 | ||
|
|
08cd17b3b7 | ||
|
|
7cff90c5d6 | ||
|
|
900089daa8 | ||
|
|
406666db05 | ||
|
|
29ace22f1c | ||
|
|
4933b592f6 | ||
|
|
fe84a78735 | ||
|
|
00d7d9d91c | ||
|
|
0dc1d089e2 | ||
|
|
eaabcb419b | ||
|
|
f448d919d7 | ||
|
|
a2a9084d44 | ||
|
|
3304d4442b | ||
|
|
2a1f798a81 | ||
|
|
0ca6aa8a2e | ||
|
|
0c2857e469 | ||
|
|
9b3e5bcb19 | ||
|
|
cada968da5 | ||
|
|
0c362da6f1 | ||
|
|
59d6f14e97 | ||
|
|
f0ca40c94f | ||
|
|
3bdd7e80a1 | ||
|
|
44893b28a3 | ||
|
|
4b0c1fbb12 | ||
|
|
a4973ac2d4 | ||
|
|
df09803364 | ||
|
|
c1fe1675b8 | ||
|
|
e6f430b274 | ||
|
|
5764c1b0fa | ||
|
|
63ec43820e | ||
|
|
e019614ab9 | ||
|
|
5c336487fd | ||
|
|
c6bd845169 | ||
|
|
d83078ca12 | ||
|
|
4b64f81106 | ||
|
|
d117059d27 | ||
|
|
1d3adf001b | ||
|
|
53706ae820 | ||
|
|
67c28a9b01 | ||
|
|
bebbeb6399 | ||
|
|
836eccec63 | ||
|
|
02bd096123 | ||
|
|
9e5a41550e | ||
|
|
a0c6b7f034 | ||
|
|
fe51cafc23 | ||
|
|
592e042a5f | ||
|
|
cf4e62b86d | ||
|
|
4b1d12b12a | ||
|
|
db097eb0b6 | ||
|
|
884f8ca60b | ||
|
|
150b40cac1 | ||
|
|
a4c8b18708 | ||
|
|
1f22863ccd | ||
|
|
a74384116d | ||
|
|
b0003ba3f5 | ||
|
|
c39d5252c7 | ||
|
|
58a2e2f971 | ||
|
|
d8e96389e1 | ||
|
|
b14f8fbb74 | ||
|
|
0b6ae71b29 | ||
|
|
9b83d19980 | ||
|
|
b09c446871 | ||
|
|
dd3694e504 | ||
|
|
ddcc9d5afe | ||
|
|
192dbe0918 | ||
|
|
5859e09d08 | ||
|
|
33d88105a1 | ||
|
|
f8b4a2ba1c | ||
|
|
668989a1c8 | ||
|
|
48199e0459 | ||
|
|
0e1aa5a744 | ||
|
|
bdf9afc623 | ||
|
|
ca7a48bfdd | ||
|
|
0efbc1300e | ||
|
|
53d5cb0cd5 | ||
|
|
4d2137156a | ||
|
|
1fe77c95b1 | ||
|
|
aec5dcbd7a | ||
|
|
7f2da58ad7 | ||
|
|
303d51235e | ||
|
|
66487b4c71 | ||
|
|
88ebd9f5ec | ||
|
|
d85a0d7413 | ||
|
|
62d4d822fa | ||
|
|
20af6dcfeb | ||
|
|
d2e75a2cad | ||
|
|
31d2077e67 | ||
|
|
3ed56a6017 | ||
|
|
51e22711cf | ||
|
|
57be21539c | ||
|
|
3deba72387 | ||
|
|
a3eff1e982 | ||
|
|
64f84aeb97 | ||
|
|
06d50224cc | ||
|
|
f412c70cf7 | ||
|
|
c95677212e | ||
|
|
1682138b38 | ||
|
|
ce2f48f390 | ||
|
|
c8805612da | ||
|
|
26cfad56d0 | ||
|
|
77aa4da574 | ||
|
|
0a97deac0e | ||
|
|
029c575725 | ||
|
|
d37982385b | ||
|
|
1c88beab89 | ||
|
|
28d4379b7c | ||
|
|
e3850b7cb0 | ||
|
|
ce8d308838 | ||
|
|
7973bd606a | ||
|
|
dce4c1b17a | ||
|
|
0206799dbd | ||
|
|
0635abd1f6 | ||
|
|
53c5a5054d | ||
|
|
910447c01e | ||
|
|
d789e73078 | ||
|
|
656a40102d | ||
|
|
3ea94c8413 | ||
|
|
07173bfbad | ||
|
|
2c0fe95227 | ||
|
|
e2f1003d54 | ||
|
|
4ca84bd6ff | ||
|
|
e5e485993a | ||
|
|
2f1ba1e607 | ||
|
|
935f1ec3e3 | ||
|
|
c89f3fbd2d | ||
|
|
481f060889 | ||
|
|
9bcdcbe201 | ||
|
|
7c580bacc6 | ||
|
|
c1fac1327d | ||
|
|
737bea0291 | ||
|
|
4f36938937 | ||
|
|
77e12b7f34 | ||
|
|
56b204e3c4 | ||
|
|
65d6f84322 | ||
|
|
1ea19ce3da | ||
|
|
85f3793b05 | ||
|
|
b43c707be2 | ||
|
|
aa4219ffaa | ||
|
|
951e50ec2b | ||
|
|
72dfbeef2f | ||
|
|
52325bf865 | ||
|
|
8741663b37 | ||
|
|
f6c466042e | ||
|
|
2709d6b4f4 | ||
|
|
fb6f0040ba | ||
|
|
b2aab90a9c | ||
|
|
fe7386bbc1 | ||
|
|
55b0f7b857 | ||
|
|
5029ec8c4b | ||
|
|
85698966be | ||
|
|
e739993fea | ||
|
|
89d7ad761d | ||
|
|
06dfd43f5a | ||
|
|
9d32e5581e | ||
|
|
5f6ddcdf15 | ||
|
|
1780b903fd | ||
|
|
422b402a18 | ||
|
|
1bd731c055 | ||
|
|
3094343814 | ||
|
|
6f3af9d4b1 | ||
|
|
ce8a82fb44 | ||
|
|
33ca91a44e | ||
|
|
aa3e83b5be | ||
|
|
0fb5f0c1d5 | ||
|
|
eaaeed2a57 | ||
|
|
b7481153ba | ||
|
|
66b5ff6922 | ||
|
|
bb64af82c3 | ||
|
|
030180ff42 | ||
|
|
93c2daee52 | ||
|
|
cf5eebf360 | ||
|
|
1ae2eaa175 | ||
|
|
3d43477063 | ||
|
|
80d7920bdd | ||
|
|
be8bc646d4 | ||
|
|
d3ea2a3180 | ||
|
|
a756cf1950 | ||
|
|
c9a869ef27 | ||
|
|
631bb3f063 | ||
|
|
0e207a2f94 | ||
|
|
8fb20960f6 | ||
|
|
6ba22d1955 | ||
|
|
14c9361dac | ||
|
|
694e6348b1 | ||
|
|
9652e1332d | ||
|
|
e6f60a365a | ||
|
|
fe496ec525 | ||
|
|
4f6ec6fc96 | ||
|
|
979d1af798 | ||
|
|
01b81663af | ||
|
|
143000035a | ||
|
|
6a00cf9029 | ||
|
|
b8849050c9 | ||
|
|
35eba27db6 | ||
|
|
67204887a8 | ||
|
|
007ea29d17 | ||
|
|
63f496d8fb | ||
|
|
56caf75a2b | ||
|
|
e79e57c3d0 | ||
|
|
f659de9be2 | ||
|
|
0eb7f664f8 | ||
|
|
339568c9f9 | ||
|
|
36077ec8f8 | ||
|
|
c0216ed720 | ||
|
|
dac609047e | ||
|
|
0e0204bf39 | ||
|
|
b5231255ab | ||
|
|
3e44519ed5 | ||
|
|
4c4644e487 | ||
|
|
0b99f61e56 | ||
|
|
e72f7e0e9e | ||
|
|
6efd50f603 | ||
|
|
5ff3d47156 | ||
|
|
f2f80d3cde | ||
|
|
68a131f652 | ||
|
|
33f1076b16 | ||
|
|
50e42b2d6c | ||
|
|
107ecb2533 | ||
|
|
84d99e1916 | ||
|
|
4893b4e92d | ||
|
|
dfea27aa96 | ||
|
|
ba6c358aff | ||
|
|
a51d057203 | ||
|
|
dbd0f87198 | ||
|
|
fab8604004 | ||
|
|
03d3fa0074 | ||
|
|
f49885ecdb | ||
|
|
e6b738aa10 | ||
|
|
d0cbf1997e | ||
|
|
a043bd8b36 | ||
|
|
bd7c058954 | ||
|
|
290bcbbbb4 | ||
|
|
18c75074ca | ||
|
|
26482ee87c | ||
|
|
af253c905a | ||
|
|
55781a05ed | ||
|
|
6204aa2983 | ||
|
|
5964572d17 | ||
|
|
cbd66b68e2 | ||
|
|
12babd1e2a | ||
|
|
d88eb9f171 | ||
|
|
5614859b5a | ||
|
|
9508ddad2b | ||
|
|
35bc596317 | ||
|
|
5526f30e5a | ||
|
|
d14289b445 | ||
|
|
d066489411 | ||
|
|
3259398327 | ||
|
|
d83657c9d0 | ||
|
|
d15af2a4ae | ||
|
|
ba1857095f | ||
|
|
b3a0b19271 | ||
|
|
112e7742ee | ||
|
|
4dc18b3075 | ||
|
|
1021584703 | ||
|
|
18ab73a292 | ||
|
|
8f44366127 | ||
|
|
aaa47dc077 | ||
|
|
4f2971fd5a | ||
|
|
0565c96604 | ||
|
|
9e2a988b66 | ||
|
|
4355f310c6 |
@@ -93,6 +93,11 @@
|
||||
github = "0x120581f";
|
||||
githubId = 130835755;
|
||||
};
|
||||
_0x2B = {
|
||||
name = "0x2B";
|
||||
github = "0x2B-bin";
|
||||
githubId = 49249957;
|
||||
};
|
||||
_0x3f = {
|
||||
name = "0x3f";
|
||||
github = "0x3fiona";
|
||||
@@ -4181,6 +4186,12 @@
|
||||
github = "brittonr";
|
||||
githubId = 4730485;
|
||||
};
|
||||
BrockoliniMorgan = {
|
||||
name = "Brock Morgan";
|
||||
email = "brockjamesmorgan@gmail.com";
|
||||
github = "BrockoliniMorgan";
|
||||
githubId = 166275321;
|
||||
};
|
||||
brodes = {
|
||||
email = "me@brod.es";
|
||||
github = "brhoades";
|
||||
@@ -12301,6 +12312,12 @@
|
||||
githubId = 67414100;
|
||||
name = "Jachym Putta";
|
||||
};
|
||||
jack-avery = {
|
||||
email = "jack.avery.business@gmail.com";
|
||||
github = "jack-avery";
|
||||
githubId = 47289484;
|
||||
name = "Jack Avery";
|
||||
};
|
||||
jackcres = {
|
||||
email = "crespomerchano@gmail.com";
|
||||
github = "omarcresp";
|
||||
@@ -29856,6 +29873,11 @@
|
||||
githubId = 7038383;
|
||||
name = "Vojta Káně";
|
||||
};
|
||||
vokinn = {
|
||||
github = "vokinn";
|
||||
githubId = 113241287;
|
||||
name = "vokin";
|
||||
};
|
||||
volfyd = {
|
||||
email = "lb.nix@lisbethmail.com";
|
||||
github = "volfyd";
|
||||
|
||||
@@ -17,6 +17,7 @@ let
|
||||
notice = 5;
|
||||
info = 6;
|
||||
debug = 7;
|
||||
trace = 8;
|
||||
};
|
||||
|
||||
fsOptions = with lib.types; {
|
||||
|
||||
@@ -31,6 +31,6 @@
|
||||
assert ("Latitude: 12.345000°" in whereAmI), f"Incorrect latitude in:\n{whereAmI}"
|
||||
assert ("Longitude: -67.890000°" in whereAmI), f"Incorrect longitude in:\n{whereAmI}"
|
||||
assert ("Altitude: 123.450000 meters" in whereAmI), f"Incorrect altitude in:\n{whereAmI}"
|
||||
assert ("Accuracy: 1000.000000 meters" in whereAmI), f"Incorrect accuracy in:\n{whereAmI}"
|
||||
assert ("Accuracy: 1000 meters" in whereAmI), f"Incorrect accuracy in:\n{whereAmI}"
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -460,19 +460,17 @@ in
|
||||
nodes.machine = common;
|
||||
|
||||
testScript =
|
||||
let
|
||||
oldVersion = "222";
|
||||
in
|
||||
# python
|
||||
''
|
||||
machine.succeed("mount -o remount,rw /boot")
|
||||
|
||||
def switch():
|
||||
# Replace version inside sd-boot with something older. See magic[] string in systemd src/boot/efi/boot.c
|
||||
# Replace version inside sd-boot with something older. See SD_MAGIC in systemd src/boot/boot.c
|
||||
# Note: the sed replacement has to be length-preserving, because section length matters.
|
||||
machine.succeed(
|
||||
"""
|
||||
r"""
|
||||
find /boot -iname '*boot*.efi' -print0 | \
|
||||
xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot ${oldVersion} ####/' '{}'
|
||||
xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot [0-9]\(.*\) ####/#### LoaderInfo: systemd-boot 0\1 ####/' '{}'
|
||||
"""
|
||||
)
|
||||
return machine.succeed("/run/current-system/bin/switch-to-configuration boot 2>&1")
|
||||
|
||||
@@ -14,13 +14,13 @@ let
|
||||
|
||||
pname = "ghostel";
|
||||
|
||||
version = "0.41.0-unstable-2026-07-06";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dakra";
|
||||
repo = "ghostel";
|
||||
rev = "eb806d158df4ff302aee68e91caf257f11d66320";
|
||||
hash = "sha256-Xz3Sy0iR/g5SoEzqJTZo2ymfMPYQ0NvnAOEoXiXhQFE=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vRGZoQtjsL42ga07fOfEjccKRidAhqgwHBoKs++62Ls=";
|
||||
};
|
||||
|
||||
module = stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -29,7 +29,7 @@ let
|
||||
deps = zig.fetchDeps {
|
||||
inherit (finalAttrs) src pname version;
|
||||
fetchAll = true;
|
||||
hash = "sha256-lFU0ywNyP1q2NL9MkIfWciH03VAA/Act5dGYAV4V7EY=";
|
||||
hash = "sha256-yrVgiofdmVjTGJ+PGPGRCc8gb/JcEca1uAzIoPgHHqU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
|
||||
@@ -69,7 +69,7 @@ melpaBuild {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
inherit module;
|
||||
};
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "gambatte";
|
||||
version = "0-unstable-2026-07-03";
|
||||
version = "0-unstable-2026-07-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "gambatte-libretro";
|
||||
rev = "dfc165599f3f1068c40a0b7ad6fe5f161283d483";
|
||||
hash = "sha256-a7GXw0B/ekIcNl08s1DpuRQZyxm4tYGWzNVVBTjXeOk=";
|
||||
rev = "9b3b5e3cc18ec92f460d37dd551eaf90c55bfcea";
|
||||
hash = "sha256-IBQmVcWx839rRV8uLUou4fdwxgZqVbMWyqRVa3Dq0rc=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "swanstation";
|
||||
version = "0-unstable-2026-06-25";
|
||||
version = "0-unstable-2026-07-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "swanstation";
|
||||
rev = "32e5654cb4ff17db3e950250a677767906fa3cf8";
|
||||
hash = "sha256-l4Vb1kSuoqMJC4gn+S61zuePZaYvJ/nmVyoFOlsCTBM=";
|
||||
rev = "5430a4a53b89fa5827c97b84ada29d23317245bc";
|
||||
hash = "sha256-sE9jJjdt25nz0+B0oSonRubYWurE20o/FDdUTj//qOI=";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "vba-next";
|
||||
version = "0-unstable-2026-06-29";
|
||||
version = "0-unstable-2026-07-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "vba-next";
|
||||
rev = "91de6188c2544ecb13c7bc05e4d9c361d21a49ad";
|
||||
hash = "sha256-gC5SAw7wHlMxvFFXOSFB5abInAme23140eAm5uyOlNg=";
|
||||
rev = "2b96fd3a77025f3083daf61126b1852d5e0eace7";
|
||||
hash = "sha256-09KSCGlmHNrftX86CVUUAAIHiOpM+MpWwa+XOw3MrJA=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -109,6 +109,20 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
|
||||
# Include gobject-introspection typelibs in the wrapper.
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
|
||||
# TexText probes for a GUI toolkit by spawning a subprocess
|
||||
# (`sys.executable -c "import gi; gi.require_version('Gtk', '3.0'); ..."`)
|
||||
# instead of importing in-process. The Python wrapper makes runtime
|
||||
# dependencies importable via a site.addsitedir preamble and deliberately
|
||||
# does not export PYTHONPATH, so the spawned probe interpreter cannot import
|
||||
# gi and TexText aborts with "Neither GTK nor TkInter has been found".
|
||||
# Export PYTHONPATH so the probe subprocess inherits the dependencies too.
|
||||
# See https://github.com/NixOS/nixpkgs/issues/384042
|
||||
makeWrapperArgs+=(--prefix PYTHONPATH : "${
|
||||
lib.makeSearchPath python3.sitePackages (
|
||||
finalAttrs.propagatedBuildInputs ++ [ python3.pkgs.pycairo ]
|
||||
)
|
||||
}")
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nodejs,
|
||||
pnpm_9,
|
||||
pnpm_11,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
makeWrapper,
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aonsoku";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "victoralvesf";
|
||||
repo = "aonsoku";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Rbte0qYcZQ70E6ib8rj0YsNP5SMNO8eC3MEvWcT7N08=";
|
||||
hash = "sha256-zHYr50FBV7sSdNz6j07SdlMbVaXKj1SnJHmtjmsnBdY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -31,14 +31,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-oBwqYOx2KEtF0qdMKEIgdArZ4xs/AyeOqFoU4nHl3xY=";
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-YV3ZpXBSX9EEDUfWmk1aNbwGQI+5zNQ3eoXvNg7k0yQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpm_9
|
||||
pnpm_11
|
||||
pnpmConfigHook
|
||||
makeWrapper
|
||||
electron
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
gitUpdater,
|
||||
cmake,
|
||||
arpa2cm,
|
||||
quickder,
|
||||
@@ -14,13 +15,13 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
# leaf is already used
|
||||
pname = "arpa2-leaf";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arpa2";
|
||||
repo = "leaf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s52gtxM+BmG7oVrB5F0ORjkb4F3fWONiOxIWdDn2P5k=";
|
||||
hash = "sha256-I2fJ3QkVFRRk9VVSQd0UKl01NDTYo9UGVhrL/mdy0vE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -37,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lillydap
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = {
|
||||
description = "LDAP Extended Attribute Filter";
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/source/blender/gpu/vulkan/vk_texture_pool.cc b/source/blender/gpu/vulkan/vk_texture_pool.cc
|
||||
index 850e7808ae7..3478d4907f2 100644
|
||||
--- a/source/blender/gpu/vulkan/vk_texture_pool.cc
|
||||
+++ b/source/blender/gpu/vulkan/vk_texture_pool.cc
|
||||
@@ -554,7 +554,7 @@ void VKTexturePool::log_usage_data()
|
||||
log_message += std::format(" ({} cached VkImages)", current_usage_data_.image_cache_size);
|
||||
}
|
||||
|
||||
- CLOG_TRACE(&LOG, log_message.c_str());
|
||||
+ CLOG_TRACE(&LOG, "%s", log_message.c_str());
|
||||
}
|
||||
|
||||
} // namespace gpu
|
||||
@@ -1,42 +0,0 @@
|
||||
diff --git a/extern/hipew/src/hipew.c b/extern/hipew/src/hipew.c
|
||||
index e72ccde6..138e1efc 100644
|
||||
--- a/extern/hipew/src/hipew.c
|
||||
+++ b/extern/hipew/src/hipew.c
|
||||
@@ -241,13 +241,13 @@ static int hipewHipInit(void) {
|
||||
/* ROCm 6 changes paths from /opt/rocm/hip/lib to /opt/rocm/lib, so
|
||||
* search for libraries there. */
|
||||
|
||||
- const char* hip_paths[] = { "libamdhip64.so",
|
||||
+ const char* hip_paths[] = { "libamdhip64.so.7",
|
||||
+ "/opt/rocm/lib/libamdhip64.so.7",
|
||||
+ "/opt/rocm/hip/lib/libamdhip64.so.7",
|
||||
"libamdhip64.so.6",
|
||||
"/opt/rocm/lib/libamdhip64.so.6",
|
||||
"/opt/rocm/hip/lib/libamdhip64.so.6",
|
||||
- "libamdhip64.so.7",
|
||||
- "/opt/rocm/lib/libamdhip64.so.7",
|
||||
- "/opt/rocm/hip/lib/libamdhip64.so.7",
|
||||
+ "libamdhip64.so",
|
||||
NULL };
|
||||
#endif
|
||||
static int initialized = 0;
|
||||
diff --git a/intern/cycles/kernel/device/hiprt/CMakeLists.txt b/intern/cycles/kernel/device/hiprt/CMakeLists.txt
|
||||
index 9f48fb9be3..01e05159c9 100644
|
||||
--- a/intern/cycles/kernel/device/hiprt/CMakeLists.txt
|
||||
+++ b/intern/cycles/kernel/device/hiprt/CMakeLists.txt
|
||||
@@ -30,13 +30,13 @@
|
||||
set(SRC_KERNEL_DEVICE_HIPRT_SDK
|
||||
hiprt/impl/Aabb.h
|
||||
hiprt/impl/BvhNode.h
|
||||
- hiprt/impl/Geometry.h
|
||||
+ hiprt/impl/Header.h
|
||||
hiprt/impl/hiprt_device_impl.h
|
||||
hiprt/impl/hiprt_kernels_bitcode.h
|
||||
hiprt/impl/Instance.h
|
||||
+ hiprt/impl/Obb.h
|
||||
hiprt/impl/QrDecomposition.h
|
||||
hiprt/impl/Quaternion.h
|
||||
- hiprt/impl/Scene.h
|
||||
hiprt/impl/Transform.h
|
||||
hiprt/impl/Triangle.h
|
||||
)
|
||||
@@ -13,6 +13,7 @@
|
||||
cudaPackages,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
dbus,
|
||||
draco,
|
||||
embree,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
@@ -50,6 +51,7 @@
|
||||
makeWrapper,
|
||||
manifold,
|
||||
mesa,
|
||||
meshoptimizer,
|
||||
nix-update-script,
|
||||
onetbb,
|
||||
openal,
|
||||
@@ -117,12 +119,12 @@ in
|
||||
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "blender";
|
||||
version = "5.1.2";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchzip {
|
||||
name = "source";
|
||||
url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-FnReSNsP8U1/4jSgZN3cMQV2qkP7OZPh0f/9JA1lAxs=";
|
||||
hash = "sha256-V2+Oc7GT31JvWccffzUaingEs8CtSFaazgQ+YdZUB7M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -130,36 +132,33 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
# ceres-solver dependency propagates eigen 3 and appears to be incompatible
|
||||
# with more recent versions.
|
||||
./eigen-3-compat.patch
|
||||
# Required due to `-Werror=format-security` in nixpkgs
|
||||
# https://projects.blender.org/blender/blender/commit/470127ede2448de50a6936b8484b3c382c76d596
|
||||
./fix-quite-clog-warning.patch
|
||||
]
|
||||
# Minimal backport of hiprt 3.x support from https://projects.blender.org/blender/blender/pulls/144889
|
||||
++ lib.optionals rocmSupport [
|
||||
./hiprt-3-compat.patch
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
./darwin.patch
|
||||
];
|
||||
|
||||
postPatch =
|
||||
(lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
: > build_files/cmake/platform/platform_apple_xcode.cmake
|
||||
substituteInPlace source/creator/CMakeLists.txt \
|
||||
--replace-fail '${"$"}{LIBDIR}/python' \
|
||||
'${python3}' \
|
||||
--replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/'
|
||||
substituteInPlace build_files/cmake/platform/platform_apple.cmake \
|
||||
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \
|
||||
'${lib.getLib brotli}/lib/libbrotlicommon.dylib' \
|
||||
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \
|
||||
'${lib.getLib brotli}/lib/libbrotlidec.dylib'
|
||||
'')
|
||||
+ (lib.optionalString rocmSupport ''
|
||||
substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so.${lib.versions.major rocmPackages.clr.version}"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
|
||||
substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
|
||||
substituteInPlace extern/hipew/src/hiprtew.cc --replace-fail '"/opt/rocm/lib/libhiprt64.so"' '"${rocmPackages.hiprt}/lib/libhiprt64.so"'
|
||||
'');
|
||||
postPatch = ''
|
||||
substituteInPlace intern/ghost/intern/GHOST_SystemPathsUnix.cc \
|
||||
--replace-fail \
|
||||
'static const char *static_libs_path = PREFIX "/" BLENDER_INSTALL_LIBDIR;' \
|
||||
'static const char *static_libs_path = BLENDER_INSTALL_LIBDIR;'
|
||||
''
|
||||
+ (lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
: > build_files/cmake/platform/platform_apple_xcode.cmake
|
||||
substituteInPlace source/creator/CMakeLists.txt \
|
||||
--replace-fail '${"$"}{LIBDIR}/python' \
|
||||
'${python3}' \
|
||||
--replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/'
|
||||
substituteInPlace build_files/cmake/platform/platform_apple.cmake \
|
||||
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \
|
||||
'${lib.getLib brotli}/lib/libbrotlicommon.dylib' \
|
||||
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \
|
||||
'${lib.getLib brotli}/lib/libbrotlidec.dylib'
|
||||
'')
|
||||
+ (lib.optionalString rocmSupport ''
|
||||
substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so.${lib.versions.major rocmPackages.clr.version}"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
|
||||
substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
|
||||
'');
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}";
|
||||
|
||||
@@ -207,8 +206,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" true)
|
||||
]
|
||||
++ lib.optionals rocmSupport [
|
||||
(lib.cmakeFeature "HIPRT_INCLUDE_DIR" "${rocmPackages.hiprt}/include")
|
||||
(lib.cmakeBool "WITH_CYCLES_DEVICE_HIPRT" true)
|
||||
(lib.cmakeBool "WITH_CYCLES_DEVICE_HIPRT" false)
|
||||
(lib.cmakeBool "WITH_CYCLES_HIP_BINARIES" true)
|
||||
]
|
||||
++ lib.optionals waylandSupport [
|
||||
@@ -255,6 +253,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
alembic
|
||||
boost
|
||||
ceres-solver
|
||||
draco
|
||||
ffmpeg_7
|
||||
fftw
|
||||
fftwFloat
|
||||
@@ -272,6 +271,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
libtiff
|
||||
libwebp
|
||||
manifold
|
||||
meshoptimizer
|
||||
opencolorio
|
||||
openexr
|
||||
openimageio
|
||||
@@ -339,6 +339,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
ps = python3Packages;
|
||||
in
|
||||
[
|
||||
ps.cattrs
|
||||
ps.materialx
|
||||
ps.numpy
|
||||
ps.openshadinglanguage
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
# https://github.com/balta2ar/brotab/issues/138
|
||||
python313Packages,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
python313Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "brotab";
|
||||
version = "1.5.0";
|
||||
pyproject = true;
|
||||
@@ -16,11 +17,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
hash = "sha256-Pv5tEDL11brc/n3TuFcad9kTr7Jb/Bt7JFb29HuX/28=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
build-system = with python313Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
dependencies = with python313Packages; [
|
||||
flask
|
||||
psutil
|
||||
requests
|
||||
@@ -50,7 +51,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
nativeCheckInputs = with python313Packages; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ let
|
||||
lib.concatStringsSep "\n\n" extraCertificateStrings
|
||||
);
|
||||
|
||||
version = "3.125";
|
||||
version = "3.126";
|
||||
meta = {
|
||||
homepage = "https://firefox-source-docs.mozilla.org/security/nss/runbooks/rootstore.html#root-store-consumers";
|
||||
description = "Bundle of X.509 certificates of public Certificate Authorities (CA)";
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
|
||||
"https://hg-edge.mozilla.org/projects/nss/raw-file/${tag}/${file}"
|
||||
"https://raw.githubusercontent.com/nss-dev/nss/refs/tags/${tag}/${file}"
|
||||
];
|
||||
hash = "sha256-5XkSgI2u97Kw+k3yzPF+R66vJsg5o4+Fx2AD66/YZr0=";
|
||||
hash = "sha256-gbfyV2MzouNg5nP5Etewt6dl2DbHMQA+NIpGysXTcZg=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@@ -34,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
baloo
|
||||
matthiasbeyer
|
||||
sshine
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
appimageTools,
|
||||
lib,
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "cider";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ciderapp/Cider/releases/download/v${version}/Cider-${version}.AppImage";
|
||||
sha256 = "sha256-NwoV1eeAN0u9VXWpu5mANXhmgqe8u3h7BlsREP1f/pI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
extraInstallCommands =
|
||||
let
|
||||
contents = appimageTools.extract { inherit pname version src; };
|
||||
in
|
||||
''
|
||||
wrapProgram $out/bin/${pname} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
|
||||
install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace-warn 'Exec=AppRun' 'Exec=${pname}'
|
||||
cp -r ${contents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "New look into listening and enjoying Apple Music in style and performance";
|
||||
homepage = "https://github.com/ciderapp/Cider";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "cider";
|
||||
maintainers = [ lib.maintainers.cigrainger ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "clickhouse-backup";
|
||||
version = "2.7.4";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Altinity";
|
||||
repo = "clickhouse-backup";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HlVngChgU+Do6e5gfP1fg1R/fSGfB8kjG2Ul+N7eJkE=";
|
||||
hash = "sha256-FULdduxFQe1T2UbD/ieE7+ZqRqnRDvbydbmcC2v+D1I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HN0H2YFj7k/T2ff1GCrjfE9PO6MtdR/SWKZL/FoqHZ8=";
|
||||
vendorHash = "sha256-fCn3zEaAR+HnbYKNhtuapvThMcIMgcMGCfpEDTZ+jcM=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
|
||||
@@ -12,23 +12,25 @@
|
||||
pkg-config,
|
||||
glib,
|
||||
libadwaita,
|
||||
libxml2,
|
||||
vte-gtk4,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "distroshelf";
|
||||
version = "1.0.15";
|
||||
version = "1.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ranfdev";
|
||||
repo = "DistroShelf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4rNdp0g/QaiLnKGC4baYAq29dxluyZ+9TgeBlqidRp0=";
|
||||
hash = "sha256-3O+KsOZzwH8E2rDSEgiVZK64B2wK1U/uDJ2z37NtJCg=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-5luI46rSgB+N0OKQzSopEhCCEnwAhMabRit9MtsSSVA=";
|
||||
hash = "sha256-lNKWcpdIr1tm2m50B9uOqFQvhndAEM5ADmmPBPb8sj4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -40,11 +42,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rustc
|
||||
desktop-file-utils
|
||||
pkg-config
|
||||
libxml2
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
libadwaita
|
||||
vte-gtk4
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "doctest";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doctest";
|
||||
repo = "doctest";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4jW6xPFCFxk1l47EkSUVojhycrtluPhOc5Adf/25R7M=";
|
||||
hash = "sha256-+/IEISqN9HdaCJ0udLVUitOUziLvF/D3POecZMoXuho=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ethtool";
|
||||
version = "7.0";
|
||||
version = "7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/software/network/ethtool/ethtool-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Zgv5clp4cTQ6DSMgaKdjT7z7abbC+O/0VYJ/rvsM0WI=";
|
||||
hash = "sha256-TXjCbtwCVbyS9LmVtf1mEI11/5Zu1GlPYCWm03C8JJY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fluidsynth";
|
||||
version = "2.5.5";
|
||||
version = "2.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FluidSynth";
|
||||
repo = "fluidsynth";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WEzOYHtPIUkPZu3v4dWcCh3dOJUyG1xRxDuoSXqiGbk=";
|
||||
hash = "sha256-q4NdfemCprYEYCrKlHumeRM8TyNz8eJcFM18EsB0p0c=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/FluidSynth/fluidsynth/blob/${finalAttrs.src.tag}/doc/wiki/ChangeLog.md";
|
||||
description = "Real-time software synthesizer based on the SoundFont 2 specifications";
|
||||
homepage = "https://www.fluidsynth.org";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "folia-major";
|
||||
version = "0.5.27";
|
||||
version = "0.6.1";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
@@ -23,12 +23,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
owner = "chthollyphile";
|
||||
repo = "folia-major";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-47W6nFDJlF9/voITX2nd9ZrH8gl+GNtESv1T6AXL3F4=";
|
||||
hash = "sha256-rGkIFMbbLA2dxxDJ41NyIi++jcfIZQ3EoBpRJ0n+fTU=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-lLxa6fT35w+qdn08aNCi6Og/eFs72E8FfHTVM+fIvq8=";
|
||||
hash = "sha256-bH9nSHRjYiQzJIU9MC9k+13Uc0ZIem+hRz0CD+9oWPs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -35,7 +35,7 @@ in
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "pangolin";
|
||||
version = "1.19.4";
|
||||
version = "1.21.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
enableParallelBuilding = true;
|
||||
@@ -44,11 +44,11 @@ buildNpmPackage (finalAttrs: {
|
||||
owner = "fosrl";
|
||||
repo = "pangolin";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Joo7N92ZbKybD15ojIIoEtjLjzcho5PqAzuGlj17zag=";
|
||||
hash = "sha256-LR4UO2xrTLKmemDVsJWtEQoV2bDy6U2ahxTtA+SDymI=";
|
||||
};
|
||||
|
||||
npmDepsFetcherVersion = 2;
|
||||
npmDepsHash = "sha256-XOuP3WgV9Xt2uRhHVmnjjf46RV+Pv1pl8a71yTizn10=";
|
||||
npmDepsHash = "sha256-EBectG1zNdUb30SlhAzy9rCwF/mYHAV4HZTRbk2CbDY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
esbuild
|
||||
|
||||
@@ -51,6 +51,7 @@ let
|
||||
scipy
|
||||
shiboken6
|
||||
vtk
|
||||
networkx # for sheetmetal plugin
|
||||
];
|
||||
|
||||
freecad-utils = callPackage ./freecad-utils.nix { inherit (python3Packages) python; };
|
||||
|
||||
@@ -79,8 +79,8 @@
|
||||
xz,
|
||||
zlib,
|
||||
zstd,
|
||||
buildPackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
|
||||
version = "3.13.1";
|
||||
@@ -132,6 +132,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# This is not strictly needed as the Java bindings wouldn't build anyway if
|
||||
# ant/jdk were not available.
|
||||
"-DBUILD_JAVA_BINDINGS=OFF"
|
||||
]
|
||||
++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
|
||||
13
pkgs/by-name/ge/geoclue2/fix-sysusers_dir.patch
Normal file
13
pkgs/by-name/ge/geoclue2/fix-sysusers_dir.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index 2591e6a..dc1bd8d 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -69,7 +69,7 @@ if get_option('enable-backend')
|
||||
if systemd.found()
|
||||
sysusers_dir = systemd.get_variable(pkgconfig: 'sysusersdir')
|
||||
else
|
||||
- sysusers_dir = '/usr/lib/sysusers.d'
|
||||
+ sysusers_dir = join_paths(get_option('prefix'), 'usr/lib/sysusers.d')
|
||||
endif
|
||||
configure_file(output: 'geoclue-sysusers.conf',
|
||||
input: 'geoclue-sysusers.conf.in',
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "geoclue";
|
||||
version = "2.7.2";
|
||||
version = "2.8.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -42,11 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "geoclue";
|
||||
repo = "geoclue";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LwL1WtCdHb/NwPr3/OLISwaAwplhJwiZT9vUdX29Bbs=";
|
||||
hash = "sha256-CyZhUMAa2vMUi61sL+gGBZFxGo0lu7Cm68fTjcbblTg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./add-option-for-installation-sysconfdir.patch
|
||||
./fix-sysusers_dir.patch
|
||||
];
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "git-pkgs";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-pkgs";
|
||||
repo = "git-pkgs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4Q95ONe6tcrUk7TsxR347PAFQ/HuMjcqNfCLo6oZtws=";
|
||||
hash = "sha256-xGcyl1BMgGkrjr0QgarQWkBBsZa5lKGYFqUpnHQRJvw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YjKktBQT62htk/nqZp9quKEg4eI3vTz6AY64o9IT3/4=";
|
||||
vendorHash = "sha256-7wxcBDZKnTqBUsnQ7dznl8e5qHN1Ep4uJ4/nqc+oL3c=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gitte";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -30,12 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ckruse";
|
||||
repo = "Gitte";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-c7GhPn7/0PzRTYQbhfvlSUMJqHs4dRqeWRMBJG2eqdc=";
|
||||
hash = "sha256-k10Rqpf9fhcG+PU6WGr7Q2nVwZb0tLp2B2r3BNeicoI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-yR4MYQJQMjqEs++8RhQwDV+h/blSVgFqrGYUfrPUGOg=";
|
||||
hash = "sha256-eK8o/psq0eHwUlbfD0I/TwIqoA40Ay0eJ9CtZypZCi4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
version ?
|
||||
# This is a workaround for update-source-version to be able to update this
|
||||
let
|
||||
_version = "0-unstable-2026-04-01";
|
||||
_version = "0-unstable-2026-05-27";
|
||||
in
|
||||
_version,
|
||||
rev ? "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a",
|
||||
hash ? "sha256-BTPD8WM1pVAMkFDlHekMdWFGyf63KdhKkKwsqikqoBQ=",
|
||||
rev ? "3357c4f51b1a9e676378c695dd9c7e9911c35ee6",
|
||||
hash ? "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8=",
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -40,13 +40,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "graphviz";
|
||||
version = "14.1.2";
|
||||
version = "15.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "graphviz";
|
||||
repo = "graphviz";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LkyiKl0ulS9ujEdVLfyeoc4CtjITd6CAc35IUtlHSfw=";
|
||||
hash = "sha256-5v/ib8hwqHrJLs+jvDGvg0aJiKIt8ipXEd1EUzew7XU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Fix build on i686 by not trying to build AVX2 code
|
||||
# Submitted upstream: https://github.com/HdrHistogram/HdrHistogram_c/pull/143
|
||||
${if stdenv.hostPlatform.isi686 then "patches" else null} = [
|
||||
patches = [
|
||||
./no-avx2-i386.patch
|
||||
];
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
let
|
||||
pname = "hunk";
|
||||
version = "0.17.0";
|
||||
version = "0.17.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "modem-dev";
|
||||
repo = "hunk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FlwCtcu2JRECyKC1balItY/DmQyb+obh+97wo7+06DU=";
|
||||
hash = "sha256-Sm/JPTjKw6zbXmBqiXt9wogTR0C24wxVzK3G9Ms7h9Y=";
|
||||
};
|
||||
|
||||
node_modules = stdenv.mkDerivation {
|
||||
@@ -56,7 +56,7 @@ let
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-LkOAWScuNPx9/KOcG110ngLz0QmB4/S3VxIAb3EIH7I=";
|
||||
outputHash = "sha256-m1XHfN5wnIoEFBnNMAUPErgL56KzKPMWmUJuz6T0vts=";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
in
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprsunset";
|
||||
version = "0.3.3";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprsunset";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Yk6nDzCXrOehX3At8qdZ0cLr1kPySqACsihMYuP6T8w=";
|
||||
hash = "sha256-MhrVi5f6n9eJv8kcDngb8j2P5F3i5/GCR77+qIWnjf4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -67,26 +67,6 @@
|
||||
assert libXtSupport -> libX11Support;
|
||||
assert libraqmSupport -> freetypeSupport;
|
||||
|
||||
let
|
||||
arch =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then
|
||||
"i686"
|
||||
else if
|
||||
stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin"
|
||||
then
|
||||
"x86-64"
|
||||
else if stdenv.hostPlatform.system == "armv7l-linux" then
|
||||
"armv7l"
|
||||
else if
|
||||
stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin"
|
||||
then
|
||||
"aarch64"
|
||||
else if stdenv.hostPlatform.system == "powerpc64le-linux" then
|
||||
"ppc64le"
|
||||
else
|
||||
null;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.2-27";
|
||||
@@ -113,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"MVDelegate=${lib.getExe' coreutils "mv"}"
|
||||
"RMDelegate=${lib.getExe' coreutils "rm"}"
|
||||
"--with-frozenpaths"
|
||||
(lib.withFeatureAs (arch != null) "gcc-arch" arch)
|
||||
"--with-gcc-arch=generic"
|
||||
(lib.withFeature librsvgSupport "rsvg")
|
||||
(lib.withFeature librsvgSupport "pango")
|
||||
(lib.withFeature liblqr1Support "lqr")
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "inferno";
|
||||
version = "0.12.6";
|
||||
version = "0.12.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonhoo";
|
||||
repo = "inferno";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-maqyxntCm8F8B14+26+ASJNl7JL3Pk+xzwgA2f8r4zc=";
|
||||
hash = "sha256-IRL7hHXZlJiYw4dea0gjxVTgpSwxeAZBCCqkMMkukRo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0Zn3KS8Qo39yR+WUxj68eYt9jnDwpf4QUBGBqZPqFIU=";
|
||||
cargoHash = "sha256-RB9XUURf+Eb2c3JcmqCmmM776FuNenn6Mj2zjo1X/Tw=";
|
||||
|
||||
# skip flaky tests
|
||||
checkFlags = [
|
||||
|
||||
44
pkgs/by-name/jw/jwtcat/package.nix
Normal file
44
pkgs/by-name/jw/jwtcat/package.nix
Normal file
@@ -0,0 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "jwtcat";
|
||||
version = "0-unstable-2022-10-15";
|
||||
pyproject = false;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aress31";
|
||||
repo = "jwtcat";
|
||||
rev = "f80f3d9352b82f0e7da504b2ee11f4a61f23c385";
|
||||
hash = "sha256-pk0/Lzw4yUIXfLBX/0Xwaecio42MjLYUzECQ8xaH3vY=";
|
||||
};
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
pyjwt
|
||||
coloredlogs
|
||||
tqdm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 jwtcat.py $out/bin/jwtcat
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "CPU-based JSON Web Token cracker and scanner";
|
||||
homepage = "https://github.com/aress31/jwtcat";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ _0x2B ];
|
||||
mainProgram = "jwtcat";
|
||||
};
|
||||
}
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
# native deps.
|
||||
runCommand,
|
||||
pkg-config,
|
||||
@@ -36,11 +35,11 @@ let
|
||||
|
||||
unwrapped = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "knot-resolver_5";
|
||||
version = "5.7.6";
|
||||
version = "5.7.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-resolver/knot-resolver-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "500ccd3a560300e547b8dc5aaff322f7c8e2e7d6f0d7ef5f36e59cb60504d674";
|
||||
sha256 = "481d2a6eb8690023895d389601e56fffbaeba3cc18cc1de5a5f177df9d0f9530";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -48,15 +47,6 @@ let
|
||||
"dev"
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/1772
|
||||
url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/f4eaf8e69cc9839f68b613d0be10103e05c57fe9.patch";
|
||||
hash = "sha256-u/YQ85Jb5OxV8G3HeVPQUw0cmA+TLIDPze9mreqJGL4=";
|
||||
excludes = [ "daemon/ratelimiting.test/tests.inc.c" ];
|
||||
})
|
||||
];
|
||||
|
||||
# Path fixups for the NixOS service.
|
||||
postPatch = ''
|
||||
patch meson.build <<EOF
|
||||
|
||||
@@ -36,11 +36,11 @@ let
|
||||
# TODO: we could cut the `let` short here, but it would de-indent everything.
|
||||
unwrapped = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "knot-resolver_6";
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-resolver/knot-resolver-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-T0v+CfjXOw7n1nDdHJD18qwOkGD5sUeDVfJvJzdGrIA=";
|
||||
hash = "sha256-GqTClyHAm86amfPVZXIjEQNj1ms1ytSYm5Wyr9qTeag=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -32,13 +32,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libapparmor";
|
||||
version = "5.0.1";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "apparmor";
|
||||
repo = "apparmor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-y5r8X7Cpwp7TSsKYXNoAeyy0MbgxLSW8gNtLsIvKP8c=";
|
||||
hash = "sha256-Kuc5Nrz4iq5MC5AOcJL9Sb54DWNKlEk3b3DW0vpgSZg=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/libraries/libapparmor";
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libffi";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
with finalAttrs;
|
||||
"https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-IlXFpjjftRv2fCChKnu3DRf+senqurrAX1VzFG9YZDY=";
|
||||
hash = "sha256-1emmY43b0lE921RRjrZ+S75vpwe8wBwQ9iEvCgiNgZ0=";
|
||||
};
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
@@ -32,9 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./freebsd-tsan-pthread.patch
|
||||
];
|
||||
|
||||
# To workaround https://github.com/libffi/libffi/issues/993, we empty the test file:
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin "echo 'int main (void) { return 0; }' > testsuite/libffi.call/i128-1.c";
|
||||
|
||||
strictDeps = true;
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -94,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
homepage = "http://sourceware.org/libffi/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ aduh95 ];
|
||||
platforms = lib.platforms.all;
|
||||
pkgConfigModules = [ "libffi" ];
|
||||
};
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmysofa";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hoene";
|
||||
repo = "libmysofa";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-jvib1hGPJEY2w/KjlD7iTtRy1s8LFG+Qhb2d6xdpUyc=";
|
||||
hash = "sha256-gP/RjKzMx8JIYcyiivBGvy3kIdwHMEKY6abssyVUKNQ=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libsodium";
|
||||
version = "1.0.22-unstable-2026-04-16";
|
||||
version = "1.0.22-unstable-2026-07-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jedisct1";
|
||||
repo = "libsodium";
|
||||
rev = "33cc75ab1565d9dcbe808354191bd572ad6b64d0";
|
||||
hash = "sha256-8kS9FBoaFaJOjH7XZc8IG3GaQaUiYD/awQOhs7j0n1Y=";
|
||||
rev = "77a422c85a3b8b487de50c811b38d18394831ba6";
|
||||
hash = "sha256-Ahka2PnrmYvTLjZMzik5mFsxhDpMLRMKT/I5ftUb0Xc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libssh";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.libssh.org/files/${lib.versions.majorMinor finalAttrs.version}/libssh-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Gmr0JNgyfl7t705f5/W5JCJt1hesnz3oDyF9gqNqcSE=";
|
||||
hash = "sha256-05Qa8KLXjV2C7Xo2mI6RM5lDEvA1uWWabkP42zloeEw=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -37,13 +37,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libtiff";
|
||||
version = "4.7.1";
|
||||
version = "4.7.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "libtiff";
|
||||
repo = "libtiff";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-UiC6s86i7UavW86EKm74oPVlEacvoKmwW7KETjpnNaI=";
|
||||
hash = "sha256-60Lpg5WRfWMzlOoOUA+C6KLlYIZ+3BjXidOVqv4M2GA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.1.4";
|
||||
version = "2.2.0";
|
||||
in
|
||||
{
|
||||
inherit version;
|
||||
@@ -13,10 +13,10 @@ in
|
||||
owner = "lima-vm";
|
||||
repo = "lima";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3vn557inLuV1DF0x8Fzc+OtLRAYKa7oE7s6x2S4gKSY=";
|
||||
hash = "sha256-4Wi+YzMdEN263jeBefEvizlF2k+nLVq3+AHyqagUeHw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8AksUgle1SlWuALi553TlpZ2qwO+jMA1kZQke91fimU=";
|
||||
vendorHash = "sha256-gD9C0kupcEWCsU0nYOg+VcBCWR0oRf6Gaw0DDn0xits=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/lima-vm/lima";
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
}:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
version = "4.1.0";
|
||||
hash = "sha256-TA1uka13So8URttw+JJVdKIL+IonkhIQSc0IfraXpIM=";
|
||||
version = "4.2.0";
|
||||
hash = "sha256-Xz5W5zYPNlASPyc1/Sz2O1LONdxpUkg1hgzKdax/3ag=";
|
||||
|
||||
patches = [
|
||||
# Fixes the build with GCC 14 on aarch64.
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
}:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
version = "3.6.6";
|
||||
hash = "sha256-+PW41/c8M/Yz0EVWM4Gt4HTNBMUTU5MayaKVZ+upLIo=";
|
||||
version = "3.6.7";
|
||||
hash = "sha256-t1ZPeFA3ftKaEIaXQ7RXZEsiOAYK4KSSm55SFr9g17A=";
|
||||
|
||||
patches = [
|
||||
# Fixes the build with GCC 14 on aarch64.
|
||||
|
||||
@@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-cli";
|
||||
version = "0.18.5.0";
|
||||
version = "0.18.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-clw+7mZenWp58iA7fuEp4BPFH3KUwL53cC4IChIVh7w=";
|
||||
hash = "sha256-RxuhR+GH4Y5kSzNxsqJklRWMbq1K82K3A2V+6JqYR98=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-gui";
|
||||
version = "0.18.5.0";
|
||||
version = "0.18.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero-gui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uBZMBQ6Co1+H8DsyeL1vbjtVlKyIkJopKxHxr24BZv0=";
|
||||
hash = "sha256-2FlenQtrsoHmRTfU+KhWtg3eVPzz9ktQ3dnOlWhOPC8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -49,7 +49,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mumps";
|
||||
version = "5.9.0";
|
||||
version = "5.9.1";
|
||||
# makeFlags contain space and one should use makeFlagsArray+
|
||||
# Setting this magic var is an optional solution
|
||||
__structuredAttrs = true;
|
||||
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mumps-solver.org/MUMPS_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-6dytNY5IbuPcOOnCPdE08hNPS09eNrJeoNdJXhLnB5I=";
|
||||
hash = "sha256-DHuOlExYaksyW9UU23ddz8Jbit7nIkMRaHsBmBE+Py8=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
||||
@@ -49,13 +49,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nezha";
|
||||
version = "2.2.10";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "nezha";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eAJj+R3tSaZNa7aSfwLg8fS9grbGJRoBUBXdQpncqdI=";
|
||||
hash = "sha256-wlGDNsh67pAuPPgae56bXrtDsgwuviLxiaZ6CrOi3go=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
@@ -95,7 +95,7 @@ buildGoModule (finalAttrs: {
|
||||
GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d cmd/dashboard -g main.go -o cmd/dashboard/docs
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-rYzkaJqk5r31Uagn1FRFDeICUeK392o1fyP6IBk9zgk=";
|
||||
vendorHash = "sha256-U2rZVluYM+XcI8e9TBXAlb9sKz4IL+FMEj1CTDcH6qM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "offpunk";
|
||||
version = "3.1";
|
||||
version = "3.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~lioploum";
|
||||
repo = "offpunk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RwigItHVNsgq6k3O8YrSMFBaZMJwJSzB6dfnNiYsefY=";
|
||||
hash = "sha256-1S8iftZ34NkhTydnr8RJBWzAMu/uk0MGi14PANWv/lM=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
@@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "LLVM_STATIC" true)
|
||||
(lib.cmakeBool "USE_QT" false)
|
||||
|
||||
# Build system implies llvm-config and llvm-as are in the same directory.
|
||||
@@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
hexdump
|
||||
libclang
|
||||
libxml2
|
||||
llvm
|
||||
openexr
|
||||
openimageio
|
||||
@@ -68,9 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3Packages.pybind11
|
||||
robin-map
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libxml2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -29,13 +29,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opentelemetry-cpp";
|
||||
version = "1.27.0";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-cpp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7G9uHMlV7/rHvD/g+ktxT6RTfDRSfsXQO7QHk26XVKs=";
|
||||
hash = "sha256-+S/C+msuUEzOVIcx/1lEuQh6ZmyujALVXsiSqb0s2FM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -41,13 +41,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "peergos";
|
||||
version = "1.29.0";
|
||||
version = "1.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Peergos";
|
||||
repo = "web-ui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WaTWz55pEfE/ncJnyc8FjkxJhsBYBXt7cFjBz8v0hw8=";
|
||||
hash = "sha256-lxxOPS/G+dNcdr0pnF/5KHLb/isrL759YT3tRAOn7Yw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
38
pkgs/by-name/pe/pesde/package.nix
Normal file
38
pkgs/by-name/pe/pesde/package.nix
Normal file
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
dbus,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "pesde";
|
||||
version = "0.7.3";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pesde-pkg";
|
||||
repo = "pesde";
|
||||
rev = "e57b4c2db9eaf295c8af998212f427ea039ed46e";
|
||||
hash = "sha256-+8SneWw3UQwXg1IV1zn0OM1ySAJpcvMqyoQd7eYAarE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1k7bmH4ocF9JK15C7YonCmwDKVh639Nropuzm62roDA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
dbus
|
||||
];
|
||||
buildFeatures = [ "bin" ];
|
||||
|
||||
meta = {
|
||||
description = "Package manager for the Luau programming language, supporting multiple runtimes including Roblox and Lune.";
|
||||
homepage = "https://github.com/pesde-pkg/pesde";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ vokinn ];
|
||||
mainProgram = "pesde";
|
||||
};
|
||||
}
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "prek";
|
||||
version = "0.4.4";
|
||||
version = "0.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "j178";
|
||||
repo = "prek";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PAEmRQ5Vro83fkegOWsdY59U7WAQxBPSEalzxZV6K4o=";
|
||||
hash = "sha256-tTr/Aob6jP1YL+n5vGkUkByew73WdP3mqLW5Lci1gNM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EmlR6Lmt5XR0uS/y3FqY5yGNeVBSdtLtEGH9jZLcP2o=";
|
||||
cargoHash = "sha256-He55uH7t7NI5sYgowujqCMK5yjhC2F+8ZLxKG6TLjYY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "knot-exporter";
|
||||
version = "3.5.5";
|
||||
version = "3.5.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "knot_exporter";
|
||||
inherit version;
|
||||
hash = "sha256-4V7fIY5qgKFGSKoodRFgP8e0P0DDvsBPBmzP9TdG98A=";
|
||||
hash = "sha256-jCBi/PHMizG/OkwuoCbkud5w+pgGumHwwGd8W5C4zXc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
gitUpdater,
|
||||
pkg-config,
|
||||
cmake,
|
||||
arpa2cm,
|
||||
@@ -12,18 +13,17 @@
|
||||
libkrb5,
|
||||
libev,
|
||||
e2fsprogs,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quick-sasl";
|
||||
version = "0.13.2";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arpa2";
|
||||
repo = "quick-sasl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kMKZRromm/hb9PZwvWAzmJorSqTB8xMIbWASfSjajiQ=";
|
||||
hash = "sha256-RVk44Ioaennw088HFxdAMU744aqw3ii8v8cJqjlVmno=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
e2fsprogs
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = {
|
||||
description = "Gentle wrapper around any SASL implementation";
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
python3,
|
||||
cmake,
|
||||
doxygen,
|
||||
gitUpdater,
|
||||
graphviz,
|
||||
quickmem,
|
||||
arpa2common,
|
||||
@@ -35,13 +36,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quickder";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arpa2";
|
||||
repo = "quick-der";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk=";
|
||||
hash = "sha256-IxoE9h+ISExNys2egvjSEb3phkrf4ices7k5oYgOL4A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -67,15 +68,19 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>='
|
||||
substituteInPlace setup.py --replace-fail 'pyparsing==' 'pyparsing>='
|
||||
rm python/__init__.py
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = {
|
||||
description = "Quick (and Easy) DER, a Library for parsing ASN.1";
|
||||
homepage = "https://gitlab.com/arpa2/quick-der/";
|
||||
license = lib.licenses.bsd2;
|
||||
platforms = lib.platforms.linux;
|
||||
teams = with lib.teams; [ ngi ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitLab,
|
||||
cmake,
|
||||
doxygen,
|
||||
gitUpdater,
|
||||
graphviz,
|
||||
arpa2common,
|
||||
arpa2cm,
|
||||
@@ -11,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quickmem";
|
||||
version = "0.3.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arpa2";
|
||||
repo = "Quick-MEM";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc=";
|
||||
hash = "sha256-I6WTBzY275a82YM+qsH9k2Zbb8SqAIF3qboxv9o3f4Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -33,11 +34,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = {
|
||||
description = "Memory pooling for ARPA2 projects";
|
||||
homepage = "https://gitlab.com/arpa2/Quick-MEM/";
|
||||
license = lib.licenses.bsd2;
|
||||
platforms = lib.platforms.linux;
|
||||
teams = with lib.teams; [ ngi ];
|
||||
maintainers = with lib.maintainers; [ leungbk ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -23,13 +23,13 @@ in
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "radicle-explorer";
|
||||
version = "0-unstable-2026-07-16";
|
||||
version = "0-unstable-2026-07-21";
|
||||
|
||||
src = fetchFromRadicle {
|
||||
seed = "seed.radicle.dev";
|
||||
repo = "z4V1sjrXqjvFdnCUbxPFqd5p4DtH5";
|
||||
rev = "3c2935704f5767d60b3caf609ef772948bbecb10";
|
||||
hash = "sha256-EpHKuFNgRLwCVdDDRKjPJEvfDpS9qka75B2fQEVc1ns=";
|
||||
rev = "2afde78941226a6d791f8a7392713864457ec772";
|
||||
hash = "sha256-fEfr2jt1NY7rFt2/BO61ukRYEpyH4ATsuheAz8MdKpY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-74r7cyggbuva9XpW++HdAHHFqEBJ6BgNuJJUR+8HE4c=";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "randomX";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "tevador";
|
||||
repo = "randomX";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-dfImzwbEfJQcaPZCoWypHiI6dishVRdqS/r+n3tfjvM=";
|
||||
sha256 = "sha256-15hRPPEo48SL09gYpGtdpXqsVlOTQuMRn4AoXQJWEMI=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -4,15 +4,17 @@
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
pkgsStatic,
|
||||
rc,
|
||||
byacc,
|
||||
ed,
|
||||
ncurses,
|
||||
readline,
|
||||
editline,
|
||||
installShellFiles,
|
||||
historySupport ? true,
|
||||
readlineSupport ? true,
|
||||
lineEditingLibrary ?
|
||||
if (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isStatic) then "null" else "readline",
|
||||
editlineSupport ? false,
|
||||
lineEditingLibrary ? if stdenv.hostPlatform.isDarwin then "null" else "readline",
|
||||
}:
|
||||
|
||||
assert lib.elem lineEditingLibrary [
|
||||
@@ -25,10 +27,10 @@ assert lib.elem lineEditingLibrary [
|
||||
assert
|
||||
!(lib.elem lineEditingLibrary [
|
||||
"edit"
|
||||
"editline"
|
||||
"vrl"
|
||||
]); # broken
|
||||
assert (lineEditingLibrary == "readline") -> readlineSupport;
|
||||
assert (lineEditingLibrary == "editline") -> editlineSupport;
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rc";
|
||||
version = "unstable-2025-10-01";
|
||||
@@ -61,9 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
ncurses
|
||||
]
|
||||
++ lib.optionals readlineSupport [
|
||||
readline
|
||||
];
|
||||
++ lib.optional readlineSupport readline
|
||||
++ lib.optional editlineSupport editline;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -73,7 +74,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"MANPREFIX=${placeholder "man"}/share/man"
|
||||
"CPPFLAGS=\"-DSIGCLD=SIGCHLD\""
|
||||
"EDIT=${lineEditingLibrary}"
|
||||
];
|
||||
]
|
||||
# Required to fix static build, harmless for dynamic builds.
|
||||
++ lib.optional (lineEditingLibrary == "readline") "LDLIBS=-lncurses";
|
||||
|
||||
buildFlags = [
|
||||
"all"
|
||||
@@ -88,7 +91,21 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
shellPath = "/bin/rc";
|
||||
tests.static = pkgsStatic.rc;
|
||||
tests = {
|
||||
static = pkgsStatic.rc;
|
||||
readline = lib.optionalDrvAttr (!stdenv.hostPlatform.isDarwin) (
|
||||
rc.override {
|
||||
readlineSupport = true;
|
||||
lineEditingLibrary = "readline";
|
||||
}
|
||||
);
|
||||
editline = lib.optionalDrvAttr (!stdenv.hostPlatform.isDarwin) (
|
||||
rc.override {
|
||||
editlineSupport = true;
|
||||
lineEditingLibrary = "editline";
|
||||
}
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shader-slang";
|
||||
version = "2026.12.2";
|
||||
version = "2026.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shader-slang";
|
||||
repo = "slang";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kSc8+McxHQ6Vh7M+AUDx6zre7zjjq0w5A8QZhLZ3wGw=";
|
||||
hash = "sha256-nZAe/lQAcnKSi/XjbT2EAOvJeUG+5zRLtx0ArRMxTCE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "skills";
|
||||
version = "1.5.16";
|
||||
version = "1.5.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vercel-labs";
|
||||
repo = "skills";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gL8uNkS3gsRGXIunIsYLYykLYs2c1gO9PFVTE69nWKU=";
|
||||
hash = "sha256-lxf2ODxgwin83JHRrDynMccTFtCo+tYFb053XrS1IqA=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "skim";
|
||||
version = "5.1.0";
|
||||
version = "5.4.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
outputs = [
|
||||
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "skim-rs";
|
||||
repo = "skim";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AB/73sU02/DHV/bnQXpBqmzmGy+roXyIWd4BnN6GWGw=";
|
||||
hash = "sha256-inNBe4Qzn6QjmIL8VMnJ/RuSUIrZ0tCbUV63vP/61Y4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail "expand('<sfile>:h:h')" "'$out'"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-tPNAwaefZrwhH7AoQnAkQYQUfKOKWMehHHeoUf7i4yE=";
|
||||
cargoHash = "sha256-7nV/PxTpPLeblmjnzsYpAFM6u50AQ+OAaUWf/2JHGzQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "snx-rs";
|
||||
version = "6.2.0";
|
||||
version = "6.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ancwrd1";
|
||||
repo = "snx-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GA6YlsX2AgyorWSTPwZI84ViOG1RH9/CDSGOKzbUhHo=";
|
||||
hash = "sha256-LjRU48OjXwkbXPPNDWsPFPipT2qPlwBB7YksUURCetA=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
cargoHash = "sha256-o01QwkDtbRLOjeAJhajqbWOB/rm7+/dK7t0Nzc1h/gc=";
|
||||
cargoHash = "sha256-6IuU/qbLxrN3ZfynlL/w1bbDVvg8/1EbTcCzMaz4tng=";
|
||||
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
|
||||
|
||||
@@ -29,6 +29,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://github.com/KhronosGroup/SPIRV-Tools/commit/2ec8457ab33d539b6f1fecc998360c0b8b05ed4f.diff";
|
||||
hash = "sha256-YHbYBwXMm4rTKpmMW6I3LUafhA4RuNUdXqUBUAXwXpE=";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
url = "https://github.com/KhronosGroup/SPIRV-Tools/commit/0db9162641d9709c63c92a13e66fd88905180e89.diff";
|
||||
hash = "sha256-eoS35Zxb+frQTTTNCaZ4TV/QZjaK45mW1OzzIlXQ1C0=";
|
||||
})
|
||||
]
|
||||
# The cmake options are sufficient for turning on static building, but not
|
||||
# for disabling shared building, just trim the shared lib from the CMake
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sqlite-vec";
|
||||
version = "0.1.6";
|
||||
version = "0.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asg017";
|
||||
repo = "sqlite-vec";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CgeSoRoQRMb/V+RzU5NQuIk/3OonYjAfolWD2hqNuXU=";
|
||||
hash = "sha256-bM0IYcI84PSKBVHKlY+j+dK6bnqO9UPHJixgb/1+Cow=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "srt";
|
||||
version = "1.5.5";
|
||||
version = "1.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Haivision";
|
||||
repo = "srt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-hOkLlmtF9dKqXZTjAeBntkkg5WsmsZN6DKhyakoIF1k=";
|
||||
sha256 = "sha256-fdgj6URuMaem+ZVy7D8Hnf2Ev1HindevdvX0xyxCL4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -51,7 +51,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "stalwart" + (lib.optionalString stalwartEnterprise "-enterprise");
|
||||
version = "0.16.13";
|
||||
version = "0.16.14";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -59,10 +59,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "stalwartlabs";
|
||||
repo = "stalwart";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Uc1dUuu4TnpTKB17GArlo/hYT2gdUUnl3NxWalSB50k=";
|
||||
hash = "sha256-FggCbIgn/7ncbuE02miIfwJh3Adaj0xcTTaOyYRHeQY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-C+BwUqeYzutGcX13YgR1ngfUtuk+S12/k/xAYz68b3s=";
|
||||
cargoHash = "sha256-pdwXJ5/Ko+UloTYHEkXOcyw5gVuHmyAAHDfWoTFZ8FY=";
|
||||
|
||||
env = {
|
||||
# https://docs.rs/openssl/latest/openssl/#manual
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
diffutils,
|
||||
writeScriptBin,
|
||||
bzip2,
|
||||
runtimeShellPackage,
|
||||
}:
|
||||
|
||||
# quick usage:
|
||||
@@ -22,18 +23,29 @@
|
||||
|
||||
let
|
||||
dummyMount = writeScriptBin "mount" "#!${stdenv.shell}";
|
||||
|
||||
perl' = perl.withPackages (p: [ p.DBFile ]);
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
version = "3.5.2";
|
||||
pname = "storebackup";
|
||||
|
||||
pname = "store-backup";
|
||||
|
||||
__structuredAttrs = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ perl ];
|
||||
nativeInstallCheckInputs = [
|
||||
diffutils
|
||||
perl'
|
||||
];
|
||||
buildInputs = [
|
||||
perl'
|
||||
which
|
||||
bzip2
|
||||
runtimeShellPackage
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/storebackup/storeBackup-${finalAttrs.version}.tar.bz2";
|
||||
@@ -46,15 +58,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/scripts
|
||||
mv * $out
|
||||
mv $out/_ATTENTION_ $out/doc
|
||||
mv $out/{correct.sh,cron-storebackup} $out/scripts
|
||||
|
||||
find $out -name "*.pl" | xargs sed -i \
|
||||
-e 's@/bin/pwd@${coreutils}/bin/pwd@' \
|
||||
-e 's@/bin/sync@${coreutils}/bin/sync@' \
|
||||
-e '1 s@/usr/bin/env perl@${perl.withPackages (p: [ p.DBFile ])}/bin/perl@'
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
find $out -name "*.pl" -print0 | xargs --null sed -i \
|
||||
-e 's@/bin/pwd@${coreutils}/bin/pwd@g' \
|
||||
-e 's@/bin/sync@${coreutils}/bin/sync@g'
|
||||
|
||||
for p in $out/bin/*
|
||||
do wrapProgram "$p" --prefix PATH ":" "${
|
||||
@@ -64,8 +81,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
}"
|
||||
done
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
patchShebangs $out
|
||||
# do a dummy test ensuring this works
|
||||
|
||||
PATH=$PATH:${dummyMount}/bin
|
||||
@@ -85,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
$out/bin/storeBackup.pl --sourceDir "$source" --backupDir backup
|
||||
latestBackup=backup/default/$(ls -1 backup/default | sort | tail -n 1)
|
||||
$out/bin/storeBackupRecover.pl -b "$latestBackup" -t restored -r /
|
||||
${diffutils}/bin/diff -r "$source" restored
|
||||
diff -r "$source" restored
|
||||
|
||||
# storeBackupCheckSource should return 0
|
||||
$out/bin/storeBackupCheckSource.pl -s "$source" -b "$latestBackup"
|
||||
@@ -99,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rm -fr restored
|
||||
}
|
||||
|
||||
testDir=$TMP/testDir
|
||||
testDir=$HOME/testDir
|
||||
|
||||
mkdir $testDir
|
||||
echo X > $testDir/X
|
||||
@@ -121,6 +142,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
backupRestore 'test 3: backup, restore' $out
|
||||
backupRestore 'test 4: backup diffutils to same backup locations, restore' ${diffutils}
|
||||
}
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "stremio-linux-shell";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
@@ -35,10 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "Stremio";
|
||||
repo = "stremio-linux-shell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jo+9KDX/a46jPTmYhiFNgp5fDKhoAsML/+m7u3ituEQ=";
|
||||
hash = "sha256-8WJB4t4Fq5WEV1nxKRpnfFwUSiXExsyXRZkvnfsq11k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hZ9neZD+aB7bth4UTsWJXIKGSbo/c3wZRtfOIp7LvwY=";
|
||||
cargoHash = "sha256-zg0ExdzoujcRT1SLKACxekYXH52L8dufOvMM085jcNw=";
|
||||
|
||||
patches = [
|
||||
./out-path.patch
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tzdata";
|
||||
version = "2026b";
|
||||
version = "2026c";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "https://data.iana.org/time-zones/releases/tzdata${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-EUVD2fGaa/61vKQ2hq6hc9OHVaPbHy7sESZHrpLG9UQ=";
|
||||
hash = "sha256-5KF4pEd/PQ6nfMMYKP9yqjj+/41hqhPn6Z4ULp2QK+Q=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://data.iana.org/time-zones/releases/tzcode${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-N+nthCf101IcIvxY4pPL+wQ9cO7fEAOHCzPzY/Yco0Q=";
|
||||
hash = "sha256-sc/8Os5MTHzQ77ovet2G7D0LedpIvPA1gmcf08j+rOg=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "valkey";
|
||||
version = "9.1.0";
|
||||
version = "9.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "valkey-io";
|
||||
repo = "valkey";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-RMZz83fycpOTPWB1dIXU0/hdh4ZGC+6JhCws8htAQ5E=";
|
||||
hash = "sha256-wGHlPQ2JPxGTaJRJ9Siz3Q3eKdlo5z1tQpSFs9xZMbI=";
|
||||
};
|
||||
|
||||
patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch;
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "vault-ssh-plus";
|
||||
version = "0.7.9";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "isometry";
|
||||
repo = "vault-ssh-plus";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-soz4xXVLyR479d+qcLuHq06CZ5afy+jqyIEZblyRlC0=";
|
||||
hash = "sha256-6XJHtsvQinOr45fuLQeWtH41zK1S9HX35CTUgn1sEHU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eHhs+6sPKkAdMWzh51ICfuejxwqEGeTNSI3P0X4BFSY=";
|
||||
vendorHash = "sha256-GBledtKjPSUOFRtriPykTN2Bo2c/DMexMmu73z+dz/Q=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "wakatime-cli";
|
||||
version = "2.15.0";
|
||||
version = "2.22.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wakatime";
|
||||
repo = "wakatime-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jEQ9c0dejAEAgIyUeJ/PSsAFDUkNPsaU0FW3AVDmL7g=";
|
||||
hash = "sha256-9OeWTjWoda8Hbiaej+UuNSvWtgEEK2MKy3PUqguyZ0U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xrIvtUfOFOgcKJ+2VgUgOzF2Cwp3NPBf39yXgAHN/cQ=";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wasm-component-ld";
|
||||
version = "0.5.26";
|
||||
version = "0.5.27";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -14,10 +14,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wasm-component-ld";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4hKHChIxVpTo18sfeUd8GzjQeb2ONAGeg4I7vKTAhSI=";
|
||||
hash = "sha256-AXMJRKWFcd9tcyxKasRY/k/WT4K/3FlY9nJ6M/jv6VI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IQe4TLWbjlB/h7K5qH5ANxoqG8A2D3RF+UVDj4u6qFQ=";
|
||||
cargoHash = "sha256-yFNxNV/rS+P2PtX2ktWdBl2S9Z0/gsZv77wkgWErgic=";
|
||||
|
||||
# Tests require a rustc that can target wasm32-wasip1, including std. This is awkward for
|
||||
# Nixpkgs to provide at the same time as providing a rustc that's targetting the actual target.
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.22.0";
|
||||
version = "2.23.0";
|
||||
pname = "wowup-cf";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/WowUp/WowUp.CF/releases/download/v${version}/WowUp-CF-${version}.AppImage";
|
||||
hash = "sha256-X5gDnj4YBZRBwJEeb8sVMNoGmWUI9iVdWOmsA20bWig=";
|
||||
hash = "sha256-596j+i2TTbzpGfdWwzzoQKpB6AD2rqT0hvF4nvbD32A=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType1 { inherit pname version src; };
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wxmaxima";
|
||||
version = "26.07.0";
|
||||
version = "26.07.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wxMaxima-developers";
|
||||
repo = "wxmaxima";
|
||||
rev = "Version-${finalAttrs.version}";
|
||||
hash = "sha256-rrXYSW3PU4CvtmBH0dU/sBwe1sVel9IkI89HTj0YEqc=";
|
||||
hash = "sha256-pSo6I2U8yOf083/fNYQzPJtTexnQGt0rRsoMcBl67Ik=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchurl,
|
||||
fetchDebianPatch,
|
||||
pkg-config,
|
||||
bashNonInteractive,
|
||||
curl,
|
||||
libxml2,
|
||||
}:
|
||||
@@ -12,6 +13,9 @@ stdenv.mkDerivation rec {
|
||||
pname = "xmlrpc-c";
|
||||
version = "1.60.05";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/xmlrpc-c/xmlrpc-c-${version}.tgz";
|
||||
hash = "sha256-Z9hgBiRZ6ieEwHtNeRMxnZU5+nKfU0N46OQciRjyrfY=";
|
||||
@@ -31,6 +35,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
bashNonInteractive
|
||||
pkg-config
|
||||
];
|
||||
|
||||
@@ -43,12 +48,24 @@ stdenv.mkDerivation rec {
|
||||
"--enable-libxml2-backend"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export PATH="${
|
||||
lib.makeBinPath [
|
||||
(lib.getDev curl)
|
||||
(lib.getDev libxml2)
|
||||
]
|
||||
}:$PATH"
|
||||
'';
|
||||
|
||||
# Build and install the "xmlrpc" tool (like the Debian package)
|
||||
postInstall = ''
|
||||
(cd tools/xmlrpc && make && make install)
|
||||
patchShebangs --build $out/bin/xmlrpc-c-config
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# parallel make sometimes fails with:
|
||||
# ln: failed to create symbolic link 'libxmlrpc_util.so.4': File exists
|
||||
enableParallelBuilding = false;
|
||||
|
||||
# ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration";
|
||||
@@ -56,6 +73,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Lightweight RPC library based on XML and HTTP";
|
||||
homepage = "https://xmlrpc-c.sourceforge.net/";
|
||||
changelog = "https://xmlrpc-c.sourceforge.io/change.html";
|
||||
# <xmlrpc-c>/doc/COPYING also lists "ABYSS Web Server License" and "Python 1.5.2 License"
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xsimd";
|
||||
version = "14.2.0";
|
||||
version = "14.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xtensor-stack";
|
||||
repo = "xsimd";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-BTiN4B3//wlB3nmOoluM/7bL7J7YIBp5afih9zUP1yw=";
|
||||
hash = "sha256-0m9gUDCgGh58lf9uPp1Obw4rsqWEL1RffWYB6s315p0=";
|
||||
};
|
||||
|
||||
# strictDeps raises the chance that xsimd will be able to be cross compiled
|
||||
|
||||
@@ -38,14 +38,7 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xvfb";
|
||||
|
||||
# TODO: commented out for rebuild avoidance after xorg-server update. revert
|
||||
# on staging.
|
||||
# inherit (xorg-server) src version;
|
||||
version = "21.1.23";
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-45gy5WF9ra8HL9+fDhnl0uHCoTYHrCgLrBq6n4/hRjQ=";
|
||||
};
|
||||
inherit (xorg-server) src version;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zeroclaw";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeroclaw-labs";
|
||||
repo = "zeroclaw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mTH7DRaCHmYw3m9DguceP+nGGMYff7vsoIe3J0XNb/Q=";
|
||||
hash = "sha256-H1512vayE35bLxlFpWExT6u/z3rMKsrv6gs5un9IPaA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6tLLt8cblYABOTli1LrrWbyTOJYGmmewHJgTxBAhJlE=";
|
||||
cargoHash = "sha256-zLj2ItDp8tbldBvFNxlrcoqcE0J5Ce19NDlV+lCu/BY=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
autoreconfHook,
|
||||
boost,
|
||||
fuse,
|
||||
log4cxx,
|
||||
zookeeper,
|
||||
zookeeper_mt,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zkfuse";
|
||||
inherit (zookeeper_mt) version src;
|
||||
|
||||
sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-contrib/zookeeper-contrib-zkfuse";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [
|
||||
zookeeper_mt
|
||||
log4cxx
|
||||
boost
|
||||
fuse
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Make the async API accessible, and use the proper include path.
|
||||
sed -i src/zkadapter.h \
|
||||
-e '/"zookeeper\.h"/i#define THREADED' \
|
||||
-e 's,"zookeeper\.h",<zookeeper/zookeeper.h>,'
|
||||
'';
|
||||
|
||||
# c++17 (gcc-11's default) breaks the build as:
|
||||
# zkadapter.h:616:33: error: ISO C++17 does not allow dynamic exception specifications
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -v src/zkfuse $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Utility to mount a Zookeeper instance as a file-system";
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ztzg ];
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "zkfuse";
|
||||
};
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"hash": "sha256-Szed0lCe3parouN7VjBrKY7FcocyIuA4umuDqurbM4Y=",
|
||||
"hash": "sha256-0cmzR5KZY6q+ZhoF90HkiIqHJsEdMeLOt4bmV8ID5so=",
|
||||
"owner": "openjdk",
|
||||
"repo": "jdk17u",
|
||||
"rev": "refs/tags/jdk-17.0.20+2"
|
||||
"rev": "refs/tags/jdk-17.0.20+8"
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"hash": "sha256-A5TWx/HDFlx46VAgPmkanwcZeBeSwtgGCD90mmUu4Vc=",
|
||||
"hash": "sha256-/42TUyZnw8LVOuUnupVFBkqsT5IIeTw9/WNQ0eCfQRQ=",
|
||||
"owner": "openjdk",
|
||||
"repo": "jdk25u",
|
||||
"rev": "refs/tags/jdk-25.0.4+1"
|
||||
"rev": "refs/tags/jdk-25.0.4+7"
|
||||
}
|
||||
|
||||
@@ -50,8 +50,8 @@ let
|
||||
in
|
||||
import ./default.nix
|
||||
{
|
||||
rustcVersion = "1.97.0";
|
||||
rustcSha256 = "sha256-HAhV2JgqD7HQMhtgVLVbcy07HRfIRoQet/0Ks3vydvg=";
|
||||
rustcVersion = "1.97.1";
|
||||
rustcSha256 = "sha256-YiwrQpxTy/3A3TpR0DVU6RzWPr7BkSwfVwlkDN/vGp0=";
|
||||
|
||||
llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
|
||||
llvmSharedForHost = llvmSharedFor pkgsBuildHost;
|
||||
@@ -65,27 +65,27 @@ import ./default.nix
|
||||
# Note: the version MUST be the same version that we are building. Upstream
|
||||
# ensures that each released compiler can compile itself:
|
||||
# https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363
|
||||
bootstrapVersion = "1.97.0";
|
||||
bootstrapVersion = "1.97.1";
|
||||
|
||||
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
|
||||
bootstrapHashes = {
|
||||
i686-unknown-linux-gnu = "d066e5dd59c15fc1c793173d53b41719162de4470b5c34041a8bc664542df375";
|
||||
x86_64-unknown-linux-gnu = "eb89b20287153391c49ebcdb7fd91b683a12438d129bfb92eadcc495545af3a7";
|
||||
x86_64-unknown-linux-musl = "675bb2d574efc64da0563a9cb70cc017560394c5938e04c92987cad383299e8d";
|
||||
arm-unknown-linux-gnueabihf = "180e487a1f7abaeda374b942d369dd7faa4364b1267629d48552d9a17a5bc4ab";
|
||||
armv7-unknown-linux-gnueabihf = "2f9dfd76694efcf391f6d4947e97be17d1f469c9e989ed194660ddd85877ca60";
|
||||
aarch64-unknown-linux-gnu = "70fb01b4894d56fad34c260ce63aee647589be57a26ab33730110d8228cbcf02";
|
||||
aarch64-unknown-linux-musl = "28efcf4ee31235eb5f7820dadba46400ab9dbbb030719e7a2ab284b02c8cbf82";
|
||||
x86_64-apple-darwin = "3dc9ad8ec35a9f0acd2c5ae2c80c36baf5c7010423bf339ca55709fc995885d4";
|
||||
aarch64-apple-darwin = "c2e6a5ef480f5715ae9874188c1fa749b6a6f90d8d911f5a3a5d768f0ac70427";
|
||||
powerpc64-unknown-linux-gnu = "62c9f9b7887505fc4dcda40784469f23909657d245e53025a7a8124b016d6631";
|
||||
powerpc64le-unknown-linux-gnu = "a8d3f487d07cebc48ce03ad66a970a5f5138a5c1e7c7cec12fb9b6e47a24bf1a";
|
||||
powerpc64le-unknown-linux-musl = "09fee3b9ede1e94ff6c3bad3918dc231be909c74bb182e0acd583c03a9f1df5f";
|
||||
riscv64gc-unknown-linux-gnu = "be239392f7112f6a81f20c9e715d5743319a8b773592e027ad800d73527d8fae";
|
||||
s390x-unknown-linux-gnu = "fee699e31d0a0034f46669c473e61a88af6734f8c5902d77329ac236fcd9b538";
|
||||
loongarch64-unknown-linux-gnu = "37ad9d55b98cc680a2d75c7184e6457b632ce82690a56be7a2044e32c91176ce";
|
||||
loongarch64-unknown-linux-musl = "bfba202bae252ac372026171d9bc98e5eb80578d576546f56e8aee2e9d64ecf0";
|
||||
x86_64-unknown-freebsd = "77101232e3769395e99c0e663d2c8beb3d4127857945cf7c812c1886ba823b8f";
|
||||
i686-unknown-linux-gnu = "914c2702deada0b9cf1d64bb3495d76e55cb3eba07d508472dde8b55a93e3759";
|
||||
x86_64-unknown-linux-gnu = "b4cdbc7cc6b0ee0a2666b1872769fdb2ad8393b28b63952f6493b4b400e4832b";
|
||||
x86_64-unknown-linux-musl = "40dbea28193cf2b488cf3e4a89274ccfb60efa50883f19917a382f84fd05bdc4";
|
||||
arm-unknown-linux-gnueabihf = "ba62fe07ad85b507907705a14adc1e8bc258de5f6177ba41d77bbff9f469a4ce";
|
||||
armv7-unknown-linux-gnueabihf = "e89c5e33aaddc6ef56857000c9117875c2997e9a1a500bd7b16277c9874b002f";
|
||||
aarch64-unknown-linux-gnu = "2f2496c70bd336a66a4c8baf2d303ba161f3552f192444c3639ba903c7c1e2c5";
|
||||
aarch64-unknown-linux-musl = "c5f45b5c6eb7f8fdb277c54c08402b7c931516740fbd4eccc26ba148f7cd5d57";
|
||||
x86_64-apple-darwin = "5f4c84d2bcce7983468642855a45fc4978fba1324cfdd1ea0b182face3ab4ffa";
|
||||
aarch64-apple-darwin = "cbd14c36f039f6f11f38148a6295d8234d18ddf20bea53031c86f119423a8b26";
|
||||
powerpc64-unknown-linux-gnu = "2b507d5eb9b5c4c041b50e93e069db56d094f02e6df103dc74c016155141bfae";
|
||||
powerpc64le-unknown-linux-gnu = "ff524eef5a59d801df09ccad5cdaf9ea1f0a07d75cbed2a7e9f013a9eb76a3c1";
|
||||
powerpc64le-unknown-linux-musl = "15630f33fbea2dd9661f8482b6c612da271549aba40401444aaa53650e646b9b";
|
||||
riscv64gc-unknown-linux-gnu = "59bec35d8febb2ab918fa41cffbaa5b07146a63bdc33f029ff756d70a3151ece";
|
||||
s390x-unknown-linux-gnu = "808268af9e880d41b8cb32b242e38c9bd3ea7aba6409b02fbffa0fbc5370c538";
|
||||
loongarch64-unknown-linux-gnu = "d5a925962854730ae7641420d8337af93988ea4ff47b503a856ec53776c87841";
|
||||
loongarch64-unknown-linux-musl = "3fb653299d228e3e0726afb179b07dd10a51a2ecc3cdfcd740011b1d8420ca97";
|
||||
x86_64-unknown-freebsd = "77866a4c449bcccb40e9d6712bf3eb899d29018ed8e841fd9d8d59370751f152";
|
||||
};
|
||||
|
||||
selectRustPackage = pkgs: pkgs.rust_1_97;
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fontconfig";
|
||||
version = "2.18.1";
|
||||
version = "2.18.2";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# ref: https://github.com/NixOS/nixpkgs/pull/401037#discussion_r2055430206
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${finalAttrs.version}/fontconfig-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-IwDz2/pyU7OkT0/uzbyN+kXd5dws+3H86vMfOUy0EDE=";
|
||||
hash = "sha256-z45ldu8EhMFQeb2vd82cUcRk31NlgUraTT7nMx6jHrU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -69,8 +69,7 @@ let
|
||||
++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.is64bit) "ABI=64"
|
||||
# to build a .dll on windows, we need --disable-static + --enable-shared
|
||||
# see https://gmplib.org/manual/Notes-for-Particular-Systems.html
|
||||
++ optional (!withStatic && stdenv.hostPlatform.isPE) "--disable-static --enable-shared"
|
||||
++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "--disable-assembly";
|
||||
++ optional (!withStatic && stdenv.hostPlatform.isPE) "--disable-static --enable-shared";
|
||||
|
||||
doCheck = true; # not cross;
|
||||
|
||||
|
||||
@@ -48,14 +48,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aiohttp";
|
||||
version = "3.14.1";
|
||||
version = "3.14.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = "aiohttp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OJSLv/NfVrKESZqNr51FJUzLRz7wLMRdGoNjKC5EhlI=";
|
||||
hash = "sha256-gpAYbANSlUZoB0lATEP2N288GxlF8/GzD7bEW1AkHZw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -3,16 +3,16 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
cython,
|
||||
packaging,
|
||||
pkgconfig,
|
||||
setuptools,
|
||||
wheel,
|
||||
pytestCheckHook,
|
||||
python,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "faust-cchardet";
|
||||
version = "2.1.19";
|
||||
version = "2.1.20";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -20,14 +20,19 @@ buildPythonPackage rec {
|
||||
repo = "cChardet";
|
||||
tag = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-yY6YEhXC4S47rxnkKAta4m16IVGn7gkHSt056bYOYJ4=";
|
||||
hash = "sha256-MeRX/g38c+q2jiTtEhUpaGYf+5tkhexRGuIG0PdUGvI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "packaging<26" packaging
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
cython
|
||||
packaging
|
||||
pkgconfig
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
@@ -41,7 +46,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/faust-streaming/cChardet/blob/${src.rev}/CHANGES.rst";
|
||||
changelog = "https://github.com/faust-streaming/cChardet/blob/${src.tag}/CHANGES.rst";
|
||||
description = "High-speed universal character encoding detector";
|
||||
mainProgram = "cchardetect";
|
||||
homepage = "https://github.com/faust-streaming/cChardet";
|
||||
|
||||
@@ -2,27 +2,30 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
python-dateutil,
|
||||
lxml,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "feedgen";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-2b1Rw7XpVqKlKZjDcIxNLHKfL8wxEYjh5dO5cmOTVGo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
python-dateutil
|
||||
lxml
|
||||
];
|
||||
|
||||
# No tests in archive
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Python module to generate ATOM feeds, RSS feeds and Podcasts";
|
||||
@@ -34,4 +37,4 @@ buildPythonPackage rec {
|
||||
];
|
||||
maintainers = with lib.maintainers; [ casey ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,24 +2,29 @@
|
||||
buildPythonPackage,
|
||||
lib,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fields";
|
||||
version = "5.0.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-MdSqA9jUTjXfE8Qx3jUTaZfwR6kkpZfYT3vCCeG+Vyc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [ "fields" ];
|
||||
|
||||
doCheck = false; # Argument(s) {'path'} are declared in the hookimpl but can not be found in the hookspec
|
||||
|
||||
meta = {
|
||||
description = "Container class boilerplate killer";
|
||||
homepage = "https://github.com/ionelmc/python-fields";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [ lib.maintainers.sheepforce ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -41,6 +41,7 @@ buildPythonPackage (finalAttrs: {
|
||||
"tests/test_virtualenv.py"
|
||||
# Very prone to timeouts on busy machines
|
||||
"tests/test_filelock.py"
|
||||
"tests/test_read_write.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user