Updated flake
This commit is contained in:
parent
60b28466a3
commit
edce7fa616
76
flake.lock
generated
76
flake.lock
generated
@ -25,19 +25,11 @@
|
||||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1713524729,
|
||||
"narHash": "sha256-nHNh+7wMy3oON7Nabd4hNPARAhHvYOyqZfR2opKidfk=",
|
||||
"lastModified": 1715359851,
|
||||
"narHash": "sha256-yGdBqEO6kYOYRoDj+l6DGyCYkrX7u2Zi2KulRjq4wws=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "55eb93f0324e5a47c8b2c112983ce4f6bd4040c0",
|
||||
=======
|
||||
"lastModified": 1713931409,
|
||||
"narHash": "sha256-GTdTWfJW1LT4OW9Sp5EAyuyc6Ig5Ez9lZZVG7rcEr8U=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "afa2d40b6b54185449dc67c958107d5652035a3f",
|
||||
>>>>>>> 8c44307b001a101539dfbe1f78fd669b2967a8fd
|
||||
"rev": "929f7e7c87912a9b1579eac1bfd96aea37c14b18",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@ -69,19 +61,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1712983920,
|
||||
"narHash": "sha256-TlFwckmidm+bd/1GP9HV0m6FBCRuiTH2uevxiPM0XW0=",
|
||||
"lastModified": 1714783443,
|
||||
"narHash": "sha256-xN87HgB8hdP4HiTykRjrta9FrzB7iGDQL0Ehrjmo5Ek=",
|
||||
"owner": "getchoo",
|
||||
"repo": "nix-exprs",
|
||||
"rev": "acc4ee73f36cf25e97f6e5b8aa49dfffa67aa9a4",
|
||||
=======
|
||||
"lastModified": 1713574676,
|
||||
"narHash": "sha256-ZV/JEAi7vEUjq2rFBZ0tEPQvSwGM+9uU5npyPjFJkOs=",
|
||||
"owner": "getchoo",
|
||||
"repo": "nix-exprs",
|
||||
"rev": "54f61b3c3c726d8b325583617edb0bb24a8764ab",
|
||||
>>>>>>> 8c44307b001a101539dfbe1f78fd669b2967a8fd
|
||||
"rev": "9bc0ee639e54fecb19277ba0a883d77972bfccbc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -97,11 +81,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712386041,
|
||||
"narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=",
|
||||
"lastModified": 1714043624,
|
||||
"narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff",
|
||||
"rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -186,19 +170,11 @@
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1713214544,
|
||||
"narHash": "sha256-36qa6MOhCBd39YPC0FgapwGRHZXjstw8BQuKdFzwQ4k=",
|
||||
"lastModified": 1714843107,
|
||||
"narHash": "sha256-89WxndRGO3CGuWE5XCaHKnsV3IKBRdOWqScp6o8enT4=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlock",
|
||||
"rev": "2bce52f094c49109520ad37fc8f0d051acaace55",
|
||||
=======
|
||||
"lastModified": 1713777162,
|
||||
"narHash": "sha256-cF5DfaRfqVcDSqIG+ePLPS9rATElKhWNLS/9MXpMzk8=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlock",
|
||||
"rev": "8658386f212f29447874fe62fa665c5864cdcc41",
|
||||
>>>>>>> 8c44307b001a101539dfbe1f78fd669b2967a8fd
|
||||
"rev": "c87af3aa1f6e6bd06cffaabcc400bd45e26d565a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -228,19 +204,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1713344939,
|
||||
"narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=",
|
||||
"lastModified": 1715218190,
|
||||
"narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd",
|
||||
=======
|
||||
"lastModified": 1713725259,
|
||||
"narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7",
|
||||
>>>>>>> 8c44307b001a101539dfbe1f78fd669b2967a8fd
|
||||
"rev": "9a9960b98418f8c385f52de3b09a63f9c561427a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -266,19 +234,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1713297878,
|
||||
"narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
|
||||
"lastModified": 1715266358,
|
||||
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
|
||||
=======
|
||||
"lastModified": 1713714899,
|
||||
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
|
||||
>>>>>>> 8c44307b001a101539dfbe1f78fd669b2967a8fd
|
||||
"rev": "f1010e0469db743d14519a1efd37e23f8513d714",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
Loading…
Reference in New Issue
Block a user