FIX: flake.lock

This commit is contained in:
L0m1g 2025-09-22 11:23:39 +02:00
parent 2bfd79c92f
commit 98dcb573a1

24
flake.lock generated
View file

@ -80,19 +80,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
<<<<<<< HEAD
"lastModified": 1758070117,
"narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d",
=======
"lastModified": 1758346548, "lastModified": 1758346548,
"narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20",
>>>>>>> 7f80ed4 (ADD: various things ...)
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -104,19 +96,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
<<<<<<< HEAD
"lastModified": 1758098782,
"narHash": "sha256-sX+iNoZkgSQsnsCHO6aI7mYh2GqbYDLWMB0iN41i61k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5874893c92e656c85dc729e8b570fc38d3c85853",
=======
"lastModified": 1758395428, "lastModified": 1758395428,
"narHash": "sha256-VPLAH58pBb+6qHXKy/RbJi0jedJ14atDh3r5VNB1uNk=", "narHash": "sha256-VPLAH58pBb+6qHXKy/RbJi0jedJ14atDh3r5VNB1uNk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2e894638a7716cb1161a1084e04af88d98684855", "rev": "2e894638a7716cb1161a1084e04af88d98684855",
>>>>>>> 7f80ed4 (ADD: various things ...)
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,19 +116,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
<<<<<<< HEAD
"lastModified": 1758144108,
"narHash": "sha256-fq/Fd89pUrdVcFmw8aNVQoF9UPq7L5gtS/0ioPTUNKg=",
"owner": "nix-community",
"repo": "NUR",
"rev": "47a4f8514d9aecd033d53a84f698a115b3074f2b",
=======
"lastModified": 1758450341, "lastModified": 1758450341,
"narHash": "sha256-0kaTYX6B3c1oY1PmOnv4eJAEaKHA/tfK1ay/YNnX2cc=", "narHash": "sha256-0kaTYX6B3c1oY1PmOnv4eJAEaKHA/tfK1ay/YNnX2cc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "b1fb458916c940a2a47e4f01f24129c719d53343", "rev": "b1fb458916c940a2a47e4f01f24129c719d53343",
>>>>>>> 7f80ed4 (ADD: various things ...)
"type": "github" "type": "github"
}, },
"original": { "original": {