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

Compare commits

base: torjus:b40bef3a2bd60e4a4a6968297ef58b65de41899d
Branches Tags
torjus:master
torjus:temp-small
..
compare: torjus:c524e569c1700429a495656351cdbb3787b2d057
Branches Tags
torjus:master
torjus:temp-small

No commits in common. "b40bef3a2bd60e4a4a6968297ef58b65de41899d" and "c524e569c1700429a495656351cdbb3787b2d057" have entirely different histories.
b40bef3a2b ... c524e569c1

1 changed files with 19 additions and 3 deletions
Show Stats Expand all files Collapse all files

22
flake.lock generated
View File

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