diff --git a/flake.lock b/flake.lock index ebcd1a9..59ae112 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1654994491, - "narHash": "sha256-HFu3HTFFFcZSKImuiki3q+MLvcc85hRgYvW+sXmH8LE=", + "lastModified": 1661700591, + "narHash": "sha256-NZa+z+TJC+Hk+87+LKkjFFmBn4GyMVEPcWFXFU+aTkU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1f8d88087a3753e55a29b5207f7f0997f7c813fa", + "rev": "16236dd7e33ba4579ccd3ca8349396b2f9c960fe", "type": "github" }, "original": { @@ -75,29 +75,12 @@ "type": "github" } }, - "nixpkgs-samw": { - "locked": { - "lastModified": 1655065841, - "narHash": "sha256-jFtkxS6k/LzJ/RvDuTk1x/igcRwE7JIoXXv8Lh/QauY=", - "owner": "wlcx", - "repo": "nixpkgs", - "rev": "794deaa7696e76e3f1159f27d2fe8607a4e1f0e6", - "type": "github" - }, - "original": { - "owner": "wlcx", - "ref": "pngpaste-0.2.3", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "devshell": "devshell", "flake-utils": "flake-utils", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "nixpkgs-samw": "nixpkgs-samw" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index ab17e90..2fff083 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { # Nixpkgs nixpkgs = {url = "github:nixos/nixpkgs/nixos-22.05";}; - nixpkgs-samw = {url = "github:wlcx/nixpkgs/pngpaste-0.2.3";}; # Other modules home-manager = { url = "github:nix-community/home-manager/release-22.05"; @@ -18,12 +17,6 @@ }; outputs = inputs: let overlays = [ - # Add packages from "other" nixpkgs - (final: prev: - with inputs; { - # TODO: get pngpaste PR merged... - pngpaste = nixpkgs-samw.legacyPackages.${prev.system}.pngpaste; - }) # Add our own local packages (final: prev: rec { # Make my local packages available as pkgs.mypkgs.