From 1e69c5543397a4717aa198ea3dfeb548b7112095 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 25 May 2026 16:27:24 +0200 Subject: [PATCH 1/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 'nixpkgs': 'github:NixOS/nixpkgs/ac62194c3917d5f474c1a844b6fd6da2db95077d' (2026-01-02) → 'github:NixOS/nixpkgs/b9684918990186f249404b27054ecff597817567' (2026-05-25) --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 7611f4d..8122271 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1767313136, - "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", + "lastModified": 1779686684, + "narHash": "sha256-TzdZuSIyFopxm/lNmvd1Od6OrfKZKTM+nKchA6Zu3xI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", + "rev": "b9684918990186f249404b27054ecff597817567", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05-small", + "ref": "nixos-26.05-small", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index e9229af..7ae7ed8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Script for generating Nixpkgs/NixOS channels"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05-small"; outputs = { self, nixpkgs }: From 3e0c030e682e832a361665806c256b8a1bc4dcda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 25 May 2026 16:29:17 +0200 Subject: [PATCH 2/2] Drop patches on nix-index --- flake.nix | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/flake.nix b/flake.nix index 7ae7ed8..521b7b0 100644 --- a/flake.nix +++ b/flake.nix @@ -36,35 +36,6 @@ ''; }; - # TODO: drop after getting fixed - # https://github.com/nix-community/nix-index/pull/296 - nix-index-unwrapped = prev.nix-index-unwrapped.overrideAttrs (oa: { - postPatch = (oa.postPatch or "") + '' - patch -p1 <<-EOF - --- a/src/listings.rs - +++ b/src/listings.rs - @@ -26,2 +26 @@ - -pub const EXTRA_SCOPES: [&str; 6] = [ - - "xorg", - +pub const EXTRA_SCOPES: [&str; 5] = [ - EOF - - patch -p1 <<-EOF - --- a/src/listings.rs - +++ b/src/listings.rs - @@ -26,10 +26,9 @@ use crate::workset::{WorkSet, WorkSetHandle, WorkSetWatch}; - -pub const EXTRA_SCOPES: [&str; 5] = [ - +pub const EXTRA_SCOPES: [&str; 4] = [ - "haskellPackages", - "rPackages", - - "nodePackages", - "coqPackages", - "texlive.pkgs", - ]; - EOF - ''; - }); - nixos-channel-scripts = final.stdenv.mkDerivation { name = "nixos-channel-scripts";