Merge staging-next into staging

9 files changed, 7 insertions, 255 deletions

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index e2626b69c55a..2585cfa3926a 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.229.1";
+  version = "0.229.2";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    hash = "sha256-zovtSY37f7WKwE0Mjl9Vc+RcYjqMRhPHafN50XAj5cE=";
+    hash = "sha256-PoEtXk8EqlFgy33akd6na50P/tT6uWtEq+kfbayDo5s=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/tools/build-managers/gprbuild/boot.nix b/pkgs/development/tools/build-managers/gprbuild/boot.nix
deleted file mode 100644
index 4207b3649594..000000000000
--- a/pkgs/development/tools/build-managers/gprbuild/boot.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, gnat
-, which
-, xmlada # for src
-}:
-
-let
-  version = "24.0.0";
-
-  gprConfigKbSrc = fetchFromGitHub {
-    name = "gprconfig-kb-${version}-src";
-    owner = "AdaCore";
-    repo = "gprconfig_kb";
-    rev = "v${version}";
-    sha256 = "1vnjv2q63l8nq2w4wya75m40isvs78j5ss9b5ga3zx3cpdx3xh09";
-  };
-in
-
-stdenv.mkDerivation {
-  pname = "gprbuild-boot";
-  inherit version;
-
-  src = fetchFromGitHub {
-    name = "gprbuild-${version}";
-    owner = "AdaCore";
-    repo = "gprbuild";
-    rev = "v${version}";
-    sha256 = "096a43453z2xknn6x4hyk2ldp2wh0qhfdfmzsrks50zqcvmkq4v7";
-  };
-
-  nativeBuildInputs = [
-    gnat
-    which
-  ];
-
-  postPatch = ''
-    # The Makefile uses gprbuild to build gprbuild which
-    # we can't do at this point, delete it to prevent the
-    # default phases from failing.
-    rm Makefile
-
-    # make sure bootstrap script runs
-    patchShebangs --build bootstrap.sh
-  '';
-
-  # This setupHook populates GPR_PROJECT_PATH which is used by
-  # gprbuild to find dependencies. It works quite similar to
-  # the pkg-config setupHook in the sense that it also splits
-  # dependencies into GPR_PROJECT_PATH and GPR_PROJECT_PATH_FOR_BUILD,
-  # but gprbuild itself doesn't support this, so we'll need to
-  # introducing a wrapper for it in the future remains TODO.
-  # For the moment this doesn't matter since we have no situation
-  # were gprbuild is used to build something used at build time.
-  setupHooks = [
-    ./gpr-project-path-hook.sh
-  ] ++ lib.optionals stdenv.targetPlatform.isDarwin [
-    # This setupHook replaces the paths of shared libraries starting
-    # with @rpath with the absolute paths on Darwin, so that the
-    # binaries can be run without additional setup.
-    ./gpr-project-darwin-rpath-hook.sh
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    ./bootstrap.sh \
-      --with-xmlada=${xmlada.src} \
-      --with-kb=${gprConfigKbSrc} \
-      --prefix=$out
-
-    # Install custom compiler description which can detect nixpkgs'
-    # GNAT wrapper as a proper Ada compiler. The default compiler
-    # description expects the runtime library to be installed in
-    # the same prefix which isn't the case for nixpkgs. As a
-    # result, it would detect the unwrapped GNAT as a proper
-    # compiler which is unable to produce working binaries.
-    #
-    # Our compiler description is very similar to the upstream
-    # GNAT description except that we use a symlink in $out/nix-support
-    # created by the cc-wrapper to find the associated runtime
-    # libraries and use gnatmake instead of gnatls to find GNAT's
-    # bin directory.
-    install -m644 ${./nixpkgs-gnat.xml} $out/share/gprconfig/nixpkgs-gnat.xml
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Multi-language extensible build tool";
-    homepage = "https://github.com/AdaCore/gprbuild";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.sternenseemann ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/tools/build-managers/gprbuild/default.nix b/pkgs/development/tools/build-managers/gprbuild/default.nix
deleted file mode 100644
index aad115701263..000000000000
--- a/pkgs/development/tools/build-managers/gprbuild/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, gprbuild-boot
-, which
-, gnat
-, xmlada
-}:
-
-stdenv.mkDerivation {
-  pname = "gprbuild";
-
-  # See ./boot.nix for an explanation of the gprbuild setupHook,
-  # our custom knowledge base entry and the situation wrt a
-  # (future) gprbuild wrapper.
-  inherit (gprbuild-boot)
-    version
-    src
-    setupHooks
-    meta
-    ;
-
-  nativeBuildInputs = [
-    gnat
-    gprbuild-boot
-    which
-  ];
-
-  propagatedBuildInputs = [
-    xmlada
-  ];
-
-  makeFlags = [
-    "ENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "no" else "yes"}"
-    "PROCESSORS=$(NIX_BUILD_CORES)"
-    # confusingly, for gprbuild --target is autoconf --host
-    "TARGET=${stdenv.hostPlatform.config}"
-    "prefix=${placeholder "out"}"
-  ] ++ lib.optionals (!stdenv.hostPlatform.isStatic) [
-    "LIBRARY_TYPE=relocatable"
-  ];
-
-  # Fixes gprbuild being linked statically always. Based on the AUR's patch:
-  # https://aur.archlinux.org/cgit/aur.git/plain/0001-Makefile-build-relocatable-instead-of-static-binary.patch?h=gprbuild&id=bac524c76cd59c68fb91ef4dfcbe427357b9f850
-  patches = lib.optionals (!stdenv.hostPlatform.isStatic) [
-    ./gprbuild-relocatable-build.patch
-  ];
-
-  buildFlags = [ "all" "libgpr.build" ];
-
-  installFlags = [ "all" "libgpr.install" ];
-
-  # link gprconfig_kb db from gprbuild-boot into build dir,
-  # the install process copies its contents to $out
-  preInstall = ''
-    ln -sf ${gprbuild-boot}/share/gprconfig share/gprconfig
-  '';
-
-  # no need for the install script
-  postInstall = ''
-    rm $out/doinstall
-  '';
-}
diff --git a/pkgs/development/tools/build-managers/gprbuild/gpr-project-darwin-rpath-hook.sh b/pkgs/development/tools/build-managers/gprbuild/gpr-project-darwin-rpath-hook.sh
deleted file mode 100644
index 73be2eb5960a..000000000000
--- a/pkgs/development/tools/build-managers/gprbuild/gpr-project-darwin-rpath-hook.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-fixGprProjectDarwinRpath() {
-    for f in $(find $out -type f -executable); do
-        install_name_tool -id $f $f || true
-        for rpath in $(otool -L $f | grep @rpath | awk '{print $1}'); do
-            install_name_tool -change $rpath ${!outputLib}/lib/$(basename $rpath) $f || true
-        done
-    done
-}
-
-preFixupPhases+=" fixGprProjectDarwinRpath"
diff --git a/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh b/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh
deleted file mode 100644
index f98b2ab9e58d..000000000000
--- a/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-addAdaObjectsPath() {
-    local role_post
-    getHostRoleEnvHook
-
-    addToSearchPath "GPR_PROJECT_PATH${role_post}" "$1/share/gpr"
-}
-
-addEnvHooks "$targetOffset" addAdaObjectsPath
diff --git a/pkgs/development/tools/build-managers/gprbuild/gprbuild-relocatable-build.patch b/pkgs/development/tools/build-managers/gprbuild/gprbuild-relocatable-build.patch
deleted file mode 100644
index f49478f6e38c..000000000000
--- a/pkgs/development/tools/build-managers/gprbuild/gprbuild-relocatable-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 8c542078..e91cef5e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -82,7 +82,7 @@ LIB_INSTALLER=gprinstall -p -f --target=$(TARGET) $(RBD) "--prefix=${prefix}"
- CLEANER=gprclean -q $(RBD)
- 
- GPRBUILD_BUILDER=$(BUILDER) $(GPRBUILD_GPR) \
--	-XLIBRARY_TYPE=static -XXMLADA_BUILD=static
-+	-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
- LIBGPR_BUILDER=$(BUILDER) $(GPR_GPR) $(LIBGPR_OS)
- LIBGPR_INSTALLER=$(LIB_INSTALLER) $(GPR_GPR) $(LIBGPR_OS) -XBUILD=${BUILD} \
- 	--install-name=gpr \
diff --git a/pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml b/pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml
deleted file mode 100644
index ead88dc365c1..000000000000
--- a/pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" ?>
-<gprconfig>
-  <!-- This differs from the default GNAT compiler description
-       in the following ways:
-
-       * gnatmake is used over gnatls to detect the GNAT version
-         since the latter is not part of the wrapper.
-       * to find the runtime libraries, we rely on the symlink
-         ../nix-support/gprconfig-gnat-unwrapped which is a
-         gprconfig-specific addition to the cc-wrapper we employ
-         for Ada compilers (which is only GNAT at the moment).
-
-       For documentation on this file format and its use refer to
-       https://docs.adacore.com/gprbuild-docs/html/gprbuild_ug/companion_tools.html#the-gprconfig-knowledge-base
-  -->
-  <compiler_description>
-    <!-- We would like to name this something different, so users
-         of gprconfig know this is something custom, nixpkgs-related,
-         but unfortunately the knowledge base depends on the name of
-         the compiler for e. g. linker settings.
-    -->
-    <name>GNAT</name>
-    <executable prefix="1">(.*-.*-.*)?gnatmake</executable>
-    <version>
-      <external>${PREFIX}gnatmake -v</external>
-      <grep regexp="^GNATMAKE.+?(\d+(\.\d+)?)" group="1"></grep>
-    </version>
-    <languages>Ada</languages>
-    <variable name="gcc_version">
-      <external>${PREFIX}gcc -v</external>
-      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
-    </variable>
-    <!-- The ada runtime libraries and objects are only part of the unwrapped
-         GNAT derivation. We can't symlink them into the wrapper derivation
-         (at least not the canonical location) since that screws with linking
-         against libraries distributed with gcc.
-
-         As a workaround, we create a symlink to the unwrapped GNAT's "out"
-         output in the cc-wrapper which we can read into a variable here and
-         use to find GNAT's Ada runtime.
-    -->
-    <variable name="gnat_unwrapped">
-      <external>readlink -n ${PATH}/../nix-support/gprconfig-gnat-unwrapped</external>
-    </variable>
-    <runtimes default="default,kernel,native">
-       <directory group="default" >$gnat_unwrapped/lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/</directory>
-       <directory group="default" contents="^rts-">$gnat_unwrapped/lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path</directory>
-       <directory group="2" >$gnat_unwrapped/lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/</directory>
-       <directory group="1" >$gnat_unwrapped/$TARGET/lib/gnat/(.*)/adalib/</directory>
-    </runtimes>
-    <target>
-      <external>${PREFIX}gcc -dumpmachine</external>
-      <grep regexp="[^\r\n]+"></grep>
-    </target>
-  </compiler_description>
-</gprconfig>
diff --git a/pkgs/development/tools/misc/kool/default.nix b/pkgs/development/tools/misc/kool/default.nix
index f1d4b2b74654..b5a3c5e77035 100644
--- a/pkgs/development/tools/misc/kool/default.nix
+++ b/pkgs/development/tools/misc/kool/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "kool";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "kool-dev";
     repo = "kool";
     rev = version;
-    hash = "sha256-+vdizU2/q2nrEanpRPy1scgfTYh/I7feW4jz8efelWY=";
+    hash = "sha256-apecHILrtvzD1bAOuyhSokDqBB2UgCavQXOw4dQSPwc=";
   };
 
   vendorHash = "sha256-PmS96KVhe9TDmtYBx2hROLCbGMQ0OY3MN405dUmxPzk=";
diff --git a/pkgs/development/tools/rust/ravedude/default.nix b/pkgs/development/tools/rust/ravedude/default.nix
index aeb44664cf6c..ac5325336430 100644
--- a/pkgs/development/tools/rust/ravedude/default.nix
+++ b/pkgs/development/tools/rust/ravedude/default.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ravedude";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-LhPRz3DUMDoe50Hq3yO+2BHpyh5fQ4sMNGLttjkdSZw=";
+    hash = "sha256-p5pbxnoUBhdDf7acpLStgBvoWZyFYNHxTwzDhGSApRM=";
   };
 
-  cargoHash = "sha256-Uo8wlTAHBkn/WeGPhPP+BU80wjSyNHsWQj8QvA7mHrk=";
+  cargoHash = "sha256-L7eXSji+irjwuOZ5uxqWK9SesRZrqEeoenJgMzqpszo=";
 
   nativeBuildInputs = [ pkg-config ];