From 18efdda35e14d50fef7f089c30c31da07ac1c004 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 8 Jun 2022 13:54:55 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 108 ++++++++++++++++++++++++++++++++----------- flake.nix | 5 +- patches/176387.patch | 29 ------------ 3 files changed, 85 insertions(+), 57 deletions(-) delete mode 100644 patches/176387.patch diff --git a/flake.lock b/flake.lock index efc737fa..6357604b 100644 --- a/flake.lock +++ b/flake.lock @@ -15,11 +15,11 @@ "web": "web" }, "locked": { - "lastModified": 1654239243, - "narHash": "sha256-f8eJMJH7GQ/JFpSAEAWTSeQy95EmbKYUX1txJ4a0Bqw=", + "lastModified": 1654671237, + "narHash": "sha256-cfENByWxyzabqJAPC2qiCiFqE6i3Zym2qYe6CcyUDjk=", "owner": "accentor", "repo": "flake", - "rev": "62eb6bd94a2708e05532ff2195dccbb1fd2ec3f9", + "rev": "aa224fa3affd8da35b2585839c8fa5025d224b20", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1654238959, - "narHash": "sha256-cCmzAnQyh4iOO38MUEblexsf03+63cHMxcjG2692M3M=", + "lastModified": 1654671118, + "narHash": "sha256-cA7q1I6LglymfyThEAvCzK5jouS7CmhPqnKjzMcZ5mc=", "owner": "accentor", "repo": "api", - "rev": "e0997e31e1e748d2a01fe37a6b8e956b9829c7d3", + "rev": "acd52178a2be93029cd8490d56b17521ccfddb7f", "type": "github" }, "original": { @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1654239132, - "narHash": "sha256-ldRYOp2i8WIAHxKtNi7r6I+CtQeoDxYfbW1qKCqQwus=", + "lastModified": 1654685091, + "narHash": "sha256-Uj+6hsG6gsHGy8RDoSeldd8fEzWGD6TaS9ETOctxNc4=", "owner": "accentor", "repo": "web", - "rev": "6b1f2e5d569910736232cf51b16464179745eea4", + "rev": "2049d9e07c970456c85d100152d61a6f1ce1c755", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1654284392, - "narHash": "sha256-USEIiwMDSGYYCIV2EpgPzXbtqn/ber/X86p1Kh/0ULA=", + "lastModified": 1654685982, + "narHash": "sha256-a+VtGW8QsCpLX6v8wWKEguUNTfTklcPS6HtzC8ygfnI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "06da47152be5f7d8186d2602ced50109ad77e519", + "rev": "71a37a76c851547a0241d7f6ba25a751bc337b92", "type": "github" }, "original": { @@ -190,6 +190,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1653893745, @@ -222,16 +238,22 @@ }, "home-manager": { "inputs": { + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" + ], + "nmd": "nmd", + "nmt": "nmt", + "utils": [ + "flake-utils" ] }, "locked": { - "lastModified": 1654113406, - "narHash": "sha256-70esZvhal+FsyU89mJRcAb+cDGHKt0sgZ6MlRr9Cplg=", + "lastModified": 1654628474, + "narHash": "sha256-Llm9X8Af15uC9IMStxqjCfO15WgYTqTnsQq8wMcpp5Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "684e85d01d333be91c4875baebb05b93c7d2ffaa", + "rev": "70824bb5c790b820b189f62f643f795b1d2ade2e", "type": "github" }, "original": { @@ -266,11 +288,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1654019511, - "narHash": "sha256-s3fcwUxa2rV2ZmSbdOtisNmXqeqnF9IFrvhPQL5GCBU=", + "lastModified": 1654593855, + "narHash": "sha256-c+SyXvj7THre87OyIdZfRVR+HhI/g1ZDrQ3VUtTuHkU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "692517bf851f2d8d999f0ad50f53fa1d2dd5c8f9", + "rev": "033bd4fa9a8fbe0c68a88e925d9a884161044b25", "type": "github" }, "original": { @@ -280,13 +302,45 @@ "type": "github" } }, + "nmd": { + "flake": false, + "locked": { + "lastModified": 1653339422, + "narHash": "sha256-8nc7lcYOgih3YEmRMlBwZaLLJYpLPYKBlewqHqx8ieg=", + "owner": "rycee", + "repo": "nmd", + "rev": "9e7a20e6ee3f6751f699f79c0b299390f81f7bcd", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmd", + "type": "gitlab" + } + }, + "nmt": { + "flake": false, + "locked": { + "lastModified": 1648075362, + "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", + "owner": "rycee", + "repo": "nmt", + "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmt", + "type": "gitlab" + } + }, "nur": { "locked": { - "lastModified": 1654248756, - "narHash": "sha256-LZuhksW59MwklXQPGlnqns07rz91NAqnDM7K5+s5Kro=", + "lastModified": 1654686758, + "narHash": "sha256-0j8a9BCR2kQVwUcxmIcpP+wLJbbB7sf3yeN4u6oumW4=", "owner": "nix-community", "repo": "NUR", - "rev": "5473c9e430d69b933cae009b0e686e1316c57718", + "rev": "81ef3c67526e57420c6961b69152d654735040d1", "type": "github" }, "original": { @@ -323,11 +377,11 @@ ] }, "locked": { - "lastModified": 1654483484, - "narHash": "sha256-Ki/sMgrUEj+31P3YMzZZp5Nea7+MQVVTdaRWQVS1PL4=", + "lastModified": 1654656257, + "narHash": "sha256-AdLXdVgAwsUA0A3UI8ncD/pBVunxrIpvaA40uQlKqbA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6bc59b9c4ad1cc1089219e935aa727a96d948c5d", + "rev": "0689534b4e85d6a0b2742bbc6fcf7593914fa07f", "type": "github" }, "original": { @@ -349,11 +403,11 @@ ] }, "locked": { - "lastModified": 1654241791, - "narHash": "sha256-aPGe0XCzYwO1PwG/qZdUrkY+ph0EylA0qT+llg41tXs=", + "lastModified": 1654670723, + "narHash": "sha256-Rx/4GYYN4vLErDmDo7Ikmgp5Qr7YVdgEMF73fKEGRd4=", "owner": "chvp", "repo": "tetris", - "rev": "d76a4bf19213aba09809af3abcb8d678028b6ee0", + "rev": "6531281fe3d3175e12ac458fd32183fb013a93f9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 189e256e..33f6d549 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,10 @@ flake-utils.url = "github:numtide/flake-utils"; home-manager = { url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + utils.follows = "flake-utils"; + }; }; nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; diff --git a/patches/176387.patch b/patches/176387.patch deleted file mode 100644 index df2be8a2..00000000 --- a/patches/176387.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a354d5b16bea0fe4b6790d2e078551e25f9b0d92 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Sun, 5 Jun 2022 14:11:40 +0200 -Subject: [PATCH] mu: 1.6.10 -> 1.6.11 - ---- - 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 47d0dffda0079..fd140bfe55edc 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.10"; -+ version = "1.6.11"; - - src = fetchFromGitHub { - owner = "djcb"; - repo = "mu"; - rev = version; -- sha256 = "1uJB8QdR0JgWlogb1cdUicz+LLtYQpAvYJjwcRjXt+E="; -+ sha256 = "E/6+vEwYXk65/ZoAtUeTjvg56g6gz+Qtcaz0qwEru6c="; - }; - - postPatch = lib.optionalString (batchSize != null) ''