From 4438f7226c48f27b2efd663199280d6b7ee4679c Mon Sep 17 00:00:00 2001 From: Rory& Date: Fri, 29 Dec 2023 00:02:50 +0100 Subject: Patch no longer needed on i686, update RoryNix to 23.11 --- flake.lock | 8 ++++---- flake.nix | 3 ++- host/RoryNix/configuration.nix | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e043486..308aae8 100644 --- a/flake.lock +++ b/flake.lock @@ -250,16 +250,16 @@ }, "nixpkgs-RoryNix": { "locked": { - "lastModified": 1703351344, - "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", + "lastModified": 1703467016, + "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", + "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index bbfda08..5ac075e 100755 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,8 @@ url = "github:TheArcaneBrony/nixpkgs/master"; }; nixpkgs-RoryNix = { - url = "github:NixOS/nixpkgs/nixos-23.05"; + #url = "github:NixOS/nixpkgs/nixos-23.05"; + url = "github:NixOS/nixpkgs/nixos-23.11"; }; botcore-v4 = { url = "gitlab:BotCore-Devs/BotCore-v4/staging"; diff --git a/host/RoryNix/configuration.nix b/host/RoryNix/configuration.nix index 26c1c25..6f79c8f 100644 --- a/host/RoryNix/configuration.nix +++ b/host/RoryNix/configuration.nix @@ -6,7 +6,7 @@ # ./hardware-configuration.nix ../../modules/packages/vim.nix ../../modules/environments/home.nix - ../../modules/packages/overlays/haskell/basement/IntWord64.nix +# ../../modules/packages/overlays/haskell/basement/IntWord64.nix ]; boot = { -- cgit 1.4.1