Commit 37e563cb authored by Raito Bezarius's avatar Raito Bezarius Committed by Florian Klink
Browse files

nixVersions.2_3: 2.3.16 -> 2.3.17 



2.3.17 became a bit more like 2.4, so a lot of the conditionals can
be dropped.

The documentation for 2.3.17 needs libxslt/libxml2 as well as the
docbook stack to render docs.

Co-Authored-By: default avatarFlorian Klink <flokli@flokli.de>
parent bea932e0

pkgs/tools/package-management/nix/common.nix

+13 −16
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ in 
, callPackage

, coreutils

, curl

, docbook_xsl_ns

, docbook5

, editline

, flex

, gnutar
@@ -37,6 +39,8 @@ in 
, libarchive

, libcpuid

, libsodium

, libxml2

, libxslt

, lowdown

, mdbook

, mdbook-linkcheck
@@ -86,13 +90,17 @@ self = stdenv.mkDerivation { 


  nativeBuildInputs = [

    pkg-config

  ] ++ lib.optionals atLeast24 [

    autoconf-archive

    autoreconfHook

    bison

    flex

    jq

  ] ++ lib.optionals (atLeast24 && enableDocumentation) [

  ] ++ lib.optionals (enableDocumentation && !atLeast24) [

    libxslt

    libxml2

    docbook_xsl_ns

    docbook5

  ] ++ lib.optionals (enableDocumentation && atLeast24) [

    (lib.getBin lowdown)

    mdbook

  ] ++ lib.optionals (atLeast213 && enableDocumentation) [
@@ -111,13 +119,12 @@ self = stdenv.mkDerivation { 
    openssl

    sqlite

    xz

  ] ++ lib.optionals stdenv.isDarwin [

    Security

  ] ++ lib.optionals atLeast24 [

    gtest

    libarchive

    lowdown

  ] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [

  ] ++ lib.optionals stdenv.isDarwin [

    Security

  ] ++ lib.optionals (stdenv.isx86_64) [

    libcpuid

  ] ++ lib.optionals atLeast214 [

    rapidcheck
@@ -133,13 +140,6 @@ self = stdenv.mkDerivation { 
    nlohmann_json

  ];



  NIX_LDFLAGS = lib.optionals (!atLeast24) [

    # https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba

    (lib.optionalString enableStatic "-lssl -lbrotlicommon -lssh2 -lz -lnghttp2 -lcrypto")

    # https://github.com/NixOS/nix/commits/74b4737d8f0e1922ef5314a158271acf81cd79f8

    (lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic")

  ];



  postPatch = ''

    patchShebangs --build tests

  '';
@@ -180,9 +180,6 @@ self = stdenv.mkDerivation { 
    "--enable-gc"

  ] ++ lib.optionals (!enableDocumentation) [

    "--disable-doc-gen"

  ] ++ lib.optionals (!atLeast24) [

    # option was removed in 2.4

    "--disable-init-state"

  ] ++ lib.optionals atLeast214 [

    "CXXFLAGS=-I${lib.getDev rapidcheck}/extras/gtest/include"

  ] ++ lib.optionals stdenv.isLinux [

pkgs/tools/package-management/nix/default.nix

+3 −6
Original line number Diff line number Diff line
@@ -145,12 +145,9 @@ let 
    pkg;



in lib.makeExtensible (self: ({

  nix_2_3 = (common rec {

    version = "2.3.16";

    src = fetchurl {

      url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz";

      hash = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw=";

    };

  nix_2_3 = (common {

    version = "2.3.17";

    hash = "sha256-EK0pgHDekJFqr0oMj+8ANIjq96WPjICe2s0m4xkUdH4=";

    patches = [

      patch-monitorfdhup

    ];