From 3bb4ce6320ae626effd48488a04549279065d391 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 24 Nov 2022 17:25:36 +0100 Subject: [PATCH] Update dependencies --- flake.lock | 18 +++++++++--------- patches/202363.patch | 25 ------------------------- 2 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 patches/202363.patch diff --git a/flake.lock b/flake.lock index aca3ff98..053baa8c 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ ] }, "locked": { - "lastModified": 1669211485, - "narHash": "sha256-wtDX1UVQGM/tfuB5WNoLfWq75uJKOVfTxT7eWf/j4tU=", + "lastModified": 1669305067, + "narHash": "sha256-EcqJEIhrKAXbuwAEvoVqlAzcHbHep4DzziMOWQM4Hcw=", "owner": "accentor", "repo": "flake", - "rev": "d65f5766f1107677379d953e9eb6c9f9c9f93dc9", + "rev": "22434c29070eba82759755957ebe02dace891ef5", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669140675, - "narHash": "sha256-npzfyfLECsJWgzK/M4gWhykP2DNAJTYjgY2BWkz/oEQ=", + "lastModified": 1669230746, + "narHash": "sha256-+rU3DixJnygpJsGhhp6OvViruJux4TaiCz4IO+DdtZU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2788904d26dda6cfa1921c5abb7a2466ffe3cb8c", + "rev": "42337aad353c5efff4382d7bf99deda491459845", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1669211170, - "narHash": "sha256-yL3+4FbIgDfa2Lyyr2vbtUPG6jBA968YhsiUvXXTf2k=", + "lastModified": 1669304320, + "narHash": "sha256-9i5u5IDZSYYyadZ/g1q14YB0EYVTenUKZcjCQuIgKpU=", "owner": "chvp", "repo": "tetris", - "rev": "54e3ef66222f591c9ddbb74e644e2bdfc4f1c1d0", + "rev": "4c0820f7874c99626fc652e91066e37b4aecbd0c", "type": "github" }, "original": { diff --git a/patches/202363.patch b/patches/202363.patch deleted file mode 100644 index ca73f1d2..00000000 --- a/patches/202363.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f6b4b52a17e47707e9ab6b252c50b663781f34c1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Tue, 22 Nov 2022 16:19:35 +0100 -Subject: [PATCH] autojump: fixup python shebang after cross fix - -we need python also in buildInputs for the shebang to get fixed properly ---- - pkgs/tools/misc/autojump/default.nix | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix -index 844e3ba99ea9cf..424497ee182b76 100644 ---- a/pkgs/tools/misc/autojump/default.nix -+++ b/pkgs/tools/misc/autojump/default.nix -@@ -11,8 +11,10 @@ stdenv.mkDerivation rec { - sha256 = "1rgpsh70manr2dydna9da4x7p8ahii7dgdgwir5fka340n1wrcws"; - }; - -+ buildInputs = [ python3 ]; - nativeBuildInputs = [ python3 ]; - dontBuild = true; -+ strictDeps = true; - - installPhase = '' - python ./install.py -d "$out" -p "" -z "$out/share/zsh/site-functions/"