torjus/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Fix borked flake.lock

Browse Source
This commit is contained in:
Torjus Håkestad 2024-09-30 13:21:06 +02:00
parent c524e569c1
commit e467cd157b
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flake.lock
View File

@ -145,19 +145,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
<<<<<<< HEAD
"lastModified": 1727348695, "lastModified": 1727348695,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
=======
"lastModified": 1727122398,
"narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
>>>>>>> bc2c560 (flake.lock: Update)
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -169,19 +161,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
<<<<<<< HEAD
"lastModified": 1727524019, "lastModified": 1727524019,
"narHash": "sha256-lGRWrLmaoSA57PJrdlaPA3iqxVA34mYwEAnwWEZ6lOo=", "narHash": "sha256-lGRWrLmaoSA57PJrdlaPA3iqxVA34mYwEAnwWEZ6lOo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "590ec2408cc025f55284cd138f9882e79b3c9bf6", "rev": "590ec2408cc025f55284cd138f9882e79b3c9bf6",
=======
"lastModified": 1727339191,
"narHash": "sha256-bxmzQ7UkFe9VIR/cpej5QCG1M9R/TbKkRShrOzEG9co=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4743875bc65a24861eadf2a3b92f3e9c28b417d8",
>>>>>>> bc2c560 (flake.lock: Update)
"type": "github" "type": "github"
}, },
"original": { "original": {