From b0f3cf820e390d86253699cb1166fb7f1bb95c7c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 6 Mar 2026 12:05:06 +0100 Subject: [PATCH] nix-serve-ng: 1.0.1-unstable-2025-05-28 -> 1.1.0-unstable-2026-03-26 Adds support for Lix 2.93, 2.94.1 (!) and 2.95. --- pkgs/development/haskell-modules/configuration-nix.nix | 6 +++--- pkgs/tools/package-management/lix/default.nix | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index cb6cd01b488b..8c596d8e66bb 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -442,10 +442,10 @@ builtins.intersectAttrs super { src = pkgs.fetchFromGitHub { repo = "nix-serve-ng"; owner = "aristanetworks"; - rev = "1d21f73a2d563ffbb924a4244c29b35e898caefe"; - hash = "sha256-N6c3NozYqAGwmjf+k5GHOZzlcquDntrJwsZQ7O2sqtQ="; + rev = "f63998a6c81fab86e840dbab483d387dee5ffc0a"; + hash = "sha256-paUnCU08wDZ3bS0Fa4QhtjWMcpWgcTRwO/ee3wT28Nw="; }; - version = "1.0.1-unstable-2025-05-28"; + version = "1.1.0-unstable-2026-03-26"; }) (overrideCabal (old: { diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index e307fcf7e7be..1d95ef9a66ee 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -131,9 +131,8 @@ let nix-serve-ng = lib.pipe (nix-serve-ng.override { nix = self.lix; }) [ (haskell.lib.compose.enableCabalFlag "lix") (haskell.lib.compose.overrideCabal (drv: { - # https://github.com/aristanetworks/nix-serve-ng/issues/46 # Resetting (previous) broken flag since it may be related to C++ Nix - broken = lib.versionAtLeast self.lix.version "2.93"; + broken = false; })) ];