pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

fix/upstreaming-merge-conflicts #41

Merged
teutat3s merged 19 commits from refs/pull/41/head into main 2021-10-11 22:11:36 +00:00
Conversation 0 Commits 19 Files changed 5 +32 -39
1 changed files with 32 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1df67a3f2a - Show all commits

71
flake.lock
View file

@ -82,10 +82,9 @@
"deploy": { "deploy": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"naersk": "naersk",
"nixpkgs": [ "nixpkgs": [
"digga", "digga",
"nixpkgs" "latest"
], ],
"utils": [ "utils": [
"digga", "digga",
@ -93,11 +92,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1628752686, "lastModified": 1632822684,
"narHash": "sha256-Lzh9MYUJDsjgif+YEyOErXtj1IH+ci8J1C30g1ms69s=", "narHash": "sha256-lt7eayYmgsD5OQwpb1XYfHpxttn43bWo7G7hIJs+zJw=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "e5546f9c2503c26d175f08a81fc0a0f330be4cbe", "rev": "9a02de4373e0ec272d08a417b269a28ac8b961b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,11 +107,11 @@
}, },
"devshell": { "devshell": {
"locked": { "locked": {
"lastModified": 1629275356, "lastModified": 1632436039,
"narHash": "sha256-R17M69EKXP6q8/mNHaK53ECwjFo1pdF+XaJC9Qq8zjg=", "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "26f25a12265f030917358a9632cd600b51af1d97", "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -131,6 +130,7 @@
"home-manager": [ "home-manager": [
"home" "home"
], ],
"latest": "latest",
"nix": "nix", "nix": "nix",
"nixlib": [ "nixlib": [
"nixos" "nixos"
@ -141,11 +141,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1632784893, "lastModified": 1632959483,
"narHash": "sha256-SBmGCObLqF9CrWoF7hrBpiCMPTUFzHiBvAtCJXQrPg4=", "narHash": "sha256-jXogai6e+QRtiZFBOrMmYdeLXejzVT91kuDKu2RuJ10=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "6316878be3527ef2b27b8e92afb44ce1857830b3", "rev": "6549cf4c87d1a77138cbecbc6bb9483c20572cd7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -157,11 +157,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1606424373, "lastModified": 1627913399,
"narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -228,6 +228,22 @@
} }
}, },
"latest": { "latest": {
"locked": {
"lastModified": 1632660378,
"narHash": "sha256-sjA8eQlnyDjDLyAyq3XlJmN0nqW0ftl/pb7VnMg86L0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "31ffc50c571e6683e9ecc9dbcbd4a8e9914b4497",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"latest_2": {
"locked": { "locked": {
"lastModified": 1627942574, "lastModified": 1627942574,
"narHash": "sha256-guUcGRWvY2mfiVSet2x/zeHIyflm2wgglj0ldg0mMio=", "narHash": "sha256-guUcGRWvY2mfiVSet2x/zeHIyflm2wgglj0ldg0mMio=",
@ -261,29 +277,6 @@
} }
}, },
"naersk": { "naersk": {
"inputs": {
"nixpkgs": [
"digga",
"deploy",
"nixpkgs"
]
},
"locked": {
"lastModified": 1622810282,
"narHash": "sha256-4wmvM3/xfD0hCdNDIXVzRMfL4yB1J+DjH6Zte2xbAxk=",
"owner": "nmattia",
"repo": "naersk",
"rev": "e8061169e1495871b56be97c5c51d310fae01374",
"type": "github"
},
"original": {
"owner": "nmattia",
"ref": "master",
"repo": "naersk",
"type": "github"
}
},
"naersk_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"latest" "latest"
@ -448,8 +441,8 @@
"flake-utils-plus" "flake-utils-plus"
], ],
"home": "home", "home": "home",
"latest": "latest", "latest": "latest_2",
"naersk": "naersk_2", "naersk": "naersk",
"nixlib": [ "nixlib": [
"digga", "digga",
"nixlib" "nixlib"