Merge remote-tracking branch 'origin/staging-next' into staging
This commit is contained in:
K900
@@ -632,8 +632,6 @@ rec {
|
||||
else if platform.isPower64 then
|
||||
if platform.isLittleEndian then powernv else ppc64
|
||||
|
||||
else if platform.isLoongArch64 then
|
||||
loongarch64-multiplatform
|
||||
else
|
||||
{ };
|
||||
}
|
||||
|
||||
@@ -2807,6 +2807,12 @@
|
||||
github = "azazak123";
|
||||
githubId = 50211158;
|
||||
};
|
||||
azban = {
|
||||
name = "azban";
|
||||
matrix = "azban@matrix.org";
|
||||
github = "azban";
|
||||
githubId = 714931;
|
||||
};
|
||||
azd325 = {
|
||||
email = "tim.kleinschmidt@gmail.com";
|
||||
github = "Azd325";
|
||||
@@ -15504,6 +15510,11 @@
|
||||
githubId = 516527;
|
||||
name = "Lukas Werling";
|
||||
};
|
||||
lnk3 = {
|
||||
github = "lnk3";
|
||||
githubId = 23727619;
|
||||
name = "Luca Ruperto";
|
||||
};
|
||||
lnl7 = {
|
||||
email = "daiderd@gmail.com";
|
||||
github = "LnL7";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "fbneo";
|
||||
version = "0-unstable-2026-03-17";
|
||||
version = "0-unstable-2026-03-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fbneo";
|
||||
rev = "baafb100b487f2ac06f9e78ac322e3ecf36b8924";
|
||||
hash = "sha256-46hVbQN8QO1FNm56wJ7Q323blUWV9sn529tMwdAOhW8=";
|
||||
rev = "7290e95232faacb0c31b0b12cb0884bb9f6e8cfc";
|
||||
hash = "sha256-vYryEUrYauVGGjmePCUnGdCpOGKUFxSI4tkFCt7wKs8=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame";
|
||||
version = "0-unstable-2026-02-27";
|
||||
version = "0-unstable-2026-03-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame";
|
||||
rev = "74731455f45c08d4f303c6d07c4f1cbf791d52b6";
|
||||
hash = "sha256-f0f0ajliLM2ZJjOpA7sk3pgA7LZ2JTEIl7+w/3TpFK0=";
|
||||
rev = "a10380b436c2103cad06826d64e10ca90692a08b";
|
||||
hash = "sha256-M9/GTOiXcZc5J2SxSDzDEYDMBC1zMR/zAhvbgZEwBlk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "20kly";
|
||||
version = "1.5.0";
|
||||
version = "1.5.2";
|
||||
|
||||
pyproject = false;
|
||||
|
||||
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "20kly";
|
||||
repo = "20kly";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "1zxsxg49a02k7zidx3kgk2maa0vv0n1f9wrl5vch07sq3ghvpphx";
|
||||
sha256 = "sha256-7i1tHylnXWlTvfu9CbStTcA0qsFFqQcGX6bUUTUcYBw=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
+56
-56
@@ -5,13 +5,13 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@sourcegraph/amp": "^0.0.1773907698-g6757dd"
|
||||
"@sourcegraph/amp": "^0.0.1774699422-ga16517"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring/-/keyring-1.1.9.tgz",
|
||||
"integrity": "sha512-qjg04yaJ/gFqgG7wDqLlWBvZpsjvYDtwL+xOr2vSM2JrhojuIKsw7pH013U7xJOradTVGeQqhwqgZtt2IblgOw==",
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring/-/keyring-1.1.10.tgz",
|
||||
"integrity": "sha512-PTMyX7FVZGP4s0LcjgrFonek7Sr9ZTdi0TgpR4/4RQmC2TiDcjpdZOXxRMe2aP+5N89Ix9RG9QWclgqRHLk/Xw==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
@@ -21,24 +21,24 @@
|
||||
"url": "https://github.com/sponsors/Brooooooklyn"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"@napi-rs/keyring-darwin-arm64": "1.1.9",
|
||||
"@napi-rs/keyring-darwin-x64": "1.1.9",
|
||||
"@napi-rs/keyring-freebsd-x64": "1.1.9",
|
||||
"@napi-rs/keyring-linux-arm-gnueabihf": "1.1.9",
|
||||
"@napi-rs/keyring-linux-arm64-gnu": "1.1.9",
|
||||
"@napi-rs/keyring-linux-arm64-musl": "1.1.9",
|
||||
"@napi-rs/keyring-linux-riscv64-gnu": "1.1.9",
|
||||
"@napi-rs/keyring-linux-x64-gnu": "1.1.9",
|
||||
"@napi-rs/keyring-linux-x64-musl": "1.1.9",
|
||||
"@napi-rs/keyring-win32-arm64-msvc": "1.1.9",
|
||||
"@napi-rs/keyring-win32-ia32-msvc": "1.1.9",
|
||||
"@napi-rs/keyring-win32-x64-msvc": "1.1.9"
|
||||
"@napi-rs/keyring-darwin-arm64": "1.1.10",
|
||||
"@napi-rs/keyring-darwin-x64": "1.1.10",
|
||||
"@napi-rs/keyring-freebsd-x64": "1.1.10",
|
||||
"@napi-rs/keyring-linux-arm-gnueabihf": "1.1.10",
|
||||
"@napi-rs/keyring-linux-arm64-gnu": "1.1.10",
|
||||
"@napi-rs/keyring-linux-arm64-musl": "1.1.10",
|
||||
"@napi-rs/keyring-linux-riscv64-gnu": "1.1.10",
|
||||
"@napi-rs/keyring-linux-x64-gnu": "1.1.10",
|
||||
"@napi-rs/keyring-linux-x64-musl": "1.1.10",
|
||||
"@napi-rs/keyring-win32-arm64-msvc": "1.1.10",
|
||||
"@napi-rs/keyring-win32-ia32-msvc": "1.1.10",
|
||||
"@napi-rs/keyring-win32-x64-msvc": "1.1.10"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-darwin-arm64": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-darwin-arm64/-/keyring-darwin-arm64-1.1.9.tgz",
|
||||
"integrity": "sha512-/lVnrSFrut+8pQC6IcqlfHKzcEmf2XvQDOZPB5X4vI23GrNXBd56EuBlFPdTBtx46A8Bn+Aqi6pS8cnprHtcCw==",
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-darwin-arm64/-/keyring-darwin-arm64-1.1.10.tgz",
|
||||
"integrity": "sha512-qdXBVypPNgTzso5F/YXWy5dOfFEb9eo43uROMlvwlhj7Aw137iwqwHiqlxR0teFKA33cWnem+ZKeVSIPoobtNA==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
@@ -52,9 +52,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-darwin-x64": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-darwin-x64/-/keyring-darwin-x64-1.1.9.tgz",
|
||||
"integrity": "sha512-G3PiFZTAFTzUnpSB31A/UaPjl48/3sDTLmLxaAZBEk7HcOyBnL31gA1YqhDCO7F2y5sD5TWiFiuID9MyqYOcjw==",
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-darwin-x64/-/keyring-darwin-x64-1.1.10.tgz",
|
||||
"integrity": "sha512-53DgSzhTAJwxR3KCyggHWcLwp+cw2v1zAhBiqNn1P8XwSJSba7HzFwsei6zZMn7bn3UY1ngIHEtaA74UUJVJyw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
@@ -68,9 +68,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-freebsd-x64": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-freebsd-x64/-/keyring-freebsd-x64-1.1.9.tgz",
|
||||
"integrity": "sha512-R4XbvRhEzQyOy4yM+SMDgk8BgkLPkIzXGwR6QR0wJ2YrPeBx3F2TrgdHfsIGSn/X5Axg/2UlrCiZVciZ5BmusA==",
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-freebsd-x64/-/keyring-freebsd-x64-1.1.10.tgz",
|
||||
"integrity": "sha512-pI6lect/Dp8NnV+g3w1hmYLt69FbSwKFAHn77vjeUaIT5H9C0ikAgwLk89Sd8/Ei/AHHldGkrLeWkNjnIiHfoQ==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
@@ -84,9 +84,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-linux-arm-gnueabihf": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm-gnueabihf/-/keyring-linux-arm-gnueabihf-1.1.9.tgz",
|
||||
"integrity": "sha512-UrKy110I+zQyBtw4HLVUqZ1jDq11K3PmQIYgWAJNwB5VQOj4IQ63zLxk4V01Jx4bNOJmGNlvHDJUAyh/lC5Yww==",
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm-gnueabihf/-/keyring-linux-arm-gnueabihf-1.1.10.tgz",
|
||||
"integrity": "sha512-w4psOx5m1ltvNLABT/BpIzP5roVcglR1kDhzZgSEOIIrf2i4FKPQqUIo5UQtjsu+AqhhYwnlnketKDf4h+D06g==",
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
@@ -100,9 +100,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-linux-arm64-gnu": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm64-gnu/-/keyring-linux-arm64-gnu-1.1.9.tgz",
|
||||
"integrity": "sha512-yOrhVpNGexDYzybe3dhmHQRPBDjlZPtJDE+eGSi1JwEqYlWDB+4IWjRsetxnO63DhnMFRLeMTdwWghsYrA7VwA==",
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm64-gnu/-/keyring-linux-arm64-gnu-1.1.10.tgz",
|
||||
"integrity": "sha512-YMC+ZLj3RldGD2Q5wzlZbc8vTh5Fteln+FpB2lw7EbDib3mmIribNH1NG21E4SwculFRDkVJqYGzwIhafloT8Q==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
@@ -116,9 +116,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-linux-arm64-musl": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm64-musl/-/keyring-linux-arm64-musl-1.1.9.tgz",
|
||||
"integrity": "sha512-82EcuzoV/+Dxwi1HHhrEEprN5Ou7OsRKyTJSaRqiVuGvLaQDUhZX/4zXTTh4Pz24m22Q4aoJogafS31w8iKGGw==",
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm64-musl/-/keyring-linux-arm64-musl-1.1.10.tgz",
|
||||
"integrity": "sha512-X/Gr5q2vJW7HMpcWRKj7eXer00a1PYb3zt3xsEG/VbcEo5A973pJANTBhYuoW098O/b7ORkunFt9WSbCgenw2A==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
@@ -132,9 +132,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-linux-riscv64-gnu": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-riscv64-gnu/-/keyring-linux-riscv64-gnu-1.1.9.tgz",
|
||||
"integrity": "sha512-Q1ar7DszC1X8FW6w7Ql7b72GFeAUxkTiOuxXChCFBy7eWCQSDrr52ZLroIowp82RmkQLZebnK+IwSssD2Ntoag==",
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-riscv64-gnu/-/keyring-linux-riscv64-gnu-1.1.10.tgz",
|
||||
"integrity": "sha512-vA3R4NVBlU0TVDHavwr5hSqePSs9OwTzzzFlTbZzqgh9s7OqcSwNT096nbr5dRjuQfG9o4/xvjfvVJ4v5z0Egg==",
|
||||
"cpu": [
|
||||
"riscv64"
|
||||
],
|
||||
@@ -148,9 +148,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-linux-x64-gnu": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-x64-gnu/-/keyring-linux-x64-gnu-1.1.9.tgz",
|
||||
"integrity": "sha512-LMvrYt1ho3pEDECssA7ATbcMDgayEUwwSD+UfrC7Hj1+C6dlvipwt5njwUDCno2OeXbjjisCo4CR9fDmXa4sZA==",
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-x64-gnu/-/keyring-linux-x64-gnu-1.1.10.tgz",
|
||||
"integrity": "sha512-qbKE72UeVOrIoiYYHh7joTpDIgQCZpW5OJHG4Ir19GHLdQwNZGKLfFxrTT2DvZ5EXwFJWbOp4Dew4OvvQ0E63g==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
@@ -164,9 +164,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-linux-x64-musl": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-x64-musl/-/keyring-linux-x64-musl-1.1.9.tgz",
|
||||
"integrity": "sha512-x2i/TgS2/fM+6LRj1MrtVC580sepz5GcxbSCXpttx2H58uZKBF0vVM9HDPHoKP2w5++fyrA17eltJNYN3Ob46A==",
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-x64-musl/-/keyring-linux-x64-musl-1.1.10.tgz",
|
||||
"integrity": "sha512-niLWyjD/JxQwlOTPeldIx8Xnf03Mp4ooorpWJMWbMuVz/6hSyLVghY/BDYu2Oaxhc+XlTEjmqwhoTWYhmti5eA==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
@@ -180,9 +180,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-win32-arm64-msvc": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-arm64-msvc/-/keyring-win32-arm64-msvc-1.1.9.tgz",
|
||||
"integrity": "sha512-14t6p8CTBNfGzLO5LXqurT+pAOf/ocGjOM/qiG/LW+jPkhyJYBNI9e3HKq3QX+ObbnxVpt4fAY02b4XLt7EWig==",
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-arm64-msvc/-/keyring-win32-arm64-msvc-1.1.10.tgz",
|
||||
"integrity": "sha512-VBlqZ0MF5ksc/Z+yxoL2+p6TDu2rqBOcgZ+HwXzSfgFnfnuPds7xOVdFwwaiJbj9CsCrgnByr1jtHRvfEQ6Iiw==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
@@ -196,9 +196,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-win32-ia32-msvc": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-ia32-msvc/-/keyring-win32-ia32-msvc-1.1.9.tgz",
|
||||
"integrity": "sha512-7+7aXz5op6PtOnWYcK1GYXWQlk2zfpdPt9taLqmCCVpk1g4m3Gw1wyKyQxjrg9clHWdNhdWxhFEA0osDxG8/Eg==",
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-ia32-msvc/-/keyring-win32-ia32-msvc-1.1.10.tgz",
|
||||
"integrity": "sha512-0AvwivxgtjdpTCZCFAQUCxFA45DNKXOsdZYXBCIDfPIpUPgLxhIAsg6q7NJK00r1M24StwwfD+AzZDu14J1PKQ==",
|
||||
"cpu": [
|
||||
"ia32"
|
||||
],
|
||||
@@ -212,9 +212,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-win32-x64-msvc": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-x64-msvc/-/keyring-win32-x64-msvc-1.1.9.tgz",
|
||||
"integrity": "sha512-P1wsSrSqDqvcXLL7yiH2RsO3De65wuEQj1ZjV9s1MHfEP5dIdriNYZfFsRBlOsl32GoK3qFzsuH5DTVviGEHSw==",
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-x64-msvc/-/keyring-win32-x64-msvc-1.1.10.tgz",
|
||||
"integrity": "sha512-T02DfUUvp3epOJ5lC7hcM5ff6xaLhIfymBf0LEa0oQMi+yCVoDrgjeKeGCUGwtVJWfphu58Tf9twX+hRiAD0dg==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
@@ -228,12 +228,12 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@sourcegraph/amp": {
|
||||
"version": "0.0.1773907698-g6757dd",
|
||||
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1773907698-g6757dd.tgz",
|
||||
"integrity": "sha512-yCY1M8D42FBRdq3MwNHHmrKngH/nNKOWRHLgBehR9gt3w7cv9BaD2cPA/+eQgjcNMCpL7w7YcGGkXapOc1EiqA==",
|
||||
"version": "0.0.1774699422-ga16517",
|
||||
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1774699422-ga16517.tgz",
|
||||
"integrity": "sha512-Y5Y3H2iDgCkuqISWFqlpyT9lTPyXQzhjBOT9TwzvR9z0mHMmq+EDQnyXXfp2u9GTV4yaBsFGHZFzqJXWH5VdMw==",
|
||||
"license": "Amp Commercial License",
|
||||
"dependencies": {
|
||||
"@napi-rs/keyring": "1.1.9"
|
||||
"@napi-rs/keyring": "1.1.10"
|
||||
},
|
||||
"bin": {
|
||||
"amp": "dist/main.js"
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "amp-cli";
|
||||
version = "0.0.1773907698-g6757dd";
|
||||
version = "0.0.1774699422-ga16517";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-Lyl53DH2qnl7HaHDDrPjVI7OoppQ41vL85mAstyGBD4=";
|
||||
hash = "sha256-nM1U5RyQ+wa5RHR4GxPGeoP/93U1G47NIAm2BXRk0y8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
|
||||
chmod +x bin/amp-wrapper.js
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-X7DxJ6gLr5AhuGrWyp/PI+NglFgbZSiGxIqD1FiW9do=";
|
||||
npmDepsHash = "sha256-USrhTsSRh/j2kR7i20ttr3QN/qv+45w9trJAgYd4axQ=";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ripgrep
|
||||
|
||||
@@ -9,20 +9,20 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2026.3";
|
||||
version = "2026.3.1";
|
||||
|
||||
product =
|
||||
if proEdition then
|
||||
{
|
||||
productName = "pro";
|
||||
productDesktop = "Burp Suite Professional Edition";
|
||||
hash = "sha256-iGSXyF6Jh3eSuokzu8DNK6wIUw7a0px/Hg5QwzgMQY4=";
|
||||
hash = "sha256-jRVRvqFRsRO+vbEoV35bX4vi9XEYl737L0umt61ACtk=";
|
||||
}
|
||||
else
|
||||
{
|
||||
productName = "community";
|
||||
productDesktop = "Burp Suite Community Edition";
|
||||
hash = "sha256-kr4Fa6NjaCiN6ulwr+HR6KN/DpYWFlzwnyO4E34x4yY=";
|
||||
hash = "sha256-wjXzFXE+cIHw8tXuitsN4emH5varOTWQxiohwFGKZvc=";
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
(
|
||||
finalAttrs: _: {
|
||||
pname = "chatterino7";
|
||||
version = "7.5.4";
|
||||
version = "7.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SevenTV";
|
||||
repo = "chatterino7";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zA198AIFIRx4qE5MZwrGOFFrpnVrZMVQx1SX0RJpDo4=";
|
||||
hash = "sha256-GP6wZLYliTc2JnC5s4ddbxc9asz6Ntg/4LRH7X4QlOQ=";
|
||||
fetchSubmodules = true;
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cnspec";
|
||||
version = "13.1.1";
|
||||
version = "13.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-579zSogioTKdsqOwTptJUqN1IEWnPzEmWrSjllqIYOY=";
|
||||
hash = "sha256-z02BAKPPWqKUiCotgGr+kOIg8omXjyXnLze/RaNdWc0=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-ZPJGtI5HTetjSDfkXmF2elyXPO7AmQn1zmXzEjNIIXc=";
|
||||
vendorHash = "sha256-EgSj4EL6s30u4p5tNOJMyH4h+DM1O8UMg8iveRi6hJA=";
|
||||
|
||||
subPackages = [ "apps/cnspec" ];
|
||||
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "deja-dup";
|
||||
version = "49.2";
|
||||
version = "50.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "deja-dup";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-yH4XX1MwPxTmKh6p27pYQBQDyeGIT+Ed9E0Y508EF7s=";
|
||||
hash = "sha256-sdUyKRksi0ZvheivQVcDRBh7t6PoFeQ1mf4ygSTk4b4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,25 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
cctools,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
python3,
|
||||
cctools,
|
||||
lib,
|
||||
nix-update-script,
|
||||
nodejs_22,
|
||||
python3Minimal,
|
||||
stdenvNoCC,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "dl-librescore";
|
||||
version = "0.35.34";
|
||||
version = "0.35.40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibreScore";
|
||||
repo = "dl-librescore";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IuHX4wFhilSK09WWNopHtkAfd9Mm2oo5M2m4KcRkCBE=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jCwySndc3ZeEoKVA9Ne2PLStyM73hDPO1vaNeVShwQ0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-DCjN9x6sjw66UIATxhRclJpz6v/1ZVUiGqlbZUDMpBY=";
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmDepsHash = "sha256-8x1WuzIaxzaEgM9hu2cCtXr4GLCE6DHt3F7lvnbcMgk=";
|
||||
npmDepsFetcherVersion = 2;
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3Minimal
|
||||
]
|
||||
++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ cctools ];
|
||||
|
||||
patches = [
|
||||
# https://github.com/LibreScore/dl-librescore/pull/144
|
||||
@@ -30,20 +42,20 @@ buildNpmPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
makeCacheWritable = true;
|
||||
postPatch = ''
|
||||
for file in src/i18n/*.json; do
|
||||
substituteInPlace "$file" --replace-quiet \
|
||||
'Run npm i -g dl-librescore@{{latest}} to update' ""
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
cctools
|
||||
];
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Download sheet music";
|
||||
homepage = "https://github.com/LibreScore/dl-librescore";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "dl-librescore";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ yiyu ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "endlessh-go";
|
||||
version = "2025.0914.0";
|
||||
version = "2026.0328.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shizunge";
|
||||
repo = "endlessh-go";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ABrmvP8xfH1DWzepnzrIsNJDE9sDoXPQteA/ToyRtoo=";
|
||||
hash = "sha256-EiIWgyAHAJrloIztKX1oZaSNNSG4t2OaVYyLTfJCkLU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HumLc9u7jVFk7228SYHptBEOSRdLp4r5QECYlYrO6KY=";
|
||||
|
||||
@@ -121,7 +121,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--add-flags $out/opt/Equibop/resources/app.asar \
|
||||
${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
|
||||
${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ (lib.getLib stdenv.cc.cc) ]}"
|
||||
'';
|
||||
|
||||
desktopItems = makeDesktopItem {
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
}:
|
||||
let
|
||||
pname = "fleet";
|
||||
version = "4.81.0";
|
||||
version = "4.82.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fleetdm";
|
||||
repo = "fleet";
|
||||
tag = "fleet-v${version}";
|
||||
hash = "sha256-LPbMcaQ3YIfh5qwIBB7BwJFgMPurCJudrOzUPm5+VcM=";
|
||||
hash = "sha256-Cbn7phhaDcpYm3nV8nLb/2QVQl9mhsRfHa6GG59MNcA=";
|
||||
};
|
||||
|
||||
frontend = stdenvNoCC.mkDerivation {
|
||||
@@ -32,7 +32,7 @@ let
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/yarn.lock";
|
||||
hash = "sha256-9FuGmL9/hkPZo0ecneL4i9Hg6gkRbwhKGfIvn3/YpVo=";
|
||||
hash = "sha256-2gTV42OVgeH35rOrOgXiop+DGWtq2PpHqKY4mFblbAs=";
|
||||
};
|
||||
|
||||
NODE_ENV = "production";
|
||||
@@ -54,7 +54,7 @@ in
|
||||
buildGoModule (finalAttrs: {
|
||||
inherit pname version src;
|
||||
|
||||
vendorHash = "sha256-kudomUa5c0OJA2LgqLQ2Az0mDH/s9go3jHdyeALGgs8=";
|
||||
vendorHash = "sha256-hgo+j2+gE0ArGRRvxC/0jcpv0Bp3hvBRO7Wl+9xl8io=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/fleet"
|
||||
|
||||
@@ -70,13 +70,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freerdp";
|
||||
version = "3.24.1";
|
||||
version = "3.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ecMsypmFF1y6ppmOcMWKPP8bEaIrSikO4ryFH5pZoSI=";
|
||||
hash = "sha256-gIe5MoPaKCTHlNGBt+Gc4QZFQ24avas9EBARtiRfLQE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
# Additionally, when gemrb adds support for the EE games, libvlc will be needed anyway.
|
||||
|
||||
let
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gemrb";
|
||||
repo = "gemrb";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+aPnOJQGRblqcrblVU5ZwA8CZqeT19rxEtn3GLuofYU=";
|
||||
hash = "sha256-gPtmJb3GhBrvP1vy933wPPy+n3BwBIbJ2o8VV674Mso=";
|
||||
};
|
||||
|
||||
icons = runCommand "gemrb-icons" { nativeBuildInputs = [ imagemagick ]; } ''
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
rustPlatform,
|
||||
sqlite,
|
||||
stdenv,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -30,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# - https://github.com/facebook/sapling/commit/9e27acb84605079bf4e305afb637a4d6801831ac
|
||||
postPatch = ''
|
||||
(
|
||||
cd ../git-branchless-*-vendor/esl01-indexedlog-*/
|
||||
cd $cargoDepsCopy/*/esl01-indexedlog-*/
|
||||
patch -p1 < ${./fix-esl01-indexedlog-for-rust-1_89.patch}
|
||||
)
|
||||
'';
|
||||
@@ -67,10 +68,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"--skip=test_switch_auto_switch_interactive"
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Suite of tools to help you visualize, navigate, manipulate, and repair your commit history";
|
||||
homepage = "https://github.com/arxanas/git-branchless";
|
||||
license = lib.licenses.gpl2Only;
|
||||
license = [
|
||||
lib.licenses.asl20
|
||||
lib.licenses.mit
|
||||
];
|
||||
mainProgram = "git-branchless";
|
||||
maintainers = with lib.maintainers; [
|
||||
nh2
|
||||
|
||||
@@ -23,19 +23,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-decoder";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "decoder";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-g3ztQ+wiCDY19bc2/IABzXGSQrZltQgrTZ7rSI0RyFs=";
|
||||
hash = "sha256-ssbqtDuUpHDT0Q91YCWsvYS8T9cMl4ukOKuaIvnGg44=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-lYbJN5XliFATZVoZqiTDD3wzKPTfpFHk24iLh7ctjG4=";
|
||||
hash = "sha256-Ue89/U4OXQVftuGtiYF2cr4UuFzrfz6DT52EQM1wd7s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "gnome-graphs";
|
||||
version = "1.8.7";
|
||||
version = "1.8.8";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "World";
|
||||
repo = "Graphs";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nMcpsYW8/WdCKmHnsObAWhDeo7+1vqBGTTXteh6jBus=";
|
||||
hash = "sha256-XsdrXdIZmAngS52KmjcNbOWwYJsnhNGELSd0p3h/XWE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
diff --git a/go.mod b/go.mod
|
||||
index 7e3d596..d90b393 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -1,27 +1,50 @@
|
||||
module github.com/google/go-licenses
|
||||
|
||||
-go 1.16
|
||||
+go 1.17
|
||||
|
||||
require (
|
||||
- cloud.google.com/go/iam v0.4.0 // indirect
|
||||
- github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
||||
github.com/google/go-cmp v0.5.8
|
||||
github.com/google/go-replayers/httpreplay v1.1.1
|
||||
github.com/google/licenseclassifier v0.0.0-20210722185704-3043a050f148
|
||||
- github.com/kr/text v0.2.0 // indirect
|
||||
- github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
|
||||
github.com/otiai10/copy v1.6.0
|
||||
- github.com/pkg/errors v0.9.1 // indirect
|
||||
- github.com/sergi/go-diff v1.2.0 // indirect
|
||||
github.com/spf13/cobra v1.6.0
|
||||
- github.com/stretchr/testify v1.8.0 // indirect
|
||||
go.opencensus.io v0.23.0
|
||||
- golang.org/x/crypto v0.1.0 // indirect
|
||||
golang.org/x/mod v0.7.0
|
||||
golang.org/x/net v0.5.0
|
||||
golang.org/x/text v0.6.0
|
||||
golang.org/x/tools v0.5.0
|
||||
- gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
|
||||
gopkg.in/src-d/go-git.v4 v4.13.1
|
||||
k8s.io/klog/v2 v2.80.1
|
||||
)
|
||||
+
|
||||
+require (
|
||||
+ cloud.google.com/go v0.102.1 // indirect
|
||||
+ cloud.google.com/go/iam v0.4.0 // indirect
|
||||
+ cloud.google.com/go/storage v1.22.1 // indirect
|
||||
+ github.com/emirpasic/gods v1.12.0 // indirect
|
||||
+ github.com/go-logr/logr v1.2.0 // indirect
|
||||
+ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
||||
+ github.com/google/martian/v3 v3.3.2 // indirect
|
||||
+ github.com/inconshreveable/mousetrap v1.0.1 // indirect
|
||||
+ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
|
||||
+ github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
|
||||
+ github.com/kr/text v0.2.0 // indirect
|
||||
+ github.com/mitchellh/go-homedir v1.1.0 // indirect
|
||||
+ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
|
||||
+ github.com/pkg/errors v0.9.1 // indirect
|
||||
+ github.com/sergi/go-diff v1.2.0 // indirect
|
||||
+ github.com/spf13/pflag v1.0.5 // indirect
|
||||
+ github.com/src-d/gcfg v1.4.0 // indirect
|
||||
+ github.com/stretchr/testify v1.8.0 // indirect
|
||||
+ github.com/xanzy/ssh-agent v0.2.1 // indirect
|
||||
+ golang.org/x/crypto v0.1.0 // indirect
|
||||
+ golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect
|
||||
+ golang.org/x/sys v0.4.0 // indirect
|
||||
+ google.golang.org/api v0.93.0 // indirect
|
||||
+ google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959 // indirect
|
||||
+ google.golang.org/grpc v1.48.0 // indirect
|
||||
+ google.golang.org/protobuf v1.28.1 // indirect
|
||||
+ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
|
||||
+ gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
|
||||
+ gopkg.in/warnings.v0 v0.1.2 // indirect
|
||||
+)
|
||||
@@ -10,23 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-licenses";
|
||||
version = "1.6.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "go-licenses";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GAlwTVoVA+n9+EfhybmpKm16FoY9kFzrxy1ZQxS6A8E=";
|
||||
hash = "sha256-byKuUf8XMyXjAHZUANaBVAc6c2Jz9mEEdRxAy69P2QM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ToRn2wj7Yi+UDJwvAhV0ACEhqlcQjt4bRpz7abNRt9A=";
|
||||
|
||||
patches = [
|
||||
# Without this, we get error messages like:
|
||||
# vendor/golang.org/x/sys/unix/syscall.go:83:16: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod)
|
||||
# The patch was generated by changing "go 1.16" to "go 1.17" and executing `go mod tidy`.
|
||||
./fix-go-version-error.patch
|
||||
];
|
||||
vendorHash = "sha256-AYbx/DmYnbjJ2iqx34t/dUsthTjJ+YDvfxxCl/cJenI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "grafana-image-renderer";
|
||||
version = "5.7.2";
|
||||
version = "5.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "grafana-image-renderer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-b3+mh6RyXeHwFJQV9O0x/L0AMwF4P+dtS0s+L20PqJI=";
|
||||
hash = "sha256-CrJkBx2BMGlFtqXR174A5CVTH2GIZHTVxxwJjCi68pg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nRwd1luj8AFjDM67KtinVxRd31lUO+Vv3PDnsv2BMZU=";
|
||||
vendorHash = "sha256-3nd0m0PltTiJX5e1tbQ7LSgUmDRXC8nRktOVAIgHOCU=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace go.mod --replace-fail 'go 1.26.1' 'go 1.25.7'
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "iotas";
|
||||
version = "0.12.7";
|
||||
version = "2026.4";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
owner = "World";
|
||||
repo = "iotas";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LA00Szhjk/tzGnzDGm65SCgH6l2fk+8+p4PhIpB7T1I=";
|
||||
hash = "sha256-PLKKV6FNYvhvb1Kp2tYu7jXkzxfN/W0C618o5+/tenY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||
}:
|
||||
let
|
||||
version = "1.48.0";
|
||||
version = "1.48.1";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit version;
|
||||
@@ -34,10 +34,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "casey";
|
||||
repo = "just";
|
||||
tag = version;
|
||||
hash = "sha256-U/o9MyT/DMybfV/LHi50KL7sh6ZqJ6rvqAY5pzlJAA8=";
|
||||
hash = "sha256-w4u9grbK+L1q497qr04oARNonVuoiUs2d9eTC115T+s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1cSk7dGuh5ZX4XrYgOvqM89e54o8yrr13VpTtdFbtEA=";
|
||||
cargoHash = "sha256-bcepiMLdo8YNpkYGLoLUCcZ0f3l5tpMaRDUPhO86FEY=";
|
||||
|
||||
nativeBuildInputs =
|
||||
lib.optionals (installShellCompletions || installManPages) [ installShellFiles ]
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff '--color=auto' -u -r khard-0.20.1/doc/source/conf.py new/doc/source/conf.py
|
||||
--- khard-0.20.1/doc/source/conf.py 2025-07-29 04:47:18.000000000 +0800
|
||||
+++ new/doc/source/conf.py 2026-03-29 12:53:42.904389827 +0800
|
||||
@@ -52,8 +52,8 @@
|
||||
'sphinx.ext.autodoc', # https://pypi.org/project/sphinx-autodoc-typehints/
|
||||
'sphinx.ext.autosectionlabel',
|
||||
'sphinx.ext.todo',
|
||||
- 'sphinx_autodoc_typehints', # https://pypi.org/project/sphinx-autodoc-typehints/
|
||||
'sphinxarg.ext',
|
||||
+ 'sphinx_autodoc_typehints', # https://pypi.org/project/sphinx-autodoc-typehints/
|
||||
]
|
||||
|
||||
autoapi_type = 'python'
|
||||
@@ -15,6 +15,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
hash = "sha256-s+W/rfa11+jxaNDDIMdLlU5NDvQZSyh5EUD+V3pI+Ug=";
|
||||
};
|
||||
|
||||
patches = [ ./khard-sphinx.patch ];
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -77,12 +77,8 @@
|
||||
if (USE_MIMALLOC)
|
||||
ExternalProject_add(mimalloc
|
||||
@@ -80,11 +80,7 @@
|
||||
ExternalProject_add(
|
||||
mimalloc
|
||||
PREFIX mimalloc
|
||||
- GIT_REPOSITORY https://github.com/microsoft/mimalloc
|
||||
- GIT_TAG v2.2.3
|
||||
@@ -10,7 +10,8 @@
|
||||
- CONFIGURE_COMMAND ""
|
||||
- BUILD_COMMAND ""
|
||||
+ SOURCE_DIR "MIMALLOC-SRC"
|
||||
INSTALL_COMMAND "")
|
||||
INSTALL_COMMAND ""
|
||||
)
|
||||
list(APPEND EXTRA_DEPENDS mimalloc)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lean4";
|
||||
version = "4.28.0";
|
||||
version = "4.29.0";
|
||||
|
||||
# Using a vendored version rather than nixpkgs' version to match the exact version required by
|
||||
# Lean. Apparently, even a slight version change can impact greatly the final performance.
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "leanprover";
|
||||
repo = "lean4";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-K6lWXZ8XVEv91skjCal+hML2Tzr9G804j9Roq+4HXQQ=";
|
||||
hash = "sha256-0v4OTrCLdHBbWJUq7hIjJonqget9SvsG3izGlOwhwyU=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
buildPackages,
|
||||
cargo-c,
|
||||
openssl,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "librice";
|
||||
# Cannot bump to 0.4.0 because it breaks webkitgtk_4_1's enableExperimental build.
|
||||
# /build/webkitgtk-2.52.1/Source/WebCore/platform/rice/GRefPtrRice.h:34:47: error: use of undeclared identifier 'rice_turn_config_ref'; did you mean 'rice_turn_config_free'?
|
||||
# 34 | WTF_DEFINE_GREF_TRAITS_INLINE(RiceTurnConfig, rice_turn_config_ref, rice_turn_config_unref)
|
||||
# | ^~~~~~~~~~~~~~~~~~~~
|
||||
# | rice_turn_config_free
|
||||
# Unpin when https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-50/elements/sdk/librice.bst moves to newer version.
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ystreet";
|
||||
repo = "librice";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CM+YoeVdWfnT/RjkHP0ILwMOkFEylFaN83B71r+S5Ik=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GNqzAFAnOYP5tCE4qb9F9XAlinX1xV4QyBWJjqXb5VE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-c
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for p in rice-proto rice-io; do
|
||||
${buildPackages.rust.envVars.setEnv} cargo cinstall -p ''${p} -j $NIX_BUILD_CORES --release \
|
||||
--frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}
|
||||
done
|
||||
'';
|
||||
|
||||
# All tests require network calls
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "A (sans-IO) implementation of ICE (RFC8445) protocol written in Rust";
|
||||
homepage = "https://github.com/ystreet/librice";
|
||||
license = with lib.licenses; [
|
||||
asl20
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ azban ];
|
||||
};
|
||||
})
|
||||
@@ -13,19 +13,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mcporter";
|
||||
version = "0.7.3";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "steipete";
|
||||
repo = "mcporter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-x/2Ln6kohj59RSJgctWlYKckmGbWjY2ryPaLhoj0Q48=";
|
||||
hash = "sha256-I7UqHsi4pw4wQB4bb8XObo4aUOVtYpF17aYzEHzgCrg=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-0nc+jYANd95/R+BrkGRHcdqw9/RqMja88qkVvHtj1W4=";
|
||||
hash = "sha256-OJhlpKwRCE7IqstwIzj1dBJMbMyPVA/w3RVnYfjz764=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nerva";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praetorian-inc";
|
||||
repo = "nerva";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-X39P/4OrRDwZieCDVaMj0YJhotZ0PHMGVgN5ky5+pDk=";
|
||||
hash = "sha256-N4j+jJBTC5kGHyRlu2JNqTbJMc7RIde4JGJpg3ecDqk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-c8dkMsuzBuHBPBTHAhwMgpGLUVLkzBmItnp1QAUBQSI=";
|
||||
vendorHash = "sha256-j+8KZxHnYrtxwdBxpAXZ+Q5Sm1REluUEmD69tKYTCag=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -17,7 +17,7 @@ buildGoModule (
|
||||
ui = buildNpmPackage {
|
||||
inherit (finalAttrs) src version;
|
||||
pname = "ntfy-sh-ui";
|
||||
npmDepsHash = "sha256-PmhWzktybM6Cg7yYRfbxWE83C+XkmHh4garHhsydwwE=";
|
||||
npmDepsHash = "sha256-ZH/RlV8TZuyx1pwIyDpdQgkFy2XTVQe7OCVACtxFayQ=";
|
||||
|
||||
prePatch = ''
|
||||
cd web/
|
||||
@@ -37,16 +37,16 @@ buildGoModule (
|
||||
in
|
||||
{
|
||||
pname = "ntfy-sh";
|
||||
version = "2.19.2";
|
||||
version = "2.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "binwiederhier";
|
||||
repo = "ntfy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HISQnb6LkKGujZsWCzVD3dTuobhUXqrmTFuov7dU+lY=";
|
||||
hash = "sha256-yMMhtqUXdQB6s5fH8Jtfkf8X2P7WA+MuLuhbex6UyOQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mr2PbxT5QWf4HZGgUg+oUjauqmZ6bh6N3f0ytwPDppU=";
|
||||
vendorHash = "sha256-HbgS68fhbSUK2uRZFZS0WvW3bIofIHpqObODQvVi0aY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -13,18 +13,18 @@
|
||||
}:
|
||||
let
|
||||
pname = "onedriver";
|
||||
version = "0.14.1";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jstaf";
|
||||
repo = "onedriver";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mA5otgqXQAw2UYUOJaC1zyJuzEu2OS/pxmjJnWsVdxs=";
|
||||
hash = "sha256-DCxF52CtA9KAP+yz5Rgzc/nUAXtZwfYAVU7oHREJlRY=";
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version src;
|
||||
vendorHash = "sha256-OOiiKtKb+BiFkoSBUQQfqm4dMfDW3Is+30Kwcdg8LNA=";
|
||||
vendorHash = "sha256-Ifcmf9AtZnrjgTPQnof/ap0TY19zHVftm5N4JgvbAgs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -51,19 +51,19 @@ buildGoModule {
|
||||
install -Dm644 ./pkg/resources/onedriver.png $out/share/icons/onedriver/onedriver.png
|
||||
install -Dm644 ./pkg/resources/onedriver-128.png $out/share/icons/onedriver/onedriver-128.png
|
||||
|
||||
install -Dm644 ./pkg/resources/onedriver.desktop $out/share/applications/onedriver.desktop
|
||||
install -Dm644 ./pkg/resources/onedriver-launcher.desktop $out/share/applications/onedriver-launcher.desktop
|
||||
install -Dm644 ./pkg/resources/onedriver@.service $out/lib/systemd/user/onedriver@.service
|
||||
|
||||
mkdir -p $out/share/man/man1
|
||||
installManPage ./pkg/resources/onedriver.1
|
||||
|
||||
substituteInPlace $out/share/applications/onedriver.desktop \
|
||||
--replace "/usr/bin/onedriver-launcher" "$out/bin/onedriver-launcher" \
|
||||
--replace "/usr/share/icons" "$out/share/icons"
|
||||
substituteInPlace $out/share/applications/onedriver-launcher.desktop \
|
||||
--replace-fail "/usr/bin/onedriver-launcher" "$out/bin/onedriver-launcher" \
|
||||
--replace-fail "/usr/share/icons" "$out/share/icons"
|
||||
|
||||
substituteInPlace $out/lib/systemd/user/onedriver@.service \
|
||||
--replace "/usr/bin/onedriver" "$out/bin/onedriver" \
|
||||
--replace "/usr/bin/fusermount" "${wrapperDir}/fusermount"
|
||||
--replace-fail "/usr/bin/onedriver" "$out/bin/onedriver" \
|
||||
--replace-fail "/usr/bin/fusermount" "${wrapperDir}/fusermount"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -76,7 +76,10 @@ buildGoModule {
|
||||
'';
|
||||
inherit (src.meta) homepage;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.massimogengarelli ];
|
||||
maintainers = [
|
||||
lib.maintainers.massimogengarelli
|
||||
lib.maintainers.lnk3
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,12 +16,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
hash = "sha256-72HFPByH4FBRIYaTeEWaZ2dW43Q1OjosT3qAOMiu5t4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "[project.scripts]" "" \
|
||||
--replace-fail 'penelope = "penelope:main"' ""
|
||||
'';
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
# Project has no tests
|
||||
@@ -31,9 +25,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
description = "Penelope Shell Handler";
|
||||
homepage = "https://github.com/brightio/penelope";
|
||||
changelog = "https://github.com/brightio/penelope/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "penelope.py";
|
||||
mainProgram = "penelope";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
dpkg,
|
||||
}:
|
||||
let
|
||||
version = "2.0.3";
|
||||
version = "2.1.1";
|
||||
deb =
|
||||
runCommand "PureRef-${version}_x64"
|
||||
{
|
||||
@@ -19,7 +19,7 @@ let
|
||||
cacert
|
||||
dpkg
|
||||
];
|
||||
outputHash = "sha256-VdKu1YQa+//FbNWqgTPoUhY4pSekgVohI53D4i5hVkQ=";
|
||||
outputHash = "sha256-Dyozn6WJ93AvXavlW3xmY5p5TsQxU+dJkogEBE8e+zs=";
|
||||
outputHashMode = "recursive";
|
||||
}
|
||||
''
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "sandhole";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EpicEric";
|
||||
repo = "sandhole";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HsTH3/j3S5pZ+StGElMjkBoqWKsixAP/TDWpPTO/h3M=";
|
||||
hash = "sha256-v0wfdVhAOVCkxI59M7x7MneQrEK+Rfua4PcAcBq71Ho=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pGA1Q5gx1xNRpH3DGkJndLZkhm6ws52EBQKlIpWNOMo=";
|
||||
cargoHash = "sha256-WD2f9P42mGN3l111Cr3m75EppAWxsmFFsVSt8dc+RdQ=";
|
||||
|
||||
# All integration tests require networking.
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sarasa-gothic";
|
||||
version = "1.0.36";
|
||||
version = "1.0.37";
|
||||
|
||||
src = fetchurl {
|
||||
# Use the 'ttc' files here for a smaller closure size.
|
||||
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
|
||||
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
|
||||
hash = "sha256-iM/AfX2Ws4/CVw7PWSNMTPz49WEK8m8RMFpsTUS7+CI=";
|
||||
hash = "sha256-YIupzXfSAnep7qKQ4sNtxABUiDwJvzX5QtiUduYEHb4=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -20,16 +20,16 @@ let
|
||||
television = rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "television";
|
||||
|
||||
version = "0.15.3";
|
||||
version = "0.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexpasmantier";
|
||||
repo = "television";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ZVQdh9C0kd6O+PDcSSCPvzPa66Cl3J+2so1sTKjSM1I=";
|
||||
hash = "sha256-0tZx6UgXlB6rVAtf10gEFcHGzGpI6vfWBAYxvfOa5MM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eQBwoDSvRPAIJ7l2QsyQtCEdwWXdBjf/8Y1FoikkrSw=";
|
||||
cargoHash = "sha256-hnFE+s1btCzMEUvdIENsNwnTq3U1hLxjHlD9UAsT/es=";
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "tsgolint";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxc-project";
|
||||
repo = "tsgolint";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7uHdK1fQ77d+4Yl4wmYP2IR0t+/ddt+LBups+BOvpEo=";
|
||||
hash = "sha256-1qz4lP3kz7Njg9f513z/RS566vIN3f3Mbko7dhOjp+8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -20,19 +20,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "video-trimmer";
|
||||
version = "25.03";
|
||||
version = "26.03";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "YaLTeR";
|
||||
repo = "video-trimmer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pJCXL0voOoc8KpYECYRWGefYMrsApNPST4wv8SQlH34=";
|
||||
hash = "sha256-ro7yOl+OZ4IZxIkRMjYf4IqOxfCAB4PdIlWUEuymOc8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-3ycc4jXneGsz9Jp9Arzf224JPAKM+PxUkitWcIXre8Y=";
|
||||
hash = "sha256-nYPVRTMY0XA3VDclid7+w6SMFl0i4Ra6HYKJtTTC1y0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "warp";
|
||||
version = "0.9.2";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "warp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-60FhXIO1etcMhZJuSQjO2UWrkwV+AJOFmaAIi3uLpzY=";
|
||||
hash = "sha256-cFMIMNAVrP3rF7UQeKgSdaRZmJT8XcERR4BSLYqxSoI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-sQFJ+eR/Ywl3KPN50P2RVHKAjxtOUb6YRoThRb5aMe8=";
|
||||
hash = "sha256-CFe6Hg1cSz59agZ/eCL7PfnMe/N0vJvAs3gzfjZCwlY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,20 +13,20 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wasmtime";
|
||||
version = "42.0.1";
|
||||
version = "43.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wasmtime";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vKKPeYRqRWVx+ZErnXf8k7GUASaNeASR9YkPciWcLJU=";
|
||||
hash = "sha256-zCU3CtqbqagSWQZULvTxCRwK709ZfyL9PGtjJpNAYQE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
|
||||
auditable = false;
|
||||
|
||||
cargoHash = "sha256-9OvBmbld4DK5c+E3m5EEQwUhhLZIK5l0cc3zCipSQ20=";
|
||||
cargoHash = "sha256-WJz7J9FHGRqni889o2omkC1K+rwZ8iM6SarT1nd1p0Q=";
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"wasmtime-cli"
|
||||
|
||||
@@ -25,13 +25,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wipeout-rewrite";
|
||||
version = "0-unstable-2026-03-17";
|
||||
version = "0-unstable-2026-03-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phoboslab";
|
||||
repo = "wipeout-rewrite";
|
||||
rev = "55fd79749ea69d8dce99326830cb0c5097994bca";
|
||||
hash = "sha256-2LzlAx9cNye/ZE0+8ZMWTdEJEGhTnXJrSLhryvfqRqo=";
|
||||
rev = "ac9d0aca74fbe62e3f5cdddd91863754c5379a0b";
|
||||
hash = "sha256-35+P37pLIa2rx5Q4bJAdZR4LAYUhewcxZ9xtdj77t0Y=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "wpprobe";
|
||||
version = "0.11.1";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chocapikk";
|
||||
repo = "wpprobe";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ELj2qDRUqcSP1T0Q0/5oX8cLDTqq2LKgT364ctJakTA=";
|
||||
hash = "sha256-ZPivKTcbJub3uUBvTMnfFflra+RKQQUsvpAdfOjWHnI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pAKFrdja+rH0kiJH6hToZwLjE8lLBHFAUCjnCLbgxVo=";
|
||||
|
||||
@@ -21,25 +21,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "xrizer";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Supreeeme";
|
||||
repo = "xrizer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IRhLWlGHywp0kZe5aGmMHAF1zZwva3sGg68eG1E2K9A=";
|
||||
hash = "sha256-y/K+eXECUi9wGol0IUuIUI9hqhEN8GHaOO5i1xMFNQo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/Supreeeme/xrizer/pull/262
|
||||
(fetchpatch2 {
|
||||
name = "xrizer-fix-aarch64.patch";
|
||||
url = "https://github.com/Supreeeme/xrizer/commit/70ea6f616cd7608462cdf2f5bf76a85acf23fe33.patch?full_index=1";
|
||||
hash = "sha256-Bwu/GjsaoS1VqpXmijBuZcJFUf6kRYWYWpGxm40AWyc=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoHash = "sha256-orfK5pwWv91hA7Ra3Kk+isFTR+qMHSZ0EYZTVbf0fO0=";
|
||||
cargoHash = "sha256-btGPIujawY5NPmx7hGBxW5ZYi2RvboyQpfw6fA3c3jE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||
let
|
||||
pname = "zettlr";
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
|
||||
hash = "sha256-/gRAfZhnYeHrZvpB/7bDuOxuwOphFLJOmn+HRBf0arQ=";
|
||||
hash = "sha256-nkGcVg/4Vsg+1uy4RlC9eYTiUlClWCeZ12qc7QfFIN8=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit pname version src;
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
import ./common-hadrian.nix {
|
||||
version = "9.12.4";
|
||||
sha256 = "02d1ee5080acf00e135b93b238f09015b06ff27254cde59669cf57c42c2bee43";
|
||||
}
|
||||
@@ -319,24 +319,34 @@
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/26518 krank:ignore-line
|
||||
./ghc-define-undefined-elf-st-visibility.patch
|
||||
]
|
||||
|
||||
++ lib.optionals (lib.versionOlder version "9.15.20260127") [
|
||||
# Fix docs build with Sphinx >= 9 https://gitlab.haskell.org/ghc/ghc/-/issues/26810
|
||||
./ghc-9.6-or-later-docs-sphinx-9.patch
|
||||
]
|
||||
++
|
||||
lib.optionals
|
||||
(
|
||||
lib.versionOlder version "9.12.4"
|
||||
|| (lib.versionAtLeast version "9.14" && lib.versionOlder version "9.15.20260129")
|
||||
)
|
||||
[
|
||||
./ghc-9.6-or-later-docs-sphinx-9.patch
|
||||
]
|
||||
|
||||
# Fixes rts/Types.h missing from the install when targeting javascript
|
||||
# See https://gitlab.haskell.org/ghc/ghc/-/merge_requests/15740, krank:ignore-line
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/27033. krank:ignore-line
|
||||
# TODO(@sternenseemann): patch likely included in 9.12.4
|
||||
++ lib.optionals (lib.versionAtLeast version "9.12.3" && lib.versionOlder version "9.15") [
|
||||
(fetchpatch {
|
||||
name = "ghc-9.12.3-ghcjs-install-rts-types.h.patch";
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/5b1be555be4f0989d78c274991c5046d7ac6d25e.patch";
|
||||
hash = "sha256-pv4NDyQ6FlZgmTYZ4Ghis4qggt7nCDMhqGaFxTxVPac=";
|
||||
includes = [ "rts/rts.cabal" ];
|
||||
})
|
||||
]
|
||||
++
|
||||
lib.optionals
|
||||
(
|
||||
version == "9.12.3"
|
||||
# TODO(@sternenseemann): 9.14.2 will likely also have this patch
|
||||
|| (lib.versionAtLeast version "9.14" && lib.versionOlder version "9.15.20260127")
|
||||
)
|
||||
[
|
||||
(fetchpatch {
|
||||
name = "ghc-9.12.3-ghcjs-install-rts-types.h.patch";
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/5b1be555be4f0989d78c274991c5046d7ac6d25e.patch";
|
||||
hash = "sha256-pv4NDyQ6FlZgmTYZ4Ghis4qggt7nCDMhqGaFxTxVPac=";
|
||||
includes = [ "rts/rts.cabal" ];
|
||||
})
|
||||
]
|
||||
|
||||
++ (import ./common-llvm-patches.nix { inherit lib version fetchpatch; });
|
||||
|
||||
|
||||
@@ -67,14 +67,14 @@ intel-oneapi.mkIntelOneApi (finalAttrs: {
|
||||
pname = "intel-oneapi-base-toolkit";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/3b7a16b3-a7b0-460f-be16-de0d64fa6b1e/intel-oneapi-base-toolkit-2025.2.1.44_offline.sh";
|
||||
hash = "sha256-oVURJZG6uZ3YvYefUuqeakbaVR47ZgWduBV6bS6r5Dk=";
|
||||
url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/6caa93ca-e10a-4cc5-b210-68f385feea9e/intel-oneapi-base-toolkit-2025.3.1.36_offline.sh";
|
||||
hash = "sha256-xXV6FP4t1ChSi/bcDFpkmMexNejPTtk2Nay/PmSpCFA=";
|
||||
};
|
||||
|
||||
versionYear = "2025";
|
||||
versionMajor = "2";
|
||||
versionMajor = "3";
|
||||
versionMinor = "1";
|
||||
versionRel = "44";
|
||||
versionRel = "36";
|
||||
|
||||
inherit components;
|
||||
|
||||
@@ -180,6 +180,7 @@ intel-oneapi.mkIntelOneApi (finalAttrs: {
|
||||
"libffi.so.6"
|
||||
"libgdbm.so.4"
|
||||
"libopencl-clang.so.14"
|
||||
"libreadline.so.6"
|
||||
];
|
||||
|
||||
passthru.updateScript = intel-oneapi.mkUpdateScript {
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
# For the updater script
|
||||
writeShellApplication,
|
||||
curl,
|
||||
jq,
|
||||
htmlq,
|
||||
common-updater-scripts,
|
||||
writableTmpDirAsHomeHook,
|
||||
@@ -129,11 +128,10 @@
|
||||
downloadPage,
|
||||
file,
|
||||
}:
|
||||
writeShellApplication {
|
||||
lib.getExe (writeShellApplication {
|
||||
name = "update-intel-oneapi";
|
||||
runtimeInputs = [
|
||||
curl
|
||||
jq
|
||||
htmlq
|
||||
common-updater-scripts
|
||||
];
|
||||
@@ -141,7 +139,7 @@
|
||||
download_page=${lib.escapeShellArg downloadPage}
|
||||
pname=${lib.escapeShellArg pname}
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
packageDir="$nixpkgs/pkgs/by-name/in/intel-oneapi"
|
||||
packageDir="$nixpkgs/pkgs/development/libraries/intel-oneapi"
|
||||
file="$packageDir"/${lib.escapeShellArg file}
|
||||
|
||||
echo 'Figuring out the download URL' >&2
|
||||
@@ -152,25 +150,30 @@
|
||||
| htmlq 'code' --text \
|
||||
| grep "wget.*$pname.*sh")"
|
||||
|
||||
regex="wget (.*$pname.([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)_offline[.]sh)"
|
||||
# _offline is optional: Intel sometimes only links the online installer, which shares the same UUID and version.
|
||||
regex="wget (https://registrationcenter-download[.]intel[.]com/akdlm/IRC_NAS/([0-9a-z-]+)/$pname.([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)(_offline)?[.]sh)"
|
||||
if [[ "$wget_command" =~ $regex ]]; then
|
||||
url="''${BASH_REMATCH[1]}"
|
||||
versionYear="''${BASH_REMATCH[2]}"
|
||||
versionMajor="''${BASH_REMATCH[3]}"
|
||||
versionMinor="''${BASH_REMATCH[4]}"
|
||||
versionRel="''${BASH_REMATCH[5]}"
|
||||
uuid="''${BASH_REMATCH[2]}"
|
||||
versionYear="''${BASH_REMATCH[3]}"
|
||||
versionMajor="''${BASH_REMATCH[4]}"
|
||||
versionMinor="''${BASH_REMATCH[5]}"
|
||||
versionRel="''${BASH_REMATCH[6]}"
|
||||
else
|
||||
echo "'$wget_command' does not match the expected format $regex" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "$(grep 'url =' "$file")" =~ "$url" ]] && [[ "''${BASH_REMATCH[0]}" == "$url" ]]; then
|
||||
# Always reconstruct to point at the offline installer
|
||||
url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/$uuid/$pname-$versionYear.$versionMajor.$versionMinor.''${versionRel}_offline.sh"
|
||||
|
||||
if grep -qF "url = \"$url\"" "$file"; then
|
||||
echo "The URL is the same ($url), skipping update" >&2
|
||||
else
|
||||
echo "The new download URL is $url, prefetching it to store" >&2
|
||||
hash="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --quiet "$url")")"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "The new download URL is $url, prefetching it to store" >&2
|
||||
hash="$(nix hash convert --hash-algo sha256 "$(nix-prefetch-url --quiet "$url")")"
|
||||
|
||||
sed -i "s|versionYear = \".*\";|versionYear = \"$versionYear\";|" "$file"
|
||||
sed -i "s|versionMajor = \".*\";|versionMajor = \"$versionMajor\";|" "$file"
|
||||
sed -i "s|versionMinor = \".*\";|versionMinor = \"$versionMinor\";|" "$file"
|
||||
@@ -178,7 +181,7 @@
|
||||
sed -i "s|url = \".*\";|url = \"$url\";|" "$file"
|
||||
sed -i "s|hash = \".*\";|hash = \"$hash\";|" "$file"
|
||||
'';
|
||||
};
|
||||
});
|
||||
|
||||
base = callPackage ./base.nix { };
|
||||
hpc = callPackage ./hpc.nix { };
|
||||
|
||||
@@ -30,14 +30,14 @@ intel-oneapi.mkIntelOneApi (finalAttrs: {
|
||||
pname = "intel-oneapi-hpc-toolkit";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/2d2a6686-ff06-44ce-baf0-ab84f8dafa89/intel-oneapi-hpc-toolkit-2025.2.1.44_offline.sh";
|
||||
hash = "sha256-SC0eDu4TGf9bZB8aAX4AnIvguTpP0afOj9JqA63QSPs=";
|
||||
url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/f59a79aa-4a6e-46e8-a6c2-be04bb13f274/intel-oneapi-hpc-toolkit-2025.3.1.55_offline.sh";
|
||||
hash = "sha256-NwLR7OWzmKYM05BZ2U7IZI+3IBnb0wiUgF+vHrX0Tro=";
|
||||
};
|
||||
|
||||
versionYear = "2025";
|
||||
versionMajor = "2";
|
||||
versionMajor = "3";
|
||||
versionMinor = "1";
|
||||
versionRel = "44";
|
||||
versionRel = "55";
|
||||
|
||||
inherit components;
|
||||
|
||||
|
||||
@@ -51,6 +51,7 @@
|
||||
libintl,
|
||||
lcms2,
|
||||
libmanette,
|
||||
librice,
|
||||
geoclue2,
|
||||
flite,
|
||||
fontconfig,
|
||||
@@ -84,7 +85,7 @@ in
|
||||
# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "webkitgtk";
|
||||
version = "2.52.0";
|
||||
version = "2.52.1";
|
||||
name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}";
|
||||
|
||||
outputs = [
|
||||
@@ -99,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-sxxV8YGUrIO6CMm5O77/71en7P9/Qch00XqeeFPcoZ8=";
|
||||
hash = "sha256-I459UyBbFABK3X7rQpPJTW+/cJez7+987lUZ5cEhqQQ=";
|
||||
};
|
||||
|
||||
patches = lib.optionals clangStdenv.hostPlatform.isLinux [
|
||||
@@ -116,6 +117,14 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-MgaSpXq9l6KCLQdQyel6bQFHG53l3GY277WePpYXdjA=";
|
||||
name = "fix_ftbfs_riscv64.patch";
|
||||
})
|
||||
|
||||
# Fix webkitgtk_4_1 build
|
||||
# WebKitDOMDOMWindow.cpp:1085:10: error: variable has incomplete type 'void'
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=310915
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WebKit/WebKit/commit/40c315ca7b3ad6ae5c98d72a6927b3a75b43cb46.patch";
|
||||
hash = "sha256-xGPi5p2XhDxpd4NtZMrd1JbHvV2fey6V3eH0fgy6ifY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -197,6 +206,7 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals enableExperimental [
|
||||
# For ENABLE_WEB_RTC
|
||||
openssl
|
||||
librice
|
||||
# For ENABLE_WEBXR
|
||||
openxr-loader
|
||||
]
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aioairq";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CorantGmbH";
|
||||
repo = "aioairq";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TnO9tb56lKzoQxHXedBwePB474dAOFRi6fyygpFvb+8=";
|
||||
hash = "sha256-I8pbNYbSWns0fbJvgJ71AZK0SzpY/51MXLr7+D5/xF4=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aiodns";
|
||||
version = "4.0.0";
|
||||
pyproject = true;
|
||||
@@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "saghul";
|
||||
repo = "aiodns";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/iYkhzN01+NaUfMXaM39IvlEKfoKc29+f0S4y0y3GG8=";
|
||||
};
|
||||
|
||||
@@ -30,8 +30,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Simple DNS resolver for asyncio";
|
||||
homepage = "https://github.com/saghul/aiodns";
|
||||
changelog = "https://github.com/saghul/aiodns/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/saghul/aiodns/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "confection";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "explosion";
|
||||
repo = "confection";
|
||||
tag = "release-v${finalAttrs.version}";
|
||||
hash = "sha256-14e2aOE9HyqrLE6i8ljA81pi7PYdQL+AReo/HPzOwck=";
|
||||
hash = "sha256-64QwxK0Rl67n5vb/CuRJw/42A/SE9/Q5gtqITggYqhg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "hier-config";
|
||||
version = "3.4.2";
|
||||
version = "3.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netdevops";
|
||||
repo = "hier_config";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1E/eWODD4ESmQIZJEvFbeIa0w49i/bcPQSmxriT/m7k=";
|
||||
hash = "sha256-OMX66ffIPuWkjVEL8fe6E7WCVF+J9+suh5TsQW5e7IY=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202603271";
|
||||
version = "0.1.202603281";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-v25fp1KvR51wATdOP1eBgtNhxcQ7olAHR85KzSdSU/g=";
|
||||
hash = "sha256-Wl9GlMr8Y7jLjw6uYLb4JtLIzoQo8WZm0vOL9np1xPU=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -50,14 +50,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "litellm";
|
||||
version = "1.81.14";
|
||||
version = "1.82.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BerriAI";
|
||||
repo = "litellm";
|
||||
tag = "v${version}-stable";
|
||||
hash = "sha256-1QYqTsTOynLrLmjzYL4TPxwKagFKFXIQbQ1rfw8TXjc=";
|
||||
hash = "sha256-oeaK8Flt/oSX9nA7tFHyBp+hvsDeRK+w16zljyA9vdE=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "opower";
|
||||
version = "0.17.1";
|
||||
version = "0.18.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tronikos";
|
||||
repo = "opower";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZBSpEEGChrUjshEXstzFG1Bw1mrRINAeRNiywNEfIhA=";
|
||||
hash = "sha256-ZkYZsML3xBMGNNhwVzOuUmVeRU/aJnHld6hSACuhTxc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pueblo";
|
||||
version = "0.0.15";
|
||||
version = "0.0.17";
|
||||
pyproject = true;
|
||||
|
||||
# This tarball doesn't include tests unfortunately, and the GitHub tarball
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
# should work for us as well.
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bz4ZxKp5oUfhLDMv0etJfDIPCoMcDtwCcA2hw+DAS8I=";
|
||||
hash = "sha256-8JQo581zJ47omJJkJ1dMmkKY+ycddJ3cKI2v3lxk0Ys=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
tornado,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pycares";
|
||||
version = "5.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-WjwknIMEMmMUOYFfmoGEY0FvKoy9semI54dX3prnUIE=";
|
||||
};
|
||||
|
||||
@@ -47,8 +47,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python interface for c-ares";
|
||||
homepage = "https://github.com/saghul/pycares";
|
||||
changelog = "https://github.com/saghul/pycares/releases/tag/v${version}";
|
||||
changelog = "https://github.com/saghul/pycares/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
typing-extensions,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyreaderwriterlock";
|
||||
version = "1.0.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elarivie";
|
||||
repo = "pyReaderWriterLock";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8FC+4aDgGpF1BmOdlkFtMy7OfWdSmvn9fjKXSmmeJlg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ typing-extensions ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "readerwriterlock" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/elarivie/pyReaderWriterLock/blob/master/CHANGELOG.md";
|
||||
description = "Implementation of the Readers-writers problem";
|
||||
homepage = "https://github.com/elarivie/pyReaderWriterLock";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ MayNiklas ];
|
||||
};
|
||||
}
|
||||
@@ -8,16 +8,16 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pysigma-backend-splunk";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SigmaHQ";
|
||||
repo = "pySigma-backend-splunk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SiEESeF0YqPYDAK3OUEkqSHmn4uM5LQrCLOHvOy26Io=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OIW/ylN4QlguKnY2/yLICEu3Ix41lfXN5qil5dD+eTM=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
@@ -34,8 +34,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Library to support Splunk for pySigma";
|
||||
homepage = "https://github.com/SigmaHQ/pySigma-backend-splunk";
|
||||
changelog = "https://github.com/SigmaHQ/pySigma-backend-splunk/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/SigmaHQ/pySigma-backend-splunk/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.1.63";
|
||||
version = "3.1.64";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-MpoB0tf6KoPq0/xrKsHHRgLlcSBFrTIoFSwTziLPJX8=";
|
||||
hash = "sha256-X8UCnuXhaPsBrtuFz8cLkvag86Fa5aO7YXuPmazZdVA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -37,6 +37,9 @@ mkKdeDerivation {
|
||||
# @QtBinariesDir@ only appears in the *removed* lines of the diff
|
||||
QtBinariesDir = null;
|
||||
})
|
||||
|
||||
# stop accidentally duplicating fontconfig configs
|
||||
./fontconfig.patch
|
||||
];
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
diff --git a/kcms/fonts/kxftconfig.cpp b/kcms/fonts/kxftconfig.cpp
|
||||
index b67d885de7..29cc3a00d8 100644
|
||||
--- a/kcms/fonts/kxftconfig.cpp
|
||||
+++ b/kcms/fonts/kxftconfig.cpp
|
||||
@@ -310,6 +310,10 @@ bool KXftConfig::apply()
|
||||
m_excludePixelRange.from = (int)point2Pixel(m_excludeRange.from);
|
||||
m_excludePixelRange.to = (int)point2Pixel(m_excludeRange.to);
|
||||
|
||||
+ // Ensure m_doc is the config file we want
|
||||
+ m_doc.clear();
|
||||
+ parseConfigFile(m_file);
|
||||
+
|
||||
FcAtomic *atomic = FcAtomicCreate((const unsigned char *)(QFile::encodeName(m_file).data()));
|
||||
|
||||
ok = false;
|
||||
@@ -618,7 +622,7 @@ void KXftConfig::readContents()
|
||||
}
|
||||
}
|
||||
} else if (childNodesCount == 3) { // CPD: Is target "font" or "pattern" ????
|
||||
- if (u"font" != e.attribute(u"target"_s)) {
|
||||
+ if (u"font" != e.attribute(u"target"_s) && u"pattern" != e.attribute(u"target"_s)) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -692,7 +696,7 @@ void KXftConfig::applySubPixelType()
|
||||
QDomElement editNode = m_doc.createElement(u"edit"_s);
|
||||
QDomText typeText = m_doc.createTextNode(toStr(m_subPixel.type));
|
||||
|
||||
- matchNode.setAttribute(u"target"_s, u"font"_s);
|
||||
+ matchNode.setAttribute(u"target"_s, u"pattern"_s);
|
||||
editNode.setAttribute(u"mode"_s, u"assign"_s);
|
||||
editNode.setAttribute(u"name"_s, u"rgba"_s);
|
||||
editNode.appendChild(typeNode);
|
||||
@@ -724,7 +728,7 @@ void KXftConfig::applyHintStyle()
|
||||
QDomElement matchNode = m_doc.createElement(u"match"_s), typeNode = m_doc.createElement(u"const"_s), editNode = m_doc.createElement(u"edit"_s);
|
||||
QDomText typeText = m_doc.createTextNode(toStr(m_hint.style));
|
||||
|
||||
- matchNode.setAttribute(u"target"_s, u"font"_s);
|
||||
+ matchNode.setAttribute(u"target"_s, u"pattern"_s);
|
||||
editNode.setAttribute(u"mode"_s, u"assign"_s);
|
||||
editNode.setAttribute(u"name"_s, u"hintstyle"_s);
|
||||
editNode.appendChild(typeNode);
|
||||
@@ -744,7 +748,7 @@ void KXftConfig::applyHinting()
|
||||
QDomElement matchNode = m_doc.createElement(u"match"_s), typeNode = m_doc.createElement(u"bool"_s), editNode = m_doc.createElement(u"edit"_s);
|
||||
QDomText typeText = m_doc.createTextNode(m_hinting.set ? u"true"_s : u"false"_s);
|
||||
|
||||
- matchNode.setAttribute(u"target"_s, u"font"_s);
|
||||
+ matchNode.setAttribute(u"target"_s, u"pattern"_s);
|
||||
editNode.setAttribute(u"mode"_s, u"assign"_s);
|
||||
editNode.setAttribute(u"name"_s, u"hinting"_s);
|
||||
editNode.appendChild(typeNode);
|
||||
@@ -778,7 +782,7 @@ void KXftConfig::applyExcludeRange(bool pixel)
|
||||
boolNode = m_doc.createElement(u"bool"_s);
|
||||
QDomText fromText = m_doc.createTextNode(fromString), toText = m_doc.createTextNode(toString), boolText = m_doc.createTextNode(u"false"_s);
|
||||
|
||||
- matchNode.setAttribute(u"target"_s, u"font"_s); // CPD: Is target "font" or "pattern" ????
|
||||
+ matchNode.setAttribute(u"target"_s, u"pattern"_s); // CPD: Is target "font" or "pattern" ????
|
||||
fromTestNode.setAttribute(u"qual"_s, u"any"_s);
|
||||
fromTestNode.setAttribute(u"name"_s, pixel ? u"pixelsize"_s : u"size"_s);
|
||||
fromTestNode.setAttribute(u"compare"_s, u"more_eq"_s);
|
||||
@@ -840,7 +844,7 @@ void KXftConfig::applyAntiAliasing()
|
||||
QDomElement editNode = m_doc.createElement(u"edit"_s);
|
||||
QDomText typeText = m_doc.createTextNode(m_antiAliasing.state == AntiAliasing::Enabled ? u"true"_s : u"false"_s);
|
||||
|
||||
- matchNode.setAttribute(u"target"_s, u"font"_s);
|
||||
+ matchNode.setAttribute(u"target"_s, u"pattern"_s);
|
||||
editNode.setAttribute(u"mode"_s, u"assign"_s);
|
||||
editNode.setAttribute(u"name"_s, u"antialias"_s);
|
||||
editNode.appendChild(typeNode);
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
srcOnly,
|
||||
kernel,
|
||||
kernelModuleMakeFlags,
|
||||
nix-update-script,
|
||||
@@ -10,28 +9,32 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amneziawg";
|
||||
version = "1.0.20251009";
|
||||
version = "1.0.20260322";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amnezia-vpn";
|
||||
repo = "amneziawg-linux-kernel-module";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OcMlwXOwjxLqHkAQHSwDigK6wuOFCSzoE5spVwybN1M=";
|
||||
hash = "sha256-Y6TETOo5oAr3ZtqsJX909zm38rXq+1fAXiRFSt+g2Gw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix aarch64-linux builds with NEON
|
||||
# upstream PR: https://github.com/amnezia-vpn/amneziawg-linux-kernel-module/pull/159
|
||||
./neon-619.patch
|
||||
];
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
hardeningDisable = [ "pic" ];
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
buildFlags = [
|
||||
"apply-patches"
|
||||
"module"
|
||||
];
|
||||
|
||||
makeFlags =
|
||||
kernelModuleMakeFlags
|
||||
++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]
|
||||
++ lib.optional (lib.versionAtLeast kernel.version "5.6") "KERNEL_SOURCE_DIR=${srcOnly kernel}";
|
||||
makeFlags = kernelModuleMakeFlags ++ [
|
||||
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
--- a/compat/simd/include/linux/simd.h
|
||||
+++ b/compat/simd/include/linux/simd.h
|
||||
@@ -18,31 +18,42 @@ typedef enum {
|
||||
HAVE_NO_SIMD = 1 << 0,
|
||||
HAVE_FULL_SIMD = 1 << 1,
|
||||
HAVE_SIMD_IN_USE = 1 << 31
|
||||
+} simd_state_t;
|
||||
+
|
||||
+typedef struct {
|
||||
+ simd_state_t state;
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0) && defined(CONFIG_KERNEL_MODE_NEON)
|
||||
+ struct user_fpsimd_state kstate;
|
||||
+#endif
|
||||
} simd_context_t;
|
||||
|
||||
#define DONT_USE_SIMD ((simd_context_t []){ HAVE_NO_SIMD })
|
||||
|
||||
static inline void simd_get(simd_context_t *ctx)
|
||||
{
|
||||
- *ctx = !IS_ENABLED(CONFIG_PREEMPT_RT) && !IS_ENABLED(CONFIG_PREEMPT_RT_BASE) && may_use_simd() ? HAVE_FULL_SIMD : HAVE_NO_SIMD;
|
||||
+ ctx->state = !IS_ENABLED(CONFIG_PREEMPT_RT) && !IS_ENABLED(CONFIG_PREEMPT_RT_BASE) && may_use_simd() ? HAVE_FULL_SIMD : HAVE_NO_SIMD;
|
||||
}
|
||||
|
||||
static inline void simd_put(simd_context_t *ctx)
|
||||
{
|
||||
#if defined(CONFIG_X86_64)
|
||||
- if (*ctx & HAVE_SIMD_IN_USE)
|
||||
+ if (ctx->state & HAVE_SIMD_IN_USE)
|
||||
kernel_fpu_end();
|
||||
#elif defined(CONFIG_KERNEL_MODE_NEON)
|
||||
- if (*ctx & HAVE_SIMD_IN_USE)
|
||||
+ if (ctx->state & HAVE_SIMD_IN_USE)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+ kernel_neon_end(&ctx->kstate);
|
||||
+#else
|
||||
kernel_neon_end();
|
||||
#endif
|
||||
- *ctx = HAVE_NO_SIMD;
|
||||
+#endif
|
||||
+ ctx->state = HAVE_NO_SIMD;
|
||||
}
|
||||
|
||||
static inline bool simd_relax(simd_context_t *ctx)
|
||||
{
|
||||
#ifdef CONFIG_PREEMPT
|
||||
- if ((*ctx & HAVE_SIMD_IN_USE) && need_resched()) {
|
||||
+ if ((ctx->state & HAVE_SIMD_IN_USE) && need_resched()) {
|
||||
simd_put(ctx);
|
||||
simd_get(ctx);
|
||||
return true;
|
||||
@@ -53,16 +64,20 @@ static inline bool simd_relax(simd_context_t *ctx)
|
||||
|
||||
static __must_check inline bool simd_use(simd_context_t *ctx)
|
||||
{
|
||||
- if (!(*ctx & HAVE_FULL_SIMD))
|
||||
+ if (!(ctx->state & HAVE_FULL_SIMD))
|
||||
return false;
|
||||
- if (*ctx & HAVE_SIMD_IN_USE)
|
||||
+ if (ctx->state & HAVE_SIMD_IN_USE)
|
||||
return true;
|
||||
#if defined(CONFIG_X86_64)
|
||||
kernel_fpu_begin();
|
||||
#elif defined(CONFIG_KERNEL_MODE_NEON)
|
||||
+#if LINUX_VERSION_CODE > KERNEL_VERSION(6, 19, 0)
|
||||
+ kernel_neon_begin(&ctx->kstate);
|
||||
+#else
|
||||
kernel_neon_begin();
|
||||
#endif
|
||||
- *ctx |= HAVE_SIMD_IN_USE;
|
||||
+#endif
|
||||
+ ctx->state |= HAVE_SIMD_IN_USE;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -191,6 +191,14 @@ in
|
||||
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
|
||||
inherit buildTargetLlvmPackages llvmPackages;
|
||||
};
|
||||
ghc9124 = callPackage ../development/compilers/ghc/9.12.4.nix {
|
||||
bootPkgs =
|
||||
# No suitable bindist packaged yet
|
||||
bb.packages.ghc9103;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
|
||||
inherit buildTargetLlvmPackages llvmPackages;
|
||||
};
|
||||
ghc9141 = callPackage ../development/compilers/ghc/9.14.1.nix {
|
||||
bootPkgs =
|
||||
# No suitable bindist packaged yet
|
||||
@@ -295,6 +303,11 @@ in
|
||||
ghc = bh.compiler.ghc9123;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
|
||||
};
|
||||
ghc9124 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc9124;
|
||||
ghc = bh.compiler.ghc9124;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
|
||||
};
|
||||
ghc9141 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc9141;
|
||||
ghc = bh.compiler.ghc9141;
|
||||
|
||||
@@ -420,6 +420,7 @@ mapAliases {
|
||||
pyramid_mako = throw "'pyramid_mako' has been renamed to/replaced by 'pyramid-mako'"; # Converted to throw 2025-10-29
|
||||
pyramid_multiauth = throw "'pyramid_multiauth' has been renamed to/replaced by 'pyramid-multiauth'"; # Converted to throw 2025-10-29
|
||||
pyreadability = throw "'pyreadability' has been renamed to/replaced by 'readability-lxml'"; # Converted to throw 2025-10-29
|
||||
pyreaderwriterlock = throw "'pyreaderwriterlock' has been removed as it was unmaintained upstream"; # Added 2026-03-21
|
||||
pyRFC3339 = throw "'pyRFC3339' has been renamed to/replaced by 'pyrfc3339'"; # Converted to throw 2025-10-29
|
||||
Pyro4 = throw "'Pyro4' has been renamed to/replaced by 'pyro4'"; # Converted to throw 2025-10-29
|
||||
Pyro5 = throw "'Pyro5' has been renamed to/replaced by 'pyro5'"; # Converted to throw 2025-10-29
|
||||
|
||||
@@ -14757,8 +14757,6 @@ self: super: with self; {
|
||||
|
||||
pyre-extensions = callPackage ../development/python-modules/pyre-extensions { };
|
||||
|
||||
pyreaderwriterlock = callPackage ../development/python-modules/pyreaderwriterlock { };
|
||||
|
||||
pyreadstat = callPackage ../development/python-modules/pyreadstat { };
|
||||
|
||||
pyrealsense2 = toPythonModule (
|
||||
|
||||
Reference in New Issue
Block a user