🎉 Remove my fork of nixpkgs

My MR got merged 🎉
This commit is contained in:
Sam W 2022-08-29 21:25:00 +01:00
parent 62a9c79689
commit 3720eb175c
2 changed files with 4 additions and 28 deletions

View File

@ -61,11 +61,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1654994491, "lastModified": 1661700591,
"narHash": "sha256-HFu3HTFFFcZSKImuiki3q+MLvcc85hRgYvW+sXmH8LE=", "narHash": "sha256-NZa+z+TJC+Hk+87+LKkjFFmBn4GyMVEPcWFXFU+aTkU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1f8d88087a3753e55a29b5207f7f0997f7c813fa", "rev": "16236dd7e33ba4579ccd3ca8349396b2f9c960fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,29 +75,12 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"nixpkgs-samw": "nixpkgs-samw"
} }
} }
}, },

View File

@ -3,7 +3,6 @@
inputs = { inputs = {
# Nixpkgs # Nixpkgs
nixpkgs = {url = "github:nixos/nixpkgs/nixos-22.05";}; nixpkgs = {url = "github:nixos/nixpkgs/nixos-22.05";};
nixpkgs-samw = {url = "github:wlcx/nixpkgs/pngpaste-0.2.3";};
# Other modules # Other modules
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-22.05"; url = "github:nix-community/home-manager/release-22.05";
@ -18,12 +17,6 @@
}; };
outputs = inputs: let outputs = inputs: let
overlays = [ 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 # Add our own local packages
(final: prev: rec { (final: prev: rec {
# Make my local packages available as pkgs.mypkgs.<foo> # Make my local packages available as pkgs.mypkgs.<foo>