lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

treewide: fixup

+38 -57
+5 -9
pkgs/applications/misc/haunt/default.nix
··· 49 49 # Test suite is non-determinisitic in later versions 50 50 doCheck = false; 51 51 52 - postInstall = 53 - let 54 - guileVersion = lib.versions.majorMinor guile.version; 55 - in 56 - '' 57 - wrapProgram $out/bin/haunt \ 58 - --prefix GUILE_LOAD_PATH : "$out/share/guile/site/${guileVersion}:$GUILE_LOAD_PATH" \ 59 - --prefix GUILE_LOAD_COMPILED_PATH : "$out/lib/guile/${guileVersion}/site-ccache:$GUILE_LOAD_COMPILED_PATH" 60 - ''; 52 + postInstall = '' 53 + wrapProgram $out/bin/haunt \ 54 + --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \ 55 + --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" 56 + ''; 61 57 62 58 doInstallCheck = true; 63 59 installCheckPhase = ''
+3 -3
pkgs/development/guile-modules/guile-gnutls/default.nix
··· 27 27 ]; 28 28 29 29 configureFlags = [ 30 - "--with-guile-site-dir=${builtins.placeholder "out"}/share/guile/site" 31 - "--with-guile-site-ccache-dir=${builtins.placeholder "out"}/share/guile/site" 32 - "--with-guile-extension-dir=${builtins.placeholder "out"}/share/guile/extensions" 30 + "--with-guile-site-dir=${builtins.placeholder "out"}/${guile.siteDir}" 31 + "--with-guile-site-ccache-dir=${builtins.placeholder "out"}/${guile.siteCcacheDir}" 32 + "--with-guile-extension-dir=${builtins.placeholder "out"}/lib/guile/${guile.effectiveVersion}/extensions" 33 33 ]; 34 34 35 35 meta = with lib; {
+6 -10
pkgs/development/guile-modules/guile-ncurses/default.nix
··· 29 29 "--with-gnu-filesystem-hierarchy" 30 30 ]; 31 31 32 - postFixup = 33 - let 34 - guileVersion = lib.versions.majorMinor guile.version; 35 - in 36 - '' 37 - for f in $out/share/guile/site/ncurses/**.scm; do \ 38 - substituteInPlace $f \ 39 - --replace "libguile-ncurses" "$out/lib/guile/${guileVersion}/libguile-ncurses"; \ 40 - done 41 - ''; 32 + postFixup = '' 33 + for f in $out/${guile.siteDir}/ncurses/**.scm; do \ 34 + substituteInPlace $f \ 35 + --replace "libguile-ncurses" "$out/lib/guile/${guile.effectiveVersion}/libguile-ncurses"; \ 36 + done 37 + ''; 42 38 43 39 # XXX: 1 of 65 tests failed. 44 40 doCheck = false;
+2 -2
pkgs/development/guile-modules/guile-reader/default.nix
··· 27 27 libffi 28 28 ]; 29 29 30 - GUILE_SITE="${guile-lib}/share/guile/site"; 30 + env.GUILE_SITE = "${guile-lib}/${guile.siteDir}"; 31 31 32 - configureFlags = [ "--with-guilemoduledir=$(out)/share/guile/site" ]; 32 + configureFlags = [ "--with-guilemoduledir=$(out)/${guile.siteDir}" ]; 33 33 34 34 meta = with lib; { 35 35 homepage = "https://www.nongnu.org/guile-reader/";
+2 -2
pkgs/development/guile-modules/guile-ssh/default.nix
··· 20 20 sha256 = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw="; 21 21 }; 22 22 23 - configureFlags = [ "--with-guilesitedir=\${out}/share/guile/site" ]; 23 + configureFlags = [ "--with-guilesitedir=\${out}/${guile.siteDir}" ]; 24 24 25 25 postFixup = '' 26 - for f in $out/share/guile/site/ssh/**.scm; do \ 26 + for f in $out/${guile.siteDir}/ssh/**.scm; do \ 27 27 substituteInPlace $f \ 28 28 --replace "libguile-ssh" "$out/lib/libguile-ssh"; \ 29 29 done
+2 -2
pkgs/development/guile-modules/guile-xcb/default.nix
··· 28 28 ]; 29 29 30 30 configureFlags = [ 31 - "--with-guile-site-dir=$out/share/guile/site" 32 - "--with-guile-site-ccache-dir=$out/share/guile/site" 31 + "--with-guile-site-dir=$(out)/${guile.siteDir}" 32 + "--with-guile-site-ccache-dir=$(out)/${guile.siteCcacheDir}" 33 33 ]; 34 34 35 35 makeFlags = [
+4 -4
pkgs/development/libraries/libfive/default.nix
··· 9 9 , zlib 10 10 , libpng 11 11 , boost 12 - , guile_3_0 12 + , guile 13 13 , stdenv 14 14 }: 15 15 ··· 25 25 }; 26 26 27 27 nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ]; 28 - buildInputs = [ eigen zlib libpng boost guile_3_0 ]; 28 + buildInputs = [ eigen zlib libpng boost guile ]; 29 29 30 30 preConfigure = '' 31 31 substituteInPlace studio/src/guile/interpreter.cpp \ 32 32 --replace "qputenv(\"GUILE_LOAD_COMPILED_PATH\", \"libfive/bind/guile\");" \ 33 - "qputenv(\"GUILE_LOAD_COMPILED_PATH\", \"libfive/bind/guile:$out/lib/guile/3.0/ccache\");" 33 + "qputenv(\"GUILE_LOAD_COMPILED_PATH\", \"libfive/bind/guile:$out/${guile.siteCcacheDir}\");" 34 34 35 35 substituteInPlace libfive/bind/guile/CMakeLists.txt \ 36 36 --replace "LIBFIVE_FRAMEWORK_DIR=$<TARGET_FILE_DIR:libfive>" \ ··· 42 42 ''; 43 43 44 44 cmakeFlags = [ 45 - "-DGUILE_CCACHE_DIR=${placeholder "out"}/lib/guile/3.0/ccache" 45 + "-DGUILE_CCACHE_DIR=${placeholder "out"}/${guile.siteCcacheDir}" 46 46 ]; 47 47 48 48 postInstall = if stdenv.isDarwin then ''
+2 -5
pkgs/development/libraries/libmatheval/default.nix
··· 1 1 { lib, stdenv, fetchurl, pkg-config, guile, flex, fetchpatch }: 2 2 3 - let 4 - guileVersion = lib.versions.majorMinor guile.version; 5 - in 6 3 stdenv.mkDerivation rec { 7 4 version = "1.1.11"; 8 5 pname = "libmatheval"; ··· 32 29 }) 33 30 ]; 34 31 35 - env.NIX_CFLAGS_COMPILE = "-I${lib.getDev guile}/include/guile/${guileVersion}"; 36 - env.NIX_LDFLAGS = "-L${guile}/lib -lguile-${guileVersion}"; 32 + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev guile}/include/guile/${guile.effectiveVersion}"; 33 + env.NIX_LDFLAGS = "-L${guile}/lib -lguile-${guile.effectiveVersion}"; 37 34 38 35 meta = { 39 36 description = "A library to parse and evaluate symbolic expressions input as text";
+5 -9
pkgs/development/tools/guile/guile-hall/default.nix
··· 20 20 21 21 doCheck = true; 22 22 23 - postInstall = 24 - let 25 - guileVersion = lib.versions.majorMinor guile.version; 26 - in 27 - '' 28 - wrapProgram $out/bin/hall \ 29 - --prefix GUILE_LOAD_PATH : "$out/share/guile/site/${guileVersion}:$GUILE_LOAD_PATH" \ 30 - --prefix GUILE_LOAD_COMPILED_PATH : "$out/lib/guile/${guileVersion}/site-ccache:$GUILE_LOAD_COMPILED_PATH" 31 - ''; 23 + postInstall = '' 24 + wrapProgram $out/bin/hall \ 25 + --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \ 26 + --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" 27 + ''; 32 28 33 29 doInstallCheck = true; 34 30 installCheckPhase = ''
+2 -2
pkgs/tools/networking/junkie/default.nix
··· 28 28 buildInputs = [ libpcap guile_2_2 openssl ]; 29 29 nativeBuildInputs = [ autoreconfHook pkg-config ]; 30 30 configureFlags = [ 31 - "GUILELIBDIR=\${out}/share/guile/site" 32 - "GUILECACHEDIR=\${out}/lib/guile/ccache" 31 + "GUILELIBDIR=\${out}/${guile_2_2.siteDir}" 32 + "GUILECACHEDIR=\${out}/${guile_2_2.siteCcacheDir}" 33 33 ]; 34 34 35 35 meta = {
+5 -9
pkgs/tools/typesetting/skribilo/default.nix
··· 46 46 ++ optional enablePloticus ploticus 47 47 ++ optional enableTex tex; 48 48 49 - postInstall = 50 - let 51 - guileVersion = lib.versions.majorMinor guile.version; 52 - in 53 - '' 54 - wrapProgram $out/bin/skribilo \ 55 - --prefix GUILE_LOAD_PATH : "$out/share/guile/site/${guileVersion}:$GUILE_LOAD_PATH" \ 56 - --prefix GUILE_LOAD_COMPILED_PATH : "$out/lib/guile/${guileVersion}/site-ccache:$GUILE_LOAD_COMPILED_PATH" 57 - ''; 49 + postInstall = '' 50 + wrapProgram $out/bin/skribilo \ 51 + --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \ 52 + --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" 53 + ''; 58 54 59 55 meta = { 60 56 homepage = "https://www.nongnu.org/skribilo/";