mirror of
https://github.com/ellmau/nixos.git
synced 2025-12-19 09:29:36 +01:00
FLAKE upd
• Updated input 'emacs-overlay': → 'github:nix-community/emacs-overlay/cda8c68fe3dabd1cfd8b9621564d3088d0bcb071' (2022-01-17) • Updated input 'nixos-hardware': → 'github:NixOS/nixos-hardware/87a35a0d58f546dc23f37b4f6af575d0e4be6a7a' (2022-01-12) • Updated input 'nixpkgs': → 'github:NixOS/nixpkgs/3ddd960a3b575bf3230d0e59f42614b71f9e0db9' (2022-01-14) • Updated input 'nixpkgs-unstable': → 'github:NixOS/nixpkgs/5aaed40d22f0d9376330b6fa413223435ad6fee5' (2022-01-13)
This commit is contained in:
parent
fffa1bd960
commit
d95e07f637
20
flake.lock
generated
20
flake.lock
generated
@ -2,11 +2,19 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"emacs-overlay": {
|
"emacs-overlay": {
|
||||||
"locked": {
|
"locked": {
|
||||||
|
<<<<<<< HEAD
|
||||||
"lastModified": 1642044102,
|
"lastModified": 1642044102,
|
||||||
"narHash": "sha256-GjDR4EmJw+OUCapU8Lx4VqKsycfr9Kd1gbeHL32q0jM=",
|
"narHash": "sha256-GjDR4EmJw+OUCapU8Lx4VqKsycfr9Kd1gbeHL32q0jM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "7b47359a8007a77b36c8bc2484930f988333f3ce",
|
"rev": "7b47359a8007a77b36c8bc2484930f988333f3ce",
|
||||||
|
=======
|
||||||
|
"lastModified": 1642414078,
|
||||||
|
"narHash": "sha256-izmKOQGC3nttxqnpgJZo6IoR/ZNto9u12ToFRdEwL4Y=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "emacs-overlay",
|
||||||
|
"rev": "cda8c68fe3dabd1cfd8b9621564d3088d0bcb071",
|
||||||
|
>>>>>>> edea0b8 (FLAKE upd)
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -54,11 +62,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1641870998,
|
"lastModified": 1642190797,
|
||||||
"narHash": "sha256-6HkxR2WZsm37VoQS7jgp6Omd71iw6t1kP8bDbaqCDuI=",
|
"narHash": "sha256-cxeEEAtfIACnm8sV1oz0xlNp9IVk10Fxcc09ggoEZuo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "386234e2a61e1e8acf94dfa3a3d3ca19a6776efb",
|
"rev": "3ddd960a3b575bf3230d0e59f42614b71f9e0db9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -70,11 +78,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1641887635,
|
"lastModified": 1642104392,
|
||||||
"narHash": "sha256-kDGpufwzVaiGe5e1sBUBPo9f1YN+nYHJlYqCaVpZTQQ=",
|
"narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b2737d4980a17cc2b7d600d7d0b32fd7333aca88",
|
"rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user