From f7b94cc8b286da23b1989f9e75b3806773006700 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Jun 2024 15:05:22 +0200 Subject: [PATCH] Drop nix-index overlay and upgrade to 24.05 --- flake.nix | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/flake.nix b/flake.nix index dab85cf..381ec58 100644 --- a/flake.nix +++ b/flake.nix @@ -1,31 +1,11 @@ { description = "Script for generating Nixpkgs/NixOS channels"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11-small"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small"; outputs = { self, nixpkgs }: { overlays.default = final: prev: { - nix-index-unwrapped = (prev.nix-index-unwrapped.override { - rustPlatform = final.rustPackages_1_76.rustPlatform; - }).overrideAttrs(old: rec { - version = "0.1.7-unstable-2024-05-11"; - - # commit with proper HTTPS fixes - # FIXME: unpin after next release - src = final.fetchFromGitHub { - owner = "nix-community"; - repo = "nix-index"; - rev = "195fb3525038e40836b8d286371365f5e7857c0c"; - hash = "sha256-Cw6Q9rHcLjPKzab5O4G7cetFAaTZCex2VLvYIhJCbpg="; - }; - - cargoDeps = final.rustPlatform.fetchCargoTarball { - inherit src; - hash = "sha256-Pl56f8FU/U/x4gkTt5yXxE8FVQ/pGBDuxxP7HrfsaBc="; - }; - }); - nixos-channel-native-programs = with final; stdenv.mkDerivation { name = "nixos-channel-native-programs"; buildInputs = [ @@ -68,7 +48,7 @@ brotli jq nixos-channel-native-programs - nix-index-unwrapped + nix-index ]; buildCommand = ''