diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 4c4d9024a8a9..9e1eea6eeab8 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -27,7 +27,7 @@ ### Breaking changes {#sec-nixpkgs-release-26.05-lib-breaking} -- Create the first release note entry in this section! +- `corepack_latest` has been removed, as Corepack is no longer distributed with Node.js. ### Deprecations {#sec-nixpkgs-release-26.05-lib-deprecations} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index da66dd850817..5a429efe0a58 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16163,6 +16163,11 @@ githubId = 29855073; name = "Michael Colicchia"; }; + masrlinu = { + github = "masrlinu"; + githubId = 5259918; + name = "masrlinu"; + }; massimogengarelli = { email = "massimo.gengarelli@gmail.com"; github = "massix"; diff --git a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix index e52dd49082be..6d9b8bd185fd 100644 --- a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix @@ -12,19 +12,19 @@ let vsix = stdenvNoCC.mkDerivation (finalAttrs: { name = "kilo-code-${finalAttrs.version}.vsix"; pname = "kilo-code-vsix"; - version = "4.118.0"; + version = "4.124.0"; src = fetchFromGitHub { owner = "Kilo-Org"; repo = "kilocode"; tag = "v${finalAttrs.version}"; - hash = "sha256-k5dDgNUbOd+aOzPeub7P/uWDCeWO0ffyDaGtu2M87Wg="; + hash = "sha256-Dy0dd07pWsSbrO6BX7GEYf7CunXD0itaeIFRv9mQJks="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-YeCrmTPOeBfsSAMMv11ipHM8AgLzcy/sOW/Jg8H5H+w="; + hash = "sha256-hxgzmJD+Sl7E+ape1M1/Xl8XLtAhtht3AE45zHFctsQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix index ec50658c1c78..a4b13d7ef359 100644 --- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix +++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "pcsx-rearmed"; - version = "0-unstable-2025-08-16"; + version = "0-unstable-2025-11-24"; src = fetchFromGitHub { owner = "libretro"; repo = "pcsx_rearmed"; - rev = "228c14e10e9a8fae0ead8adf30daad2cdd8655b9"; - hash = "sha256-89/1axjha8Pv2MVWIr1P3TGq43HwhHeUZRUHkes52tk="; + rev = "9059485691c44cb3a555464b06eddfb1082d586c"; + hash = "sha256-sm59Xo6bEiajbmRYbCNnWToDLpJPdaJhovJe+g+GWVg="; }; dontConfigure = true; diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix index 79da226615e2..2cf39327d653 100644 --- a/pkgs/applications/emulators/libretro/cores/stella.nix +++ b/pkgs/applications/emulators/libretro/cores/stella.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella"; - version = "0-unstable-2025-11-09"; + version = "0-unstable-2025-11-26"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; - rev = "7c4e3b2f8c027ae54a3ad9c90d7f00fccde15de9"; - hash = "sha256-YPuMImDSXFqg+TVrBtBt6zaNb9ngg1jBLsMXv2Sk29c="; + rev = "ec7ad887c777a7924fdc786a9c5901e65d4c6cd0"; + hash = "sha256-M0DD+xNS+kf9x49YPZHulmYeV36fTh09rsRtQT+/zFY="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cc0172449622..805cadd5567f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -118,13 +118,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite_buildkite": { - "hash": "sha256-WP1CcGYtyItpMzKvYFiv5q0jQfvB5nSv8suDmSB1tSs=", + "hash": "sha256-0jxyoT9cKSNetA5bE455B7JN6izrRAS1EvnaN0RvA44=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.26.0", + "rev": "v1.27.0", "spdx": "MIT", - "vendorHash": "sha256-nKXQsAu1tHOHnle7G0Bt+CCNU9AGvxIIv6LJ/INiU7g=" + "vendorHash": "sha256-IsviKF349jAXs55wadqWgjJMgwcAhU5MqZ0Tg9eGjeI=" }, "camptocamp_pass": { "hash": "sha256-GQ2g7VyK+eeBqW3LMR4U0gMYsvQnG3y+KEKKkvnmfsk=", diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index d6d684302151..aac65ebfc2a5 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.58.1"; + version = "3.58.2"; outputs = [ "out" @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-A9jQzM0QKqGnPDHZ4vN0yz24Os3fwRJskYavY9psvsw="; + hash = "sha256-uhvDtXKKMbjJ6qDaHuiulG7dzFRO6CQtzMIJ2W3KozA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index 068976a78ac5..9959222ab73d 100644 --- a/pkgs/by-name/as/astro-language-server/package.nix +++ b/pkgs/by-name/as/astro-language-server/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "astro-language-server"; - version = "2.16.0"; + version = "2.16.1"; src = fetchFromGitHub { owner = "withastro"; repo = "astro"; rev = "@astrojs/language-server@${finalAttrs.version}"; - hash = "sha256-95IsNW/ha4XsH0E0adX3x9N7ANDL6MZreXy//mIQk/I="; + hash = "sha256-nZ00Zvks5O+6PvT68kiA3Y6/5yfOwKEpyIf8sPoURNo="; }; # https://pnpm.io/filtering#--filter-package_name-1 @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { prePnpmInstall ; fetcherVersion = 2; - hash = "sha256-LQpFnK+01SCyC4AHHHvdZlc6Ss40Lxq5+p9ioK10BSU="; + hash = "sha256-RVQfXvCRz8+t/En8FP+wQZD2qJiwlIUzmDK2aYfEK28="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/autotrash/package.nix b/pkgs/by-name/au/autotrash/package.nix index 1314d03f6eaa..ff11b549a12c 100644 --- a/pkgs/by-name/au/autotrash/package.nix +++ b/pkgs/by-name/au/autotrash/package.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonPackage rec { description = "Tool to automatically purge old trashed files"; license = lib.licenses.gpl3Plus; homepage = "https://bneijt.nl/pr/autotrash"; - changelog = "https://github.com/bneijt/autotrash/releases/tag/${src.tag}"; + changelog = "https://github.com/bneijt/autotrash/releases/tag/${version}"; maintainers = with lib.maintainers; [ sigmanificient mithicspirit diff --git a/pkgs/by-name/aw/aws-lc/package.nix b/pkgs/by-name/aw/aws-lc/package.nix index 51da17e1f2ab..1207ea2eb15e 100644 --- a/pkgs/by-name/aw/aws-lc/package.nix +++ b/pkgs/by-name/aw/aws-lc/package.nix @@ -6,17 +6,18 @@ ninja, testers, aws-lc, + nix-update-script, useSharedLibraries ? !stdenv.hostPlatform.isStatic, }: stdenv.mkDerivation (finalAttrs: { pname = "aws-lc"; - version = "1.56.0"; + version = "1.65.0"; src = fetchFromGitHub { owner = "aws"; repo = "aws-lc"; rev = "v${finalAttrs.version}"; - hash = "sha256-h7GrR86h/Z9pfJowABJFwBf/TlQzsMMG2x0/dsepbmQ="; + hash = "sha256-rpxEhOy9qYwIDa78u1BOgANfnkfGgGacKOjjlqXtn88="; }; outputs = [ @@ -53,28 +54,24 @@ stdenv.mkDerivation (finalAttrs: { ] ); - postFixup = '' - for f in $out/lib/crypto/cmake/*/crypto-targets.cmake; do - substituteInPlace "$f" \ - --replace-fail 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' - done - ''; - __darwinAllowLocalNetworking = true; - passthru.tests = { - version = testers.testVersion { - package = aws-lc; - command = "bssl version"; - }; - pkg-config = testers.hasPkgConfigModules { - package = aws-lc; - moduleNames = [ - "libcrypto" - "libssl" - "openssl" - ]; + passthru = { + tests = { + version = testers.testVersion { + package = aws-lc; + command = "bssl version"; + }; + pkg-config = testers.hasPkgConfigModules { + package = aws-lc; + moduleNames = [ + "libcrypto" + "libssl" + "openssl" + ]; + }; }; + updateScript = nix-update-script { }; }; meta = { diff --git a/pkgs/by-name/ba/banana-vera/package.nix b/pkgs/by-name/ba/banana-vera/package.nix index cfaa1713635e..c068230fb25c 100644 --- a/pkgs/by-name/ba/banana-vera/package.nix +++ b/pkgs/by-name/ba/banana-vera/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Epitech"; repo = "banana-vera"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-sSN3trSySJe3KVyrb/hc5HUGRS4M3c4UX9SLlzBM43c="; + hash = "sha256-sSN3trSySJe3KVyrb/hc5HUGRS4M3c4UX9SLlzBM43c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix index 0a55cfc7081c..42dead3fbe99 100644 --- a/pkgs/by-name/bi/bilibili/sources.nix +++ b/pkgs/by-name/bi/bilibili/sources.nix @@ -1,6 +1,6 @@ # Generated by ./update.sh - do not update manually! { - version = "1.17.3-1"; - arm64-hash = "sha256-BzWByQ9ConOHZvyTRp5ogWo9esRiD5Ub/TOeuYJTggA="; - x86_64-hash = "sha256-FCc1NO8Law7fMBqyBxQB4NJR0ZN/ZYZ0wakGrnNw4DU="; + version = "1.17.3-2"; + arm64-hash = "sha256-MhMeOVTex4W9qTAWXMx88kjOgoN0REHBqDY25K25tYc="; + x86_64-hash = "sha256-os6wN0gOKIYRTHXrN66T2J1wYgyH/J1VLTq4GPtk5tQ="; } diff --git a/pkgs/by-name/bo/boinc/package.nix b/pkgs/by-name/bo/boinc/package.nix index fb98264a223e..52390386ac90 100644 --- a/pkgs/by-name/bo/boinc/package.nix +++ b/pkgs/by-name/bo/boinc/package.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "boinc"; - version = "8.2.6"; + version = "8.2.8"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-ci5KwQgeWVSvq04S3cEpeMmFz/qXUxqO2pcZZw17BUU="; + hash = "sha256-yCsqkC6kle2oE29KP5qILe0F+5AOpFl2S3s2c09x7N4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/cano/package.nix b/pkgs/by-name/ca/cano/package.nix index 5702ce5fb19f..a72f49c789d1 100644 --- a/pkgs/by-name/ca/cano/package.nix +++ b/pkgs/by-name/ca/cano/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "CobbCoding1"; repo = "Cano"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OaWj0AKw3+sEhcAbIjgOLfxwCKRG6O1k+zSp0GnnFn8="; }; diff --git a/pkgs/by-name/ci/cista/package.nix b/pkgs/by-name/ci/cista/package.nix index d5338afc7b72..84e74ac266d3 100644 --- a/pkgs/by-name/ci/cista/package.nix +++ b/pkgs/by-name/ci/cista/package.nix @@ -5,26 +5,26 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cista"; version = "0.16"; src = fetchFromGitHub { owner = "felixguendling"; repo = "cista"; - rev = "v${version}"; - sha256 = "sha256-Q7IDQckFa/iMZ/f3Bim/yWyKCGqsNxJJ5C9PTToFZYI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q7IDQckFa/iMZ/f3Bim/yWyKCGqsNxJJ5C9PTToFZYI="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DCISTA_INSTALL=ON" ]; - meta = with lib; { + meta = { homepage = "https://cista.rocks"; description = "Simple, high-performance, zero-copy C++ serialization & reflection library"; - license = licenses.mit; - maintainers = [ maintainers.sigmanificient ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sigmanificient ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index 763262a67059..5839dbfc8299 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "12.10.0"; + version = "12.11.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-vzdh/cB78C2ug0QlpgpTyCYgiyF+tBIOQeJhjufg8Xs="; + hash = "sha256-SJslEdoLGl2Amu0iChIajcO2m1YXewGh8P6MZ7/Up/I="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-V2h+n6JVi3vPcNFVvnBTIq9+gorbTFi30mdBuraH/LU="; + vendorHash = "sha256-RFhF0OoznlHTvQesHA68gG7UhAbhUBdop8pX/szypUM="; ldflags = [ "-w" diff --git a/pkgs/by-name/co/coost/package.nix b/pkgs/by-name/co/coost/package.nix index e27524414864..0ecdf3cf684b 100644 --- a/pkgs/by-name/co/coost/package.nix +++ b/pkgs/by-name/co/coost/package.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "idealvin"; repo = "coost"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HbMenAL/UWsqQ1o7cMeWfwXkLh4GxIKV7iuZQD3hDA8="; }; postPatch = '' substituteInPlace cmake/coost.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ + --replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ ''; nativeBuildInputs = [ cmake ]; @@ -45,11 +45,11 @@ stdenv.mkDerivation (finalAttrs: { allowedVersions = "^[0-9]"; }; - meta = with lib; { + meta = { description = "Tiny boost library in C++11"; homepage = "https://github.com/idealvin/coost"; - license = licenses.mit; - maintainers = [ maintainers.sigmanificient ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sigmanificient ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/co/corepack/missing-hashes.json b/pkgs/by-name/co/corepack/missing-hashes.json new file mode 100644 index 000000000000..b9d097b31333 --- /dev/null +++ b/pkgs/by-name/co/corepack/missing-hashes.json @@ -0,0 +1,50 @@ +{ + "@esbuild/aix-ppc64@npm:0.25.12": "deeef1c11ce6d3dde3fc87368cf600218de18cff4cefe9888a09c39cc81177305c51c2dbccf6513c1b07795c67a11297c12014366fdeb9e51f34896020dd0210", + "@esbuild/android-arm64@npm:0.25.12": "7364b62583e0b0e0c3997d38815f462b11b85997efad33099715ede94a3bac29a80a98709e6ba902e9ced207242308d5923b249da7af2fb83b50efab4bd693fd", + "@esbuild/android-arm@npm:0.25.12": "04c9b60e0447331d7005745a7e9750987db465fd94717df62276b5dd7e13a3789db95b029f6e9f735e583b95f2f50b18f2aba1a381c8b5645156bb9d21ecacf0", + "@esbuild/android-x64@npm:0.25.12": "a22c5c03c55c3a12693b67f1a5de8dff7b853f79261ad1562a55b25bf91d327fd8c8899444c069a3fb68175c7df6dd0f2824ba5051927a4711f5841793cc58f2", + "@esbuild/darwin-arm64@npm:0.25.12": "5a66f6d44f2dac62341cc73956d8a1ea346e2e66f8cbdfcda9349a0b6ad01024d6c9c2ded05a9ba720c7541575c0b4be4c4ed6f62c529c13df141bb2a247f461", + "@esbuild/darwin-x64@npm:0.25.12": "181a933b603253a3eab9173a97e619b59fb953c70309fd3e005e58ed32654c866f752edde7250e63f788bb857e13b28c710d87496479b2de894226bf5779661e", + "@esbuild/freebsd-arm64@npm:0.25.12": "7a7bd7f62d7e5e4a162bea901365bef5996ac15b3b0af361ce6adb77431f95cc9b831e8f764056f2395fc09a4117fdc7d14a583af4344770ae13dc1dc030dcb4", + "@esbuild/freebsd-x64@npm:0.25.12": "ca5c61ab87dadadff1cd72c62c32b3dbff6e5242ee6f7f53c579e3e11aae263bd009e18a2cbd36a065d42e7b7c43e7186832584f7436646bfc25dc637fac819d", + "@esbuild/linux-arm64@npm:0.25.12": "b66f73867351e0666fe00f9281bb7d8dd089d221a5cef6311826b169271b8451f5e265fb41625161a0af142641d5db1e02999aaba98dc1b8a52f4c099db07cb7", + "@esbuild/linux-arm@npm:0.25.12": "1ea6f003abec0177f27ee6954fcce15cecffd94aa57781e712936b6eed64d9579267bcd7612645d3b41cc7591ae411d6491c4517e3bc0de936f101e278510644", + "@esbuild/linux-ia32@npm:0.25.12": "df3d5ceb61b7cf4471cdba740a8ca46ae6c5a9dc6dce60440d2a62a25c36144e38b6bf301937117bb183a7b5517ee87a9735d543c785a13b1de56715e34cc7e6", + "@esbuild/linux-loong64@npm:0.25.12": "b38ba56880536b6bd46467673d81a49ed41661cd217065d440a384d0b4dd1bd59dbc79d6bc81c4948959116a7bc339c1f9749412705ff2a2f7a5c1bef69e2205", + "@esbuild/linux-mips64el@npm:0.25.12": "a8694250193ecf430fb541d1371226a922c462cafac6be65e051f13efbbdf62aa94316fc5a0805f010f60da4051517aca3bfac121b352c443803aac874024d85", + "@esbuild/linux-ppc64@npm:0.25.12": "f9c2ca2a75aefa5495ce3cb4e0a4086816b083dfe7d0642afc22c2eac4ea50f1ca4d3a353b6a603fffc689f57bd17e6cc3c0fe8d5727cb2d429bbdc1db1fdd38", + "@esbuild/linux-riscv64@npm:0.25.12": "29bc64137de629f8210e4788cef6cc021d8b432c0b28b9df05ccca6e60b772e7d23c3c9faa5da4037c7dd1574f66fdcb71775ee14298f86a571a2556beeb11d9", + "@esbuild/linux-s390x@npm:0.25.12": "cb32577ea8441277525a2acf888d32ef8d9ebbd7563d5d4ec9b5b387b11e9aa7d8a3f7cc3faea4524dc068a767300537aca4e127ac524030207d9745a785f30b", + "@esbuild/linux-x64@npm:0.25.12": "5364064fc64864df2ad963d21430b7dbeb1918a829e3d82f9c7cc87ffbca551e312338dc8016e3008288f85a9f181986056bbc782a52ee547d2435dd50738593", + "@esbuild/netbsd-arm64@npm:0.25.12": "9c9e0b87fd7385604fa4a118e88ba88b36ce846174016d7c71939ba2be2de57e720e3c684ec7de52eaae17edf4f6df88442c8eb1db7e4675870b357b15bc1bd2", + "@esbuild/netbsd-x64@npm:0.25.12": "148e7a91557ad0084af1478921bbb88ce3cb78a213e5b16250b34a28057d5ff5dd14483bec73edd959fdbd6daf617e2a56137596530de07592180c5777ac491b", + "@esbuild/openbsd-arm64@npm:0.25.12": "87b6070d4c63615802709e5f7c2de23d0c201186e18777200a023a1d84da1ba39bab3b0b444a468f93d4039147c333499589e9f00717d1e4a7eeb764e01082af", + "@esbuild/openbsd-x64@npm:0.25.12": "664bfe0fc286b1850147797d7a625b33614eba656da0fa589d93956f040559a9211ebf7b68c9e90b49b898ba330f2f81daab763c596f5c84ae4183ffa8bc0c69", + "@esbuild/openharmony-arm64@npm:0.25.12": "422e2d50f8948b45342301ee4c08ea988619bd025830c1a195eb41cafb1dedb35b8441a66c679a7a82fb920e56f89fb6bff85b4c4f10d09584f437be125d8745", + "@esbuild/sunos-x64@npm:0.25.12": "ea9f6d4d1fe803063075ffa20b3a4ae11a92a933e56d437bfa9de13bdcd2320b8057aa3e971c12fb04f1388f55185d885a2a86a96be914a42808bc636575164c", + "@esbuild/win32-arm64@npm:0.25.12": "f61e582d7a3fa474cf764573dd9b54a48bd4f0bb0684f4a588a79a1ba0fe37447bc8bc5d2d8809d1f27022ad0c95a5728ce7d2b5941dac78607c1e50ca14c6d7", + "@esbuild/win32-ia32@npm:0.25.12": "4c135f8face7b6e5682efc5972367b579f06656487d1859c3e3165d5e10a95c455bb0aa69339fc3db215084f3229ffb954d87b2780645993f70dee883cb9ba73", + "@esbuild/win32-x64@npm:0.25.12": "7db86204f566c4d1155458c6e383d5f560a3f7e00475c65e97549e30a222bac66bd64cfd422691a7dcead2e0518e50aab5caeb7f525dfea6875c3209d6352e8e", + "@rollup/rollup-android-arm-eabi@npm:4.53.2": "624c3cf3ff0b7ab780de960bce750ed28c4df7569dfc289e8c234fe1763e2e68a9747a4cb9cdb6ec1b1621e48dfd940ff8ab041c441448d053288558712ead8c", + "@rollup/rollup-android-arm64@npm:4.53.2": "a05e83077081eb4df811a3f3fbab914d1ed3ad945a60b8b2802dc21fa5bd0d3fe57e727c6b0eb36ba2e7cbe637f9be9bfeaf2fb05d2ed83b8f1971d4337cd21e", + "@rollup/rollup-darwin-arm64@npm:4.53.2": "987c4dd3b5edbd713813e1b266289352895af67f3c7649685811c0a688e2c54fd64c9dab2b37ab0eca1431ca868e61f6fa9c18e758204afacfcec4f494bd37e6", + "@rollup/rollup-darwin-x64@npm:4.53.2": "afddb37a1dc14017bd99b4aa8a263f9cc115b1968ea5ef51f3da1d0a4b24d869f3be771e1eb99971a52e7e72909d4a2384e4a6815c73b809cbdbad9a5d5b2e1e", + "@rollup/rollup-freebsd-arm64@npm:4.53.2": "590828430d14304413e746dcfd5c9133e7a389966c8677a4720b4ecd69ef049c5fddba4c6ea642e61b49b909310fb02fc00ec95cef5447c4bb26f7ac8bc739f6", + "@rollup/rollup-freebsd-x64@npm:4.53.2": "c9ba7207d6c9ce516d384f9ffb83c104a2b25d44a96d187a25bcaac5a830af9ef57475aeffc30adcfe0343a052db944ec4ae39af9d298f958386227defc06353", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.53.2": "f70d6dc3684b1599a90bbbab606348ce169a7fdd012d1b5c20238093e30d5b01b168e6f7cc6b6c2233df84d87ab1c05039ee40dda304c388356ebbcdafd1a521", + "@rollup/rollup-linux-arm-musleabihf@npm:4.53.2": "2bbc219fcaeb2b5e292650e7c9a0076ceabeaad5f1c8d6d3577a8092a565d9c8f3279030c740c86cebd35068fb4640f7f7a6c354011e925d2042d79f59af8da9", + "@rollup/rollup-linux-arm64-gnu@npm:4.53.2": "53cd00ef29ad6268e84317c2e30feface713d14df22038265929a8684c76171d6ceedd965201977f0345786d39f641dc1202aed9f4b97a476cfc952cc3719174", + "@rollup/rollup-linux-arm64-musl@npm:4.53.2": "5a439746f54b5d657b5930075b725a6a49d4f55aef6e8bdd10c59bc7186428d83028a6a22a4edef66e3ef9a954da9b96218332eaf556c12ab7bc231d88ff12ec", + "@rollup/rollup-linux-loong64-gnu@npm:4.53.2": "2a906684e9a1d585755547be77ed7c6f8d69f7f484773ba8285eeb2cbe819b7d06148c167dbb163bab029ae920e46d6977822114d9c24e9103a437637bf22f59", + "@rollup/rollup-linux-ppc64-gnu@npm:4.53.2": "fcb23e70c88ee61725b6cc9ef2b01d63ba12b674e86e5e3a7c33e1c25fc7882a666ffb4d14c714c515330f680bc74d2615f661e3f652955102541ac2c74ca217", + "@rollup/rollup-linux-riscv64-gnu@npm:4.53.2": "cc98bbebc5c4d445e60f14359fb6e2f8acdd23fe81d6aba8b27fee96bce8954ca21119928116d417f389edd594888f614ad39e9a9397de3c1b6e3c3cc9e39e14", + "@rollup/rollup-linux-riscv64-musl@npm:4.53.2": "309f231d747bbc5b37093b713c28926c827062e45fb524fa8d07c64834a2e6b84abac110b2a9f099cf76569fa4576d02b36aa292468bf06e57196bf6dd77d2a5", + "@rollup/rollup-linux-s390x-gnu@npm:4.53.2": "3f935b10cef450e4a2faff477fd9878f018066a82fc4229bd6a1e7958faaf6499cf262541fe0af03e4fddbbd3d1bd8eab6f05e743463ffdcc4b19bc4b464df8c", + "@rollup/rollup-linux-x64-gnu@npm:4.53.2": "4df0206018e3ea80f617028bf0fb69db8ec301fb1863cea791611717807f90e96f8fa4d2449c4e6847514dd5249402764134844bd8a07b50eddcca8069783ac4", + "@rollup/rollup-linux-x64-musl@npm:4.53.2": "28d1e7aa206777f600540851caba578be32abfd4379194c7d1d7a6550181eecec1bf342197b8c2096c8743d9f5e2f5641aabb9ee43e172874da438208a45a52f", + "@rollup/rollup-openharmony-arm64@npm:4.53.2": "9c430d3ad3cfc294ad221fa9f382e5cfa1479f44098807d43683cea4bcf786d0e5fdeef2a07e0eca5176abf47532b51a1bb8733bb7ee1c8bd11e31567421b89c", + "@rollup/rollup-win32-arm64-msvc@npm:4.53.2": "ca5ac1c54519ceffde6f4c69564317b5d84fc9e670fd090ced22916e5bf9e8e25a0deb8377cedb494b8a106f61d128e282b0d4bac9ae2135eb76fdcfee511ec4", + "@rollup/rollup-win32-ia32-msvc@npm:4.53.2": "01a6ae614efd77ad83115022da67b437cc7b43868741cbb4923ed2d763e2cded0bb05af5818d4fb7486abe2ab52d435727bc965c2af8efe571018d6ea0ff3e76", + "@rollup/rollup-win32-x64-gnu@npm:4.53.2": "ce081608eaa3009279aa5685e1671f15b495910556e396ab3c7585d3d2f5afb354d70544a2ff01654f46c723aac91fd38e0982f9ebba3ef843663d6c42e5692b", + "@rollup/rollup-win32-x64-msvc@npm:4.53.2": "6a4195d5ceb9533fb53daeac056d6878a6caeb03c238083db49c7a112accba15ca50e9cb2f9f4417375092ddf4819ca795954dc4a61106e42941b0cfdbb0b44c" +} diff --git a/pkgs/by-name/co/corepack/package.nix b/pkgs/by-name/co/corepack/package.nix new file mode 100644 index 000000000000..d29373c5ce40 --- /dev/null +++ b/pkgs/by-name/co/corepack/package.nix @@ -0,0 +1,112 @@ +{ + lib, + stdenvNoCC, + cacert, + yarn-berry, + nodejs, + fetchFromGitHub, + nix-update-script, + versionCheckHook, + fetchpatch2, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "corepack"; + version = "0.34.4"; + + src = fetchFromGitHub { + owner = "nodejs"; + repo = "corepack"; + tag = "v${finalAttrs.version}"; + hash = "sha256-AE2tDeDs1wzDdTrkG/ic2ydQC8G2wcaKD6s7ec7p+Ew="; + }; + + patches = [ + # The build fails with better-sqlite3, needed for installCheck phase. + # We can use the built-in SQLite module instead (and skip the installCheck phase on version of + # Node.js that do not have built-in SQLite support). + ./use-builtin-sqlite.patch + ]; + + nativeBuildInputs = [ + nodejs + yarn-berry + yarn-berry.yarnBerryConfigHook + ]; + buildInputs = [ + nodejs + ]; + + missingHashes = ./missing-hashes.json; + offlineCache = yarn-berry.fetchYarnBerryDeps { + inherit nodejs; + inherit (finalAttrs) + missingHashes + patches + src + ; + hash = "sha256-Yzm3PtdbR9Tx2bisdzTw0XGD6rAc/KUCzmhjGuXdft4="; + }; + + postPatch = '' + substituteInPlace tests/_runCli.ts --replace-fail 'require.resolve(`../dist/corepack.js`)' "'$out/bin/corepack'" + substituteInPlace tests/main.test.ts --replace-fail 'npath.dirname(__dirname)' "'$out'" + + substituteInPlace mkshims.ts --replace-fail './lib/corepack.cjs' '../lib/corepack.cjs' + substituteInPlace \ + sources/corepackUtils.ts \ + sources/commands/Enable.ts \ + --replace-fail 'require.resolve(`corepack/package.json`)' "'$out/package.json'" + ''; + + buildPhase = '' + runHook preBuild + + yarn build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 dist/lib/corepack.cjs -t $out/lib + node -p 'Object.keys(require("./package.json").publishConfig.bin).join("\0")' | while IFS= read -r -d "" binName; do + echo "Installing bin/$binName" + install -Dm755 "dist/$binName.js" -T "$out/bin/$binName" + done + mkdir "$out/dist" + find dist -maxdepth 1 -name "*.js" -print0 | while IFS= read -r -d "" jsFile; do + echo "Installing $jsFile" + if [ -f "$out/bin/''${jsFile:5:-3}" ]; then + ln -s "$out/bin/''${jsFile:5:-3}" "$out/$jsFile" + else + install -m755 "$jsFile" -T $out/$jsFile + fi + done + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ + cacert + versionCheckHook + ]; + # Built-in SQLite support is only available in Node.js 22+, and required to run the tests. + preInstallCheck = lib.optional (lib.versionAtLeast nodejs.version "22") '' + # Exclude test files that require internet access. + NOCK_ENV=replay yarn test --reporter tap --exclude tests/config.test.ts --exclude tests/Use.test.ts + ''; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/nodejs/corepack/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + description = "Package manager version manager for Node.js projects"; + homepage = "https://github.com/nodejs/corepack"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aduh95 ]; + mainProgram = "corepack"; + }; +}) diff --git a/pkgs/by-name/co/corepack/use-builtin-sqlite.patch b/pkgs/by-name/co/corepack/use-builtin-sqlite.patch new file mode 100644 index 000000000000..1491b3feb035 --- /dev/null +++ b/pkgs/by-name/co/corepack/use-builtin-sqlite.patch @@ -0,0 +1,582 @@ +diff --git a/package.json b/package.json +index fc8f2469ed5..7b3881e2a5d 100644 +--- a/package.json ++++ b/package.json +@@ -26,7 +26,6 @@ + "@yarnpkg/eslint-config": "^3.0.0", + "@yarnpkg/fslib": "^3.0.0-rc.48", + "@zkochan/cmd-shim": "^6.0.0", +- "better-sqlite3": "^11.7.2", + "clipanion": "patch:clipanion@npm%3A3.2.1#~/.yarn/patches/clipanion-npm-3.2.1-fc9187f56c.patch", + "debug": "^4.1.1", + "esbuild": "^0.25.0", +diff --git a/tests/recordRequests.js b/tests/recordRequests.js +index b78edad0e44..27667abbae4 100644 +--- a/tests/recordRequests.js ++++ b/tests/recordRequests.js +@@ -1,7 +1,7 @@ + "use strict"; + const path = require(`node:path`); + const crypto = require(`node:crypto`); +-const SQLite3 = require(`better-sqlite3`); ++const { DatabaseSync: SQLite3 } = require(`node:sqlite`); + + const db = new SQLite3(path.join(__dirname, `nocks.db`)); + process.once(`exit`, () => { +diff --git a/yarn.lock b/yarn.lock +index fc5bd2b1248..46777cbe979 100644 +--- a/yarn.lock ++++ b/yarn.lock +@@ -1145,44 +1145,6 @@ __metadata: + languageName: node + linkType: hard + +-"base64-js@npm:^1.3.1": +- version: 1.5.1 +- resolution: "base64-js@npm:1.5.1" +- checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf +- languageName: node +- linkType: hard +- +-"better-sqlite3@npm:^11.7.2": +- version: 11.10.0 +- resolution: "better-sqlite3@npm:11.10.0" +- dependencies: +- bindings: "npm:^1.5.0" +- node-gyp: "npm:latest" +- prebuild-install: "npm:^7.1.1" +- checksum: 10c0/1fffbf9e5fc9d24847a3ecf09491bceab1c294b46ba41df1c449dc20b6f5c5d9d94ff24becd0b1632ee282bd21278b7fea53a5a6215bb99209ded0ae05eda3b0 +- languageName: node +- linkType: hard +- +-"bindings@npm:^1.5.0": +- version: 1.5.0 +- resolution: "bindings@npm:1.5.0" +- dependencies: +- file-uri-to-path: "npm:1.0.0" +- checksum: 10c0/3dab2491b4bb24124252a91e656803eac24292473e56554e35bbfe3cc1875332cfa77600c3bac7564049dc95075bf6fcc63a4609920ff2d64d0fe405fcf0d4ba +- languageName: node +- linkType: hard +- +-"bl@npm:^4.0.3": +- version: 4.1.0 +- resolution: "bl@npm:4.1.0" +- dependencies: +- buffer: "npm:^5.5.0" +- inherits: "npm:^2.0.4" +- readable-stream: "npm:^3.4.0" +- checksum: 10c0/02847e1d2cb089c9dc6958add42e3cdeaf07d13f575973963335ac0fdece563a50ac770ac4c8fa06492d2dd276f6cc3b7f08c7cd9c7a7ad0f8d388b2a28def5f +- languageName: node +- linkType: hard +- + "brace-expansion@npm:^1.1.7": + version: 1.1.12 + resolution: "brace-expansion@npm:1.1.12" +@@ -1211,16 +1173,6 @@ __metadata: + languageName: node + linkType: hard + +-"buffer@npm:^5.5.0": +- version: 5.7.1 +- resolution: "buffer@npm:5.7.1" +- dependencies: +- base64-js: "npm:^1.3.1" +- ieee754: "npm:^1.1.13" +- checksum: 10c0/27cac81cff434ed2876058d72e7c4789d11ff1120ef32c9de48f59eab58179b66710c488987d295ae89a228f835fc66d088652dffeb8e3ba8659f80eb091d55e +- languageName: node +- linkType: hard +- + "cac@npm:^6.7.14": + version: 6.7.14 + resolution: "cac@npm:6.7.14" +@@ -1316,13 +1268,6 @@ __metadata: + languageName: node + linkType: hard + +-"chownr@npm:^1.1.1": +- version: 1.1.4 +- resolution: "chownr@npm:1.1.4" +- checksum: 10c0/ed57952a84cc0c802af900cf7136de643d3aba2eecb59d29344bc2f3f9bf703a301b9d84cdc71f82c3ffc9ccde831b0d92f5b45f91727d6c9da62f23aef9d9db +- languageName: node +- linkType: hard +- + "chownr@npm:^3.0.0": + version: 3.0.0 + resolution: "chownr@npm:3.0.0" +@@ -1394,7 +1339,6 @@ __metadata: + "@yarnpkg/eslint-config": "npm:^3.0.0" + "@yarnpkg/fslib": "npm:^3.0.0-rc.48" + "@zkochan/cmd-shim": "npm:^6.0.0" +- better-sqlite3: "npm:^11.7.2" + clipanion: "patch:clipanion@npm%3A3.2.1#~/.yarn/patches/clipanion-npm-3.2.1-fc9187f56c.patch" + debug: "npm:^4.1.1" + esbuild: "npm:^0.25.0" +@@ -1468,15 +1412,6 @@ __metadata: + languageName: node + linkType: hard + +-"decompress-response@npm:^6.0.0": +- version: 6.0.0 +- resolution: "decompress-response@npm:6.0.0" +- dependencies: +- mimic-response: "npm:^3.1.0" +- checksum: 10c0/bd89d23141b96d80577e70c54fb226b2f40e74a6817652b80a116d7befb8758261ad073a8895648a29cc0a5947021ab66705cb542fa9c143c82022b27c5b175e +- languageName: node +- linkType: hard +- + "deep-eql@npm:^5.0.1": + version: 5.0.2 + resolution: "deep-eql@npm:5.0.2" +@@ -1484,13 +1419,6 @@ __metadata: + languageName: node + linkType: hard + +-"deep-extend@npm:^0.6.0": +- version: 0.6.0 +- resolution: "deep-extend@npm:0.6.0" +- checksum: 10c0/1c6b0abcdb901e13a44c7d699116d3d4279fdb261983122a3783e7273844d5f2537dc2e1c454a23fcf645917f93fbf8d07101c1d03c015a87faa662755212566 +- languageName: node +- linkType: hard +- + "deep-is@npm:^0.1.3": + version: 0.1.4 + resolution: "deep-is@npm:0.1.4" +@@ -1520,13 +1448,6 @@ __metadata: + languageName: node + linkType: hard + +-"detect-libc@npm:^2.0.0": +- version: 2.1.2 +- resolution: "detect-libc@npm:2.1.2" +- checksum: 10c0/acc675c29a5649fa1fb6e255f993b8ee829e510b6b56b0910666949c80c364738833417d0edb5f90e4e46be17228b0f2b66a010513984e18b15deeeac49369c4 +- languageName: node +- linkType: hard +- + "doctrine@npm:^2.1.0": + version: 2.1.0 + resolution: "doctrine@npm:2.1.0" +@@ -1577,15 +1498,6 @@ __metadata: + languageName: node + linkType: hard + +-"end-of-stream@npm:^1.1.0, end-of-stream@npm:^1.4.1": +- version: 1.4.5 +- resolution: "end-of-stream@npm:1.4.5" +- dependencies: +- once: "npm:^1.4.0" +- checksum: 10c0/b0701c92a10b89afb1cb45bf54a5292c6f008d744eb4382fa559d54775ff31617d1d7bc3ef617575f552e24fad2c7c1a1835948c66b3f3a4be0a6c1f35c883d8 +- languageName: node +- linkType: hard +- + "env-paths@npm:^2.2.0": + version: 2.2.1 + resolution: "env-paths@npm:2.2.1" +@@ -2004,13 +1916,6 @@ __metadata: + languageName: node + linkType: hard + +-"expand-template@npm:^2.0.3": +- version: 2.0.3 +- resolution: "expand-template@npm:2.0.3" +- checksum: 10c0/1c9e7afe9acadf9d373301d27f6a47b34e89b3391b1ef38b7471d381812537ef2457e620ae7f819d2642ce9c43b189b3583813ec395e2938319abe356a9b2f51 +- languageName: node +- linkType: hard +- + "expect-type@npm:^1.2.1": + version: 1.2.2 + resolution: "expect-type@npm:1.2.2" +@@ -2089,13 +1994,6 @@ __metadata: + languageName: node + linkType: hard + +-"file-uri-to-path@npm:1.0.0": +- version: 1.0.0 +- resolution: "file-uri-to-path@npm:1.0.0" +- checksum: 10c0/3b545e3a341d322d368e880e1c204ef55f1d45cdea65f7efc6c6ce9e0c4d22d802d5629320eb779d006fe59624ac17b0e848d83cc5af7cd101f206cb704f5519 +- languageName: node +- linkType: hard +- + "fill-range@npm:^7.1.1": + version: 7.1.1 + resolution: "fill-range@npm:7.1.1" +@@ -2151,13 +2049,6 @@ __metadata: + languageName: node + linkType: hard + +-"fs-constants@npm:^1.0.0": +- version: 1.0.0 +- resolution: "fs-constants@npm:1.0.0" +- checksum: 10c0/a0cde99085f0872f4d244e83e03a46aa387b74f5a5af750896c6b05e9077fac00e9932fdf5aef84f2f16634cd473c63037d7a512576da7d5c2b9163d1909f3a8 +- languageName: node +- linkType: hard +- + "fs-minipass@npm:^3.0.0": + version: 3.0.3 + resolution: "fs-minipass@npm:3.0.3" +@@ -2272,13 +2163,6 @@ __metadata: + languageName: node + linkType: hard + +-"github-from-package@npm:0.0.0": +- version: 0.0.0 +- resolution: "github-from-package@npm:0.0.0" +- checksum: 10c0/737ee3f52d0a27e26332cde85b533c21fcdc0b09fb716c3f8e522cfaa9c600d4a631dec9fcde179ec9d47cca89017b7848ed4d6ae6b6b78f936c06825b1fcc12 +- languageName: node +- linkType: hard +- + "glob-parent@npm:^5.1.2": + version: 5.1.2 + resolution: "glob-parent@npm:5.1.2" +@@ -2451,13 +2335,6 @@ __metadata: + languageName: node + linkType: hard + +-"ieee754@npm:^1.1.13": +- version: 1.2.1 +- resolution: "ieee754@npm:1.2.1" +- checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb +- languageName: node +- linkType: hard +- + "ignore@npm:^5.2.0": + version: 5.3.2 + resolution: "ignore@npm:5.3.2" +@@ -2489,20 +2366,6 @@ __metadata: + languageName: node + linkType: hard + +-"inherits@npm:^2.0.3, inherits@npm:^2.0.4": +- version: 2.0.4 +- resolution: "inherits@npm:2.0.4" +- checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2 +- languageName: node +- linkType: hard +- +-"ini@npm:~1.3.0": +- version: 1.3.8 +- resolution: "ini@npm:1.3.8" +- checksum: 10c0/ec93838d2328b619532e4f1ff05df7909760b6f66d9c9e2ded11e5c1897d6f2f9980c54dd638f88654b00919ce31e827040631eab0a3969e4d1abefa0719516a +- languageName: node +- linkType: hard +- + "internal-slot@npm:^1.1.0": + version: 1.1.0 + resolution: "internal-slot@npm:1.1.0" +@@ -2982,13 +2845,6 @@ __metadata: + languageName: node + linkType: hard + +-"mimic-response@npm:^3.1.0": +- version: 3.1.0 +- resolution: "mimic-response@npm:3.1.0" +- checksum: 10c0/0d6f07ce6e03e9e4445bee655202153bdb8a98d67ee8dc965ac140900d7a2688343e6b4c9a72cfc9ef2f7944dfd76eef4ab2482eb7b293a68b84916bac735362 +- languageName: node +- linkType: hard +- + "minimatch@npm:^10.0.3": + version: 10.1.1 + resolution: "minimatch@npm:10.1.1" +@@ -3016,13 +2872,6 @@ __metadata: + languageName: node + linkType: hard + +-"minimist@npm:^1.2.0, minimist@npm:^1.2.3": +- version: 1.2.8 +- resolution: "minimist@npm:1.2.8" +- checksum: 10c0/19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6 +- languageName: node +- linkType: hard +- + "minipass-collect@npm:^2.0.1": + version: 2.0.1 + resolution: "minipass-collect@npm:2.0.1" +@@ -3099,13 +2948,6 @@ __metadata: + languageName: node + linkType: hard + +-"mkdirp-classic@npm:^0.5.2, mkdirp-classic@npm:^0.5.3": +- version: 0.5.3 +- resolution: "mkdirp-classic@npm:0.5.3" +- checksum: 10c0/95371d831d196960ddc3833cc6907e6b8f67ac5501a6582f47dfae5eb0f092e9f8ce88e0d83afcae95d6e2b61a01741ba03714eeafb6f7a6e9dcc158ac85b168 +- languageName: node +- linkType: hard +- + "ms@npm:^2.1.3": + version: 2.1.3 + resolution: "ms@npm:2.1.3" +@@ -3122,13 +2964,6 @@ __metadata: + languageName: node + linkType: hard + +-"napi-build-utils@npm:^2.0.0": +- version: 2.0.0 +- resolution: "napi-build-utils@npm:2.0.0" +- checksum: 10c0/5833aaeb5cc5c173da47a102efa4680a95842c13e0d9cc70428bd3ee8d96bb2172f8860d2811799b5daa5cbeda779933601492a2028a6a5351c6d0fcf6de83db +- languageName: node +- linkType: hard +- + "natural-compare@npm:^1.4.0": + version: 1.4.0 + resolution: "natural-compare@npm:1.4.0" +@@ -3143,15 +2978,6 @@ __metadata: + languageName: node + linkType: hard + +-"node-abi@npm:^3.3.0": +- version: 3.85.0 +- resolution: "node-abi@npm:3.85.0" +- dependencies: +- semver: "npm:^7.3.5" +- checksum: 10c0/d51b5718b6ebfcb23858e5429b74798c05fe3ab436d8afd8480b4809706bc53d6af3a60714ecc85e8c943f4e06e6378ca1935725c7611f3d1febdd3fc3bb5fe3 +- languageName: node +- linkType: hard +- + "node-gyp@npm:latest": + version: 12.1.0 + resolution: "node-gyp@npm:12.1.0" +@@ -3254,15 +3080,6 @@ __metadata: + languageName: node + linkType: hard + +-"once@npm:^1.3.1, once@npm:^1.4.0": +- version: 1.4.0 +- resolution: "once@npm:1.4.0" +- dependencies: +- wrappy: "npm:1" +- checksum: 10c0/5d48aca287dfefabd756621c5dfce5c91a549a93e9fdb7b8246bc4c4790aa2ec17b34a260530474635147aeb631a2dcc8b32c613df0675f96041cbb8244517d0 +- languageName: node +- linkType: hard +- + "optionator@npm:^0.9.3": + version: 0.9.4 + resolution: "optionator@npm:0.9.4" +@@ -3413,28 +3230,6 @@ __metadata: + languageName: node + linkType: hard + +-"prebuild-install@npm:^7.1.1": +- version: 7.1.3 +- resolution: "prebuild-install@npm:7.1.3" +- dependencies: +- detect-libc: "npm:^2.0.0" +- expand-template: "npm:^2.0.3" +- github-from-package: "npm:0.0.0" +- minimist: "npm:^1.2.3" +- mkdirp-classic: "npm:^0.5.3" +- napi-build-utils: "npm:^2.0.0" +- node-abi: "npm:^3.3.0" +- pump: "npm:^3.0.0" +- rc: "npm:^1.2.7" +- simple-get: "npm:^4.0.0" +- tar-fs: "npm:^2.0.0" +- tunnel-agent: "npm:^0.6.0" +- bin: +- prebuild-install: bin.js +- checksum: 10c0/25919a42b52734606a4036ab492d37cfe8b601273d8dfb1fa3c84e141a0a475e7bad3ab848c741d2f810cef892fcf6059b8c7fe5b29f98d30e0c29ad009bedff +- languageName: node +- linkType: hard +- + "prelude-ls@npm:^1.2.1": + version: 1.2.1 + resolution: "prelude-ls@npm:1.2.1" +@@ -3477,16 +3272,6 @@ __metadata: + languageName: node + linkType: hard + +-"pump@npm:^3.0.0": +- version: 3.0.3 +- resolution: "pump@npm:3.0.3" +- dependencies: +- end-of-stream: "npm:^1.1.0" +- once: "npm:^1.3.1" +- checksum: 10c0/ada5cdf1d813065bbc99aa2c393b8f6beee73b5de2890a8754c9f488d7323ffd2ca5f5a0943b48934e3fcbd97637d0337369c3c631aeb9614915db629f1c75c9 +- languageName: node +- linkType: hard +- + "punycode@npm:^2.1.0": + version: 2.3.1 + resolution: "punycode@npm:2.3.1" +@@ -3501,20 +3286,6 @@ __metadata: + languageName: node + linkType: hard + +-"rc@npm:^1.2.7": +- version: 1.2.8 +- resolution: "rc@npm:1.2.8" +- dependencies: +- deep-extend: "npm:^0.6.0" +- ini: "npm:~1.3.0" +- minimist: "npm:^1.2.0" +- strip-json-comments: "npm:~2.0.1" +- bin: +- rc: ./cli.js +- checksum: 10c0/24a07653150f0d9ac7168e52943cc3cb4b7a22c0e43c7dff3219977c2fdca5a2760a304a029c20811a0e79d351f57d46c9bde216193a0f73978496afc2b85b15 +- languageName: node +- linkType: hard +- + "react-is@npm:^16.13.1": + version: 16.13.1 + resolution: "react-is@npm:16.13.1" +@@ -3522,17 +3293,6 @@ __metadata: + languageName: node + linkType: hard + +-"readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0": +- version: 3.6.2 +- resolution: "readable-stream@npm:3.6.2" +- dependencies: +- inherits: "npm:^2.0.3" +- string_decoder: "npm:^1.1.1" +- util-deprecate: "npm:^1.0.1" +- checksum: 10c0/e37be5c79c376fdd088a45fa31ea2e423e5d48854be7a22a58869b4e84d25047b193f6acb54f1012331e1bcd667ffb569c01b99d36b0bd59658fb33f513511b7 +- languageName: node +- linkType: hard +- + "reflect.getprototypeof@npm:^1.0.6, reflect.getprototypeof@npm:^1.0.9": + version: 1.0.10 + resolution: "reflect.getprototypeof@npm:1.0.10" +@@ -3720,13 +3480,6 @@ __metadata: + languageName: node + linkType: hard + +-"safe-buffer@npm:^5.0.1, safe-buffer@npm:~5.2.0": +- version: 5.2.1 +- resolution: "safe-buffer@npm:5.2.1" +- checksum: 10c0/6501914237c0a86e9675d4e51d89ca3c21ffd6a31642efeba25ad65720bce6921c9e7e974e5be91a786b25aa058b5303285d3c15dbabf983a919f5f630d349f3 +- languageName: node +- linkType: hard +- + "safe-push-apply@npm:^1.0.0": + version: 1.0.0 + resolution: "safe-push-apply@npm:1.0.0" +@@ -3888,24 +3641,6 @@ __metadata: + languageName: node + linkType: hard + +-"simple-concat@npm:^1.0.0": +- version: 1.0.1 +- resolution: "simple-concat@npm:1.0.1" +- checksum: 10c0/62f7508e674414008910b5397c1811941d457dfa0db4fd5aa7fa0409eb02c3609608dfcd7508cace75b3a0bf67a2a77990711e32cd213d2c76f4fd12ee86d776 +- languageName: node +- linkType: hard +- +-"simple-get@npm:^4.0.0": +- version: 4.0.1 +- resolution: "simple-get@npm:4.0.1" +- dependencies: +- decompress-response: "npm:^6.0.0" +- once: "npm:^1.3.1" +- simple-concat: "npm:^1.0.0" +- checksum: 10c0/b0649a581dbca741babb960423248899203165769747142033479a7dc5e77d7b0fced0253c731cd57cf21e31e4d77c9157c3069f4448d558ebc96cf9e1eebcf0 +- languageName: node +- linkType: hard +- + "smart-buffer@npm:^4.2.0": + version: 4.2.0 + resolution: "smart-buffer@npm:4.2.0" +@@ -4074,15 +3809,6 @@ __metadata: + languageName: node + linkType: hard + +-"string_decoder@npm:^1.1.1": +- version: 1.3.0 +- resolution: "string_decoder@npm:1.3.0" +- dependencies: +- safe-buffer: "npm:~5.2.0" +- checksum: 10c0/810614ddb030e271cd591935dcd5956b2410dd079d64ff92a1844d6b7588bf992b3e1b69b0f4d34a3e06e0bd73046ac646b5264c1987b20d0601f81ef35d731d +- languageName: node +- linkType: hard +- + "strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": + version: 6.0.1 + resolution: "strip-ansi@npm:6.0.1" +@@ -4108,13 +3834,6 @@ __metadata: + languageName: node + linkType: hard + +-"strip-json-comments@npm:~2.0.1": +- version: 2.0.1 +- resolution: "strip-json-comments@npm:2.0.1" +- checksum: 10c0/b509231cbdee45064ff4f9fd73609e2bcc4e84a4d508e9dd0f31f70356473fde18abfb5838c17d56fb236f5a06b102ef115438de0600b749e818a35fbbc48c43 +- languageName: node +- linkType: hard +- + "strip-literal@npm:^3.0.0": + version: 3.1.0 + resolution: "strip-literal@npm:3.1.0" +@@ -4147,31 +3866,6 @@ __metadata: + languageName: node + linkType: hard + +-"tar-fs@npm:^2.0.0": +- version: 2.1.4 +- resolution: "tar-fs@npm:2.1.4" +- dependencies: +- chownr: "npm:^1.1.1" +- mkdirp-classic: "npm:^0.5.2" +- pump: "npm:^3.0.0" +- tar-stream: "npm:^2.1.4" +- checksum: 10c0/decb25acdc6839182c06ec83cba6136205bda1db984e120c8ffd0d80182bc5baa1d916f9b6c5c663ea3f9975b4dd49e3c6bb7b1707cbcdaba4e76042f43ec84c +- languageName: node +- linkType: hard +- +-"tar-stream@npm:^2.1.4": +- version: 2.2.0 +- resolution: "tar-stream@npm:2.2.0" +- dependencies: +- bl: "npm:^4.0.3" +- end-of-stream: "npm:^1.4.1" +- fs-constants: "npm:^1.0.0" +- inherits: "npm:^2.0.3" +- readable-stream: "npm:^3.1.1" +- checksum: 10c0/2f4c910b3ee7196502e1ff015a7ba321ec6ea837667220d7bcb8d0852d51cb04b87f7ae471008a6fb8f5b1a1b5078f62f3a82d30c706f20ada1238ac797e7692 +- languageName: node +- linkType: hard +- + "tar@npm:^7.4.0, tar@npm:^7.5.2": + version: 7.5.2 + resolution: "tar@npm:7.5.2" +@@ -4271,15 +3965,6 @@ __metadata: + languageName: node + linkType: hard + +-"tunnel-agent@npm:^0.6.0": +- version: 0.6.0 +- resolution: "tunnel-agent@npm:0.6.0" +- dependencies: +- safe-buffer: "npm:^5.0.1" +- checksum: 10c0/4c7a1b813e7beae66fdbf567a65ec6d46313643753d0beefb3c7973d66fcec3a1e7f39759f0a0b4465883499c6dc8b0750ab8b287399af2e583823e40410a17a +- languageName: node +- linkType: hard +- + "typanion@npm:^3.8.0": + version: 3.14.0 + resolution: "typanion@npm:3.14.0" +@@ -4422,13 +4107,6 @@ __metadata: + languageName: node + linkType: hard + +-"util-deprecate@npm:^1.0.1": +- version: 1.0.2 +- resolution: "util-deprecate@npm:1.0.2" +- checksum: 10c0/41a5bdd214df2f6c3ecf8622745e4a366c4adced864bc3c833739791aeeeb1838119af7daed4ba36428114b5c67dcda034a79c882e97e43c03e66a4dd7389942 +- languageName: node +- linkType: hard +- + "v8-compile-cache@npm:^2.3.0": + version: 2.4.0 + resolution: "v8-compile-cache@npm:2.4.0" +@@ -4697,13 +4375,6 @@ __metadata: + languageName: node + linkType: hard + +-"wrappy@npm:1": +- version: 1.0.2 +- resolution: "wrappy@npm:1.0.2" +- checksum: 10c0/56fece1a4018c6a6c8e28fbc88c87e0fbf4ea8fd64fc6c63b18f4acc4bd13e0ad2515189786dd2c30d3eec9663d70f4ecf699330002f8ccb547e4a18231fc9f0 +- languageName: node +- linkType: hard +- + "yallist@npm:^4.0.0": + version: 4.0.0 + resolution: "yallist@npm:4.0.0" diff --git a/pkgs/by-name/cp/cppi/package.nix b/pkgs/by-name/cp/cppi/package.nix index df2c073d0589..0a886086cdfe 100644 --- a/pkgs/by-name/cp/cppi/package.nix +++ b/pkgs/by-name/cp/cppi/package.nix @@ -4,13 +4,13 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cppi"; version = "1.18"; src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1jk42cjaggk71rimjnx3qpmb6hivps0917vl3z7wbxk3i2whb98j"; + url = "mirror://gnu/cppi/cppi-${finalAttrs.version}.tar.xz"; + hash = "sha256-EqUFuYhj9sXPH3SfkIC+O0Kz6sWjW1ljDme+pyQTZMo="; }; doCheck = true; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cr/criterion/package.nix b/pkgs/by-name/cr/criterion/package.nix index 9d508d64d68e..ee8814fdeea6 100644 --- a/pkgs/by-name/cr/criterion/package.nix +++ b/pkgs/by-name/cr/criterion/package.nix @@ -36,14 +36,14 @@ let hash = "sha256-+GaI5nXz4jYI0rO17xDhNtFpLlGL2WzeSVLMfB6Cl6E="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "criterion"; version = "2.4.2"; src = fetchFromGitHub { owner = "Snaipe"; repo = "Criterion"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-5GH7AYjrnBnqiSmp28BoaM1Xmy8sPs1atfqJkGy3Yf0="; }; @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { testers.testVersion { package = criterion; command = "${lib.getExe tester} --version"; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; meta = { @@ -112,4 +112,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cr/cryptomator-cli/package.nix b/pkgs/by-name/cr/cryptomator-cli/package.nix new file mode 100644 index 000000000000..b98ee6ba9bed --- /dev/null +++ b/pkgs/by-name/cr/cryptomator-cli/package.nix @@ -0,0 +1,108 @@ +{ + fetchFromGitHub, + fuse3, + installShellFiles, + zulu25, + lib, + makeShellWrapper, + maven, + nix-update-script, + stdenv, + versionCheckHook, +}: + +let + jdk = zulu25; +in +maven.buildMavenPackage rec { + pname = "cryptomator-cli"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "cryptomator"; + repo = "cli"; + tag = version; + hash = "sha256-rwARleKktGXmumIBmrPrfls4EywBqGBxOaB8/ka5ds0="; + }; + + mvnJdk = jdk; + mvnParameters = "-Dmaven.test.skip=true"; + mvnHash = "sha256-54DT4C+WzyUBPxayA9YnB9I/Igd19iZygByUh5of51I="; + + env = { + APP_VERSION = version; + SEMVER_STR = version; + }; + + nativeBuildInputs = [ + jdk + makeShellWrapper + installShellFiles + ]; + + # Based on the build_linux.sh script and jpackage configuration + installPhase = '' + runHook preInstall + + mkdir -p $out/bin/ $out/share/cryptomator-cli/libs/ $out/share/cryptomator-cli/mods/ + mkdir -p $out/share/bash-completion/completions/ + + # Copy dependencies + cp target/libs/* $out/share/cryptomator-cli/libs/ + cp target/mods/* target/cryptomator-cli-*.jar $out/share/cryptomator-cli/mods/ + + installShellCompletion --bash target/cryptomator-cli_completion.sh + + # Determine native access package based on architecture + NATIVE_ACCESS_PACKAGE=${ + if stdenv.hostPlatform.isx86_64 then + "org.cryptomator.jfuse.linux.amd64" + else if stdenv.hostPlatform.isAarch64 then + "org.cryptomator.jfuse.linux.aarch64" + else + "no.native.access.available" + } + + # Create wrapper script + makeShellWrapper ${jdk}/bin/java $out/bin/cryptomator-cli \ + --add-flags "--enable-native-access=$NATIVE_ACCESS_PACKAGE,org.fusesource.jansi" \ + --add-flags "--class-path '$out/share/cryptomator-cli/libs/*'" \ + --add-flags "--module-path '$out/share/cryptomator-cli/mods'" \ + --add-flags "-Dfile.encoding='utf-8'" \ + --add-flags "-Dorg.cryptomator.cli.version='${version}'" \ + --add-flags "-Xss5m" \ + --add-flags "-Xmx256m" \ + --add-flags "--module org.cryptomator.cli/org.cryptomator.cli.CryptomatorCli" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fuse3 ]}" \ + --set JAVA_HOME "${jdk.home}" + + runHook postInstall + ''; + + doInstallCheck = true; + versionCheckProgramArg = "--version"; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command line program to access encrypted Cryptomator vaults"; + homepage = "https://github.com/cryptomator/cli"; + changelog = "https://github.com/cryptomator/cli/releases/tag/${version}"; + license = lib.licenses.agpl3Plus; + mainProgram = "cryptomator-cli"; + maintainers = with lib.maintainers; [ + masrlinu + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # maven dependencies + ]; + }; +} diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix index ce778d581e42..ef89315ca6cd 100644 --- a/pkgs/by-name/cr/cryptomator/package.nix +++ b/pkgs/by-name/cr/cryptomator/package.nix @@ -44,7 +44,7 @@ maven.buildMavenPackage rec { cp target/libs/* $out/share/cryptomator/libs/ cp target/mods/* target/cryptomator-*.jar $out/share/cryptomator/mods/ - makeShellWrapper ${jdk}/bin/java $out/bin/${pname} \ + makeShellWrapper ${jdk}/bin/java $out/bin/cryptomator \ --add-flags "--enable-preview" \ --add-flags "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.purejava.appindicator" \ --add-flags "--class-path '$out/share/cryptomator/libs/*'" \ diff --git a/pkgs/by-name/di/diagrams-as-code/package.nix b/pkgs/by-name/di/diagrams-as-code/package.nix index 14ba0abf5a9b..e550e281f527 100644 --- a/pkgs/by-name/di/diagrams-as-code/package.nix +++ b/pkgs/by-name/di/diagrams-as-code/package.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonPackage rec { doCheck = false; # no tests passthru.tests = { - simple = runCommand "${pname}-test" { } '' + simple = runCommand "diagrams-as-code-test" { } '' # giving full path to diagrams-as-code causes # a bad path concatenation cp ${diagrams-as-code.src}/examples/all-fields.yaml . diff --git a/pkgs/by-name/dn/dnsdiag/package.nix b/pkgs/by-name/dn/dnsdiag/package.nix index ae1da2edbd49..c182a89d86a7 100644 --- a/pkgs/by-name/dn/dnsdiag/package.nix +++ b/pkgs/by-name/dn/dnsdiag/package.nix @@ -1,21 +1,23 @@ { lib, - python3, fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "dnsdiag"; - version = "2.7.0"; + version = "2.9.1"; pyproject = true; src = fetchFromGitHub { owner = "farrokhi"; repo = "dnsdiag"; tag = "v${version}"; - hash = "sha256-VTxIKqc7yFTLx7VLEjb4UwPKAmSD+4X+ZHrmriScVGA="; + hash = "sha256-2sFOjWjPzIT1ot0G60KvMrvlS6anHxCf/Cbh1cAXypo="; }; + pythonRelaxDeps = [ "cryptography" ]; + build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ @@ -33,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "DNS Measurement, Troubleshooting and Security Auditing Toolset"; homepage = "https://github.com/farrokhi/dnsdiag"; - changelog = "https://github.com/farrokhi/dnsdiag/releases/tag/v${version}"; + changelog = "https://github.com/farrokhi/dnsdiag/releases/tag/${src.tag}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fab ]; mainProgram = "dnsdiag"; diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index e875418bc9cb..1b804fc8348a 100644 --- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -244,7 +244,7 @@ index 92d68e2..d1e1fa4 100644 g_signal_connect_object ( watcher->priv->desktop_settings, diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c -index df89788..4a1ebd0 100644 +index 371f9bb..b0a661e 100644 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c @@ -160,7 +160,18 @@ ecmb_is_power_saver_enabled (void) @@ -267,7 +267,7 @@ index df89788..4a1ebd0 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; -@@ -2654,7 +2665,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, +@@ -2652,7 +2663,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, if (is_declined) { GSettings *settings; @@ -556,7 +556,7 @@ index bd9822d..3e021dd 100644 g_signal_connect ( registry->priv->settings, "changed", diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c -index 02dcd6e..5dfa7ac 100644 +index 980ceb1..02d9551 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c @@ -2132,7 +2132,19 @@ static void diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index 42bd77f70832..d28489fd0d18 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "evolution-data-server"; - version = "3.58.1"; + version = "3.58.2"; outputs = [ "out" @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz"; - hash = "sha256-qRSSiBTviH8Jebp46o17zJj5bPB8u3CwBRmAvZDsNfA="; + hash = "sha256-aULs/Dnrs2sLQ2Ot/wB3HBwt+jT1ToDsksO6o/6wIPs="; }; patches = [ diff --git a/pkgs/by-name/ev/evolution-ews/package.nix b/pkgs/by-name/ev/evolution-ews/package.nix index 79776d979118..a93eec2c8be1 100644 --- a/pkgs/by-name/ev/evolution-ews/package.nix +++ b/pkgs/by-name/ev/evolution-ews/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.58.1"; + version = "3.58.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-EABr14/7fWQJxdAKVYvp3BkOhZS7miuXPi7AVhMWeCA="; + hash = "sha256-+m/A39F+9hpjCtM8ZFuDWMQmZ2YSbxcWs8ef79KQyPs="; }; patches = [ diff --git a/pkgs/by-name/fi/filen-desktop/package.nix b/pkgs/by-name/fi/filen-desktop/package.nix index 48f966e3ecab..2148b063f931 100644 --- a/pkgs/by-name/fi/filen-desktop/package.nix +++ b/pkgs/by-name/fi/filen-desktop/package.nix @@ -1,54 +1,115 @@ { lib, + pkgs, stdenv, - fetchurl, - appimageTools, + buildNpmPackage, + fetchFromGitHub, makeDesktopItem, + desktopToDarwinBundle, }: let - pname = "filen-desktop"; - version = "3.0.47"; - - arch = builtins.head (builtins.split "-" stdenv.hostPlatform.system); - - src = fetchurl { - url = "https://github.com/FilenCloudDienste/filen-desktop/releases/download/v${version}/Filen_linux_${arch}.AppImage"; - hash = "sha256-keaD5PUjkoFrFTCuap4DvmYq5X3Tjnq+njtiLgAZ9W8="; - }; - + packageName = "filen-desktop"; + packageVersion = "3.0.47"; + desktopName = "Filen Desktop"; desktopItem = makeDesktopItem { - name = "filen-desktop"; - desktopName = "Filen Desktop"; + name = packageName; + exec = packageName; + icon = packageName; + startupWMClass = packageName; + desktopName = desktopName; comment = "Encrypted Cloud Storage"; - icon = "filen-desktop"; - exec = "filen-desktop %u"; - categories = [ "Office" ]; + categories = [ + "Network" + "FileTransfer" + "Utility" + ]; + keywords = [ + "cloud" + "storage" + "encrypted" + ]; }; - appimageContents = appimageTools.extract { inherit pname version src; }; + iconPrefix = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; + iconSuffix = if stdenv.hostPlatform.isDarwin then "icns" else "png"; in -appimageTools.wrapType2 { - inherit pname version src; +buildNpmPackage { + pname = packageName; + version = packageVersion; + makeCacheWritable = true; - extraInstallCommands = '' - mkdir -p $out/share - cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons - chmod -R +w $out/share - find $out/share/icons -type f -iname "*.png" -execdir mv {} "$pname.png" \; + src = fetchFromGitHub { + owner = "FilenCloudDienste"; + repo = packageName; + rev = "v${packageVersion}"; + hash = "sha256-WS9JqErfsRtt6zF+LrKkpiscJ25MRXmRxmIm3GH6xf0="; + }; + + npmDepsHash = "sha256-+Ul2z6faZvAeCHq35janVTUNoqTQ5JNDeLbCV220nFU="; + npmBuildScript = "build"; + + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"; + + nativeBuildInputs = [ + pkgs.pkg-config + pkgs.electron + pkgs.makeWrapper + ] + ++ lib.optionals stdenv.isDarwin [ + desktopToDarwinBundle + ]; + + buildInputs = [ + pkgs.pixman + pkgs.cairo + pkgs.pango + ]; + + # Override package-lock.json electron version to use what's given by nixpkgs + postPatch = '' + substituteInPlace package.json \ + --replace-fail '"electron": "^34.1.1"' '"electron": "*"' + ''; + + # Set up icon assets in path required by desktopItem + preInstall = '' + mkdir -p $out/share/pixmaps + cp $src/assets/icons/app/${iconPrefix}.${iconSuffix} $out/share/pixmaps/${packageName}.${iconSuffix} + cp $src/assets/icons/app/${iconPrefix}Notification.${iconSuffix} $out/share/pixmaps/${packageName}-notification.${iconSuffix} + ''; + + # Create binary wrapper and desktopItem + # desktopItem auto-creates the .app bundle for Darwin + postInstall = '' + makeWrapper ${pkgs.electron}/bin/electron $out/bin/${packageName} \ + --set-default ELECTRON_IS_DEV 0 \ + --add-flags $out/lib/node_modules/@filen/desktop/dist/index.js \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ pkgs.stdenv.cc.cc.lib ]}" + + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications/ + ''; + + # Write correct darwin icons to .app contents + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + cp -rf $out/share/pixmaps/* "$out/Applications/${desktopName}.app/Contents/Resources" ''; meta = { - homepage = "https://filen.io/products/desktop"; - downloadPage = "https://github.com/FilenCloudDienste/filen-desktop/releases/"; - description = "Filen Desktop Client for Linux"; + homepage = "https://filen.io/products"; + downloadPage = "https://filen.io/products/desktop"; + description = "Filen Desktop Client"; longDescription = '' Encrypted Cloud Storage built for your Desktop. - Sync your data, mount network drives, collaborate with others and access files natively — powered by robust encryption and seamless integration. + Sync your data, mount network drives, collaborate with others and access files natively powered by robust encryption and seamless integration. ''; - mainProgram = "filen-desktop"; - platforms = [ "x86_64-linux" ]; + mainProgram = packageName; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ smissingham ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ + smissingham + kashw2 + ]; }; } diff --git a/pkgs/by-name/fi/filterpath/package.nix b/pkgs/by-name/fi/filterpath/package.nix index f3cbe5c88132..4e02cebf9c56 100644 --- a/pkgs/by-name/fi/filterpath/package.nix +++ b/pkgs/by-name/fi/filterpath/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Sigmanificient"; repo = "filterpath"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-GW8f3o7D5ddHQ8WZvds6rcsKPmlTSr/w4k2mU7oR6aM="; }; diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index d1f665c72cc8..9bce264bc85b 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-KL2dRyfwwa365hEMeVixAP9DFx3QObJVeesj95tOUmo="; }; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Fuzzy finder for Makefile"; inherit (src.meta) homepage; - changelog = "https://github.com/kyu08/fzf-make/releases/tag/${src.rev}"; + changelog = "https://github.com/kyu08/fzf-make/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient diff --git a/pkgs/by-name/gb/gbsplay/package.nix b/pkgs/by-name/gb/gbsplay/package.nix index dd8536c31b79..5f7c21ffe083 100644 --- a/pkgs/by-name/gb/gbsplay/package.nix +++ b/pkgs/by-name/gb/gbsplay/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "mmitch"; repo = "gbsplay"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-vsfpBhx3bNs6hQDO+xAPWFsf8L8fMtfdU5XKjF/r6PA="; }; diff --git a/pkgs/by-name/gf/gfold/package.nix b/pkgs/by-name/gf/gfold/package.nix index 638214c3443b..bf62e0f6d280 100644 --- a/pkgs/by-name/gf/gfold/package.nix +++ b/pkgs/by-name/gf/gfold/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "nickgerace"; repo = "gfold"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-sPvhZaDGInXH2PT8fg28m7wyDZiIE4fFScNO8WIjV9s="; }; diff --git a/pkgs/by-name/gi/git-pr/package.nix b/pkgs/by-name/gi/git-pr/package.nix index 2edcddc5acf8..07ec5aac695c 100644 --- a/pkgs/by-name/gi/git-pr/package.nix +++ b/pkgs/by-name/gi/git-pr/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "picosh"; repo = "git-pr"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-2A2rP7yr8faVoIYAWprr+t7MwDPerhsuOjWWEl1mhXw="; }; diff --git a/pkgs/by-name/gi/git-standup/package.nix b/pkgs/by-name/gi/git-standup/package.nix index ce0acd7f4f40..3a5754047697 100644 --- a/pkgs/by-name/gi/git-standup/package.nix +++ b/pkgs/by-name/gi/git-standup/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "kamranahmedse"; repo = "git-standup"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-x7Z4w4UzshXYc25ag6HopRrKbP+/ELkFPdsUBaUE1vY="; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Recall what you did on the last working day"; homepage = "https://github.com/kamranahmedse/git-standup"; - changelog = "https://github.com/kamranahmedse/git-standup/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/kamranahmedse/git-standup/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index 6be3cf5d3bc4..023ba135a747 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "49.1"; + version = "49.2"; outputs = [ "out" @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-tC0HMYnkAK+U/Dna66vlo2e7D2z3hOxc6VFodZXvvOs="; + hash = "sha256-0TuFXY35nev37M+BC24FT9sK64fvixMZGKbkyRl6Asc="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-user-share/package.nix b/pkgs/by-name/gn/gnome-user-share/package.nix index 237c137cba30..54023e345f23 100644 --- a/pkgs/by-name/gn/gnome-user-share/package.nix +++ b/pkgs/by-name/gn/gnome-user-share/package.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-user-share"; - version = "48.1"; + version = "48.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major finalAttrs.version}/gnome-user-share-${finalAttrs.version}.tar.xz"; - hash = "sha256-grz9TvPqf9eyr3+6mkW0dOF03NgowcS/5/+KLvhYunc="; + hash = "sha256-Ayho1Ar4UIC6Thi6XatGwOZj7H5DiUnwgsgFeV9ivwY="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/he/hexedit/package.nix b/pkgs/by-name/he/hexedit/package.nix index e592d6633b6c..fc6c05449a9b 100644 --- a/pkgs/by-name/he/hexedit/package.nix +++ b/pkgs/by-name/he/hexedit/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "pixel"; repo = "hexedit"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-fIgPbr7qmxyEga2YaAD0+NBM8LeDm/tVAq99ub7aiAI="; }; diff --git a/pkgs/by-name/hu/hueadm/package.nix b/pkgs/by-name/hu/hueadm/package.nix index 51986732b1d5..93087a75dce7 100644 --- a/pkgs/by-name/hu/hueadm/package.nix +++ b/pkgs/by-name/hu/hueadm/package.nix @@ -11,7 +11,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "bahamas10"; repo = "hueadm"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-QNjkfE8V/lUkYP8NAf11liKXILBk3wSNm3NSrgaH+nc="; }; diff --git a/pkgs/by-name/kd/kddockwidgets/package.nix b/pkgs/by-name/kd/kddockwidgets/package.nix index 8de443074cde..7e4cebd2659b 100644 --- a/pkgs/by-name/kd/kddockwidgets/package.nix +++ b/pkgs/by-name/kd/kddockwidgets/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "KDDockWidgets"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "KDDockWidgets"; rev = "v${version}"; - sha256 = "sha256-NNGIR2MTaNs2zFeN9vmHxoRuss2IR7FQ8F34b00L9z4="; + sha256 = "sha256-/ioCX/Txqr84uJJYPhVLrZKug6VdWQDVirmsTg42PXs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ks/ksh/package.nix b/pkgs/by-name/ks/ksh/package.nix index b0780eebc8c1..5b905df961ba 100644 --- a/pkgs/by-name/ks/ksh/package.nix +++ b/pkgs/by-name/ks/ksh/package.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "att"; repo = "ast"; - sha256 = "0cdxz0nhpq03gb9rd76fn0x1yzs2c8q289b7vcxnzlsrz1imz65j"; + hash = "sha256-sphfY/hZ028722clJDBiQn8fOrDOnJbTegPgCy34vTE="; tag = finalAttrs.version; }; patches = [ (fetchpatch { url = "https://github.com/att/ast/commit/11983a71f5e29df578b7e2184400728b4e3f451d.patch"; - sha256 = "1n9558c4v2qpgpjb1vafs29n3qn3z0770wr1ayc0xjf5z5j4g3kv"; + hash = "sha256-e45HZPnFyQ6YVyFzcA74w+Jhk9BO7bDkfReLTRgqJdk="; }) ]; diff --git a/pkgs/by-name/li/liboqs/package.nix b/pkgs/by-name/li/liboqs/package.nix index 3ec3eb542d98..1131aaa12238 100644 --- a/pkgs/by-name/li/liboqs/package.nix +++ b/pkgs/by-name/li/liboqs/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "open-quantum-safe"; repo = "liboqs"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-ATnI1QFFljTmMib6oOCiieDQMTwnEe+xIvcAzrz3bbI="; }; @@ -47,11 +47,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "C library for prototyping and experimenting with quantum-resistant cryptography"; homepage = "https://openquantumsafe.org"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ maintainers.sigmanificient ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.sigmanificient ]; }; }) diff --git a/pkgs/by-name/li/libowlevelzs/package.nix b/pkgs/by-name/li/libowlevelzs/package.nix index 6bc0c5fa5371..12610487da4e 100644 --- a/pkgs/by-name/li/libowlevelzs/package.nix +++ b/pkgs/by-name/li/libowlevelzs/package.nix @@ -5,15 +5,15 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libowlevelzs"; version = "0.1.1"; src = fetchFromGitHub { owner = "fogti"; repo = "libowlevelzs"; - rev = "v${version}"; - sha256 = "y/EaMMsmJEmnptfjwiat4FC2+iIKlndC2Wdpop3t7vY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-y/EaMMsmJEmnptfjwiat4FC2+iIKlndC2Wdpop3t7vY="; }; nativeBuildInputs = [ cmake ]; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libsv/package.nix b/pkgs/by-name/li/libsv/package.nix index 4136c6471407..30b0ec98c1a2 100644 --- a/pkgs/by-name/li/libsv/package.nix +++ b/pkgs/by-name/li/libsv/package.nix @@ -5,24 +5,24 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsv"; version = "1.2"; src = fetchFromGitHub { owner = "uael"; repo = "sv"; - rev = "v${version}"; - sha256 = "sha256-sc7WTRY8XTm5+J+zlS7tGa2f+2d7apj+XHyBafZXXeE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-sc7WTRY8XTm5+J+zlS7tGa2f+2d7apj+XHyBafZXXeE="; }; nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { description = "Public domain cross-platform semantic versioning in C99"; homepage = "https://github.com/uael/sv"; - license = licenses.unlicense; + license = lib.licenses.unlicense; maintainers = [ lib.maintainers.sigmanificient ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index 9aa3351dbd74..0228849b1936 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -11,10 +11,10 @@ mattermost.override { # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(11\\.[0-9]+\\.[0-9]+)$"; - version = "11.0.5"; - srcHash = "sha256-rycML/NL/0fA1OEdE8krHPo5+3DxSaQWoEV4UDfRK5E="; - vendorHash = "sha256-QlBq8YlphD2YuOrdnhW8g5XXeMkESVDRvKg6i5MGA0k="; - npmDepsHash = "sha256-F0LzT1Ko95Zm3BZu5/P/Tz1dkd+l3FWNtFw+p0NQ5Xw="; + version = "11.1.1"; + srcHash = "sha256-8JpAdjQbIoam0q9XR93YqRLbHGBpRKuHPUOb9+cKqZk="; + vendorHash = "sha256-yI+8GAwCZjZxDiYEALKDCYAWbGE7/zCFTBkPj4RmHJk="; + npmDepsHash = "sha256-5OgWhootvh4r7nyuELAfBL8tvmJrkUCblT8IRtd6kXM="; lockfileOverlay = '' unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react") ''; diff --git a/pkgs/by-name/me/metee/package.nix b/pkgs/by-name/me/metee/package.nix index 144ee6ba2f61..4f4b38bd71f8 100644 --- a/pkgs/by-name/me/metee/package.nix +++ b/pkgs/by-name/me/metee/package.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "metee"; - version = "6.0.2"; + version = "6.1.0"; src = fetchFromGitHub { owner = "intel"; repo = "metee"; tag = finalAttrs.version; - hash = "sha256-eQpw0VdO+JGtgW4FGduoxY0Gji4hFPSONcEzDRcgWGU="; + hash = "sha256-ybTi4pFZAkoO6FAyUOLK+ZbTQb7uwu/sqhYxo06SE9A="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/mi/mini-calc/package.nix b/pkgs/by-name/mi/mini-calc/package.nix index 138cf276e18d..6961558f756e 100644 --- a/pkgs/by-name/mi/mini-calc/package.nix +++ b/pkgs/by-name/mi/mini-calc/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "vanilla-extracts"; repo = "calc"; - rev = version; + tag = version; hash = "sha256-601BmecY+jbiD39buN68MeJKd5wguH0hahHquHadsL4="; }; diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 105fb476ba33..4653bb2c718d 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "49.1.1"; + version = "49.2"; outputs = [ "out" @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-EykM/0l0EA4r/XsPrlwG+X+nXSH9xA8fXn5ILzPL0Cc="; + hash = "sha256-J2ORoIDlCVaSQKyGECVdd4q2qIoyUPmxd0AlXxNOPAo="; }; mesonFlags = [ @@ -224,13 +224,13 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Window manager for GNOME"; mainProgram = "mutter"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; changelog = "https://gitlab.gnome.org/GNOME/mutter/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; - license = licenses.gpl2Plus; - teams = [ teams.gnome ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.gnome ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix index 8d3924e4ee8d..e8992233fc18 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "49.1"; + version = "49.2"; outputs = [ "out" @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; - hash = "sha256-rdKg5BD9ItooUd3QxbPSLJ6djDMRFRHzNpYeO0YbU14="; + hash = "sha256-JXazS+0ngaifCQUeyfyuOuF+txcs175nj1kqoU5MJrE="; }; patches = [ diff --git a/pkgs/by-name/np/nph/package.nix b/pkgs/by-name/np/nph/package.nix index 9b93f5cd87bb..b5a3a28fd01a 100644 --- a/pkgs/by-name/np/nph/package.nix +++ b/pkgs/by-name/np/nph/package.nix @@ -22,7 +22,7 @@ buildNimPackage' (finalAttrs: { src = fetchFromGitHub { owner = "arnetheduck"; repo = "nph"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RIuggg09l7jZDg91FPrjwdoE+gCxgb7c8fEvCiwQk5U="; }; diff --git a/pkgs/by-name/oc/ocm/package.nix b/pkgs/by-name/oc/ocm/package.nix index 1d903fe0c5d5..e914d800f971 100644 --- a/pkgs/by-name/oc/ocm/package.nix +++ b/pkgs/by-name/oc/ocm/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "ocm"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "sha256-v+BWmdTDJm1oElP/XV59pHm7NlsFj2sDTymtT0xpXKY="; + sha256 = "sha256-hj91qHj88YW0vKhwhuDZB91u63sJ3VrxfcJwbxgIzWg="; }; vendorHash = "sha256-GOdRYVnFPS1ovFmU+9MEnwTNg1sa9/25AjzbcbBJrQ0="; diff --git a/pkgs/by-name/op/opencloud-desktop/package.nix b/pkgs/by-name/op/opencloud-desktop/package.nix index da1dfad4fbeb..c6c77bd75e74 100644 --- a/pkgs/by-name/op/opencloud-desktop/package.nix +++ b/pkgs/by-name/op/opencloud-desktop/package.nix @@ -3,7 +3,6 @@ cmake, kdePackages, fetchFromGitHub, - fetchFromGitLab, libre-graph-api-cpp-qt-client, kdsingleapplication, nix-update-script, @@ -11,46 +10,21 @@ versionCheckHook, stdenv, }: -let - # See issue https://github.com/NixOS/nixpkgs/issues/455981 - # It was spotted upstream that ecm 6.19.0 caused this issue - # Therefore we pin ecm 6.18.0 which makes opencloud function correctly - ecm618 = kdePackages.extra-cmake-modules.overrideAttrs ( - finalAttrs: prevAttrs: { - version = "6.18.0"; - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "frameworks"; - repo = "extra-cmake-modules"; - tag = "v${finalAttrs.version}"; - hash = "sha256-hpqczRaV32yyXXRWxR30tOBEUNWDkeSzVrv0SHMrz1Y="; - }; - patches = [ ]; - } - ); - -in stdenv.mkDerivation (finalAttrs: { pname = "opencloud-desktop"; - version = "2.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-NM9SspeMXu1q3tfpcFk4OuLapu/clbotJLu2u4nmAlY="; + hash = "sha256-ILOapZfySDJWZJDVFwNs46SEw/yPpe/+2dctyRl8iJ8="; }; - # Fix build with Qt 6.10.1 - # Submitted upstream: https://github.com/opencloud-eu/desktop/pull/710 - patches = [ - ./qt-6.10.1.patch - ]; - buildInputs = [ - ecm618 qt6.qtbase qt6.qtdeclarative qt6.qttools + kdePackages.extra-cmake-modules kdePackages.qtkeychain libre-graph-api-cpp-qt-client kdsingleapplication diff --git a/pkgs/by-name/op/opencloud-desktop/qt-6.10.1.patch b/pkgs/by-name/op/opencloud-desktop/qt-6.10.1.patch deleted file mode 100644 index c3e59ca05482..000000000000 --- a/pkgs/by-name/op/opencloud-desktop/qt-6.10.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/libsync/globalconfig.h b/src/libsync/globalconfig.h -index 7094385b4..2ef8a44d2 100644 ---- a/src/libsync/globalconfig.h -+++ b/src/libsync/globalconfig.h -@@ -6,7 +6,7 @@ - #include "libsync/opencloudsynclib.h" - - #include --#include -+#include - - namespace OCC { - class OPENCLOUD_SYNC_EXPORT GlobalConfig : public QObject diff --git a/pkgs/by-name/or/orca/fix-paths.patch b/pkgs/by-name/or/orca/fix-paths.patch index 49142eed47d9..8cb8d9406307 100644 --- a/pkgs/by-name/or/orca/fix-paths.patch +++ b/pkgs/by-name/or/orca/fix-paths.patch @@ -38,33 +38,33 @@ index 3fc845dc3..a82947911 100755 stdout=subprocess.PIPE) as proc: pids = proc.stdout.read() if proc.stdout else b"" diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py -index 3407be009..452297a3f 100644 +index 098b0a033..e7b040d82 100644 --- a/src/orca/orca_modifier_manager.py +++ b/src/orca/orca_modifier_manager.py -@@ -230,7 +230,7 @@ class OrcaModifierManager: - debug.print_message(debug.LEVEL_INFO, msg, True) +@@ -236,7 +236,7 @@ class OrcaModifierManager: + return self.unset_orca_modifiers(reason) -- with subprocess.Popen(["xkbcomp", os.environ["DISPLAY"], "-"], -+ with subprocess.Popen(["@xkbcomp@", os.environ["DISPLAY"], "-"], +- with subprocess.Popen(["xkbcomp", display, "-"], ++ with subprocess.Popen(["@xkbcomp@", display, "-"], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) as p: self._original_xmodmap, _ = p.communicate() self._create_orca_xmodmap() -@@ -262,7 +262,7 @@ class OrcaModifierManager: +@@ -274,7 +274,7 @@ class OrcaModifierManager: return self._caps_lock_cleared = False -- with subprocess.Popen(["xkbcomp", "-w0", "-", os.environ["DISPLAY"]], -+ with subprocess.Popen(["@xkbcomp@", "-w0", "-", os.environ["DISPLAY"]], +- with subprocess.Popen(["xkbcomp", "-w0", "-", display], ++ with subprocess.Popen(["@xkbcomp@", "-w0", "-", display], stdin=subprocess.PIPE, stdout=None, stderr=None) as p: p.communicate(self._original_xmodmap) -@@ -325,7 +325,7 @@ class OrcaModifierManager: +@@ -349,7 +349,7 @@ class OrcaModifierManager: debug.print_message(debug.LEVEL_INFO, msg, True) -- with subprocess.Popen(["xkbcomp", "-w0", "-", os.environ["DISPLAY"]], -+ with subprocess.Popen(["@xkbcomp@", "-w0", "-", os.environ["DISPLAY"]], +- with subprocess.Popen(["xkbcomp", "-w0", "-", display], ++ with subprocess.Popen(["@xkbcomp@", "-w0", "-", display], stdin=subprocess.PIPE, stdout=None, stderr=None) as p: p.communicate(bytes('\n'.join(lines), 'UTF-8')) else: diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 2016bd025d7d..7d0482be0f00 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -31,13 +31,13 @@ python3.pkgs.buildPythonApplication rec { pname = "orca"; - version = "49.4"; + version = "49.5"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz"; - hash = "sha256-trpMxYeEEcNKfVt+6bLFybHQSt0Qv9IPbiMx1ZQWUgc="; + hash = "sha256-U99BVYMZ6XwehK1gSYmVegK10P9TFBkZDwWH6mslYDQ="; }; patches = [ diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index 5285fd828211..2beebde04ec1 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "papers"; - version = "49.1"; + version = "49.2"; outputs = [ "out" @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz"; - hash = "sha256-SrI6Z4l73da+LWKYIQ//YCz+wPNWiLxb/ycDYLB4TCk="; + hash = "sha256-SanKL2LFWY+ObKTmfIf09ZxewN5wTTspnVFkyR0fakE="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { pname version ; - hash = "sha256-Pjhpo44Zau2z6aWEQEcIPy3aUYplwdF/XIkO/1Zl+kg="; + hash = "sha256-aOVPknBqBV7AWO9LxvWRjiL2H2UQHAcpGpKY5YeoQrc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ph/physac/package.nix b/pkgs/by-name/ph/physac/package.nix index bc81fb2698db..e993c7e56fd6 100644 --- a/pkgs/by-name/ph/physac/package.nix +++ b/pkgs/by-name/ph/physac/package.nix @@ -28,8 +28,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { includedir=$out/include Name: physac - Description: ${finalAttrs.meta.description} - URL: ${finalAttrs.meta.homepage} + Description: 2D physics header-only library for raylib + URL: https://github.com/victorfisac/Physac Version: ${finalAttrs.version} Cflags: -I"{includedir}" EOF diff --git a/pkgs/by-name/ps/ps_mem/package.nix b/pkgs/by-name/ps/ps_mem/package.nix index 9d360580ab65..566b4580bdf7 100644 --- a/pkgs/by-name/ps/ps_mem/package.nix +++ b/pkgs/by-name/ps/ps_mem/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "pixelb"; repo = "ps_mem"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-jCfPtPSky/QFk9Xo/tq3W7609Pie1yLC4iS4dqjCa+E="; }; diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix index b88d2343b3b7..5fc8d7db93be 100644 --- a/pkgs/by-name/qu/quadrapassel/package.nix +++ b/pkgs/by-name/qu/quadrapassel/package.nix @@ -12,7 +12,6 @@ librsvg, gsound, libmanette, - itstool, blueprint-compiler, wrapGAppsHook4, meson, @@ -23,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quadrapassel"; - version = "49.1"; + version = "49.2.1"; src = fetchurl { url = "mirror://gnome/sources/quadrapassel/${lib.versions.major finalAttrs.version}/quadrapassel-${finalAttrs.version}.tar.xz"; - hash = "sha256-ttejtndabcTxmAvZN4MkZmF6iX7KoQmPOixZvhdhZQk="; + hash = "sha256-pTIKb47ghWKkNsq6TjT3rgQP7cjXL76iJ/cCXZPExrk="; }; nativeBuildInputs = [ @@ -36,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: { vala desktop-file-utils pkg-config - itstool blueprint-compiler wrapGAppsHook4 ]; diff --git a/pkgs/by-name/qu/quisk/package.nix b/pkgs/by-name/qu/quisk/package.nix index 82bdbce848ca..a57fc5cbea80 100644 --- a/pkgs/by-name/qu/quisk/package.nix +++ b/pkgs/by-name/qu/quisk/package.nix @@ -9,12 +9,12 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.46"; + version = "4.2.48"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Tp6ctOZLGYyRe3q5EU1dZjAZTCXTsHywFzE5jKF2Ssc="; + hash = "sha256-5N8uogS/V5nwYhHsdsc81GgjS9NblLx3KpdoEaXtpJI="; }; buildInputs = [ diff --git a/pkgs/by-name/ra/ragnarwm/package.nix b/pkgs/by-name/ra/ragnarwm/package.nix index d177c112bdce..3a77bb6193e6 100644 --- a/pkgs/by-name/ra/ragnarwm/package.nix +++ b/pkgs/by-name/ra/ragnarwm/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "cococry"; repo = "Ragnar"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-OZhIwrKEhTfkw9K8nZIwGZzxXBObseWS92Y+85HmdNs="; }; prePatch = '' substituteInPlace Makefile \ - --replace '/usr/bin' "$out/bin" \ - --replace '/usr/share' "$out/share" + --replace-fail '/usr/bin' "$out/bin" \ + --replace-fail '/usr/share' "$out/share" ''; postPatch = diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index 8878b6c8de5a..71be3786753a 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rasm"; version = "3.0"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pRDfaQVqR7OVwSKh2dMU4QjEb5SGQ2eoG8g9aUJwrXU="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ra/raygui/package.nix b/pkgs/by-name/ra/raygui/package.nix index 5aa6b78023b0..d0569b39fe8e 100644 --- a/pkgs/by-name/ra/raygui/package.nix +++ b/pkgs/by-name/ra/raygui/package.nix @@ -28,8 +28,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { includedir=$out/include Name: raygui - Description: ${finalAttrs.meta.description} - URL: ${finalAttrs.meta.homepage} + Description: Simple and easy-to-use immediate-mode gui library + URL: https://github.com/raysan5/raygui Version: ${finalAttrs.version} Cflags: -I"{includedir}" EOF diff --git a/pkgs/by-name/sc/scuba/package.nix b/pkgs/by-name/sc/scuba/package.nix index af8b00cfcdda..ec87cc551181 100644 --- a/pkgs/by-name/sc/scuba/package.nix +++ b/pkgs/by-name/sc/scuba/package.nix @@ -6,13 +6,13 @@ }: let - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "JonathonReinhart"; repo = "scuba"; tag = "v${version}"; - hash = "sha256-AX70js/bvt88zWJlXpuHIeBsBRfAL4qZjuthPFKSnFI="; + hash = "sha256-AbaBTI/gz5lifjMx00sxuUl1MxhYM93iKfGdpHsLjzk="; }; # This must be built statically because scuba will execute unknown docker environments @@ -61,6 +61,7 @@ python3Packages.buildPythonPackage rec { homepage = "https://github.com/JonathonReinhart/scuba"; changelog = "https://github.com/JonathonReinhart/scuba/releases/tag/${src.tag}"; license = lib.licenses.mit; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ tbaldwin ]; mainProgram = "scuba"; }; diff --git a/pkgs/by-name/sh/shen-sbcl/package.nix b/pkgs/by-name/sh/shen-sbcl/package.nix index 281b43810ecb..4c472eec7239 100644 --- a/pkgs/by-name/sh/shen-sbcl/package.nix +++ b/pkgs/by-name/sh/shen-sbcl/package.nix @@ -3,14 +3,15 @@ stdenvNoCC, fetchzip, sbcl, + installStandardLibrary ? true, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "shen-sbcl"; - version = "39.1"; + version = "39.2"; src = fetchzip { url = "https://www.shenlanguage.org/Download/S${finalAttrs.version}.zip"; - hash = "sha256-reN9avgYGYCMiA5BeHLhRK51liKF2ctqIgxf+4IWjVY="; + hash = "sha256-V6op0G4aEdKifP6L0ho6cy1FPNax+0aE5ltWxT7Xniw="; }; nativeBuildInputs = [ sbcl ]; @@ -32,6 +33,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + postPatch = '' + # allow SBCL to define *release* global + substituteInPlace Primitives/globals.lsp \ + --replace-fail '"2.0.0"' '(LISP-IMPLEMENTATION-VERSION)' + + # remove interactive prompt during image creation + substituteInPlace install.lsp \ + --replace-fail '(Y-OR-N-P "Load Shen Library? ")' '${ + if installStandardLibrary then "T" else "NIL" + }' + ''; + meta = { homepage = "https://shenlanguage.org"; description = "Port of Shen running on Steel Bank Common Lisp"; diff --git a/pkgs/by-name/sh/showtime/package.nix b/pkgs/by-name/sh/showtime/package.nix index 85fed910f701..ad483746311d 100644 --- a/pkgs/by-name/sh/showtime/package.nix +++ b/pkgs/by-name/sh/showtime/package.nix @@ -4,7 +4,6 @@ blueprint-compiler, desktop-file-utils, fetchurl, - fetchpatch, glib, gnome, gobject-introspection, @@ -20,23 +19,14 @@ python3Packages.buildPythonApplication rec { pname = "showtime"; - version = "49.0"; + version = "49.1"; pyproject = false; src = fetchurl { url = "mirror://gnome/sources/showtime/${lib.versions.major version}/showtime-${version}.tar.xz"; - hash = "sha256-Wryvl6telTADgoKEhYjozmwmFztzA+9nVr69sLIO05g="; + hash = "sha256-iu+7DiAJx6HNRKuAGwbKN19+loPwKaBS64b7Qzp4U5M="; }; - patches = [ - # Fix startup crash when missing state directory. - # https://gitlab.gnome.org/GNOME/showtime/-/merge_requests/80 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/showtime/-/commit/a5d57a6b023664c9dc5aeb55a3467a8b56e1b7bc.patch"; - hash = "sha256-IUkopJ3J381+9MnvaItx7dn9NAVrqO9y4LjgPh8MU/M="; - }) - ]; - strictDeps = true; depsBuildBuild = [ diff --git a/pkgs/by-name/sx/sxcs/package.nix b/pkgs/by-name/sx/sxcs/package.nix index b4dd0b871573..d0f0d82e2ac4 100644 --- a/pkgs/by-name/sx/sxcs/package.nix +++ b/pkgs/by-name/sx/sxcs/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "codeberg.org"; owner = "NRK"; repo = "sxcs"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rYmbbdZjeLCvGvNocI3+KVU2KBkYvRisayTyScTRay8="; }; diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix index 721cf51303b6..68f172173c15 100644 --- a/pkgs/by-name/ta/tandoor-recipes/common.nix +++ b/pkgs/by-name/ta/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "2.3.3"; + version = "2.3.6"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; tag = version; - hash = "sha256-N9eHoQyNPbjf4XrdNvTuMKs866mO+jgn2zRkXLAMtb8="; + hash = "sha256-DWPy4wse9sAr/xmZuNRXy4kYTD5elGx9QiXmJKrw860="; }; - yarnHash = "sha256-1p79Bdsn6KDApYKz9BAwrA97svbB8ub+Wl49MTIumW8="; + yarnHash = "sha256-++Si9U9Ouz9LpeemtqzIiQIpuhbSJkruKlVR1WSgQfo="; meta = { homepage = "https://tandoor.dev/"; diff --git a/pkgs/by-name/ta/tandoor-recipes/update.sh b/pkgs/by-name/ta/tandoor-recipes/update.sh index ee0d655b89db..7b5c3a5df9b1 100755 --- a/pkgs/by-name/ta/tandoor-recipes/update.sh +++ b/pkgs/by-name/ta/tandoor-recipes/update.sh @@ -29,7 +29,7 @@ tmpdir=$(mktemp -d) trap 'rm -rf "$tmpdir"' EXIT pushd "$tmpdir" -wget "${TOKEN_ARGS[@]}" "$package_src/vue/yarn.lock" +wget "${TOKEN_ARGS[@]}" "$package_src/vue3/yarn.lock" yarn_hash=$(prefetch-yarn-deps yarn.lock) popd diff --git a/pkgs/by-name/to/toolong/package.nix b/pkgs/by-name/to/toolong/package.nix index ee68ea202a67..9c56b298722b 100644 --- a/pkgs/by-name/to/toolong/package.nix +++ b/pkgs/by-name/to/toolong/package.nix @@ -38,11 +38,11 @@ python3Packages.buildPythonApplication { command = "${lib.getExe toolong} --version"; }; - meta = with lib; { + meta = { description = "Terminal application to view, tail, merge, and search log files (plus JSONL)"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/textualize/toolong"; - maintainers = with maintainers; [ sigmanificient ]; + maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "tl"; }; } diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix index bac360575323..406bae909c10 100644 --- a/pkgs/by-name/tu/tuifimanager/package.nix +++ b/pkgs/by-name/tu/tuifimanager/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - python3, + python3Packages, fetchFromGitHub, kdePackages, gnome-themes-extra, @@ -18,7 +18,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport) "Drag and drop support is only available for linux with xorg." - python3.pkgs.buildPythonApplication + python3Packages.buildPythonApplication rec { pname = "tuifimanager"; version = "5.1.5"; @@ -32,7 +32,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport) hash = "sha256-5ShrmjEFKGdmaGBFjMnIfcM6p8AZd13uIEFwDVAkU/8="; }; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ setuptools setuptools-scm ]; @@ -44,15 +44,15 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport) makeWrapper ]); - propagatedBuildInputs = [ - python3.pkgs.send2trash - python3.pkgs.unicurses + dependencies = [ + python3Packages.send2trash + python3Packages.unicurses ] ++ (lib.optionals enableDragAndDrop [ - python3.pkgs.pynput - python3.pkgs.pyside6 - python3.pkgs.requests - python3.pkgs.xlib + python3Packages.pynput + python3Packages.pyside6 + python3Packages.requests + python3Packages.xlib kdePackages.qtbase kdePackages.qt6gtk2 ]); diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index ac726251b661..7b27c250474a 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.39.2"; + version = "1.40.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = "typos"; tag = "v${version}"; - hash = "sha256-N8lz/PEGtqBHH9smUGoPghGEIGukrS/9POv+FAb8L/M="; + hash = "sha256-fWDV4SmFsmIGrM22hT5ELqMwYBE6GOCIIPsLtLnc9cc="; }; - cargoHash = "sha256-+8RKFg8XFYgqso3lvqaKHi8O8dFU3ayEMdLgZytNZlY="; + cargoHash = "sha256-jku4918M0Ymgzk+Y1OP8cr8oG501Wp0EolS4N2CbQSs="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/un/unipicker/package.nix b/pkgs/by-name/un/unipicker/package.nix index 9549c30f7815..a1e15b1a96d3 100644 --- a/pkgs/by-name/un/unipicker/package.nix +++ b/pkgs/by-name/un/unipicker/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "jeremija"; repo = "unipicker"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Br9nCK5eWoSN1i4LM2F31B62L9vuN5KzjS9pC9lq9oM="; }; diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 9770640704c8..b8e6b1cd2126 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "updatecli"; - version = "0.108.0"; + version = "0.110.3"; src = fetchFromGitHub { owner = "updatecli"; repo = "updatecli"; rev = "v${version}"; - hash = "sha256-JFv40wtfjNMQrjmku7iVwJ0MquaHPyiRaN9Ti5tCUwI="; + hash = "sha256-PeCvJx582Ndz11CmOwGT0fmqplhOqCT98xhtH0Me818="; }; - vendorHash = "sha256-9tA55vTI+UARfR1hxmdb9iuByPeKfFLLwAbwoCG0dsc="; + vendorHash = "sha256-2LiPLFjFxyoypEe1dCzMIQvIN6CfnDr0/EZuGkmA2kM="; # tests require network access doCheck = false; diff --git a/pkgs/by-name/us/ustr/package.nix b/pkgs/by-name/us/ustr/package.nix index 776f82103cb1..16d5e2d690c7 100644 --- a/pkgs/by-name/us/ustr/package.nix +++ b/pkgs/by-name/us/ustr/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchgit { url = "http://www.and.org/ustr/ustr.git"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pQrQy+S9fVFl8Mop4QmwEAXGiBSheQE4HgAZ4srFz64="; }; diff --git a/pkgs/by-name/vb/vbam/package.nix b/pkgs/by-name/vb/vbam/package.nix index d57102d6697a..d884d63dc604 100644 --- a/pkgs/by-name/vb/vbam/package.nix +++ b/pkgs/by-name/vb/vbam/package.nix @@ -4,7 +4,7 @@ cairo, cmake, fetchFromGitHub, - ffmpeg, + ffmpeg_7, gettext, wxGTK32, gtk3, @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo - ffmpeg + ffmpeg_7 gettext libGLU libGL @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { lassulus netali ]; - homepage = "https://vba-m.com/"; + homepage = "https://www.visualboyadvance-m.org/"; platforms = lib.platforms.linux; mainProgram = "visualboyadvance-m"; }; diff --git a/pkgs/by-name/vi/viu/package.nix b/pkgs/by-name/vi/viu/package.nix index d4d1237ddf1e..c4ddf9abb9f3 100644 --- a/pkgs/by-name/vi/viu/package.nix +++ b/pkgs/by-name/vi/viu/package.nix @@ -13,8 +13,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; - rev = "v${version}"; - sha256 = "sha256-sx8BH01vTFsAEnMKTcVZTDMHiVi230BVVGRexoBNxeo="; + tag = "v${version}"; + hash = "sha256-sx8BH01vTFsAEnMKTcVZTDMHiVi230BVVGRexoBNxeo="; }; # tests need an interactive terminal @@ -25,11 +25,11 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional withSixel "sixel"; buildInputs = lib.optional withSixel libsixel; - meta = with lib; { + meta = { description = "Command-line application to view images from the terminal written in Rust"; homepage = "https://github.com/atanunq/viu"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ chuangzhu sigmanificient ]; diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix index 801d7da56e73..e64ae020a5b3 100644 --- a/pkgs/by-name/vi/vivaldi/package.nix +++ b/pkgs/by-name/vi/vivaldi/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { pname = "vivaldi"; - version = "7.6.3797.63"; + version = "7.7.3851.54"; suffix = { @@ -79,8 +79,8 @@ stdenv.mkDerivation rec { url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-byMooo6J8ycd6Nhmd8UUXJgDZA+Da+rCZauXQRWXIq8="; - x86_64-linux = "sha256-6ernnmXIg+h8lOYo4MTDTuCDuTJ87VIR8UNDr2EHIJA="; + aarch64-linux = "sha256-qt+ahh/B9xahVbIMeWgKqg9YXKqFsen1gELas/GBtyU="; + x86_64-linux = "sha256-MkIufX19GLXuPH9IlRQboEZrtvrnNlgpMMnVhSj1hUw="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -202,7 +202,7 @@ stdenv.mkDerivation rec { substituteInPlace "$out"/share/applications/*.desktop \ --replace-fail vivaldi-stable vivaldi local d - for d in 16 22 24 32 48 64 128 256; do + for d in 16 24 32 48 64 128 256; do mkdir -p "$out"/share/icons/hicolor/''${d}x''${d}/apps ln -s \ "$out"/opt/vivaldi/product_logo_''${d}.png \ diff --git a/pkgs/by-name/xm/xml-tooling-c/package.nix b/pkgs/by-name/xm/xml-tooling-c/package.nix index ab978f194f15..2f31f5efd3b2 100644 --- a/pkgs/by-name/xm/xml-tooling-c/package.nix +++ b/pkgs/by-name/xm/xml-tooling-c/package.nix @@ -12,13 +12,13 @@ xml-security-c, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xml-tooling-c"; version = "3.3.0"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-xmltooling.git"; - rev = version; + tag = finalAttrs.version; hash = "sha256-czmBu7ThDwq+x7FahgZDMHqid8jeUNnTuKMI/Fj4IIw="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.sigmanificient ]; }; -} +}) diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 28b1de2841ef..7195fb38d968 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2025.11.18"; + version = "2025.11.27"; pyproject = true; src = fetchFromGitHub { owner = "jmbannon"; repo = "ytdl-sub"; tag = version; - hash = "sha256-dvgQoHSSPsiJdve5O+Mf4oFWAc/1/fuAzzOp2ywe0kU="; + hash = "sha256-HkdDcTQza4pw72FuQgss+GRiiHPtKFRSCJ87fIYPdq4="; }; postPatch = '' diff --git a/pkgs/by-name/yy/yyjson/package.nix b/pkgs/by-name/yy/yyjson/package.nix index 59d447c92d36..613b71370b29 100644 --- a/pkgs/by-name/yy/yyjson/package.nix +++ b/pkgs/by-name/yy/yyjson/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ibireme"; repo = "yyjson"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-1CYnEgUMUc7eqdkv6M/KyL/MdVQBMov9HgLCycF6++w="; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Fastest JSON library in C"; homepage = "https://github.com/ibireme/yyjson"; - changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 0165766f3fa4..11fa9ebff6c1 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -42,14 +42,23 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; - patches = lib.optionals (lib.versionOlder version "22") [ - # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute - # https://github.com/protocolbuffers/protobuf/pull/10090 - (fetchpatch { - url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; - hash = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; - }) - ]; + patches = + lib.optionals (lib.versionOlder version "22") [ + # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute + # https://github.com/protocolbuffers/protobuf/pull/10090 + (fetchpatch { + url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; + hash = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; + }) + ] + ++ lib.optionals (lib.versions.major version == "29") [ + # fix temporary directory handling to avoid test failures on darwin + # https://github.com/NixOS/nixpkgs/issues/464439 + (fetchpatch { + url = "https://github.com/protocolbuffers/protobuf/commit/0e9d0f6e77280b7a597ebe8361156d6bb1971dca.patch"; + hash = "sha256-rIP+Ft/SWVwh9Oy8y8GSUBgP6CtLCLvGmr6nOqmyHhY="; + }) + ]; # hook to provide the path to protoc executable, used at build time build_protobuf = @@ -100,6 +109,10 @@ stdenv.mkDerivation (finalAttrs: { versionCheckProgramArg = "--version"; doInstallCheck = true; + env = lib.optionalAttrs (lib.versions.major version == "29") { + GTEST_DEATH_TEST_STYLE = "threadsafe"; + }; + passthru = { tests = { pythonProtobuf = python3.pkgs.protobuf; diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 979cc397b533..3208ce2fa9f9 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.20.1"; + version = "3.21"; pyproject = true; src = fetchFromGitHub { owner = "fox-it"; repo = "acquire"; tag = version; - hash = "sha256-QX7rPoJJqBPdvN2LzSBw8kGDSsIHLm65TJ0uXuhwB4Q="; + hash = "sha256-CVwPMMQFGqvyxm5tK7JMEX8/dgiF25wwRNaLNfLLWto="; }; build-system = [ diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 696115fc61b9..6c1ed7d2b848 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.71.0"; + version = "0.75.0"; pyproject = true; src = fetchFromGitHub { owner = "anthropics"; repo = "anthropic-sdk-python"; tag = "v${version}"; - hash = "sha256-n8hu2RFuZN0ojHhhU4qPQaT2DUvqSglFhBo2ORln/mc="; + hash = "sha256-wwaH9/o7qr8eXKvmKpj+/ubOdDydcXId/qiA6dXpd2I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 871000af62aa..a27660e90410 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "brother"; - version = "5.1.1"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "brother"; tag = version; - hash = "sha256-CrPtDHMz1vHprYD1IkR4J0WEY43kGDm+e7kTzanAiR0="; + hash = "sha256-kvR4891kaZFHKZhtgrrgtGJZUIwoYE5CsGUEQM7eKvs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/clu/default.nix b/pkgs/development/python-modules/clu/default.nix new file mode 100644 index 000000000000..383565e6ea80 --- /dev/null +++ b/pkgs/development/python-modules/clu/default.nix @@ -0,0 +1,81 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + absl-py, + etils, + flax, + jax, + jaxlib, + ml-collections, + numpy, + packaging, + typing-extensions, + wrapt, + + # tests + keras, + pytestCheckHook, + tensorflow, + tensorflow-datasets, + torch, +}: + +buildPythonPackage rec { + pname = "clu"; + version = "0.0.12"; + pyproject = true; + + src = fetchFromGitHub { + owner = "google"; + repo = "CommonLoopUtils"; + tag = "v${version}"; + hash = "sha256-ntqRz3fCXMf0EDQsddT68Mdi105ECBVQpVsStzk2kvQ="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + absl-py + etils + flax + jax + jaxlib + ml-collections + numpy + packaging + typing-extensions + wrapt + ] + ++ etils.optional-dependencies.epath; + + pythonImportsCheck = [ "clu" ]; + + nativeCheckInputs = [ + keras + pytestCheckHook + tensorflow + tensorflow-datasets + torch + ]; + + disabledTests = [ + # AssertionError: [Chex] Assertion assert_trees_all_close failed + "test_collection_mixed_async" + ]; + + meta = { + description = "Common training loops in JAX"; + homepage = "https://github.com/google/CommonLoopUtils"; + changelog = "https://github.com/google/CommonLoopUtils/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/dissect-apfs/default.nix b/pkgs/development/python-modules/dissect-apfs/default.nix new file mode 100644 index 000000000000..a47cb0989005 --- /dev/null +++ b/pkgs/development/python-modules/dissect-apfs/default.nix @@ -0,0 +1,56 @@ +{ + lib, + asn1crypto, + buildPythonPackage, + dissect-cstruct, + dissect-fve, + dissect-util, + fetchFromGitHub, + pycryptodome, + pytestCheckHook, + setuptools-scm, + setuptools, +}: + +buildPythonPackage rec { + pname = "dissect-apfs"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.apfs"; + tag = version; + hash = "sha256-w8R8hoj3pqP0cKCd2S8jz8IRwxRp6eVN0xb0/6E2aKw="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + asn1crypto + dissect-fve + dissect-cstruct + dissect-util + pycryptodome + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "dissect.apfs" ]; + + disabledTestPaths = [ + # Bad file + "tests/test_apfs.py" + ]; + + meta = with lib; { + description = "Dissect module implementing a parser for APFS"; + homepage = "https://github.com/fox-it/dissect.apfs"; + changelog = "https://github.com/fox-it/dissect.apfs/releases/tag/${src.tag}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dissect-archive/default.nix b/pkgs/development/python-modules/dissect-archive/default.nix index 79a23a310d2d..e3f1ca21591a 100644 --- a/pkgs/development/python-modules/dissect-archive/default.nix +++ b/pkgs/development/python-modules/dissect-archive/default.nix @@ -4,23 +4,21 @@ dissect-cstruct, dissect-util, fetchFromGitHub, - pythonOlder, + pytestCheckHook, setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "dissect-archive"; - version = "1.6"; + version = "1.8"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.archive"; tag = version; - hash = "sha256-TaNSgUL9Ia7Qz9qy+I+4vRFn5gGnsYxAgbsrI6iYrlo="; + hash = "sha256-HNbnluJPn275BYEdfBQdGtXlXlvZKFvDkJTpe0zgpdc="; }; build-system = [ @@ -33,8 +31,17 @@ buildPythonPackage rec { dissect-util ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "dissect.archive" ]; + disabledTests = [ + # Issue with archives + "test_vbk" + "test_vma" + "test_wim" + ]; + meta = with lib; { description = "Dissect module implementing parsers for various archive and backup formats"; homepage = "https://github.com/fox-it/dissect.archive"; diff --git a/pkgs/development/python-modules/dissect-btrfs/default.nix b/pkgs/development/python-modules/dissect-btrfs/default.nix index f1a5504d2418..f223bc6a46c6 100644 --- a/pkgs/development/python-modules/dissect-btrfs/default.nix +++ b/pkgs/development/python-modules/dissect-btrfs/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, google-crc32c, python-lzo, - pythonOlder, setuptools, setuptools-scm, zstandard, @@ -14,16 +13,14 @@ buildPythonPackage rec { pname = "dissect-btrfs"; - version = "1.7"; + version = "1.9"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.btrfs"; tag = version; - hash = "sha256-BREkGrQ1khz+uPahHeMwD0V8JytQY1K/oYa7nxP+bR0="; + hash = "sha256-qOyPMDZtudrvZNlyiL16gv513zuTCd2O14Q4QwHMmoc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index 4c8bdc38dfae..6ddd40b8c620 100644 --- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -13,7 +13,6 @@ pyshark, pytest-httpserver, pytestCheckHook, - pythonOlder, rich, }: @@ -22,8 +21,6 @@ buildPythonPackage rec { version = "1.2.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cobaltstrike"; @@ -73,6 +70,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "dissect.cobaltstrike" ]; + disabledTests = [ + # Don't run tests with a beacon + "test_c2profile_beacon_gate" + "test_beacon_dump_guardrails" + ]; + meta = with lib; { description = "Dissect module implementing a parser for Cobalt Strike related data"; homepage = "https://github.com/fox-it/dissect.cobaltstrike"; diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index 7b27df5d45c5..e211bcb3f19c 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -5,21 +5,18 @@ setuptools, setuptools-scm, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "dissect-cstruct"; - version = "4.5"; + version = "4.7"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cstruct"; tag = version; - hash = "sha256-2n7y6nHt7gJtJeJIKpobiC7A+dnD6O/o+psinfOnvT8="; + hash = "sha256-eEaKGFpArg0p3+/I2dH3mQ+eNIVJ8KsUbRcw4Ecrl7g="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-database/default.nix b/pkgs/development/python-modules/dissect-database/default.nix new file mode 100644 index 000000000000..3b03fccf0179 --- /dev/null +++ b/pkgs/development/python-modules/dissect-database/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + pytestCheckHook, + setuptools-scm, + setuptools, +}: + +buildPythonPackage rec { + pname = "dissect-database"; + version = "1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.database"; + tag = version; + hash = "sha256-ZMiYPAiumPg9nd7+OAnrVAwrnx0I5reClRgIerStpfE="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + dissect-cstruct + dissect-util + ]; + + # Test files are not ready + doCheck = false; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "dissect.database" ]; + + meta = with lib; { + description = "Dissect module implementing a parser for various database formats"; + homepage = "https://github.com/fox-it/dissect.database"; + changelog = "https://github.com/fox-it/dissect.database/releases/tag/${src.tag}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index 4cdd57611c24..36ab10d7bdb2 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -5,7 +5,6 @@ dissect-util, fetchFromGitHub, pytestCheckHook, - pythonOlder, setuptools, setuptools-scm, }: @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "3.18"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.esedb"; diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index 3d04c3652f39..331fafeaf224 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -8,21 +8,18 @@ setuptools, setuptools-scm, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "dissect-etl"; - version = "3.11"; + version = "3.14"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.etl"; tag = version; - hash = "sha256-soJH7kx/029yXyOjv6OsWjWAMMHXKx711GLPBClDAK0="; + hash = "sha256-QmtFkzO57jLTQg16MawAgU7Vq8vgo7DkEDq+FEjnObs="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix index 790ef796d0fc..c22b3f65e143 100644 --- a/pkgs/development/python-modules/dissect-executable/default.nix +++ b/pkgs/development/python-modules/dissect-executable/default.nix @@ -6,21 +6,18 @@ fetchFromGitHub, setuptools, setuptools-scm, - pythonOlder, }: buildPythonPackage rec { pname = "dissect-executable"; - version = "1.8"; + version = "1.11"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.executable"; tag = version; - hash = "sha256-6fEaXZTkygd0ZLPFWbtzWadA9VEsp3cd4/he0LxqhMw="; + hash = "sha256-TbygZJjdTfNvwEHmquiXfalu73XgNPZpar50YpxP6NA="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-fve/default.nix b/pkgs/development/python-modules/dissect-fve/default.nix index cf05f4451e78..ae9a4badcf54 100644 --- a/pkgs/development/python-modules/dissect-fve/default.nix +++ b/pkgs/development/python-modules/dissect-fve/default.nix @@ -7,7 +7,6 @@ dissect-target, fetchFromGitHub, pycryptodome, - pythonOlder, rich, setuptools-scm, setuptools, @@ -15,22 +14,16 @@ buildPythonPackage rec { pname = "dissect-fve"; - version = "4.2"; + version = "4.5"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.fve"; tag = version; - hash = "sha256-OgagTnt4y6Fzd7jbsCgbkTzcsdnozImfdKI9ew9JaqI="; + hash = "sha256-Lg29WJfXvjdhGtkZowzXgH9zzockoGkei1s9hgLr/gg="; }; - pythonRelaxDeps = [ - "pycryptodome" - ]; - build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index dbceefc817c0..6d2670f1aabe 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -7,21 +7,18 @@ setuptools, setuptools-scm, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.14"; + version = "3.15"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ntfs"; tag = version; - hash = "sha256-C2tve1RVR8Q7t1Xz7Of1xRZH6IuLP9nL2l1cHbycFQ4="; + hash = "sha256-dd0AGkOXd+7VB6RIGiLoq1AFi4Uns1axW4V8MN8W7ao="; }; build-system = [ @@ -43,6 +40,14 @@ buildPythonPackage rec { "tests/test_index.py" ]; + disabledTests = [ + # Issue with archive + "test_mft" + "test_ntfs" + "test_secure" + "test_fragmented_mft" + ]; + meta = with lib; { description = "Dissect module implementing a parser for the NTFS file system"; homepage = "https://github.com/fox-it/dissect.ntfs"; diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index dca42e401eed..4c3f4bed3c4d 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -8,6 +8,7 @@ dissect-cim, dissect-clfs, dissect-cstruct, + dissect-database, dissect-esedb, dissect-etl, dissect-eventlog, @@ -33,28 +34,24 @@ paho-mqtt, pycryptodome, pytestCheckHook, - pythonOlder, ruamel-yaml, setuptools, setuptools-scm, structlog, - tomli, yara-python, zstandard, }: buildPythonPackage rec { pname = "dissect-target"; - version = "3.23.1"; + version = "3.24"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.target"; tag = version; - hash = "sha256-WOFtDFCN3OfhEjfhEgwtJN/tQVRGvd2RMQzcKtf0atU="; + hash = "sha256-i1oA7UVo880dHJkf19YRcmPV3Lwp1a8RokfRNDZ9gG0="; fetchLFS = true; }; @@ -71,6 +68,7 @@ buildPythonPackage rec { dependencies = [ defusedxml dissect-cstruct + dissect-database dissect-eventlog dissect-evidence dissect-hypervisor @@ -88,6 +86,7 @@ buildPythonPackage rec { dissect-btrfs dissect-cim dissect-clfs + dissect-database dissect-esedb dissect-etl dissect-extfs @@ -103,8 +102,7 @@ buildPythonPackage rec { ruamel-yaml yara-python zstandard - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; yara = [ yara-python ] ++ optional-dependencies.full; smb = [ impacket ] ++ optional-dependencies.full; mqtt = [ paho-mqtt ] ++ optional-dependencies.full; diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index babe6356b0c6..9a23dbabb1bb 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -5,24 +5,21 @@ setuptools, setuptools-scm, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "dissect-util"; - version = "3.21"; - format = "pyproject"; - - disabled = pythonOlder "3.9"; + version = "3.23"; + pyproject = true; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.util"; tag = version; - hash = "sha256-DCe1V3ZQxr2uQ5L4Lucqu0E1jVo7P6cEwC+4tuBmmqI="; + hash = "sha256-dHP5nyumuQxAS3hkw4XRaLR3DMFn+WEFkLRbKBODIFo="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; @@ -38,10 +35,10 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing various utility functions for the other Dissect modules"; - mainProgram = "dump-nskeyedarchiver"; homepage = "https://github.com/fox-it/dissect.util"; - changelog = "https://github.com/fox-it/dissect.util/releases/tag/${version}"; + changelog = "https://github.com/fox-it/dissect.util/releases/tag/${src.tag}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "dump-nskeyedarchiver"; }; } diff --git a/pkgs/development/python-modules/dissect-vmfs/default.nix b/pkgs/development/python-modules/dissect-vmfs/default.nix index 8f91f46dcecc..c07ca0119c65 100644 --- a/pkgs/development/python-modules/dissect-vmfs/default.nix +++ b/pkgs/development/python-modules/dissect-vmfs/default.nix @@ -4,32 +4,29 @@ dissect-cstruct, dissect-util, fetchFromGitHub, - setuptools, - setuptools-scm, pytestCheckHook, - pythonOlder, + setuptools-scm, + setuptools, }: buildPythonPackage rec { pname = "dissect-vmfs"; - version = "3.11"; - format = "pyproject"; - - disabled = pythonOlder "3.10"; + version = "3.13"; + pyproject = true; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.vmfs"; tag = version; - hash = "sha256-jGPHZ26DDIcblgx4hP6L2BLHYY8YeIBcbxNR7bN/49g="; + hash = "sha256-4c3JVbQidGvXurWaO+/E0OehGgiY5shE5BiIBwMrCWM="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; @@ -38,6 +35,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "dissect.vmfs" ]; + disabledTests = [ + # Archive not present + "test_huge" + "test_lvm_basic" + "test_lvm_span" + "test_sparse" + "test_vmfs_basic" + "test_vmfs_content" + "test_vmfs_jbosf" + ]; + meta = with lib; { description = "Dissect module implementing a parser for the VMFS file system"; homepage = "https://github.com/fox-it/dissect.vmfs"; diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index c5a2524b03e6..2bac002d52db 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -7,7 +7,6 @@ setuptools, setuptools-scm, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "3.17"; pyproject = true; - disabled = pythonOlder "3.13"; - src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.volume"; diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 0015349fb296..70d8aca0b4ea 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + dissect-apfs, dissect-archive, dissect-btrfs, dissect-cim, @@ -31,23 +32,20 @@ dissect-volume, dissect-xfs, fetchFromGitHub, - pythonOlder, setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "dissect"; - version = "3.20.1"; + version = "3.21"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "fox-it"; repo = "dissect"; tag = version; - hash = "sha256-Zc9NBrRDbSP5Yk3gJoMG+6nAGFxBHiPKvvfQLMcu+tk="; + hash = "sha256-INqZwN3x5MzrACyaUOa2A7mrKvld9reN1PJVxkq837o="; }; pythonRelaxDeps = true; @@ -58,6 +56,7 @@ buildPythonPackage rec { ]; dependencies = [ + dissect-apfs dissect-archive dissect-btrfs dissect-cim diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 9900ba47f2ae..415ecd45623d 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -11,25 +11,24 @@ maxminddb, msgpack, pytest7CheckHook, - pythonOlder, pytz, setuptools-scm, setuptools, + structlog, + tqdm, zstandard, }: buildPythonPackage rec { pname = "flow-record"; - version = "3.20"; + version = "3.21"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "fox-it"; repo = "flow.record"; tag = version; - hash = "sha256-3jXxKA+MHjKfzKqOuP0EJxVD5QPvwjWE3N4qhIEFNvM="; + hash = "sha256-hJZCWF81pMeHOZGc6zTA046hV1J0PNQGMlPD3mgyrRI="; }; build-system = [ @@ -52,6 +51,12 @@ buildPythonPackage rec { geoip = [ maxminddb ]; avro = [ fastavro ] ++ fastavro.optional-dependencies.snappy; splunk = [ httpx ]; + # xlsx = [ openpyxl ]; # Not available + full = [ + structlog + tqdm + ] + ++ optional-dependencies.compression; }; nativeCheckInputs = [ @@ -63,8 +68,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "flow.record" ]; disabledTestPaths = [ - # Test requires rdump - "tests/test_rdump.py" + # Input not available + "tests/adapter/test_xlsx.py" + # Requires rdump + "tests/tools/test_rdump.py" ]; disabledTests = [ "test_rdump_fieldtype_path_json" ]; diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index 8b87b869877e..6b988668be73 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "gradio-client"; - version = "1.11.0"; + version = "1.12.1"; pyproject = true; # no tests on pypi @@ -41,7 +41,7 @@ buildPythonPackage rec { # not to be confused with @gradio/client@${version} tag = "gradio_client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-dj8hJPXUBbFG9awP3o0vgyPt+gcCgzKKEQTEHkrEimA="; + hash = "sha256-Q0sEn7trWVVWh2XNZam10axuQBiPZvq//qTIR5WJn+4="; }; sourceRoot = "${src.name}/client/python"; diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 02fcfec7ce3e..634bfc6c0021 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -75,25 +75,27 @@ buildPythonPackage rec { pname = "gradio"; - version = "5.38.2"; + version = "5.49.1"; pyproject = true; src = fetchFromGitHub { owner = "gradio-app"; repo = "gradio"; tag = "gradio@${version}"; - hash = "sha256-zKAH/tbF1S+LIi1i+BuKBUWDSI0+Ii5FhsZ3sQaFtto="; + hash = "sha256-tfjyu2yl+2ndPZWrsSrVf8qv2eqpU5ZJHVqM9saJVt4="; }; pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; fetcherVersion = 1; - hash = "sha256-sIEsolHffX3cpAJU79w+ndRY4vvmWLxp2efTryv+j38="; + hash = "sha256-XnCx34nbX+essVfXJlxvYB9/lnolAkF81Jp6dAOqr8E="; }; pythonRelaxDeps = [ "aiofiles" + "gradio-client" "markupsafe" + "pillow" ]; pythonRemoveDeps = [ @@ -184,11 +186,6 @@ buildPythonPackage rec { pnpm package ''; - postBuild = '' - # SyntaxError: 'await' outside function - zip -d dist/gradio-*.whl gradio/_frontend_code/lite/examples/transformers_basic/run.py - ''; - # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi. preCheck = '' diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 2972c05c3c38..a50395674a68 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202511261"; + version = "0.1.202511271"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-9p277TReiE5w5kU6EpcXrmdx+Ry/sxjJ0gSHllDIdG8="; + hash = "sha256-1kXJ3Lrs5/rIb2kvE9xENf6A8fzB5Dei7yLSVSmeOi0="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix index 15cc3192db98..ce84718b7579 100644 --- a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix +++ b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "lance-namespace"; - version = "0.0.21"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance-namespace"; tag = "v${version}"; - hash = "sha256-KbQ1xXD/+8oOcbhc+dvk68ZF0daWm7In0y0NVsSfp9U="; + hash = "sha256-OqSaDe0xA1S/KphpwJuIcyOrcT9sq+0oHhiIBtd7bcY="; }; sourceRoot = "${src.name}/python/lance_namespace_urllib3_client"; diff --git a/pkgs/development/python-modules/langchain-anthropic/default.nix b/pkgs/development/python-modules/langchain-anthropic/default.nix index 7c78e8547902..d6fdece359b6 100644 --- a/pkgs/development/python-modules/langchain-anthropic/default.nix +++ b/pkgs/development/python-modules/langchain-anthropic/default.nix @@ -12,6 +12,7 @@ pydantic, # tests + blockbuster, langchain, langchain-tests, pytest-asyncio, @@ -23,14 +24,14 @@ buildPythonPackage rec { pname = "langchain-anthropic"; - version = "1.0.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-anthropic==${version}"; - hash = "sha256-3kW5w98t5F199k14MoCY2dZGrC/HdBzKuRpM37EY3LQ="; + hash = "sha256-dmuDgKQW1yAz/8tjQx7LaUiuz5Sh4cAyd9nt33mCPbI="; }; sourceRoot = "${src.name}/libs/partners/anthropic"; @@ -43,21 +44,23 @@ buildPythonPackage rec { pydantic ]; - pythonRelaxDeps = [ - # Each component release requests the exact latest core. - # That prevents us from updating individual components. - "langchain-core" - ]; - nativeCheckInputs = [ + blockbuster langchain langchain-tests pytest-asyncio pytestCheckHook ]; - disabledTestPaths = [ - "tests/integration_tests" + enabledTestPaths = [ + "tests/unit_tests" + ]; + + disabledTests = [ + # TypeError from Pydantic + # https://github.com/langchain-ai/langchain/issues/34068 + "test_creates_bash_tool" + "test_replaces_tool_with_claude_descriptor" ]; pythonImportsCheck = [ "langchain_anthropic" ]; diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index c7584512fb76..bb1ad47775be 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "1.0.7"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-core==${version}"; - hash = "sha256-esMMA9z8z9Q909buPGZP1jujEWzdXT+Mxlwvjz0XqKk="; + hash = "sha256-uDMex+2wvvNvdFSTHjShsrJeeMymOMKCmfS+AyMMH6c="; }; sourceRoot = "${src.name}/libs/core"; diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix index cd7fb68f56f2..e3252f1e7939 100644 --- a/pkgs/development/python-modules/langchain-tests/default.nix +++ b/pkgs/development/python-modules/langchain-tests/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "langchain-tests"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-tests==${version}"; - hash = "sha256-a7tqW4h34YbfUIAK2L417egaSNyKbvZJ+GEnPdC2wME="; + hash = "sha256-ke/nIvZRtwyeN5uQuqOjJ4KdE+cJOc9XkmDuT+nnZpQ="; }; sourceRoot = "${src.name}/libs/standard-tests"; diff --git a/pkgs/development/python-modules/lunatone-rest-api-client/default.nix b/pkgs/development/python-modules/lunatone-rest-api-client/default.nix index 770f267768d6..5f91cf2e06b8 100644 --- a/pkgs/development/python-modules/lunatone-rest-api-client/default.nix +++ b/pkgs/development/python-modules/lunatone-rest-api-client/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "lunatone-rest-api-client"; - version = "0.5.7"; + version = "0.6.0"; pyproject = true; src = fetchFromGitLab { owner = "lunatone-public"; repo = "lunatone-rest-api-client"; tag = "v${version}"; - hash = "sha256-uWve5TMBwav3FdEoPBGS2x6h+2pIIRn6dd8BwRU1Kxo="; + hash = "sha256-kPvHyabiT+Vl+/yCGQxyD16HPoOKsL7ij3c0LO3qNe8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 90a8f4399ecf..71d139909ecc 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.19.0"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "python"; tag = version; - hash = "sha256-B+DFezICqYdfGfK90rsnetRt0dI1v6XEsuDL9Xd2QTc="; + hash = "sha256-3oC3eVm+RYkn+1OqUU2f/dzV/rY8T7EePDxnE/1t6n4="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 33baac38cd79..2a367a350d93 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -33,28 +33,25 @@ pytest-xdist, pytestCheckHook, safetensors, + torch, }: buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.11.28"; + version = "0.11.30"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "orbax"; tag = "v${version}"; - hash = "sha256-a7E60fZRmEXTA220mwr7EDMUc+zYbW7wG40vY7NeAOM="; + hash = "sha256-y8l0AVGt2t5zLX+x+yuWHsEDy68agpXIkrew+zfYGXU="; }; sourceRoot = "${src.name}/checkpoint"; build-system = [ flit-core ]; - pythonRelaxDeps = [ - "jax" - ]; - dependencies = [ absl-py aiofiles @@ -82,6 +79,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook safetensors + torch ]; pythonImportsCheck = [ @@ -115,6 +113,16 @@ buildPythonPackage rec { ]; disabledTestPaths = [ + # import file mismatch: + # imported module 'sharding_test' has this __file__ attribute: + # /build/source/checkpoint/orbax/checkpoint/_src/arrays/sharding_test.py + # which is not the same as the test file we want to collect: + # /build/source/checkpoint/orbax/checkpoint/_src/metadata/sharding_test.py + "orbax/checkpoint/_src/metadata/sharding_test.py" + + # Circular dependency with clu (and we should not run benchmarks anyway) + "orbax/checkpoint/_src/testing/benchmarks/" + # E absl.flags._exceptions.DuplicateFlagError: The flag 'num_processes' is defined twice. # First from multiprocess_test, Second from orbax.checkpoint._src.testing.multiprocess_test. # Description from first occurrence: Number of processes to use. diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index 3746d9df4685..e6ca2d065a88 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -8,6 +8,7 @@ rpm, urllib3, keyring, + ruamel-yaml, }: buildPythonPackage rec { @@ -31,6 +32,7 @@ buildPythonPackage rec { urllib3 cryptography keyring + ruamel-yaml ]; postInstall = '' diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index e90306f130aa..7f4447837b5d 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.10.0"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; tag = "v${version}"; - hash = "sha256-jLSX9tNJMsjdTzzSkjHpDm4QYWI+Xjw/nlKj33/lTLs="; + hash = "sha256-fgUIyI9akQbVhcff413gIPzviGNZlQJztFTnW5+n9wU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-pooldose/default.nix b/pkgs/development/python-modules/python-pooldose/default.nix index a91945b27487..e0cc2e089ea3 100644 --- a/pkgs/development/python-modules/python-pooldose/default.nix +++ b/pkgs/development/python-modules/python-pooldose/default.nix @@ -12,16 +12,20 @@ buildPythonPackage rec { pname = "python-pooldose"; - version = "0.7.8"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { owner = "lmaertin"; repo = "python-pooldose"; tag = version; - hash = "sha256-TOwogNRWmdbzEjvjSUYw9+5CXHfF2OXq8Jxaj3KsQ+A="; + hash = "sha256-zOl+c/bJmCH3ZUKcZDbRhnfctiQoq6z+C6LGHN6Jrhc="; }; + postPatch = '' + rm -r src/pooldose/values/__pycache__ + ''; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index d936fa76f68a..904f6cfb55e8 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "3.8.0"; + version = "3.8.1"; pyproject = true; src = fetchFromGitHub { owner = "Python-roborock"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-Ts1X07eTv4KXv344F3fGazHlDx6XXGQfdmxb+gd/0qc="; + hash = "sha256-ukFbD6RL6us3fSuTj52+PA5dkxeZNfxZCX/eeJL0aTc="; }; pythonRelaxDeps = [ "pycryptodome" ]; diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 1aa56d1a50bf..73db03afa62e 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -10,7 +10,6 @@ marshmallow-dataclass, poetry-core, pyjwt, - pythonOlder, pytest-asyncio, pytestCheckHook, syrupy, @@ -20,16 +19,14 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "hacf-fr"; repo = "renault-api"; tag = "v${version}"; - hash = "sha256-0fV7nPerG2b37KmLaDlsBnmZSHBItQbx++nxobvLCRg="; + hash = "sha256-FH6x+hknNGgrSHaOt7RTYeuVLqb/DNy7X3065VvcFwA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 928e61c5c420..0c8fdd5830ff 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.16.5"; + version = "0.16.6"; pyproject = true; src = fetchFromGitHub { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-crQl7zNjLijv+e+frjssUSuXMGjdcja4B325lBCkBt8="; + hash = "sha256-IrUu9bWBNWBM4EdzVnz76kjYMOyei+CoStVIzyqWOQw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix index 09fa33ea2d2b..b542f80e409c 100644 --- a/pkgs/development/python-modules/succulent/default.nix +++ b/pkgs/development/python-modules/succulent/default.nix @@ -9,33 +9,31 @@ pyyaml, poetry-core, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "succulent"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "firefly-cpp"; repo = "succulent"; tag = version; - hash = "sha256-3cqU1iYxvMyx0hCVl6r4RZARpsWNckXZgeBNq0kokuw="; + hash = "sha256-e2F2g8NfMyAfiHPUq8KRs99pu7yEZTpWraxhsAZXE4Q="; }; pythonRelaxDeps = [ "flask" + "lxml" "numpy" ]; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ flask lxml numpy @@ -47,11 +45,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "succulent" ]; - meta = with lib; { + meta = { description = "Collect POST requests"; homepage = "https://github.com/firefly-cpp/succulent"; - changelog = "https://github.com/firefly-cpp/succulent/blob/${src.tag}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ firefly-cpp ]; + changelog = "https://github.com/firefly-cpp/succulent/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ firefly-cpp ]; }; } diff --git a/pkgs/development/python-modules/tensorstore/default.nix b/pkgs/development/python-modules/tensorstore/default.nix index 4af9405da391..08d29f24f110 100644 --- a/pkgs/development/python-modules/tensorstore/default.nix +++ b/pkgs/development/python-modules/tensorstore/default.nix @@ -12,28 +12,28 @@ let pythonVersionNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; systemToPlatform = { - "aarch64-linux" = "manylinux_2_17_aarch64.manylinux2014_aarch64"; - "x86_64-linux" = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + "aarch64-linux" = "manylinux_2_27_aarch64.manylinux_2_28_aarch64"; + "x86_64-linux" = "manylinux_2_27_x86_64.manylinux_2_28_x86_64"; "aarch64-darwin" = "macosx_11_0_arm64"; }; hashes = { - "310-x86_64-linux" = "sha256-GmzcxS5LhB0j5Qovoo4Bbm2fYdbqkYjUVV6hibBAoPY="; - "311-x86_64-linux" = "sha256-NzVYuAPYwsV/xhOxEAeuWBOfGaPN3UQ6DeXXtTIeWWE="; - "312-x86_64-linux" = "sha256-ztVDC836f8s6a9xEczF2FYy4d7Nb3SM8rILiW0zJTpI="; - "313-x86_64-linux" = "sha256-UrVG8Hayw78hfGDwXeQSTMEZfOkvjoJufsc64yQHSlo="; - "310-aarch64-linux" = "sha256-lQQbVaLshtH2aQUS0Yg1gbGPL09Gw9l4lK6wrC22r38="; - "311-aarch64-linux" = "sha256-ZcOhoqNaG1N0A/NkA9JYyqtHflZLwPZBCblBzHe08gM="; - "312-aarch64-linux" = "sha256-h6l6NLBHXdx9KvxA5d1/jRJSKqge37zMs5Yoz1kUVNU="; - "313-aarch64-linux" = "sha256-YnbiebRetdm5XE3z55ViVfQU/UsSjS3hbYrs3obDY1c"; - "310-aarch64-darwin" = "sha256-uWG7u3ocakjkwUBqmMrr60AEYeLnWgi23wwBMpQDehU="; - "311-aarch64-darwin" = "sha256-9A5zvNwzPfs/f+D88CO8vsQVM8mFZldxj/duzhoZAuA="; - "312-aarch64-darwin" = "sha256-06JP62GV8cIiFillwBB8n/VtMizKI+GfDmZjb264DxQ="; - "313-aarch64-darwin" = "sha256-3ohD+zRiiZ3nvN7qzLkjA6nWEAa8NjZN60qI30YyC6Q="; + "311-x86_64-linux" = "sha256-gwcu4OVR1tylguFUtkyLgGbSduwHWXhOMUnCghKmHxg="; + "312-x86_64-linux" = "sha256-YI9xeOxuTko8JlRbCkT0S/g0ONBL8tlgzQ52meqpnvY="; + "313-x86_64-linux" = "sha256-yfLcM0LkaGr5j24lncn7N38b9le2ScJHv2ZHu+T5gJA="; + "314-x86_64-linux" = "sha256-evlCImnCv83s+d1VMJBgZlq5wtf2yJI3ftMsAyQA/uo="; + "311-aarch64-linux" = "sha256-xCMLj9KXleiORB90nYgZc+yo2t8zxSYrNng5+4iR95s="; + "312-aarch64-linux" = "sha256-3r1DUELAC+aLofs89ZMlp7q7P0o89HRMh93jRoAsu7Q="; + "313-aarch64-linux" = "sha256-lNj8nfFyGwKHBGrKcgn9UECInK1CAue3Oh/bd82bccY="; + "314-aarch64-linux" = "sha256-hHmCZSJz+3staUt4kgV0eq8+UK5kc4xct7XrA9hqmUc="; + "311-aarch64-darwin" = "sha256-XhUtM0vzT7q9/o5bw1uH0fmUcGWST/g8KeZZMIs26Ug="; + "312-aarch64-darwin" = "sha256-EIwOhnqiyH1JgsxjJaLeDE9b1jwr6hitsZOjcMQFlM4="; + "313-aarch64-darwin" = "sha256-Kc9DNhU68TasisUo4u1G3xk2ftrn4U43vKGot8SEjvI="; + "314-aarch64-darwin" = "sha256-l3VtLLo8XOIeFWAsKvWgJSHMDs2n+fttGNovO9UYJ/Q="; }; in buildPythonPackage rec { pname = "tensorstore"; - version = "0.1.71"; + version = "0.1.79"; format = "wheel"; # The source build involves some wonky Bazel stuff. diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index fb030ed2665b..5097a3202cbf 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -75,6 +75,11 @@ setproctitle, openai-harmony, + # optional-dependencies + # audio + librosa, + soundfile, + # internal dependency - for overriding in overlays vllm-flash-attn ? null, @@ -463,6 +468,15 @@ buildPythonPackage rec { flashinfer ]; + optional-dependencies = { + audio = [ + librosa + soundfile + mistral-common + ] + ++ mistral-common.optional-dependencies.audio; + }; + dontUseCmakeConfigure = true; cmakeFlags = [ ] diff --git a/pkgs/development/python-modules/ydata-profiling/default.nix b/pkgs/development/python-modules/ydata-profiling/default.nix index 3ac9241d3336..8df85d97257e 100644 --- a/pkgs/development/python-modules/ydata-profiling/default.nix +++ b/pkgs/development/python-modules/ydata-profiling/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "ydata-profiling"; - version = "4.17.0"; + version = "4.18.0"; pyproject = true; src = fetchFromGitHub { owner = "ydataai"; repo = "ydata-profiling"; tag = "v${version}"; - hash = "sha256-5CGFchkXyhALiWRTNEvWsfU+hMXeL/geNO/5i5ZKcmg="; + hash = "sha256-fzHKIojgFlyYH27z0NwCkf0nIkoIyGj5IoKIdy82Da4="; }; postPatch = '' diff --git a/pkgs/games/dwarf-fortress/df.lock.json b/pkgs/games/dwarf-fortress/df.lock.json index a7c577be9824..b3fda97b6897 100644 --- a/pkgs/games/dwarf-fortress/df.lock.json +++ b/pkgs/games/dwarf-fortress/df.lock.json @@ -1,28 +1,28 @@ { "game": { "latest": { - "linux": "53.05", + "linux": "53.06", "darwin": "0.47.05" }, "versions": { - "53.05": { + "53.06": { "df": { - "version": "53.05", + "version": "53.06", "urls": { "linux": { - "url": "https://www.bay12games.com/dwarves/df_53_05_linux.tar.bz2", - "outputHash": "sha256-9x08aZHZJbH2JUTqFTPY7gkfqjgXHAnYJ0dZ0NimzsA=" + "url": "https://www.bay12games.com/dwarves/df_53_06_linux.tar.bz2", + "outputHash": "sha256-PSoYP9XVgAYMPih3uP2pCMwkWic3jPkz+V5j9g0KO1A=" } } }, "hack": { - "version": "53.05-r1", + "version": "53.06-r1", "git": { "url": "https://github.com/DFHack/dfhack.git", - "revision": "53.05-r1", - "outputHash": "sha256-PTDP+UxLHG4VzrHDDwVaerEasSg9m8ut8ZYgN0LO/C4=" + "revision": "53.06-r1", + "outputHash": "sha256-tjhfr7UKGaiuzjanFrYeG8CS20EDjPchB2fQr/hz9HI=" }, - "xmlRev": "2bd33eba052f6ea3f65f4a22670029f2311b07b4" + "xmlRev": "24322fe4a30209399c1c5fe903726828edd9032b" } }, "52.05": { diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix index 151fe0ac9a27..30502aa036de 100644 --- a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "make-all"; domain = "tuya_local"; - version = "2025.11.1"; + version = "2025.11.2"; src = fetchFromGitHub { inherit owner; repo = "tuya-local"; tag = version; - hash = "sha256-9CYq/+aRzGRXCY8WmJBF/2kP+DzEGe/BWNDDFMOlJ4o="; + hash = "sha256-DuOzr5i5E8rP7z1TB8bPNEUSe8bz853jwW3hRREpNAY="; }; dependencies = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5a9398da909c..9a3ed283d5cf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -451,6 +451,7 @@ mapAliases { copilot-language-server-fhs = warnAlias "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07 copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22 cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07 + corepack_latest = throw "'corepack_latest' has been removed, use 'corepack.override { nodejs = pkgs.nodejs_latest; }' instead"; # Added 2025-10-25 cosmic-tasks = throw "'cosmic-tasks' has been renamed to/replaced by 'tasks'"; # Converted to throw 2025-10-27 cotton = throw "'cotton' has been removed since it is vulnerable to CVE-2025-62518 and upstream is unmaintained"; # Added 2025-10-26 cpp-ipfs-api = throw "'cpp-ipfs-api' has been renamed to/replaced by 'cpp-ipfs-http-client'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c1113a806bc..797c1f089bbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3208,7 +3208,6 @@ with pkgs; nodejs = nodejs_22; nodejs-slim = nodejs-slim_22; - corepack = corepack_22; nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; }; @@ -3225,7 +3224,6 @@ with pkgs; # Update this when adding the newest nodejs major version! nodejs_latest = nodejs_24; nodejs-slim_latest = nodejs-slim_24; - corepack_latest = corepack_24; buildNpmPackage = callPackage ../build-support/node/build-npm-package { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ef277c2d54d..c20200b70743 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2792,6 +2792,8 @@ self: super: with self; { cltk = callPackage ../development/python-modules/cltk { }; + clu = callPackage ../development/python-modules/clu { }; + clustershell = callPackage ../development/python-modules/clustershell { }; clx-sdk-xms = callPackage ../development/python-modules/clx-sdk-xms { }; @@ -3837,6 +3839,8 @@ self: super: with self; { dissect = callPackage ../development/python-modules/dissect { }; + dissect-apfs = callPackage ../development/python-modules/dissect-apfs { }; + dissect-archive = callPackage ../development/python-modules/dissect-archive { }; dissect-btrfs = callPackage ../development/python-modules/dissect-btrfs { }; @@ -3851,6 +3855,8 @@ self: super: with self; { dissect-cstruct = callPackage ../development/python-modules/dissect-cstruct { }; + dissect-database = callPackage ../development/python-modules/dissect-database { }; + dissect-esedb = callPackage ../development/python-modules/dissect-esedb { }; dissect-etl = callPackage ../development/python-modules/dissect-etl { };