Merge branch 'NixOS:master' into sfcgal-library

NixOS · Aug 29, 2024 · 0f2488e · 0f2488e
2 parents fe9d3ef + b8d0f54
commit 0f2488e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/pkgs/by-name/pg/pgraphs/package.nix b/pkgs/by-name/pg/pgraphs/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "pgraphs";
-  version = "0.6.13";
+  version = "0.6.17";
 
   src = fetchFromGitHub {
     owner = "pg-format";
     repo = "pgraphs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-NLQMBEN/wO/xOMy+gX3sQZRqU8gYesXS7hwRGWyjvX0=";
+    hash = "sha256-0Zo8Vg2KHhEGvO+vrbcP0ZTnfLtNTE2fqxq5LwPsJGs=";
   };
 
-  npmDepsHash = "sha256-Fj5huWKatJmdH2PUqNWWysE+qhiq7aR2ue723Pv5Y4M=";
+  npmDepsHash = "sha256-47zT3wlCnVIcv0Sst4lUWLUMiWftgvP60cOmHu65vB8=";
   dontNpmBuild = true;
 
   meta = {

diff --git a/pkgs/by-name/wp/wp-cli/package.nix b/pkgs/by-name/wp/wp-cli/package.nix
@@ -42,6 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];
 
+  # Usually --set-default is used to set default environment variables.
+  # But the value is wrapped in single-quotes so our variables would be used literally instead
+  # of the expanded version. Thus we use --run instead.
   installPhase = ''
     runHook preInstall
 
@@ -50,12 +53,12 @@ stdenv.mkDerivation (finalAttrs: {
     installShellCompletion --bash --name wp ${completion}
 
     makeWrapper ${lib.getExe php} $out/bin/${finalAttrs.meta.mainProgram} \
-      --set-default XDG_CACHE_HOME \$HOME/.cache \
-      --set-default XDG_CONFIG_HOME \$HOME/.config \
-      --set-default XDG_DATA_HOME \$HOME/.local/share \
-      --set-default WP_CLI_CONFIG_PATH \$XDG_CONFIG_HOME}/wp-cli \
-      --set-default WP_CLI_PACKAGES_DIR \$XDG_DATA_HOME/wp-cli \
-      --set-default WP_CLI_CACHE_DIR \$XDG_CACHE_HOME/wp-cli \
+      --run 'export XDG_CACHE_HOME=''${XDG_CACHE_HOME-"$HOME/.cache"}' \
+      --run 'export XDG_CONFIG_HOME=''${XDG_CONFIG_HOME-"$HOME/.config"}' \
+      --run 'export XDG_DATA_HOME=''${XDG_DATA_HOME-"$HOME/.local/share"}' \
+      --run 'export WP_CLI_CONFIG_PATH=''${WP_CLI_CONFIG_PATH-"$XDG_CONFIG_HOME/wp-cli"}' \
+      --run 'export WP_CLI_PACKAGES_DIR=''${WP_CLI_PACKAGES_DIR-"$XDG_DATA_HOME/wp-cli"}' \
+      --run 'export WP_CLI_CACHE_DIR=''${WP_CLI_CACHE_DIR-"$XDG_CACHE_HOME/wp-cli"}' \
       --add-flags "-c $out/etc/${ini.name}" \
       --add-flags "-f $out/share/wp-cli/wp-cli.phar" \
       --add-flags "--"

diff --git a/pkgs/development/compilers/spasm-ng/default.nix b/pkgs/development/compilers/spasm-ng/default.nix
@@ -1,25 +1,34 @@
-{ lib, stdenv, fetchFromGitHub, gcc, gmp, openssl, zlib }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, gmp, gcc, openssl, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "spasm-ng";
 
-  version = "unstable-2020-08-03";
+  version = "unstable-2022-07-05";
 
   src = fetchFromGitHub {
     owner = "alberthdev";
     repo = "spasm-ng";
-    rev = "221898beff2442f459b80ab89c8e1035db97868e";
-    sha256 = "0xspxmp2fir604b4xsk4hi1gjv61rnq2ypppr7cj981jlhicmvjj";
+    rev = "5f0786d38f064835be674d4b7df42969967bb73c";
+    sha256 = "sha256-j7Z3oI+J0wZF4EG5OMMjuDe2o69KKGuJvfyHNPTLrXM=";
   };
 
-  nativeBuildInputs = [ gcc ];
-
+  # GCC is needed for Darwin
+  nativeBuildInputs = [ makeWrapper gcc ];
   buildInputs = [ gmp openssl zlib ];
 
   enableParallelBuilding = true;
 
   installPhase = ''
+    runHook preInstall
+
     install -Dm755 spasm -t $out/bin
+    install -Dm555 inc/*.inc -t $out/include
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/spasm --add-flags "-I $out/include"
   '';
 
   meta = with lib; {