nixVersions.{nix_2_28,nix_2_26}: switch simplified meson build (#393509)

Author: Ericson2314

lib/tests/nix-for-tests.nix

@@ -14,7 +14,7 @@
 
 builtins.mapAttrs (
   attr: pkg:
-  if lib.versionAtLeast pkg.version "2.26" then
+  if lib.versionAtLeast pkg.version "2.29pre" then
     pkg.overrideScope (finalScope: prevScope: { aws-sdk-cpp = null; })
   else
     pkg.override { withAWS = false; }

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

@@ -14,24 +14,25 @@
 stdenv.mkDerivation rec {
   pname = "nix-eval-jobs";
   version = "2.28.0";
+
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
     rev = "v${version}";
     hash = "sha256-v5n6t49X7MOpqS9j0FtI6TWOXvxuZMmGsp2OfUK5QfA=";
   };
+
   buildInputs = [
     boost
     nix
     curl
     nlohmann_json
   ];
+
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
-    # nlohmann_json can be only discovered via cmake files
-    cmake
   ];
 
   # Since this package is intimately tied to a specific Nix release, we

pkgs/tools/package-management/nix/common.nix renamed to pkgs/tools/package-management/nix/common-autoconf.nix

@@ -0,0 +1,287 @@
+{
+  lib,
+  fetchFromGitHub,
+  version,
+  suffix ? "",
+  hash ? null,
+  src ? fetchFromGitHub {
+    owner = "NixOS";
+    repo = "nix";
+    rev = version;
+    inherit hash;
+  },
+  patches ? [ ],
+  maintainers ? lib.teams.nix.members ++ [
+    lib.maintainers.lovesegfault
+    lib.maintainers.artturin
+  ],
+  self_attribute_name,
+}@args:
+assert (hash == null) -> (src != null);
+{
+  stdenv,
+  bison,
+  boehmgc,
+  boost,
+  brotli,
+  busybox-sandbox-shell,
+  bzip2,
+  callPackage,
+  cmake,
+  curl,
+  darwin,
+  doxygen,
+  editline,
+  flex,
+  git,
+  gtest,
+  jq,
+  lib,
+  libarchive,
+  libblake3,
+  libcpuid,
+  libgit2,
+  libsodium,
+  lowdown,
+  lowdown-unsandboxed,
+  toml11,
+  man,
+  meson,
+  ninja,
+  mdbook,
+  mdbook-linkcheck,
+  nlohmann_json,
+  nixosTests,
+  openssl,
+  perl,
+  python3,
+  pkg-config,
+  rapidcheck,
+  rsync,
+  Security,
+  sqlite,
+  util-linuxMinimal,
+  xz,
+  enableDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
+  enableStatic ? stdenv.hostPlatform.isStatic,
+  withAWS ? !enableStatic && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin),
+  aws-sdk-cpp,
+  withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp,
+  libseccomp,
+
+  confDir,
+  stateDir,
+  storeDir,
+
+  # passthru tests
+  pkgsi686Linux,
+  pkgsStatic,
+  runCommand,
+  pkgs,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nix";
+
+  version = "${version}${suffix}";
+  VERSION_SUFFIX = suffix;
+
+  inherit src patches;
+
+  outputs =
+    [
+      "out"
+      "dev"
+    ]
+    ++ lib.optionals enableDocumentation [
+      "man"
+      "doc"
+    ];
+
+  hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
+
+  hardeningDisable = [
+    "shadowstack"
+  ] ++ lib.optional stdenv.hostPlatform.isMusl "fortify";
+
+  nativeCheckInputs = [
+    git
+    man
+  ];
+
+  nativeBuildInputs =
+    [
+      bison
+      cmake
+      flex
+      jq
+      meson
+      ninja
+      pkg-config
+      rsync
+    ]
+    ++ lib.optionals enableDocumentation [
+      (lib.getBin lowdown-unsandboxed)
+      mdbook
+      mdbook-linkcheck
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      util-linuxMinimal
+    ]
+    ++ lib.optionals enableDocumentation [
+      python3
+      doxygen
+    ];
+
+  buildInputs =
+    [
+      boost
+      brotli
+      bzip2
+      curl
+      editline
+      libgit2
+      libsodium
+      lowdown
+      openssl
+      sqlite
+      toml11
+      xz
+    ]
+    ++ lib.optionals (lib.versionAtLeast version "2.26") [
+      libblake3
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      Security
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+      libcpuid
+    ]
+    ++ lib.optionals withLibseccomp [
+      libseccomp
+    ]
+    ++ lib.optionals withAWS [
+      aws-sdk-cpp
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+      darwin.apple_sdk.libs.sandbox
+    ];
+
+  propagatedBuildInputs = [
+    boehmgc
+    nlohmann_json
+    libarchive
+  ];
+
+  checkInputs = [
+    gtest
+    rapidcheck
+  ];
+
+  postPatch = ''
+    patchShebangs --build tests
+  '';
+
+  preConfigure =
+    # Copy libboost_context so we don't get all of Boost in our closure.
+    # https://github.com/NixOS/nixpkgs/issues/45462
+    lib.optionalString (!enableStatic) ''
+      mkdir -p $out/lib
+      cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib
+      rm -f $out/lib/*.a
+      ${lib.optionalString stdenv.hostPlatform.isLinux ''
+        chmod u+w $out/lib/*.so.*
+        patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib $out/lib/libboost_thread.so.*
+      ''}
+    '';
+
+  dontUseCmakeConfigure = true;
+
+  mesonFlags =
+    [
+      (lib.mesonBool "bindings" false)
+      (lib.mesonOption "libstore:store-dir" storeDir)
+      (lib.mesonOption "libstore:localstatedir" stateDir)
+      (lib.mesonOption "libstore:sysconfdir" confDir)
+      (lib.mesonEnable "libutil:cpuid" stdenv.hostPlatform.isx86_64)
+      (lib.mesonEnable "libstore:seccomp-sandboxing" withLibseccomp)
+      (lib.mesonBool "libstore:embedded-sandbox-shell" (
+        stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic
+      ))
+      (lib.mesonBool "doc-gen" enableDocumentation)
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      (lib.mesonOption "libstore:sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
+      # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
+    ]
+    ++ lib.optionals (stdenv.cc.isGNU && !enableStatic) [
+      # TODO: do we still need this?
+      # "--enable-lto"
+    ];
+
+  doCheck = true;
+
+  # socket path becomes too long otherwise
+  preInstallCheck =
+    lib.optionalString stdenv.hostPlatform.isDarwin ''
+      export TMPDIR=$NIX_BUILD_TOP
+    ''
+    # See https://github.com/NixOS/nix/issues/5687
+    + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") ''
+      echo "exit 0" > tests/functional/flakes/show.sh
+    ''
+    + ''
+      # nixStatic otherwise does not find its man pages in tests.
+      export MANPATH=$man/share/man:$MANPATH
+    '';
+
+  separateDebugInfo = stdenv.hostPlatform.isLinux && enableStatic;
+
+  passthru = {
+    inherit aws-sdk-cpp boehmgc;
+
+    # TODO:
+    perl-bindings = perl.pkgs.toPerlModule (
+      callPackage ./nix-perl.nix {
+        nix = finalAttrs.finalPackage;
+        inherit Security;
+      }
+    );
+
+    tests = import ./tests.nix {
+      inherit
+        runCommand
+        version
+        src
+        lib
+        stdenv
+        pkgs
+        pkgsi686Linux
+        pkgsStatic
+        nixosTests
+        self_attribute_name
+        ;
+      nix = finalAttrs.finalPackage;
+    };
+  };
+
+  # point 'nix edit' and ofborg at the file that defines the attribute,
+  # not this common file.
+  pos = builtins.unsafeGetAttrPos "version" args;
+  meta = with lib; {
+    description = "Powerful package manager that makes package management reliable and reproducible";
+    longDescription = ''
+      Nix is a powerful package manager for Linux and other Unix systems that
+      makes package management reliable and reproducible. It provides atomic
+      upgrades and rollbacks, side-by-side installation of multiple versions of
+      a package, multi-user package management and easy setup of build
+      environments.
+    '';
+    homepage = "https://nixos.org/";
+    license = licenses.lgpl21Plus;
+    inherit maintainers;
+    platforms = platforms.unix;
+    outputsToInstall = [ "out" ] ++ optional enableDocumentation "man";
+    mainProgram = "nix";
+  };
+})