diff --git a/flake.lock b/flake.lock index b1e3afd5..cee0c004 100644 --- a/flake.lock +++ b/flake.lock @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700204040, - "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "lastModified": 1700390070, + "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", + "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", "type": "github" }, "original": { @@ -534,11 +534,11 @@ }, "nur": { "locked": { - "lastModified": 1700457242, - "narHash": "sha256-GMGRabT6Z8RUHPz3CJMakcARmDRqUy3+yUy0vW7D2ww=", + "lastModified": 1700466986, + "narHash": "sha256-fIo3/il98fHXKC5XWUyeV3/kF1L4MWK1Cobctbb3w4k=", "owner": "nix-community", "repo": "NUR", - "rev": "7afc4f1d1cf86e79e6db8bca6447160b50c40d4c", + "rev": "dceea9c120d99dc75ddeec5e6f8ea3c80b10d938", "type": "github" }, "original": { @@ -736,11 +736,11 @@ ] }, "locked": { - "lastModified": 1700303712, - "narHash": "sha256-hAHCedESvCkfyjPeTSwPf82xvBMQzeydgAWW/HSibxI=", + "lastModified": 1700465726, + "narHash": "sha256-AQZ3czFzNGQ1ztaB6QxWYcQL1rKOwpiUh4VekXrG9+k=", "owner": "chvp", "repo": "tetris", - "rev": "e0834f8d6d943c9284b63d7b59e9b8c2f137f468", + "rev": "19d563d42d2b383b1f026923965c7374aca12b93", "type": "github" }, "original": { diff --git a/patches/268027.patch b/patches/268027.patch deleted file mode 100644 index 9053ab57..00000000 --- a/patches/268027.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix -index 1a6f9c784cf675..6d51b51b215d43 100644 ---- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix -+++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix -@@ -57,7 +57,8 @@ - # Raise an error if two packages are installed with the same name - # TODO: For cross we probably need a different PYTHONPATH, or not - # add the runtime deps until after buildPhase. --, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform) -+# FIXME: disabled for Python 2 because broken -+, catchConflicts ? false - - # Additional arguments to pass to the makeWrapper function, which wraps - # generated binaries. diff --git a/patches/268107.patch b/patches/268107.patch deleted file mode 100644 index f2485eb5..00000000 --- a/patches/268107.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix -index 8d201624a64201..566f7d1cabfab6 100644 ---- a/pkgs/servers/mautrix-whatsapp/default.nix -+++ b/pkgs/servers/mautrix-whatsapp/default.nix -@@ -2,18 +2,18 @@ - - buildGoModule rec { - pname = "mautrix-whatsapp"; -- version = "0.10.3"; -+ version = "0.10.4"; - - src = fetchFromGitHub { - owner = "mautrix"; - repo = "whatsapp"; - rev = "v${version}"; -- hash = "sha256-lBseLxxk+3/eoJMdq4muOrA0TgEhwIReGtQO1OzqBFc="; -+ hash = "sha256-uouxOXvVbUNRHM83JearPhMTZQtMPEBfWvsVb7QJSO8="; - }; - - buildInputs = [ olm ]; - -- vendorHash = "sha256-QUZ9x9BDlhoWLvdt8BTIKxHcsclT6arGICeJnOafs1g="; -+ vendorHash = "sha256-dgaI/gpngCcVRVK8SK6ac1hmc7/aYLJCnW2CCYRDXy0="; - - doCheck = false; - diff --git a/patches/268300.patch b/patches/268300.patch deleted file mode 100644 index d07e9851..00000000 --- a/patches/268300.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix -index f07ac564b88a7b..479f319c5426af 100644 ---- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix -+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix -@@ -1,7 +1,7 @@ - { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: - - let -- version = "16.5.0"; -+ version = "16.6.0"; - in - buildGoModule rec { - inherit version; -@@ -17,13 +17,13 @@ buildGoModule rec { - # For patchShebangs - buildInputs = [ bash ]; - -- vendorHash = "sha256-C37ijxvyY9PG/Qn29Fmk0pxK+hq45kHIBveBltfIfTo="; -+ vendorHash = "sha256-m0+iAJITX0JfBd5ZboqlcG6eNbPJ35gHa4LV21jX5d8="; - - src = fetchFromGitLab { - owner = "gitlab-org"; - repo = "gitlab-runner"; - rev = "v${version}"; -- sha256 = "sha256-NLidtwn1zT7BxzMEF5K41fwbZaICA/KuAr8MIjpJD+A="; -+ sha256 = "sha256-4N00+yO7Ps0+jy7WmHhm4Eh4MXt3beH00ScZ1RWNByE="; - }; - - patches = [