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

merge

Browse source
This commit is contained in:
Julian Sutter 2023-02-06 10:11:24 -08:00
commit 5838196fd8
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.lock generated
View file

@ -8,11 +8,19 @@
"utils": "utils"
},
"locked": {
<<<<<<< HEAD
"lastModified": 1675637696,
"narHash": "sha256-tilJS8zCS3PaDfVOfsBZ4zspuam8tc7IMZxtGa/K/uo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c43d4a3d6d9ef8ddbe2438362f5c775b4186000b",
=======
"lastModified": 1675462931,
"narHash": "sha256-JiOUSERBtA1lN/s9YTKGZoZ3XUicHDwr+C8swaPSh3M=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e2c1756e3ae001ca8696912016dd31cb1503ccf3",
>>>>>>> 1d97e3a73f09e14e0e9442fe08258d3f2f2a8e67
"type": "github"
},
"original": {
@ -23,11 +31,19 @@
},
"nixpkgs": {
"locked": {
<<<<<<< HEAD
"lastModified": 1675545634,
"narHash": "sha256-TbQeQcM5TA/wIho6xtzG+inUfiGzUXi8ewwttiQWYJE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0591d6b57bfeb55dfeec99a671843337bc2c3323",
=======
"lastModified": 1675362331,
"narHash": "sha256-VmcnKPj5gJLxWK7Bxlhg2LoQvhKRss7Ax+uoFjd3qKY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a100acd7bbf105915b0004427802286c37738fef",
>>>>>>> 1d97e3a73f09e14e0e9442fe08258d3f2f2a8e67
"type": "github"
},
"original": {