Merge branch 'main' into teutat3s

This commit is contained in:
teutat3s 2022-04-09 16:57:20 +02:00
commit 2f38edecf7
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1

View file

@ -140,7 +140,7 @@
"devshell_2": { "devshell_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1647857022, "lastModified": 1647857022,
@ -177,11 +177,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1648937792, "lastModified": 1649221292,
"narHash": "sha256-KoR/L4tYoFaoIo4knVuaqjzLn6yAvQmO8e5YcfUsxY4=", "narHash": "sha256-HIvIL/rcMeKzS18MKj9XpN+6qiHS94VtdqMRTvdz7MQ=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "afa1c70e0c48395058112adf795c4999ac88eccf", "rev": "e2bb8ea28c5bbc7bb46ac91df3ac846ce9a3964c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -385,11 +385,11 @@
}, },
"latest_2": { "latest_2": {
"locked": { "locked": {
"lastModified": 1648632716, "lastModified": 1649225869,
"narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=", "narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "710fed5a2483f945b14f4a58af2cd3676b42d8c8", "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -401,11 +401,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1649003366, "lastModified": 1649515668,
"narHash": "sha256-2ujEHVIKasS7l8QbxLOuTBLzGPIINij1ylcKdWPdKHQ=", "narHash": "sha256-PjOPJvJiV1GyCyVTDad4Vb7Cz9jAta/76Av66+A08RY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eb40e8633a9b00b5492a7255287b7ed78b0b492a", "rev": "7bbf0f0ec9acb2c2f55f2c223a4cffbd16913997",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -422,11 +422,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1648544490, "lastModified": 1649096192,
"narHash": "sha256-EoBDcccV70tfz2LAs5lK0BjC7en5mzUVlgLsd5E6DW4=", "narHash": "sha256-7O8e+eZEYeU+ET98u/zW5epuoN/xYx9G+CIh4DjZVzY=",
"owner": "nmattia", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"rev": "e30ef9a5ce9b3de8bb438f15829c50f9525ca730", "rev": "d626f73332a8f587b613b0afe7293dd0777be07d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -480,29 +480,63 @@
"type": "github" "type": "github"
} }
}, },
"nixlib": {
"locked": {
"lastModified": 1636849918,
"narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1649000662, "lastModified": 1649368816,
"narHash": "sha256-KLOmqt2gBWd9h1FQJm6JtV0+T8roxH6Wq2F5wyun+l0=", "narHash": "sha256-lVzCpg2xfTUrfcankjlym/mrh/7F/gpWQ7CYQM6BcPY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "14775340a53c22a6398ab30f75428998759a9f8c", "rev": "29abf698b384258b540e39a86b53ea980495ac4c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "release-21.11", "ref": "nixos-21.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixos-generators": {
"inputs": {
"nixlib": "nixlib",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1649421936,
"narHash": "sha256-AnY5SbvQqDgb4u/bMWRpsxd9eGpm2IkDZLTldBckxQs=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "f5587111742dea4841650d4666f24d3f6577792c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixos-generators",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1648141026, "lastModified": 1649488242,
"narHash": "sha256-h8e3+5EZFbYHTMb0DN2ACuQTJBNHpqigvmEV1w2WIuE=", "narHash": "sha256-GFahTvlMnqotZ8i1AO3J8OtVFrJe4QHcEPxpFH+DIEw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "feceb4d24f582817d8f6e737cd40af9e162dee05", "rev": "850308db3ef0bcc7454155063b5fec28b4ffbc8c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -544,6 +578,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1637186689,
"narHash": "sha256-NU7BhgnwA/3ibmCeSzFK6xGi+Bari9mPfn+4cBmyEjw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7fad01d9d5a3f82081c00fb57918d64145dc904c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1643381941, "lastModified": 1643381941,
"narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=",
@ -635,6 +685,7 @@
"nix-autobahn": "nix-autobahn", "nix-autobahn": "nix-autobahn",
"nix-dram": "nix-dram", "nix-dram": "nix-dram",
"nixos": "nixos", "nixos": "nixos",
"nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nur": "nur", "nur": "nur",
"nvfetcher": "nvfetcher", "nvfetcher": "nvfetcher",