jsutter/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updates

Browse source
This commit is contained in:
Julian Sutter 2023-07-28 09:39:53 -07:00
parent 5fef97701a
commit 4908d4d340
1 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
flake.lock generated Executable file → Normal file
View file

@ -7,19 +7,11 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< HEAD
"lastModified": 1690303752,
"narHash": "sha256-2YiwFHQERGoaORNORmsdmVlPD8CVVwlwbV2+f77sFhg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ba2c0737cc848db03470828fdb5e86df75ed42a8",
=======
"lastModified": 1690476848, "lastModified": 1690476848,
"narHash": "sha256-PSmzyuEbMxEn2uwwLYUN2l1psoJXb7jm/kfHD12Sq0k=", "narHash": "sha256-PSmzyuEbMxEn2uwwLYUN2l1psoJXb7jm/kfHD12Sq0k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8d243f7da13d6ee32f722a3f1afeced150b6d4da", "rev": "8d243f7da13d6ee32f722a3f1afeced150b6d4da",
>>>>>>> 24e8b92afc7cea9796f0ced0263fd541d2250c33
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -30,19 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
<<<<<<< HEAD "lastModified": 1690367991,
"lastModified": 1690179384, "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=",
"narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b12803b6d90e2e583429bb79b859ca53c348b39a", "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703",
=======
"lastModified": 1690272529,
"narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
>>>>>>> 24e8b92afc7cea9796f0ced0263fd541d2250c33
"type": "github" "type": "github"
}, },
"original": { "original": {