From d8fe793685d91399e3f97703de9493df5050e136 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Wed, 18 Jan 2023 18:03:48 +0100 Subject: [PATCH] Flake update --- flake.lock | 136 +++++++++++++++++++++++---------------- home-manager/desktop.nix | 2 +- 2 files changed, 81 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index a1e9a86..562243a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1665870395, - "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", + "lastModified": 1673301561, + "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=", "owner": "ryantm", "repo": "agenix", - "rev": "a630400067c6d03c9b3e0455347dc8559db14288", + "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1671445040, - "narHash": "sha256-3V1ac0oibV50EG4xzGR2jbZOYwZatYDc5sWl48krQXQ=", + "lastModified": 1674032919, + "narHash": "sha256-5tHaGJsZW6EXHAPogAbHObk6OKWmLDRSkpbAmLtgol8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9207a2810c29dac8d2621aeb4584a6ab54f25373", + "rev": "d0d9310e383f25872db7dea6a2b60dbc13db9ee4", "type": "github" }, "original": { @@ -72,6 +72,44 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673362319, + "narHash": "sha256-Pjp45Vnj7S/b3BRpZEVfdu8sqqA6nvVjvYu59okhOyI=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "82c16f1682cf50c01cb0280b38a1eed202b3fe9f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -116,21 +154,6 @@ "type": "github" } }, - "flake-utils_4": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -139,11 +162,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1671459164, - "narHash": "sha256-RbkDnvLV7WjbiF4Dpiezrf8kXxwieQXAVtY8ciRQj6Q=", + "lastModified": 1674041176, + "narHash": "sha256-cMf1BQzI39nHQ0H/mOatthbbI3392qLmJ9gU0u520P4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e7eba9cc46547ae86642ad3c6a9a4fb22c07bc26", + "rev": "2c29ae48f9a149151bdd82f429ac61d4412c312a", "type": "github" }, "original": { @@ -157,11 +180,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1671365342, - "narHash": "sha256-Y89IwGILi2Y9Xo09/+LRJPwXe1hfohbY1W5pYyDfcrk=", + "lastModified": 1673784491, + "narHash": "sha256-Av6g/hjJjK/QRnO2eZle5K2LiXWVIUwERInSMXxq34c=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "096fd659f192b901b46c4c63c37e42b478e82369", + "rev": "53fd425d429ec2341d13b479478611622b944a69", "type": "github" }, "original": { @@ -172,18 +195,18 @@ }, "nix-eval-jobs": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs-wayland", "nixpkgs" ] }, "locked": { - "lastModified": 1671412664, - "narHash": "sha256-xUDk18KV+Uc+TkI9sEwk4aDkFA5C3idGrutMarOljrE=", + "lastModified": 1673832069, + "narHash": "sha256-xu33HFqVtuQlK89WghvgAeUZaQ8rrYlDzAmKjop4vtk=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "bf782641b432fcee7e269c81241ec0586cb3a5ff", + "rev": "11a99e5b1b801e7ce73f09df7ff86b173612f9ef", "type": "github" }, "original": { @@ -194,11 +217,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1671455302, - "narHash": "sha256-4nqEGeNviqPJy9IBd6Bi21ABz5z3Rdgo7IhbwBAmwYE=", + "lastModified": 1673803274, + "narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7a1b9419c9430558481d8cc117e9906fd272eaa5", + "rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3", "type": "github" }, "original": { @@ -209,18 +232,19 @@ "nixos-mailserver": { "inputs": { "blobs": "blobs", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_05": "nixpkgs-22_05", + "nixpkgs-22_11": "nixpkgs-22_11", "utils": "utils_2" }, "locked": { - "lastModified": 1669807829, - "narHash": "sha256-rgQ8MYV1UD4Ynw0wzfl9hatgsV5GV7X6eM6ioSPKzls=", + "lastModified": 1671738303, + "narHash": "sha256-PRgqtaWf2kMSYqVmcnmhTh+UsC0RmvXRTr+EOw5VZUA=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "694e7d34f60028f4877517e1c7c73c9527fad400", + "rev": "6d0d9fb966cc565a3df74d3b686f924c7615118c", "type": "gitlab" }, "original": { @@ -231,11 +255,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671359686, - "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=", + "lastModified": 1673796341, + "narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4", + "rev": "6dccdc458512abce8d19f74195bb20fdb067df50", "type": "github" }, "original": { @@ -245,28 +269,28 @@ "type": "github" } }, - "nixpkgs-22_05": { + "nixpkgs-22_11": { "locked": { - "lastModified": 1654936503, - "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=", + "lastModified": 1669558522, + "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dab6df51387c3878cdea09f43589a15729cae9f4", + "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "type": "indirect" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1671324337, - "narHash": "sha256-OZVfw69LQi2RckjPdooYrhw1I2vd28QdzEGJwI3w+jk=", + "lastModified": 1673743903, + "narHash": "sha256-sloY6KYyVOozJ1CkbgJPpZ99TKIjIvM+04V48C04sMQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b4dd796b65c0bee6185fd2b5c84c2a207231e28f", + "rev": "7555e2dfcbac1533f047021f1744ac8871150f9f", "type": "github" }, "original": { @@ -277,11 +301,11 @@ }, "nixpkgs-mozilla": { "locked": { - "lastModified": 1664789696, - "narHash": "sha256-UGWJHQShiwLCr4/DysMVFrYdYYHcOqAOVsWNUu+l6YU=", + "lastModified": 1672878308, + "narHash": "sha256-0+fl6PHokhtSV+w58z2QD2rTf8QhcOGsT9o4LwHHZHE=", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "80627b282705101e7b38e19ca6e8df105031b072", + "rev": "d38863db88e100866b3e494a651ee4962b762fcc", "type": "github" }, "original": { @@ -308,7 +332,7 @@ }, "nixpkgs-wayland": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": [ @@ -316,11 +340,11 @@ ] }, "locked": { - "lastModified": 1671447513, - "narHash": "sha256-Lbow2sh3ynFPXcsazpIGYbdvkZE33+bRvs+8mtlGg0Y=", + "lastModified": 1674056257, + "narHash": "sha256-+tAlW7NuH9h5vhgmxWuRDm8Dt3azMxoHgS06Fjj79tI=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "32860b6e42313437c5b5e6670d35238cf6cca628", + "rev": "7a4024885b31fecd4856a6bfeb30a5009c2f76dc", "type": "github" }, "original": { diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index 76c6404..9006ef2 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -164,7 +164,7 @@ in { programs.firefox = { enable = true; - package = pkgs.latest.firefox-beta-bin; + package = pkgs.latest.firefox-bin; }; home.sessionVariables = { MOZ_USE_XINPUT2 = "1";