From 15a011be027fbcba3704b5ddb636b5b1e4ec4117 Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Tue, 26 Dec 2023 14:11:17 +0400 Subject: [PATCH] try again --- flake.lock | 41 +++++++++++++++++++++++++++-------------- flake.nix | 4 ---- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 66046979..f9431f06 100644 --- a/flake.lock +++ b/flake.lock @@ -25,23 +25,20 @@ "emacs-overlay": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1703521060, - "narHash": "sha256-6ziVUbKD85cWmyQvYKU2emMiRL+kkjiX6ChfrUGXiXo=", + "lastModified": 1703552374, + "narHash": "sha256-frvgmneksi9w3J/dh4z9zaEG2JmWLpufHXuexpCFmyw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1c1dd489e1c6c6a895a1648b540b9c4ee8cd0aa6", + "rev": "9147a4227e3db2c461dac05f9e0e7c586f852fb9", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" + "id": "emacs-overlay", + "type": "indirect" } }, "flake-compat": { @@ -119,16 +116,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703200384, - "narHash": "sha256-q5j06XOsy0qHOarsYPfZYJPWbTbc8sryRxianlEPJN0=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b3d618173114c64ab666f557504d6982665d328", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -181,12 +178,28 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1703200384, + "narHash": "sha256-q5j06XOsy0qHOarsYPfZYJPWbTbc8sryRxianlEPJN0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0b3d618173114c64ab666f557504d6982665d328", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "NixOS-WSL": "NixOS-WSL", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } diff --git a/flake.nix b/flake.nix index ffdb21a0..f0e2ee9a 100644 --- a/flake.nix +++ b/flake.nix @@ -21,10 +21,6 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - #emacs-overlay = { - #url = "github:nix-community/emacs-overlay"; - #inputs.nixpkgs.follows = "nixpkgs"; -#}; }; outputs = {