From 1fd7a2631cd966e0277853a28d05013fd7db0294 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sat, 8 Jul 2023 19:03:41 +0200 Subject: [PATCH] Update flake inputs and remove `emacs-src` --- flake.lock | 73 +++++++++++++++++++++++++++++++++--------------------- flake.nix | 4 --- 2 files changed, 45 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index b0e98c7..60864f8 100644 --- a/flake.lock +++ b/flake.lock @@ -3,14 +3,15 @@ "emacs-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1678296165, - "narHash": "sha256-nEU+1PKIvYfD+oQ53KO13J2LwMPzUgWc89tFzrES9K4=", + "lastModified": 1688812108, + "narHash": "sha256-PeS1KXQ7nXg3ZOmMsgoKzgMJyxNwW3r296EFKcgr6O0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5b3d95676be5c6963c4d16f21ecf82beb14c6c05", + "rev": "ec12f6d5131ea43b2023547b93ad28d1b6c00b57", "type": "github" }, "original": { @@ -19,23 +20,6 @@ "type": "github" } }, - "emacs-src": { - "flake": false, - "locked": { - "lastModified": 1677076548, - "narHash": "sha256-yWln8CoiNJpQ8CmjNYaXFj00aJa5mSUIYLdkN+c5KbQ=", - "ref": "emacs-29", - "rev": "20c654b6f8fa24ff458e09a1eb101ba198e671f8", - "revCount": 164627, - "type": "git", - "url": "git://git.savannah.gnu.org/emacs.git" - }, - "original": { - "ref": "emacs-29", - "type": "git", - "url": "git://git.savannah.gnu.org/emacs.git" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -55,12 +39,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -71,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673540789, - "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", + "lastModified": 1688679045, + "narHash": "sha256-t3xGEfYIwhaLTPU8FLtN/pLPytNeDwbLI6a7XFFBlGo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", + "rev": "3c7487575d9445185249a159046cc02ff364bff8", "type": "github" }, "original": { @@ -103,16 +90,46 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1688594934, + "narHash": "sha256-3dUo20PsmUd57jVZRx5vgKyIN1tv+v/JQweZsve5q/A=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e11142026e2cef35ea52c9205703823df225c947", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "emacs-overlay": "emacs-overlay", - "emacs-src": "emacs-src", "flake-parts": "flake-parts", "nixpkgs": [ "emacs-overlay", "nixpkgs" ] } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d17b520..8a2cd58 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,6 @@ inputs = { flake-parts.url = "github:hercules-ci/flake-parts"; emacs-overlay.url = "github:nix-community/emacs-overlay"; - emacs-src = { - url = "git://git.savannah.gnu.org/emacs.git?ref=emacs-29"; - flake = false; - }; nixpkgs.follows = "emacs-overlay/nixpkgs"; };