From 9f45a918b22b95e51eb70289c10149794dde15c3 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 23 Jul 2022 17:10:25 +0200 Subject: [PATCH 1/2] Revert "flake: pin mu to 1.6.11" This reverts commit 58cc97b44f0a8855de5b3c4e0b2b27ebc2b22046. Doom now supports mu 1.8 ! --- flake.lock | 17 ----------------- flake.nix | 8 -------- 2 files changed, 25 deletions(-) diff --git a/flake.lock b/flake.lock index 5f1ba02..59817c7 100644 --- a/flake.lock +++ b/flake.lock @@ -88,22 +88,6 @@ "type": "github" } }, - "nixpkgs-mu-1-6-11": { - "locked": { - "lastModified": 1656166034, - "narHash": "sha256-r3v8um8KLJVm1XFGmovKeEBUtdoSTOWP+qKJztIbERQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0100c5e564462ca83aed241c58a3427783737a26", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0100c5e564462ca83aed241c58a3427783737a26", - "type": "github" - } - }, "nixpkgs-unstable-small": { "locked": { "lastModified": 1657784809, @@ -143,7 +127,6 @@ "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", - "nixpkgs-mu-1-6-11": "nixpkgs-mu-1-6-11", "nixpkgs-unstable-small": "nixpkgs-unstable-small" } }, diff --git a/flake.nix b/flake.nix index fe2d846..5ed22ed 100644 --- a/flake.nix +++ b/flake.nix @@ -8,13 +8,6 @@ ref = "nixos-unstable"; }; - nixpkgs-mu-1-6-11 = { - type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; - rev = "0100c5e564462ca83aed241c58a3427783737a26"; - }; - nixpkgs-unstable-small = { type = "github"; owner = "NixOS"; @@ -81,7 +74,6 @@ [ (self: super: { packages = import ./pkgs {pkgs = super;}; - mu = (import inputs.nixpkgs-mu-1-6-11 {inherit system;}).mu; # packages accessible through pkgs.unstable.package unstable = import inputs.nixpkgs-unstable-small { From b142ac507627cd76d5179466c40a8486656200c7 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 23 Jul 2022 21:03:26 +0200 Subject: [PATCH 2/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/4c5106ed0f3168ff2df21b646aef67e86cbfc11c' (2022-07-15) → 'github:nix-community/home-manager/d86c189158cb345e351190e362672a8485a52117' (2022-07-23) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4a01ca36d6bfc133bc617e661916a81327c9bbc8' (2022-07-14) → 'github:NixOS/nixpkgs/2d372784634e224c5a629d80a19705af655fbc7d' (2022-07-22) • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/5eb9bf5565c1aa2b375613ed22bdf55f1fd58e29' (2022-07-14) → 'github:NixOS/nixpkgs/42ca9bef09e780eabe84328dd1b730cef978f098' (2022-07-23) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 59817c7..6bca425 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1657887110, - "narHash": "sha256-8VV0/kZed2z8fGtEc2zr+WLxTow+JTIlMjnSisyv0GQ=", + "lastModified": 1658582894, + "narHash": "sha256-6iR8KSePwH9O2mClhu2RvDO/Gu5ISqNSB6t4YS/poaA=", "owner": "nix-community", "repo": "home-manager", - "rev": "4c5106ed0f3168ff2df21b646aef67e86cbfc11c", + "rev": "d86c189158cb345e351190e362672a8485a52117", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1657784809, - "narHash": "sha256-+Qigmk3dfdXSqJgDmAomjsad8n+QxZGuBMMgdxEicBs=", + "lastModified": 1658557357, + "narHash": "sha256-0gqNef6skYQKJSS2vLojxrXOrc72zoX5VTDKUqEo6Gk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5eb9bf5565c1aa2b375613ed22bdf55f1fd58e29", + "rev": "42ca9bef09e780eabe84328dd1b730cef978f098", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1657802959, - "narHash": "sha256-9+JWARSdlL8KiH3ymnKDXltE1vM+/WEJ78F5B1kjXys=", + "lastModified": 1658465217, + "narHash": "sha256-f2Zyt7TsDZ1TK3Cu6ZtzWoWQ4nnQq07uXTPxW26rIQY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a01ca36d6bfc133bc617e661916a81327c9bbc8", + "rev": "2d372784634e224c5a629d80a19705af655fbc7d", "type": "github" }, "original": {