From 0a498744e7953557adada5b8ba820539a1283534 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 2 Aug 2021 10:33:13 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 14 +++++++------- flake.nix | 2 +- modules/games/tetris/default.nix | 2 +- patches/131745.patch | 29 ----------------------------- patches/132207.patch | 29 ----------------------------- 5 files changed, 9 insertions(+), 67 deletions(-) delete mode 100644 patches/131745.patch delete mode 100644 patches/132207.patch diff --git a/flake.lock b/flake.lock index 81e10689..c4a066ac 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1627838800, - "narHash": "sha256-cirlU0cxMhPvgiCDxs5rTWEIk2xmwRbtxjO2z/vs7z0=", + "lastModified": 1627869201, + "narHash": "sha256-8luG5dc3V5hvmIbfOVvBqEc3j/ZdDiEhy8pgXc2jhe4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c2c7751ea0e1ce19db3db727255166977c76297f", + "rev": "38cc949028d967d80077de3f6f3248aa5708fa37", "type": "github" }, "original": { @@ -92,16 +92,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1627391865, - "narHash": "sha256-tPoWBO9Nzu3wuX37WcnctzL6LoDCErJLnfLGqqmXCm4=", + "lastModified": 1627850614, + "narHash": "sha256-GBRYGltjej/EUzFiW4KRhICSNM1GWZVaa49x2RJXYFk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8ecc61c91a596df7d3293603a9c2384190c1b89a", + "rev": "151c2f5a20c8d03a168242af18225f46786ef7c1", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 824736b7..be5e9680 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus"; }; diff --git a/modules/games/tetris/default.nix b/modules/games/tetris/default.nix index c7a6d5d2..e22c6f2f 100644 --- a/modules/games/tetris/default.nix +++ b/modules/games/tetris/default.nix @@ -7,7 +7,7 @@ let src = pkgs.fetchFromGitHub { owner = "chvp"; repo = "tetris"; - rev = "master"; + rev = "main"; sha256 = "0jq5pih8bb1w2pglpklqix01pdd3a3wzzf0jnai0wy5gn93abpik"; }; packageJSON = ./package.json; diff --git a/patches/131745.patch b/patches/131745.patch deleted file mode 100644 index f80db615..00000000 --- a/patches/131745.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2d1dbaa617424f17f8daa7ec4a25ab3489afdd95 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Wed, 28 Jul 2021 00:58:59 +0200 -Subject: [PATCH] mu: 1.4.15 -> 1.6.0 - ---- - pkgs/tools/networking/mu/default.nix | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix -index 4553063929fdf7..da7ef58f199442 100644 ---- a/pkgs/tools/networking/mu/default.nix -+++ b/pkgs/tools/networking/mu/default.nix -@@ -7,13 +7,13 @@ - - stdenv.mkDerivation rec { - pname = "mu"; -- version = "1.4.15"; -+ version = "1.6.0"; - - src = fetchFromGitHub { - owner = "djcb"; - repo = "mu"; - rev = version; -- sha256 = "sha256-VIUA0W+AmEbvGWatv4maBGILvUTGhBgO3iQtjIc3vG8="; -+ sha256 = "d2REyoSbznMhqV4PNntvg8uQmU66Bsi4OwH2Gj7gQ10="; - }; - - postPatch = lib.optionalString (batchSize != null) '' diff --git a/patches/132207.patch b/patches/132207.patch deleted file mode 100644 index 168d84e2..00000000 --- a/patches/132207.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6eef84d697b1e07c85892241e53c746a9ecc6bf5 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Sat, 31 Jul 2021 12:33:43 +0200 -Subject: [PATCH] mu: 1.6.0 -> 1.6.1 - ---- - pkgs/tools/networking/mu/default.nix | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix -index da7ef58f199442..b6fce962d751a4 100644 ---- a/pkgs/tools/networking/mu/default.nix -+++ b/pkgs/tools/networking/mu/default.nix -@@ -7,13 +7,13 @@ - - stdenv.mkDerivation rec { - pname = "mu"; -- version = "1.6.0"; -+ version = "1.6.1"; - - src = fetchFromGitHub { - owner = "djcb"; - repo = "mu"; - rev = version; -- sha256 = "d2REyoSbznMhqV4PNntvg8uQmU66Bsi4OwH2Gj7gQ10="; -+ sha256 = "7mSP1F2RxW0CEDRWbMzDRfoehrr24b11sCLM2gQFjuI="; - }; - - postPatch = lib.optionalString (batchSize != null) ''