From 6fd28159a7522bb708983af06d87b182bab602e8 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 7 Feb 2022 14:27:38 +0100 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/261aed7731d92414fcb29f09a9bb7d4ed41d9455' (2022-01-30) → 'github:nix-community/emacs-overlay/02d47fdf48e54598f9838f01a9d172bfa206b63e' (2022-02-07) • Updated input 'home-manager': 'github:nix-community/home-manager/acf824c9ed70f623b424c2ca41d0f6821014c67c' (2022-01-28) → 'github:nix-community/home-manager/63dccc4e60422c1db2c3929b2fd1541f36b7e664' (2022-02-04) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5bb20f9dc70e9ee16e21cc404b6508654931ce41' (2022-01-28) → 'github:NixOS/nixpkgs/9f697d60e4d9f08eacf549502528bfaed859d33b' (2022-02-05) • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/709f7b3c61dfa01db3ddc7356620a9c319a429d1' (2022-01-30) → 'github:NixOS/nixpkgs/64cb9c78e14d0ffc9ee627772a972aa4b59bbfd8' (2022-02-07) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 1138b35..bffc7d1 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1643538241, - "narHash": "sha256-16ZlVX049WZHHDwC/nozkNBTQxmwhIeh4NFZObiv9CA=", + "lastModified": 1644230579, + "narHash": "sha256-/3v0jBKY1QJPK6cdO0fZl+xK5E+GZhHcbgWb7RoFEN4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "261aed7731d92414fcb29f09a9bb7d4ed41d9455", + "rev": "02d47fdf48e54598f9838f01a9d172bfa206b63e", "type": "github" }, "original": { @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1643411645, - "narHash": "sha256-q1TjWmK1MeGNfcU8ud11v9ZTqq2UI8YiCVKCD2MeAEk=", + "lastModified": 1643933104, + "narHash": "sha256-NZPuFxRsZKN8pjRuHPpzlMyt6JQhcjiduBG8bMghSjE=", "owner": "nix-community", "repo": "home-manager", - "rev": "acf824c9ed70f623b424c2ca41d0f6821014c67c", + "rev": "63dccc4e60422c1db2c3929b2fd1541f36b7e664", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1643502397, - "narHash": "sha256-l7r8onTGYC3QgfN0oJ3NBhpJf/tRx7K30XkW2unfFno=", + "lastModified": 1644225686, + "narHash": "sha256-XDslFfn44H93WjGytIhrPSduGIug1p4cPN/cEuHdIBI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "709f7b3c61dfa01db3ddc7356620a9c319a429d1", + "rev": "64cb9c78e14d0ffc9ee627772a972aa4b59bbfd8", "type": "github" }, "original": { @@ -134,11 +134,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1643347846, - "narHash": "sha256-O0tyXF//ppRpe9yT1Uu5n34yI2MWDyY6ZiJ4Qn5zIkE=", + "lastModified": 1644033087, + "narHash": "sha256-beskas17YPhrcnanzywake9/z+k+xOWmavW24YUN8ng=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5bb20f9dc70e9ee16e21cc404b6508654931ce41", + "rev": "9f697d60e4d9f08eacf549502528bfaed859d33b", "type": "github" }, "original": { From 47c00081694cf204c6083480f66fef25d751e585 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 7 Feb 2022 14:28:11 +0100 Subject: [PATCH 2/2] Revert "flake: add temp fix for broken PAM in unstable" This reverts commit d5813bfdb60f71e17dfdd595e672e46fdd166e98. No longer necessary! --- flake.lock | 17 ----------------- flake.nix | 10 ---------- 2 files changed, 27 deletions(-) diff --git a/flake.lock b/flake.lock index bffc7d1..a5704c5 100644 --- a/flake.lock +++ b/flake.lock @@ -100,22 +100,6 @@ "type": "indirect" } }, - "nixpkgs-fixed-pam": { - "locked": { - "lastModified": 1643302241, - "narHash": "sha256-cEIhdgbUkiptcSAZ52iuXvG72WNv6m4pR3Y4Lf8mP9s=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ffdadd3ef9167657657d60daf3fe0f1b3176402d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ffdadd3ef9167657657d60daf3fe0f1b3176402d", - "type": "github" - } - }, "nixpkgs-unstable-small": { "locked": { "lastModified": 1644225686, @@ -156,7 +140,6 @@ "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", - "nixpkgs-fixed-pam": "nixpkgs-fixed-pam", "nixpkgs-unstable-small": "nixpkgs-unstable-small" } } diff --git a/flake.nix b/flake.nix index afebe6f..16e9b08 100644 --- a/flake.nix +++ b/flake.nix @@ -15,13 +15,6 @@ ref = "nixos-unstable-small"; }; - nixpkgs-fixed-pam = { - type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; - rev = "ffdadd3ef9167657657d60daf3fe0f1b3176402d"; - }; - agenix = { type = "github"; owner = "ryantm"; @@ -88,9 +81,6 @@ config.allowUnfree = true; }; - i3lock-color = super.i3lock-color.override { - pam = (import inputs.nixpkgs-fixed-pam { inherit system; }).pam; - }; }) agenix.overlay