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

flake.lock: Update
Some checks are pending
pre-commit / pre-commit (push) Waiting to run
Details

Browse Source 
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/04213d1ce4221f5d9b40bcee30706ce9a91d148d' (2024-09-22)
  → 'github:nix-community/home-manager/1e22ef1518fb175d762006f9cae7f6312b8caedb' (2024-09-25)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/9357f4f23713673f310988025d9dc261c20e70c6' (2024-09-21)
  → 'github:nixos/nixpkgs/30439d93eb8b19861ccbe3e581abf97bdc91b093' (2024-09-23)
• Updated input 'nixpkgs-master':
    'github:nixos/nixpkgs/ea9a0aed95904e86dd0084a70c8ecd89a28e9c0a' (2024-09-23)
  → 'github:nixos/nixpkgs/4743875bc65a24861eadf2a3b92f3e9c28b417d8' (2024-09-26)
This commit is contained in:
Torjus Håkestad 2024-09-26 10:26:50 +02:00
parent c09f3df800
commit c524e569c1
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flake.lock
View File

@ -145,11 +145,19 @@
}, },
"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": {
@ -161,11 +169,19 @@
}, },
"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": {