From 47c00081694cf204c6083480f66fef25d751e585 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 7 Feb 2022 14:28:11 +0100 Subject: [PATCH] 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