diff --git a/flake.lock b/flake.lock index fb2f3cf..50c1e1e 100644 --- a/flake.lock +++ b/flake.lock @@ -236,21 +236,17 @@ }, "devshell_3": { "inputs": { - "flake-utils": [ - "nix-topology", - "flake-utils" - ], "nixpkgs": [ "nix-topology", "nixpkgs" ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -309,11 +305,11 @@ ] }, "locked": { - "lastModified": 1730190761, - "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", + "lastModified": 1731060864, + "narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=", "owner": "nix-community", "repo": "disko", - "rev": "3979285062d6781525cded0f6c4ff92e71376b55", + "rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f", "type": "github" }, "original": { @@ -588,11 +584,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -709,11 +705,11 @@ ] }, "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -877,11 +873,11 @@ ] }, "locked": { - "lastModified": 1730633670, - "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", + "lastModified": 1731235328, + "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", + "rev": "60bb110917844d354f3c18e05450606a435d2d10", "type": "github" }, "original": { @@ -898,11 +894,11 @@ ] }, "locked": { - "lastModified": 1730490306, - "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "1743615b61c7285976f85b303a36cdf88a556503", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -934,11 +930,11 @@ }, "impermanence": { "locked": { - "lastModified": 1730403150, - "narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=", + "lastModified": 1731242966, + "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", "owner": "nix-community", "repo": "impermanence", - "rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f", + "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", "type": "github" }, "original": { @@ -961,16 +957,16 @@ ] }, "locked": { - "lastModified": 1729544999, - "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", "owner": "NuschtOS", "repo": "ixx", - "rev": "65c207c92befec93e22086da9456d3906a4e999c", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.5", + "ref": "v0.0.6", "repo": "ixx", "type": "github" } @@ -1008,11 +1004,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1730486688, - "narHash": "sha256-s5yzGvmyHw3NNjHhR6Ll0sIfPxIqWVegg/Jm3Qw6y9I=", + "lastModified": 1731240728, + "narHash": "sha256-a0xQE3cwZLMsycd9NneFC3z29E+z1PSD/ozhISM7qYQ=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "dccba7ef61b0f146fbae24e1118e7b082f44d9a9", + "rev": "807ab623e6d01e931269a28a07c59dcfd6474173", "type": "github" }, "original": { @@ -1045,11 +1041,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1730499294, - "narHash": "sha256-RxV89z3TwhQT0Wue42aSPh3O7hXGbAFYHHNSnW9h6P8=", + "lastModified": 1731240174, + "narHash": "sha256-HYu+bPoV3UILhwc4Ar5iQ7aF+DuQWHXl4mljN6Bwq6A=", "owner": "astro", "repo": "microvm.nix", - "rev": "93122446d6001f9789d05e565f73bebfa3f53b50", + "rev": "dd89404e1885b8d7033106f3898eaef8db660cb2", "type": "github" }, "original": { @@ -1066,11 +1062,11 @@ ] }, "locked": { - "lastModified": 1730448474, - "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=", + "lastModified": 1731153869, + "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e", + "rev": "5c74ab862c8070cbf6400128a1b56abb213656da", "type": "github" }, "original": { @@ -1087,11 +1083,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730389079, - "narHash": "sha256-g/CJ/KKe5MGsVx1oCBl0F9aCdcNSDeOw8H7e5QDGa2c=", + "lastModified": 1731222442, + "narHash": "sha256-NGmEGvvckECifktsyJh3LK48E8fTbGhBVUWsJYIsy3s=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "7f9159a16584ee86eed077c8a73e845690b7d513", + "rev": "63c10ff7e65247b34b4ba057fd9e45818dbefc56", "type": "github" }, "original": { @@ -1129,11 +1125,11 @@ ] }, "locked": { - "lastModified": 1730604744, - "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", + "lastModified": 1731209121, + "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", + "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", "type": "github" }, "original": { @@ -1150,11 +1146,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1730284926, - "narHash": "sha256-4aIBZ4/xTDYP9yuU67atTC/tRE3NDONBTybBqwOXMso=", + "lastModified": 1730803396, + "narHash": "sha256-5ycWNOxmR/wPftlSWLQEZ3odOIE3rPvSd2qjd5+nLAE=", "owner": "oddlama", "repo": "nix-topology", - "rev": "927567a4d46831c4e417a7c440b83d915bd5d7a1", + "rev": "82dbbdc3c4f8f86fefdee8d8875fd4fd9276881a", "type": "github" }, "original": { @@ -1225,11 +1221,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730537918, - "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", + "lastModified": 1730919458, + "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", + "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "type": "github" }, "original": { @@ -1261,11 +1257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -1289,11 +1285,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1729990941, - "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", + "lastModified": 1731200463, + "narHash": "sha256-qDaAweJjdFbVExqs8aG27urUgcgKufkIngHW3Rzustg=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "7d68864343650322045894951602d6e82b5296d7", + "rev": "e04234d263750db01c78a412690363dc2226e68a", "type": "github" }, "original": { @@ -1304,11 +1300,11 @@ }, "nixpkgs-octoprint": { "locked": { - "lastModified": 1730133278, - "narHash": "sha256-nRuIFRKM3YBm1otOrKBaBSrLEReYYioDZwIJs2Kn9vQ=", + "lastModified": 1730668902, + "narHash": "sha256-GVOHeDUa05ivnlW11v/uRyKl5vpPmIA0ixSdyGENT7c=", "owner": "patrickdag", "repo": "nixpkgs", - "rev": "fcdd2ee31af8709c8f6eedf2d31fca66269258c7", + "rev": "2599d2effdda740f40050d47fed0e3586397ef1e", "type": "github" }, "original": { @@ -1368,11 +1364,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -1392,11 +1388,11 @@ ] }, "locked": { - "lastModified": 1730623166, - "narHash": "sha256-tMmZC3ge0ZfjSd3R3pAPnHIXytDOq+pv3aqxNN3KW14=", + "lastModified": 1731242021, + "narHash": "sha256-t8PNNvBTY4DDNraDk9U6D6G0LqtF78bnvEAHOuG0ZVM=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "6645be2446f5a3065a819677cdc0198fcb50339c", + "rev": "7fbb5864f499098e5ea9731d487dbbafa3fe9922", "type": "github" }, "original": { @@ -1407,11 +1403,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -1468,11 +1464,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1730569492, - "narHash": "sha256-NByr7l7JetL9kIrdCOcRqBu+lAkruYXETp1DMiDHNQs=", + "lastModified": 1731155487, + "narHash": "sha256-+D57j7BcV5O3XH9za3c3XXVLHr+F+enThAN2EeF6H/M=", "owner": "nix-community", "repo": "nixvim", - "rev": "6f210158b03b01a1fd44bf3968165e6da80635ce", + "rev": "31364af1990067d5529846a2ebf17a42c5ab22ff", "type": "github" }, "original": { @@ -1491,11 +1487,11 @@ ] }, "locked": { - "lastModified": 1730515563, - "narHash": "sha256-8lklUZRV7nwkPLF3roxzi4C2oyLydDXyAzAnDvjkOms=", + "lastModified": 1731060242, + "narHash": "sha256-43yLsOm/wxBbfYSNDWVJeVv5Ij+23X3BIjFUfsdx/6M=", "owner": "NuschtOS", "repo": "search", - "rev": "9e22bd742480916ff5d0ab20ca2522eaa3fa061e", + "rev": "ef493352f9e1f051e01a55c062731503a6b36b4e", "type": "github" }, "original": { @@ -1566,10 +1562,6 @@ "pre-commit-hooks_2": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": [ - "nix-topology", - "flake-utils" - ], "gitignore": "gitignore_3", "nixpkgs": [ "nix-topology", @@ -1581,11 +1573,11 @@ ] }, "locked": { - "lastModified": 1714478972, - "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", + "lastModified": 1730797577, + "narHash": "sha256-SrID5yVpyUfknUTGWgYkTyvdr9J1LxUym4om3SVGPkg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "2849da033884f54822af194400f8dff435ada242", + "rev": "1864030ed24a2b8b4e4d386a5eeaf0c5369e50a9", "type": "github" }, "original": { @@ -1632,11 +1624,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -1723,11 +1715,11 @@ ] }, "locked": { - "lastModified": 1730607408, - "narHash": "sha256-ae8GwT8uvakniK7izEPYypuBA0RHBmehVziIit3BxH0=", + "lastModified": 1731212123, + "narHash": "sha256-z7BcNt3Z6xozfRC+ldgMPFM4RmNjeCbJWZgcnQeAdRM=", "owner": "Gerg-l", "repo": "spicetify-nix", - "rev": "c29215e233ddd504d670d432095fbba7e541b880", + "rev": "9c3f1ef622b7b82a01936bdbd75ea4c5891ee4d1", "type": "github" }, "original": { diff --git a/nix/patch.nix b/nix/patch.nix index 3a0d124..28f3065 100644 --- a/nix/patch.nix +++ b/nix/patch.nix @@ -19,7 +19,8 @@ installPhase = '' cp -r ./ $out ''; - patches = pkgs.lib.filesystem.listFilesRecursive ../patches; + patches = + if builtins.pathExists ../patches then pkgs.lib.filesystem.listFilesRecursive ../patches else [ ]; }; }; } diff --git a/patches/353230.diff b/patches/353230.diff deleted file mode 100644 index d673ce0..0000000 --- a/patches/353230.diff +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix -index 4392b3cb60121..a5b4d28b4a7dc 100644 ---- a/pkgs/development/python-modules/pyscard/default.nix -+++ b/pkgs/development/python-modules/pyscard/default.nix -@@ -18,14 +18,14 @@ in - - buildPythonPackage rec { - pname = "pyscard"; -- version = "2.1.1"; -+ version = "2.2.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "LudovicRousseau"; - repo = "pyscard"; - rev = "refs/tags/${version}"; -- hash = "sha256-wlw2QL1vfhXba8ok/URcd9M+F7Sa+ZtekV1w5X24owE="; -+ hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0="; - }; - - build-system = [ setuptools ]; -@@ -37,36 +37,31 @@ buildPythonPackage rec { - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = -- if withApplePCSC then -- '' -- substituteInPlace smartcard/scard/winscarddll.c \ -- --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \ -- "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" -- '' -- else -- '' -- substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG" -- substituteInPlace smartcard/scard/winscarddll.c \ -- --replace-fail "libpcsclite.so.1" \ -- "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" -- ''; -+ '' -+ substituteInPlace pyproject.toml \ -+ --replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]' -+ '' -+ + ( -+ if withApplePCSC then -+ '' -+ substituteInPlace src/smartcard/scard/winscarddll.c \ -+ --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \ -+ "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" -+ '' -+ else -+ '' -+ substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG" -+ substituteInPlace src/smartcard/scard/winscarddll.c \ -+ --replace-fail "libpcsclite.so.1" \ -+ "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" -+ '' -+ ); - -- preCheck = '' -- # remove src module, so tests use the installed module instead -- rm -r smartcard -- ''; -- -- disabledTests = [ -- # AssertionError -- "test_hresult" -- "test_low_level" -- ]; -- -- meta = with lib; { -+ meta = { - description = "Smartcard library for python"; - homepage = "https://pyscard.sourceforge.io/"; - changelog = "https://github.com/LudovicRousseau/pyscard/releases/tag/${version}"; -- license = licenses.lgpl21Plus; -- maintainers = with maintainers; [ layus ]; -+ license = lib.licenses.lgpl21Plus; -+ maintainers = with lib.maintainers; [ layus ]; - }; - } diff --git a/patches/353272.diff b/patches/353272.diff deleted file mode 100644 index 7e58e02..0000000 --- a/patches/353272.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix -index ca8f8366f7f6b..d23ec4af02ee4 100644 ---- a/pkgs/tools/archivers/7zz/default.nix -+++ b/pkgs/tools/archivers/7zz/default.nix -@@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { - "CXX=${stdenv.cc.targetPrefix}c++" - ] - ++ lib.optionals useUasm [ "MY_ASM=uasm" ] -+ ++ lib.optionals (!useUasm && stdenv.hostPlatform.isx86) [ "USE_ASM=" ] - # We need at minimum 10.13 here because of utimensat, however since - # we need a bump anyway, let's set the same minimum version as the one in - # aarch64-darwin so we don't need additional changes for it diff --git a/pkgs/scripts/fetch-prs.sh b/pkgs/scripts/fetch-prs.sh index 9cae1f6..99e71ea 100755 --- a/pkgs/scripts/fetch-prs.sh +++ b/pkgs/scripts/fetch-prs.sh @@ -1,5 +1,5 @@ # dependencies: wcurl -PRS=("353272" "353230") +PRS=() if [ ! -f flake.nix ]; then echo "Not in a flake top level"