From dd55c7de48db729789ef6cec06d667b9976881ff Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 10 Nov 2024 18:39:37 +0100 Subject: [PATCH 1/8] pkgs/test/simple: remove unused builder.sh Oversight in a133a74c8905c58721a2ae129c02c264bf6b3b09. (cherry picked from commit ec3a49b987d08a1a39bdaab42d6b68f81c2f43bb) --- pkgs/test/simple/builder.sh | 43 ------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 pkgs/test/simple/builder.sh diff --git a/pkgs/test/simple/builder.sh b/pkgs/test/simple/builder.sh deleted file mode 100644 index 0b09a109beadb..0000000000000 --- a/pkgs/test/simple/builder.sh +++ /dev/null @@ -1,43 +0,0 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -set -x - -export NIX_DEBUG=1 - -source $stdenv/setup - -export NIX_ENFORCE_PURITY=1 - -mkdir $out -mkdir $out/bin - -cat > hello.c < - -int main(int argc, char * * argv) -{ - printf("Hello World!\n"); - return 0; -} -EOF - -#gcc -I/nix/store/foo -I /nix/store/foo -I/usr/lib -I /usr/lib hello.c -o $out/bin/hello -gcc -I`pwd` -L /nix/store/abcd/lib -isystem /usr/lib hello.c -o $out/bin/hello - -$out/bin/hello - -cat > hello2.cc < - -int main(int argc, char * * argv) -{ - std::cout << "Hello World!\n"; - std::cout << VALUE << std::endl; - return 0; -} -EOF - -g++ hello2.cc -o $out/bin/hello2 -DVALUE="1 + 2 * 3" - -$out/bin/hello2 - -ld -v From 8cd2123b25f0f31c58344f6212fce818b7b01e79 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 10 Nov 2024 18:44:41 +0100 Subject: [PATCH 2/8] pkgs/os-specific/darwin/apple-source-releases/libiconv: remove unused static-setup-hook.sh Oversight in ca4dd24306946b5357036b96f2c323b4e2ffcfde. (cherry picked from commit aed77ec778a49f5bc060fb27cfd5ed0cca43d6c9) --- .../apple-source-releases/libiconv/static-setup-hook.sh | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/libiconv/static-setup-hook.sh diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/static-setup-hook.sh b/pkgs/os-specific/darwin/apple-source-releases/libiconv/static-setup-hook.sh deleted file mode 100644 index 2ad108b82f1d2..0000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/static-setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Darwin’s dynamic libiconv reexports libcharset, so reproduce that in static builds. -if [ -z "${dontAddExtraLibs-}" ]; then - getHostRole - export NIX_LDFLAGS${role_post}+=" -lcharset" -fi From 7e43205aae1a744a1315c2bd2fb232d66dab3903 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 10 Nov 2024 18:48:20 +0100 Subject: [PATCH 3/8] pkgs/misc/cups/drivers/samsung/4.00.39: remove unused builder.sh Oversight in d14b6e65fffc88872063d6e0c6f4635bfd6c887e. (cherry picked from commit 387f59af8dd2bc12541b6c029e4260e068c8b086) --- .../cups/drivers/samsung/4.00.39/builder.sh | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh deleted file mode 100644 index 829bc6509e069..0000000000000 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh +++ /dev/null @@ -1,36 +0,0 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - -arch=$(uname -m) -echo "$arch" | egrep -q '^i[3456]86$' && arch=i386 -echo "Installing for $arch" - -unpackPhase -patchPhase - -set -v - -cd cdroot/Linux -mkdir -p $out/opt -cp -r $arch/at_root/* $out -cp -r $arch/at_opt/* $out/opt -#cp -r noarch/at_root/* $out -cp -r noarch/at_opt/* $out/opt - -cd $out -test -d usr/lib64 && ln -s usr/lib64 lib || - ln -s usr/lib lib -mkdir -p share/cups -cd share/cups -ln -s ../../opt/share/* . -ln -s ppd model - -cd $out/lib/cups/filter -for i in $(ls); do - echo "Patching $i..." - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i || - echo "Couldn't set interpreter!" - patchelf --set-rpath $cups/lib:$gcc/lib:$glibc/lib $i # This might not be necessary. -done - -ln -s $ghostscript/bin/gs $out/lib/cups/filter From e5df692413be17dbcde085f8e89bfd1f9d9c20d7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 10 Nov 2024 18:56:26 +0100 Subject: [PATCH 4/8] pkgs/development/tools/parsing/antlr: remove unused builder.sh Oversight in a17311a33e57fe4b3bea6621a9a06e5d004158ba. (cherry picked from commit a763b9c781207209c1df288d0f5529394dbeff53) --- .../tools/parsing/antlr/builder.sh | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 pkgs/development/tools/parsing/antlr/builder.sh diff --git a/pkgs/development/tools/parsing/antlr/builder.sh b/pkgs/development/tools/parsing/antlr/builder.sh deleted file mode 100644 index c1d20845e6bff..0000000000000 --- a/pkgs/development/tools/parsing/antlr/builder.sh +++ /dev/null @@ -1,24 +0,0 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - -tar zxvf $src -cd antlr-* -cd lib - -mkdir -p $out/lib/antlr -mkdir -p $out/bin - -cp *.jar $out/lib/antlr - -classpath="" -for jar in $out/lib/antlr/*.jar; do - classpath="$classpath:$jar" -done - -cat > $out/bin/antlr < Date: Sun, 10 Nov 2024 19:00:46 +0100 Subject: [PATCH 5/8] pkgs/development/libraries/kde-framworks/kdoctools: remove unused setup-hook.sh This was added in eb604134f7fdd95c78d7979e826cd165b1f627f2 but never referenced. (cherry picked from commit 6074f9008d5b8779f84a5d7346d2400d11952ed5) --- .../libraries/kde-frameworks/kdoctools/setup-hook.sh | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh deleted file mode 100644 index 2928d9b34dbed..0000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addXdgData() { - addToSearchPath XDG_DATA_DIRS "$1/share" -} - -addEnvHooks "$targetOffset" addXdgData From 63f26920c7fad7a7b8458bf64f77f6629fa564cd Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 10 Nov 2024 19:03:41 +0100 Subject: [PATCH 6/8] pkgs/development/interpreters/octave/hooks: remove unused hook file This was added as a duplicate in 481e1d3a77e1933d82fc66b78f7b2b42fdce91d7 but never referenced. (cherry picked from commit c9d880432a0d932d9f57149f26c50dfeb977d22e) --- ...ctave-write-required-octave-packages-hook.sh | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh diff --git a/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh b/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh deleted file mode 100644 index fb808485a36ab..0000000000000 --- a/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh +++ /dev/null @@ -1,17 +0,0 @@ -# Setup hook for writing octave packages that are run-time dependencies for -# another package to a nix-support file. -# `echo`s the full path name to the package derivation that is required. -echo "Sourcing octave-write-required-octave-packages-hook.sh" - -octaveWriteRequiredOctavePackagesPhase() { - echo "Executing octaveWriteRequiredOctavePackagesPhase" - - mkdir -p $out/nix-support - echo ${requiredOctavePackages} > $out/nix-support/required-octave-packages -} - -# Yes its a bit long... -if [ -z "${dontWriteRequiredOctavePackagesPhase-}" ]; then - echo "Using octaveWriteRequiredOctavePackagesPhase" - appendToVar preDistPhases octaveWriteRequiredOctavePackagesPhase -fi From eef615f8ad19e9928cf550d27f605e1f2c9a7130 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 15 Nov 2024 20:04:00 +0100 Subject: [PATCH 7/8] pkgs/development/interpreters/lua-5/hooks: remove unused setup-hook.sh Oversight in 6427d04c2364b79e07d59c0853f86be65e4b7fd0. (cherry picked from commit e236ed17198817396e25a4c471fa4f9e35c9a218) --- pkgs/development/interpreters/lua-5/hooks/setup-hook.sh | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 pkgs/development/interpreters/lua-5/hooks/setup-hook.sh diff --git a/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh b/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh deleted file mode 100644 index 0e9aa689706e7..0000000000000 --- a/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -# set -e - -source ./utils.sh -addEnvHooks "$hostOffset" addToLuaPath From 703a8f6f3db242324ca95fb65aba0446ec955d0f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 15 Nov 2024 20:10:02 +0100 Subject: [PATCH 8/8] pkgs/by-name/re/rep-gtk: remove unused setup-hook.sh This was added in f19ed980a2b037b2c72edc974c5b83ea292e6490 as a duplicate and never referenced. (cherry picked from commit db3eb4856cdbfdc87a857f43ea3502dfd9e89b4f) --- pkgs/by-name/re/rep-gtk/setup-hook.sh | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 pkgs/by-name/re/rep-gtk/setup-hook.sh diff --git a/pkgs/by-name/re/rep-gtk/setup-hook.sh b/pkgs/by-name/re/rep-gtk/setup-hook.sh deleted file mode 100644 index 4d875b6933040..0000000000000 --- a/pkgs/by-name/re/rep-gtk/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addRepDLLoadPath () { - addToSearchPath REP_DL_LOAD_PATH $1/lib/rep -} - -addEnvHooks "$hostOffset" addRepDLLoadPath