axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

rm: use of patched nix for nixos 21.11 enabled digga

Browse source 
- patched nix held the follows patch which is now upstreamed
This commit is contained in:
David Arnold 2021-11-29 17:37:02 -05:00 committed by Parthiv Seetharaman
parent b15b8bf865
commit 6151d02b8d
2 changed files with 37 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
flake.lock
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1620877075,
"narHash": "sha256-XvgTqtmQZHegu9UMDSR50gK5cHEM2gbnRH0qecmdN54=",
"lastModified": 1637793790,
"narHash": "sha256-oPXavjxETEWGXq8g7kQHyRLKUmLX2yPtGn+t3V0mrTY=",
"owner": "ryantm",
"repo": "agenix",
"rev": "e543aa7d68f222e1e771165da9e9a64b5bf7b3e3",
"rev": "f85eea0e29fa9a8924571d0e398215e175f80d55",
"type": "github"
},
"original": {
@ -70,11 +70,11 @@
]
},
"locked": {
"lastModified": 1633373878,
"narHash": "sha256-9+ziZ8l6rq3yXyY6B0wYXrVdfxr6cdpEbPEGRHywBKc=",
"lastModified": 1633877936,
"narHash": "sha256-+o3n6s7fR8dBGRldTGelyp2j3jSyTlrniOXwNfmMG20=",
"owner": "divnix",
"repo": "bud",
"rev": "4e709a2fcf19df500ba87d9c3b1b1481401cd53b",
"rev": "15df091133ff95216c321b09be04905c0a0944c4",
"type": "github"
},
"original": {
@ -90,11 +90,11 @@
]
},
"locked": {
"lastModified": 1622060422,
"narHash": "sha256-hPVlvrAyf6zL7tTx0lpK+tMxEfZeMiIZ/A2xaJ41WOY=",
"lastModified": 1634994402,
"narHash": "sha256-xmlCVVOYGpZoxgOqsDOVF0B0ASrnbNGVAEzID9qh2xo=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "007d700e644ac588ad6668e6439950a5b6e2ff64",
"rev": "44da835ac40dab5fd231298b59d83487382d2fab",
"type": "github"
},
"original": {
@ -165,11 +165,11 @@
]
},
"locked": {
"lastModified": 1632959483,
"narHash": "sha256-jXogai6e+QRtiZFBOrMmYdeLXejzVT91kuDKu2RuJ10=",
"lastModified": 1634161492,
"narHash": "sha256-7OZz7DqAhO+3axY68xsMXAyD+b5gJgVXuKjslTSCM3Y=",
"owner": "divnix",
"repo": "digga",
"rev": "6549cf4c87d1a77138cbecbc6bb9483c20572cd7",
"rev": "a55450a16d362b6e1c50bb4025aaa604b385d3ba",
"type": "github"
},
"original": {
@ -245,27 +245,6 @@
"type": "github"
}
},
"home": {
"inputs": {
"nixpkgs": [
"nixos"
]
},
"locked": {
"lastModified": 1624228557,
"narHash": "sha256-wwOqe73BsrXfRv1PhyXQFNC8iTET50KvE/HitdkRgxs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "35a24648d155843a4d162de98c17b1afd5db51e4",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-21.05",
"repo": "home-manager",
"type": "github"
}
},
"latest": {
"locked": {
"lastModified": 1632660378,
@ -284,11 +263,11 @@
},
"latest_2": {
"locked": {
"lastModified": 1627942574,
"narHash": "sha256-guUcGRWvY2mfiVSet2x/zeHIyflm2wgglj0ldg0mMio=",
"lastModified": 1638198142,
"narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c464dc811babfe316ed4ab7bbc12351122e69dd7",
"rev": "8a308775674e178495767df90c419425474582a1",
"type": "github"
},
"original": {
@ -322,11 +301,11 @@
]
},
"locked": {
"lastModified": 1623927034,
"narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=",
"lastModified": 1638203339,
"narHash": "sha256-Sz3iCvbWrVWOD/XfYQeRJgP/7MVYL3/VKsNXvDeWBFc=",
"owner": "nmattia",
"repo": "naersk",
"rev": "e09c320446c5c2516d430803f7b19f5833781337",
"rev": "c3e56b8a4ffb6d906cdfcfee034581f9a8ece571",
"type": "github"
},
"original": {
@ -357,22 +336,6 @@
"type": "github"
}
},
"nixos": {
"locked": {
"lastModified": 1628203131,
"narHash": "sha256-jQgXeJ9NQQS0Eobb/qQOvS+RRULkqRikAeXkkFKOPDA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "178da37860823d35e801c7df2f73d7866d3d598a",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "release-21.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixos-generators": {
"inputs": {
"nixlib": [
@ -400,11 +363,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1625333638,
"narHash": "sha256-M6J9RN60XJyv6nUfDFCwnz5aVjhe8+GJnV8Q9VpdQQQ=",
"lastModified": 1638182287,
"narHash": "sha256-vBzf+hbTJz2ZdXV/DWirl6wOO7tjdqzTIU+0FANt65U=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "41775780a0b6b32b3d32dcc32bb9bc6df809062d",
"rev": "6b3f79de09c3de7c91ab51e55e87879f61b6faec",
"type": "github"
},
"original": {
@ -415,11 +378,11 @@
},
"nur": {
"locked": {
"lastModified": 1626378135,
"narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
"lastModified": 1638219753,
"narHash": "sha256-xARa9i5KHtpfekdHMo556BmlI/BCV4jz+qHZVhUx4Wg=",
"owner": "nix-community",
"repo": "NUR",
"rev": "00c2ec8f0bbdf0cfb2135bde55fbae5d6b64aa6d",
"rev": "95c40f4ecb1238bae0a179a4d02b43e1ce8af554",
"type": "github"
},
"original": {
@ -444,11 +407,11 @@
]
},
"locked": {
"lastModified": 1632700276,
"narHash": "sha256-XABvQUq2qv+YcQxW93DnU8mgtVsGJWyhcznny/Lbp0Q=",
"lastModified": 1634524567,
"narHash": "sha256-v9ZTZj1WNQaaVfs1P1mUPuh518mmwpqszj1EjdeGUmc=",
"owner": "berberman",
"repo": "nvfetcher",
"rev": "248fe98ed1bc352ce164d08a9e76fdc5f301ba2d",
"rev": "807513f4bbd0e3b5863f4c3b91f8ac846ed6da9b",
"type": "github"
},
"original": {
@ -506,14 +469,20 @@
"digga",
"flake-utils-plus"
],
"home": "home",
"home": [
"digga",
"home-manager"
],
"latest": "latest_2",
"naersk": "naersk",
"nixlib": [
"digga",
"nixlib"
],
"nixos": "nixos",
"nixos": [
"digga",
"nixpkgs"
],
"nixos-hardware": "nixos-hardware",
"nixpkgs": [
"nixos"

5
flake.nix
View file

@ -7,7 +7,7 @@
inputs =
{
nixos.url = "github:nixos/nixpkgs/release-21.05";
nixos.url = "github:nixos/nixpkgs/release-21.11";
latest.url = "github:nixos/nixpkgs/nixos-unstable";
digga.url = "github:divnix/digga";
@ -19,7 +19,7 @@
bud.inputs.nixpkgs.follows = "nixos";
bud.inputs.devshell.follows = "digga/devshell";
home.url = "github:nix-community/home-manager/release-21.05";
home.url = "github:nix-community/home-manager/release-21.11";
home.inputs.nixpkgs.follows = "nixos";
darwin.url = "github:LnL7/nix-darwin";
@ -73,7 +73,6 @@
nixos = {
imports = [ (digga.lib.importOverlays ./overlays) ];
overlays = [
digga.overlays.patchedNix
nur.overlay
agenix.overlay
nvfetcher.overlay