commit 57b496ea98bdbd633c48f16af1c69a196aaf963a · pyrox.dev/nixpkgs

+24 -24

pkgs/build-support/fetchmtn/builder.sh

···

       2
       2
        
       

     

       3
       3
        
       set -x

     

       4
       4
        
       

     

       5
       5
       -
       if ! [ -f "$cacheDB" ]; then 

     

       6
       6
       -
       	echo "Creating cache DB $cacheDB"

     

       7
       7
       -
       	mtn --db "$cacheDB" db init

     

       5
       5
       +
       if ! [ -f "$cacheDB" ]; then

     

       6
       6
       +
           echo "Creating cache DB $cacheDB"

     

       7
       7
       +
           mtn --db "$cacheDB" db init

     

       8
       8
        
       fi

     

       9
       9
        
       

     

       10
       10
        
       header "getting revision $selector";

     

       11
       11
        
       

     

       12
       12
        
       done=;

     

       13
       13
        
       for source in $dbs; do

     

       14
       14
       -
       	if mtn pull --db "$cacheDB" "$source" "${branch}"; then

     

       15
       15
       -
       		revision="$(mtn --db "$cacheDB" au toposort $(mtn --db "$cacheDB" au select "$selector") | tail -1)";

     

       16
       16
       -
       		if [ -n "$revision" ]; then

     

       17
       17
       -
       			if mtn --db "$cacheDB" au get_revision "$revision"; then

     

       18
       18
       -
       				echo "found revision $revision"

     

       19
       19
       -
       				done=1;

     

       20
       20
       -
       			else

     

       21
       21
       -
       				echo "revision $revision does not exist";

     

       22
       22
       -
       			fi

     

       23
       23
       -
       		else

     

       24
       24
       -
       			echo "selector $selector does not match any revision";

     

       25
       25
       -
       		fi

     

       26
       26
       -
       	else

     

       27
       27
       -
       		echo "pulling branch $branch wasn't successful";

     

       28
       28
       -
       	fi;

     

       29
       29
       -
       	if test -n "$done"; then

     

       30
       30
       -
       		break;

     

       31
       31
       -
       	fi;

     

       14
       14
       +
           if mtn pull --db "$cacheDB" "$source" "${branch}"; then

     

       15
       15
       +
               revision="$(mtn --db "$cacheDB" au toposort $(mtn --db "$cacheDB" au select "$selector") | tail -1)";

     

       16
       16
       +
               if [ -n "$revision" ]; then

     

       17
       17
       +
                   if mtn --db "$cacheDB" au get_revision "$revision"; then

     

       18
       18
       +
                       echo "found revision $revision"

     

       19
       19
       +
                       done=1;

     

       20
       20
       +
                   else

     

       21
       21
       +
                       echo "revision $revision does not exist";

     

       22
       22
       +
                   fi

     

       23
       23
       +
               else

     

       24
       24
       +
                   echo "selector $selector does not match any revision";

     

       25
       25
       +
               fi

     

       26
       26
       +
           else

     

       27
       27
       +
               echo "pulling branch $branch wasn't successful";

     

       28
       28
       +
           fi;

     

       29
       29
       +
           if test -n "$done"; then

     

       30
       30
       +
               break;

     

       31
       31
       +
           fi;

     

       32
       32
        
       done;

     

       33
       33
        
       

     

       34
       34
        
       stopNest;

     
···

       36
       36
        
       header "checking out the revision $revision";

     

       37
       37
        
       

     

       38
       38
        
       if test -n "$done"; then

     

       39
       39
       -
       	mtn checkout --db "$cacheDB" -r "$revision" "$out" -b "${branch}"

     

       39
       39
       +
           mtn checkout --db "$cacheDB" -r "$revision" "$out" -b "${branch}"

     

       40
       40
        
       else

     

       41
       41
       -
       	echo "Needed revision still not found. Exiting";

     

       42
       42
       -
       	exit 1;

     

       41
       41
       +
           echo "Needed revision still not found. Exiting";

     

       42
       42
       +
           exit 1;

     

       43
       43
        
       fi;

     

       44
       44
        
       

     

       45
       45
        
       stopNest

+3 -3

pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh

···

       13
       13
        
       fi

     

       14
       14
        
       

     

       15
       15
        
       if (( ${#role_suffixes[@]} > 0 )); then

     

       16
       16
       -
       	# replace env var with nix-modified one

     

       16
       16
       +
           # replace env var with nix-modified one

     

       17
       17
        
           PKG_CONFIG_PATH=$PKG_CONFIG_PATH_@suffixSalt@ exec @prog@ "$@"

     

       18
       18
        
       else

     

       19
       19
       -
       	# pkg-config isn't a bonafied dependency so ignore setup hook entirely

     

       20
       20
       -
       	exec @prog@ "$@"

     

       19
       19
       +
           # pkg-config isn't a bonafied dependency so ignore setup hook entirely

     

       20
       20
       +
           exec @prog@ "$@"

     

       21
       21
        
       fi

+3 -3

pkgs/build-support/setup-hooks/shorten-perl-shebang.sh

···

       71
       71
        
                   print

     

       72
       72
        
               }

     

       73
       73
        
           ' "$program" > "$temp" || die

     

       74
       74
       -
       	# Preserve the mode of the original file

     

       75
       75
       -
       	cp --preserve=mode --attributes-only "$program" "$temp"

     

       76
       76
       -
       	mv "$temp" "$program"

     

       74
       74
       +
           # Preserve the mode of the original file

     

       75
       75
       +
           cp --preserve=mode --attributes-only "$program" "$temp"

     

       76
       76
       +
           mv "$temp" "$program"

     

       77
       77
        
       

     

       78
       78
        
           # Measure the new shebang line length and make sure it's okay. We subtract

     

       79
       79
        
           # one to account for the trailing newline that "head" included in its

+10 -10

pkgs/data/fonts/iosevka/update-bin.sh

···

       10
       10
        
       version=$(echo "$release" | jq -r .tag_name | tr -d v)

     

       11
       11
        
       

     

       12
       12
        
       if test "$oldVersion" = "$version"; then

     

       13
       13
       -
       	echo "New version same as old version, nothing to do." >&2

     

       14
       14
       -
       	exit 0

     

       13
       13
       +
           echo "New version same as old version, nothing to do." >&2

     

       14
       14
       +
           exit 0

     

       15
       15
        
       fi

     

       16
       16
        
       

     

       17
       17
        
       sed -i "s/$oldVersion/$version/" bin.nix

     

       18
       18
        
       

     

       19
       19
        
       {

     

       20
       20
       -
       	echo '# This file was autogenerated. DO NOT EDIT!'

     

       21
       21
       -
       	echo '{'

     

       22
       22
       -
       	for asset in $(echo "$release" | jq -r '.assets[].name | select(startswith("ttc"))'); do

     

       23
       23
       -
       		printf '  %s = "%s";\n' \

     

       24
       24
       -
       			$(echo "$asset" | sed -r "s/^ttc-(.*)-$version.zip$/\1/") \

     

       25
       25
       -
       			$(nix-prefetch-url "https://github.com/be5invis/Iosevka/releases/download/v$version/$asset")

     

       26
       26
       -
       	done

     

       27
       27
       -
       	echo '}'

     

       20
       20
       +
           echo '# This file was autogenerated. DO NOT EDIT!'

     

       21
       21
       +
           echo '{'

     

       22
       22
       +
           for asset in $(echo "$release" | jq -r '.assets[].name | select(startswith("ttc"))'); do

     

       23
       23
       +
               printf '  %s = "%s";\n' \

     

       24
       24
       +
                   $(echo "$asset" | sed -r "s/^ttc-(.*)-$version.zip$/\1/") \

     

       25
       25
       +
                   $(nix-prefetch-url "https://github.com/be5invis/Iosevka/releases/download/v$version/$asset")

     

       26
       26
       +
           done

     

       27
       27
       +
           echo '}'

     

       28
       28
        
       } >variants.nix

+6 -6

pkgs/data/misc/geolite-legacy/builder.sh

···

       5
       5
        
       

     

       6
       6
        
       # Iterate over all environment variable names beginning with "src":

     

       7
       7
        
       for var in "${!src@}"; do

     

       8
       8
       -
       	# Store the value of the variable with name $var in $src:

     

       9
       9
       -
       	eval src="\$$var"

     

       8
       8
       +
           # Store the value of the variable with name $var in $src:

     

       9
       9
       +
           eval src="\$$var"

     

       10
       10
        
       

     

       11
       11
       -
       	# Copy $src to current directory, removing Nix hash from the filename:

     

       12
       12
       -
       	dest="${src##*/}"

     

       13
       13
       -
       	dest="${dest#*-}"

     

       14
       14
       -
       	cp "$src" "$dest"

     

       11
       11
       +
           # Copy $src to current directory, removing Nix hash from the filename:

     

       12
       12
       +
           dest="${src##*/}"

     

       13
       13
       +
           dest="${dest#*-}"

     

       14
       14
       +
           cp "$src" "$dest"

     

       15
       15
        
       done

     

       16
       16
        
       

     

       17
       17
        
       gzip -dv *.gz

+30 -30

pkgs/desktops/gnustep/make/builder.sh

···

       30
       30
        
           # add the current package to the paths

     

       31
       31
        
           local tmp="$out/lib/GNUstep/Applications"

     

       32
       32
        
           if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_APPS" in *"${tmp}"*) false;; *) true;; esac; then

     

       33
       33
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp"

     

       33
       33
       +
               addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp"

     

       34
       34
        
           fi

     

       35
       35
        
           tmp="$out/lib/GNUstep/Applications"

     

       36
       36
        
           if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" in *"${tmp}"*) false;; *) true;; esac; then

     

       37
       37
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp"

     

       37
       37
       +
               addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp"

     

       38
       38
        
           fi

     

       39
       39
        
           tmp="$out/lib/GNUstep/WebApplications"

     

       40
       40
        
           if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_WEB_APPS" in *"${tmp}"*) false;; *) true;; esac; then

     

       41
       41
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp"

     

       41
       41
       +
               addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp"

     

       42
       42
        
           fi

     

       43
       43
        
           tmp="$out/bin"

     

       44
       44
        
           if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then

     

       45
       45
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp"

     

       45
       45
       +
               addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp"

     

       46
       46
        
           fi

     

       47
       47
        
           tmp="$out/sbin"

     

       48
       48
        
           if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then

     

       49
       49
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp"

     

       49
       49
       +
               addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp"

     

       50
       50
        
           fi

     

       51
       51
        
           tmp="$out/lib/GNUstep"

     

       52
       52
        
           if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARY" in *"${tmp}"*) false;; *) true;; esac; then

     

       53
       53
       -
           	addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp"

     

       53
       53
       +
                   addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp"

     

       54
       54
        
           fi

     

       55
       55
        
           tmp="$out/include"

     

       56
       56
        
           if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_HEADERS" in *"${tmp}"*) false;; *) true;; esac; then

     

       57
       57
       -
           	if [ -z "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then

     

       58
       58
       -
           	    export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp"

     

       59
       59
       -
           	else

     

       60
       60
       -
           	    export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp"

     

       61
       61
       -
           	fi

     

       57
       57
       +
                   if [ -z "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then

     

       58
       58
       +
                       export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp"

     

       59
       59
       +
                   else

     

       60
       60
       +
                       export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp"

     

       61
       61
       +
                   fi

     

       62
       62
        
           fi

     

       63
       63
        
           tmp="$out/lib"

     

       64
       64
        
           if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARIES" in *"${tmp}"*) false;; *) true;; esac; then

     

       65
       65
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp"

     

       65
       65
       +
               addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp"

     

       66
       66
        
           fi

     

       67
       67
        
           tmp="$out/share/GNUstep/Documentation"

     

       68
       68
        
           if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC" in *"${tmp}"*) false;; *) true;; esac; then

     

       69
       69
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp"

     

       69
       69
       +
               addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp"

     

       70
       70
        
           fi

     

       71
       71
        
           tmp="$out/share/man"

     

       72
       72
        
           if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_MAN" in *"${tmp}"*) false;; *) true;; esac; then

     

       73
       73
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp"

     

       73
       73
       +
               addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp"

     

       74
       74
        
           fi

     

       75
       75
        
           tmp="$out/share/info"

     

       76
       76
        
           if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_INFO" in *"${tmp}"*) false;; *) true;; esac; then

     

       77
       77
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"

     

       77
       77
       +
               addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"

     

       78
       78
        
           fi

     

       79
       79
       -
           

     

       79
       79
       +
       

     

       80
       80
        
           # write the config file

     

       81
       81
        
           echo GNUSTEP_MAKEFILES=$GNUSTEP_MAKEFILES >> $conf

     

       82
       82
        
           if [ -n "$NIX_GNUSTEP_SYSTEM_APPS" ]; then

     

       83
       83
       -
       	echo NIX_GNUSTEP_SYSTEM_APPS="$NIX_GNUSTEP_SYSTEM_APPS"

     

       83
       83
       +
               echo NIX_GNUSTEP_SYSTEM_APPS="$NIX_GNUSTEP_SYSTEM_APPS"

     

       84
       84
        
           fi

     

       85
       85
        
           if [ -n "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" ]; then

     

       86
       86
       -
       	echo NIX_GNUSTEP_SYSTEM_ADMIN_APPS="$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" >> $conf

     

       86
       86
       +
               echo NIX_GNUSTEP_SYSTEM_ADMIN_APPS="$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" >> $conf

     

       87
       87
        
           fi

     

       88
       88
        
           if [ -n "$NIX_GNUSTEP_SYSTEM_WEB_APPS" ]; then

     

       89
       89
       -
       	echo NIX_GNUSTEP_SYSTEM_WEB_APPS="$NIX_GNUSTEP_SYSTEM_WEB_APPS" >> $conf

     

       89
       89
       +
               echo NIX_GNUSTEP_SYSTEM_WEB_APPS="$NIX_GNUSTEP_SYSTEM_WEB_APPS" >> $conf

     

       90
       90
        
           fi

     

       91
       91
        
           if [ -n "$NIX_GNUSTEP_SYSTEM_TOOLS" ]; then

     

       92
       92
       -
       	echo NIX_GNUSTEP_SYSTEM_TOOLS="$NIX_GNUSTEP_SYSTEM_TOOLS" >> $conf

     

       92
       92
       +
               echo NIX_GNUSTEP_SYSTEM_TOOLS="$NIX_GNUSTEP_SYSTEM_TOOLS" >> $conf

     

       93
       93
        
           fi

     

       94
       94
        
           if [ -n "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" ]; then

     

       95
       95
       -
       	echo NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS="$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" >> $conf

     

       95
       95
       +
               echo NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS="$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" >> $conf

     

       96
       96
        
           fi

     

       97
       97
        
           if [ -n "$NIX_GNUSTEP_SYSTEM_LIBRARY" ]; then

     

       98
       98
       -
       	echo NIX_GNUSTEP_SYSTEM_LIBRARY="$NIX_GNUSTEP_SYSTEM_LIBRARY" >> $conf

     

       98
       98
       +
               echo NIX_GNUSTEP_SYSTEM_LIBRARY="$NIX_GNUSTEP_SYSTEM_LIBRARY" >> $conf

     

       99
       99
        
           fi

     

       100
       100
        
           if [ -n "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then

     

       101
       101
       -
       	echo NIX_GNUSTEP_SYSTEM_HEADERS="$NIX_GNUSTEP_SYSTEM_HEADERS" >> $conf

     

       101
       101
       +
               echo NIX_GNUSTEP_SYSTEM_HEADERS="$NIX_GNUSTEP_SYSTEM_HEADERS" >> $conf

     

       102
       102
        
           fi

     

       103
       103
        
           if [ -n "$NIX_GNUSTEP_SYSTEM_LIBRARIES" ]; then

     

       104
       104
       -
       	echo NIX_GNUSTEP_SYSTEM_LIBRARIES="$NIX_GNUSTEP_SYSTEM_LIBRARIES" >> $conf

     

       104
       104
       +
               echo NIX_GNUSTEP_SYSTEM_LIBRARIES="$NIX_GNUSTEP_SYSTEM_LIBRARIES" >> $conf

     

       105
       105
        
           fi

     

       106
       106
        
           if [ -n "$NIX_GNUSTEP_SYSTEM_DOC" ]; then

     

       107
       107
       -
       	echo NIX_GNUSTEP_SYSTEM_DOC="$NIX_GNUSTEP_SYSTEM_DOC" >> $conf

     

       107
       107
       +
               echo NIX_GNUSTEP_SYSTEM_DOC="$NIX_GNUSTEP_SYSTEM_DOC" >> $conf

     

       108
       108
        
           fi

     

       109
       109
        
           if [ -n "$NIX_GNUSTEP_SYSTEM_DOC_MAN" ]; then

     

       110
       110
       -
       	echo NIX_GNUSTEP_SYSTEM_DOC_MAN="$NIX_GNUSTEP_SYSTEM_DOC_MAN" >> $conf

     

       110
       110
       +
               echo NIX_GNUSTEP_SYSTEM_DOC_MAN="$NIX_GNUSTEP_SYSTEM_DOC_MAN" >> $conf

     

       111
       111
        
           fi

     

       112
       112
        
           if [ -n "$NIX_GNUSTEP_SYSTEM_DOC_INFO" ]; then

     

       113
       113
       -
       	echo NIX_GNUSTEP_SYSTEM_DOC_INFO="$NIX_GNUSTEP_SYSTEM_DOC_INFO" >> $conf

     

       113
       113
       +
               echo NIX_GNUSTEP_SYSTEM_DOC_INFO="$NIX_GNUSTEP_SYSTEM_DOC_INFO" >> $conf

     

       114
       114
        
           fi

     

       115
       115
       -
           

     

       115
       115
       +
       

     

       116
       116
        
           for i in $out/bin/*; do

     

       117
       117
       -
       	echo "wrapping $(basename $i)"

     

       118
       118
       -
       	wrapGSMake "$i" "$out/share/.GNUstep.conf"

     

       117
       117
       +
               echo "wrapping $(basename $i)"

     

       118
       118
       +
               wrapGSMake "$i" "$out/share/.GNUstep.conf"

     

       119
       119
        
           done

     

       120
       120
        
       }

     

       121
       121

+18 -18

pkgs/desktops/gnustep/make/setup-hook.sh

···

       20
       20
        
           local filename

     

       21
       21
        
       

     

       22
       22
        
           for filename in $1/share/GNUstep/Makefiles/Additional/*.make ; do

     

       23
       23
       -
       	if case "${NIX_GNUSTEP_MAKEFILES_ADDITIONAL-}" in *"{$filename}"*) false;; *) true;; esac; then

     

       24
       24
       -
       	    export NIX_GNUSTEP_MAKEFILES_ADDITIONAL+=" $filename"

     

       25
       25
       -
       	fi

     

       23
       23
       +
           if case "${NIX_GNUSTEP_MAKEFILES_ADDITIONAL-}" in *"{$filename}"*) false;; *) true;; esac; then

     

       24
       24
       +
               export NIX_GNUSTEP_MAKEFILES_ADDITIONAL+=" $filename"

     

       25
       25
       +
           fi

     

       26
       26
        
           done

     

       27
       27
        
       

     

       28
       28
        
           local tmp="$1/lib/GNUstep/Applications"

     

       29
       29
        
           if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then

     

       30
       30
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp"

     

       30
       30
       +
           addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp"

     

       31
       31
        
           fi

     

       32
       32
        
           tmp="$1/lib/GNUstep/Applications"

     

       33
       33
        
           if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then

     

       34
       34
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp"

     

       34
       34
       +
           addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp"

     

       35
       35
        
           fi

     

       36
       36
        
           tmp="$1/lib/GNUstep/WebApplications"

     

       37
       37
        
           if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_WEB_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then

     

       38
       38
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp"

     

       38
       38
       +
           addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp"

     

       39
       39
        
           fi

     

       40
       40
        
           tmp="$1/bin"

     

       41
       41
        
           if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then

     

       42
       42
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp"

     

       42
       42
       +
           addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp"

     

       43
       43
        
           fi

     

       44
       44
        
           tmp="$1/sbin"

     

       45
       45
        
           if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then

     

       46
       46
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp"

     

       46
       46
       +
           addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp"

     

       47
       47
        
           fi

     

       48
       48
        
           tmp="$1/lib/GNUstep"

     

       49
       49
        
           if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARY-}" in *"${tmp}"*) false;; *) true;; esac; then

     

       50
       50
       -
           	addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp"

     

       50
       50
       +
               addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp"

     

       51
       51
        
           fi

     

       52
       52
        
           tmp="$1/include"

     

       53
       53
        
           if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_HEADERS-}" in *"${tmp}"*) false;; *) true;; esac; then

     

       54
       54
       -
           	if [ -z "${NIX_GNUSTEP_SYSTEM_HEADERS-}" ]; then

     

       55
       55
       -
           	    export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp"

     

       56
       56
       -
           	else

     

       57
       57
       -
           	    export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp"

     

       58
       58
       -
           	fi

     

       54
       54
       +
               if [ -z "${NIX_GNUSTEP_SYSTEM_HEADERS-}" ]; then

     

       55
       55
       +
                   export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp"

     

       56
       56
       +
               else

     

       57
       57
       +
                   export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp"

     

       58
       58
       +
               fi

     

       59
       59
        
           fi

     

       60
       60
        
           tmp="$1/lib"

     

       61
       61
        
           if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARIES-}" in *"${tmp}"*) false;; *) true;; esac; then

     

       62
       62
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp"

     

       62
       62
       +
           addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp"

     

       63
       63
        
           fi

     

       64
       64
        
           tmp="$1/share/GNUstep/Documentation"

     

       65
       65
        
           if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC-}" in *"${tmp}"*) false;; *) true;; esac; then

     

       66
       66
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp"

     

       66
       66
       +
           addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp"

     

       67
       67
        
           fi

     

       68
       68
        
           tmp="$1/share/man"

     

       69
       69
        
           if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_MAN-}" in *"${tmp}"*) false;; *) true;; esac; then

     

       70
       70
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp"

     

       70
       70
       +
           addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp"

     

       71
       71
        
           fi

     

       72
       72
        
           tmp="$1/share/info"

     

       73
       73
        
           if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_INFO-}" in *"${tmp}"*) false;; *) true;; esac; then

     

       74
       74
       -
       	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"

     

       74
       74
       +
           addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"

     

       75
       75
        
           fi

     

       76
       76
        
       }

     

       77
       77
        
       addEnvHooks "$targetOffset" addEnvVars

+39 -39

pkgs/development/compilers/ios-cross-compile/9.2_builder.sh

···

       8
       8
        
       

     

       9
       9
        
           case "$1" in

     

       10
       10
        
               *.tar.xz)

     

       11
       11
       -
       	    xz -dc $1 | tar "$tarflags" - ;;

     

       12
       12
       -
       	*)

     

       13
       13
       -
       	    printf "Make sure you give a iPhoneOS9.2.sdk.tar.xz file \n" ;;

     

       11
       11
       +
               xz -dc $1 | tar "$tarflags" - ;;

     

       12
       12
       +
           *)

     

       13
       13
       +
               printf "Make sure you give a iPhoneOS9.2.sdk.tar.xz file \n" ;;

     

       14
       14
        
           esac

     

       15
       15
        
       }

     

       16
       16
        
       

     

       17
       17
        
       function verify_arch {

     

       18
       18
        
           case "$1" in

     

       19
       19
       -
       	# Our good arches.

     

       20
       20
       -
       	armv7|arm64) ;;

     

       21
       21
       -
       	*)

     

       22
       22
       -
       	    local

     

       23
       23
       -
       	    acc="armv7 | arm64"

     

       24
       24
       -
       	    error_message=$(

     

       25
       25
       -
       		printf '%s is not an acceptable arch. Try one of %s' "$1" "$acc"

     

       26
       26
       -
       			 )

     

       27
       27
       -
       	    printf "$error_message\n"

     

       28
       28
       -
       	    exit

     

       19
       19
       +
           # Our good arches.

     

       20
       20
       +
           armv7|arm64) ;;

     

       21
       21
       +
           *)

     

       22
       22
       +
               local

     

       23
       23
       +
               acc="armv7 | arm64"

     

       24
       24
       +
               error_message=$(

     

       25
       25
       +
               printf '%s is not an acceptable arch. Try one of %s' "$1" "$acc"

     

       26
       26
       +
                    )

     

       27
       27
       +
               printf "$error_message\n"

     

       28
       28
       +
               exit

     

       29
       29
        
           esac

     

       30
       30
        
       }

     

       31
       31
        
       

     

       32
       32
        
       function verify_sdk_version {

     

       33
       33
        
           sdk_version=$(basename "$1" | grep -P -o "[0-9].[0-9]+")

     

       34
       34
        
           case "$sdk_version" in

     

       35
       35
       -
       	# Make sure the SDK is correct.

     

       36
       36
       -
       	[5-9].[0-9]) ;;

     

       37
       37
       -
       	*)

     

       38
       38
       -
       	    printf 'No iPhone SDK version in file name\n'

     

       35
       35
       +
           # Make sure the SDK is correct.

     

       36
       36
       +
           [5-9].[0-9]) ;;

     

       37
       37
       +
           *)

     

       38
       38
       +
               printf 'No iPhone SDK version in file name\n'

     

       39
       39
        
           esac

     

       40
       40
        
       }

     

       41
       41
        
       

     

       42
       42
        
       function do_build {

     

       43
       43
        
       

     

       44
       44
        
           if [ $# -lt 2 ]; then

     

       45
       45
       -
       	printf "usage: $0 iPhoneOS.sdk.tar* <target cpu>\n" 1>&2

     

       46
       46
       -
       	printf "i.e. $0 /path/to/iPhoneOS.sdk.tar.xz armv7\n" 1>&2

     

       47
       47
       -
       	exit 1

     

       45
       45
       +
           printf "usage: $0 iPhoneOS.sdk.tar* <target cpu>\n" 1>&2

     

       46
       46
       +
           printf "i.e. $0 /path/to/iPhoneOS.sdk.tar.xz armv7\n" 1>&2

     

       47
       47
       +
           exit 1

     

       48
       48
        
           fi

     

       49
       49
        
       

     

       50
       50
        
           mkdir -p $out

     
···

       54
       54
        
           pushd "$cctools_port"/usage_examples/ios_toolchain &> /dev/null

     

       55
       55
        
       

     

       56
       56
        
           export LC_ALL=C

     

       57
       57
       -
           

     

       57
       57
       +
       

     

       58
       58
        
           local

     

       59
       59
        
           triple='%s-apple-darwin11'

     

       60
       60
        
           target_dir="$PWD/target"

     
···

       75
       75
        
           extract "$1"

     

       76
       76
        
       

     

       77
       77
        
           local sys_lib=$(

     

       78
       78
       -
           	find $sdk_dir -name libSystem.dylib -o -name libSystem.tbd | head -n1

     

       79
       79
       -
           	  )

     

       78
       78
       +
               find $sdk_dir -name libSystem.dylib -o -name libSystem.tbd | head -n1

     

       79
       79
       +
                 )

     

       80
       80
        
       

     

       81
       81
        
           if [ -z "$sys_lib" ]; then

     

       82
       82
       -
           	printf "SDK should contain libSystem{.dylib,.tbd}\n" 1>&2

     

       83
       83
       -
           	exit 1

     

       82
       82
       +
               printf "SDK should contain libSystem{.dylib,.tbd}\n" 1>&2

     

       83
       83
       +
               exit 1

     

       84
       84
        
           fi

     

       85
       85
        
       

     

       86
       86
        
           local sys_root=$(readlink -f "$(dirname $sys_lib)/../..")

     
···

       96
       96
        
           printf "int main(){return 0;}" | clang -xc -O2 -o "$target_dir"/bin/dsymutil -

     

       97
       97
        
       

     

       98
       98
        
           clang -O2 -std=c99 $alt_wrapper \

     

       99
       99
       -
           	  -DTARGET_CPU=$(printf '"%s"' "$2") \

     

       100
       100
       -
           	  -DNIX_APPLE_HDRS=$(

     

       101
       101
       -
           	printf '"%s"' "-I$out/$sdk/usr/include"

     

       102
       102
       -
           	  ) \

     

       103
       103
       -
           	  -DNIX_APPLE_FRAMEWORKS=$(

     

       104
       104
       -
           	printf '"%s"' "$out/$sdk/System/Library/Frameworks"

     

       105
       105
       -
           	  ) \

     

       106
       106
       -
           	  -DNIX_APPLE_PRIV_FRAMEWORKS=$(

     

       107
       107
       -
           	printf '"%s"' "$out/$sdk/System/Library/PrivateFrameworks"

     

       108
       108
       -
           	  ) \

     

       109
       109
       -
           	  -DOS_VER_MIN=$(printf '"%s"' "7.1") \

     

       110
       110
       -
           	  -o "$target_dir/bin/$triple-clang"

     

       99
       99
       +
                 -DTARGET_CPU=$(printf '"%s"' "$2") \

     

       100
       100
       +
                 -DNIX_APPLE_HDRS=$(

     

       101
       101
       +
               printf '"%s"' "-I$out/$sdk/usr/include"

     

       102
       102
       +
                 ) \

     

       103
       103
       +
                 -DNIX_APPLE_FRAMEWORKS=$(

     

       104
       104
       +
               printf '"%s"' "$out/$sdk/System/Library/Frameworks"

     

       105
       105
       +
                 ) \

     

       106
       106
       +
                 -DNIX_APPLE_PRIV_FRAMEWORKS=$(

     

       107
       107
       +
               printf '"%s"' "$out/$sdk/System/Library/PrivateFrameworks"

     

       108
       108
       +
                 ) \

     

       109
       109
       +
                 -DOS_VER_MIN=$(printf '"%s"' "7.1") \

     

       110
       110
       +
                 -o "$target_dir/bin/$triple-clang"

     

       111
       111
        
       

     

       112
       112
        
           pushd "$target_dir"/bin &>/dev/null

     

       113
       113
        
       

     
···

       141
       141
        
           local me=`whoami`

     

       142
       142
        
       

     

       143
       143
        
           for d in bin libexec SDK; do

     

       144
       144
       -
           	chown -R $me:$me target/$d

     

       145
       145
       -
           	cp -R target/$d $out

     

       144
       144
       +
               chown -R $me:$me target/$d

     

       145
       145
       +
               cp -R target/$d $out

     

       146
       146
        
           done

     

       147
       147
        
       

     

       148
       148
        
           # Crucial piece

+11 -11

pkgs/development/libraries/gdk-pixbuf/setup-hook.sh

···

       1
       1
        
       findGdkPixbufLoaders() {

     

       2
       2
        
       

     

       3
       3
       -
       	# choose the longest loaders.cache

     

       4
       4
       -
       	local loadersCache="$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"

     

       5
       5
       -
       	if [[ -f "$loadersCache" ]]; then

     

       6
       6
       -
       		if [[ -f "${GDK_PIXBUF_MODULE_FILE-}" ]]; then

     

       7
       7
       -
       			if (( "$(cat "$loadersCache" | wc -l)" > "$(cat "$GDK_PIXBUF_MODULE_FILE" | wc -l)" )); then

     

       8
       8
       -
       				export GDK_PIXBUF_MODULE_FILE="$loadersCache"

     

       9
       9
       -
       			fi

     

       10
       10
       -
       		else

     

       11
       11
       -
       			export GDK_PIXBUF_MODULE_FILE="$loadersCache"

     

       12
       12
       -
       		fi

     

       13
       13
       -
       	fi

     

       3
       3
       +
           # choose the longest loaders.cache

     

       4
       4
       +
           local loadersCache="$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"

     

       5
       5
       +
           if [[ -f "$loadersCache" ]]; then

     

       6
       6
       +
               if [[ -f "${GDK_PIXBUF_MODULE_FILE-}" ]]; then

     

       7
       7
       +
                   if (( "$(cat "$loadersCache" | wc -l)" > "$(cat "$GDK_PIXBUF_MODULE_FILE" | wc -l)" )); then

     

       8
       8
       +
                       export GDK_PIXBUF_MODULE_FILE="$loadersCache"

     

       9
       9
       +
                   fi

     

       10
       10
       +
               else

     

       11
       11
       +
                   export GDK_PIXBUF_MODULE_FILE="$loadersCache"

     

       12
       12
       +
               fi

     

       13
       13
       +
           fi

     

       14
       14
        
       

     

       15
       15
        
       }

     

       16
       16

+3 -3

pkgs/development/libraries/physics/lhapdf/maintainer.sh

···

       7
       7
        
       BASE_URL="https://lhapdfsets.web.cern.ch/lhapdfsets/current/"

     

       8
       8
        
       

     

       9
       9
        
       for pdf_set in `curl -L $BASE_URL 2>/dev/null | "$SED" -e "s/.*<a href=\"\([^\"/]*.tar.gz\)\".*/\1/;tx;d;:x" | sort -u`; do

     

       10
       10
       -
       	echo -n "    \"${pdf_set%.tar.gz}\" = \""

     

       11
       11
       -
       	nix-prefetch-url "${BASE_URL}${pdf_set}" 2>/dev/null | tr -d '\n'

     

       12
       12
       -
       	echo "\";"

     

       10
       10
       +
           echo -n "    \"${pdf_set%.tar.gz}\" = \""

     

       11
       11
       +
           nix-prefetch-url "${BASE_URL}${pdf_set}" 2>/dev/null | tr -d '\n'

     

       12
       12
       +
           echo "\";"

     

       13
       13
        
       done

+5 -5

pkgs/development/libraries/slib/setup-hook.sh

···

       1
       1
        
       addSlibPath () {

     

       2
       2
        
           if test -f "$1/lib/slib/slibcat"

     

       3
       3
        
           then

     

       4
       4
       -
       	export SCHEME_LIBRARY_PATH="$1/lib/slib/"

     

       5
       5
       -
       	echo "SLIB found in \`$1'; setting \$SCHEME_LIBRARY_PATH to \`$SCHEME_LIBRARY_PATH'"

     

       4
       4
       +
               export SCHEME_LIBRARY_PATH="$1/lib/slib/"

     

       5
       5
       +
               echo "SLIB found in \`$1'; setting \$SCHEME_LIBRARY_PATH to \`$SCHEME_LIBRARY_PATH'"

     

       6
       6
        
       

     

       7
       7
       -
       	# This is needed so that `(load-from-path "slib/guile.init")' works.

     

       8
       8
       -
       	export GUILE_LOAD_PATH="$1/lib:$GUILE_LOAD_PATH"

     

       9
       9
       -
       	echo "SLIB: setting \$GUILE_LOAD_PATH to \`$GUILE_LOAD_PATH'"

     

       7
       7
       +
               # This is needed so that `(load-from-path "slib/guile.init")' works.

     

       8
       8
       +
               export GUILE_LOAD_PATH="$1/lib:$GUILE_LOAD_PATH"

     

       9
       9
       +
               echo "SLIB: setting \$GUILE_LOAD_PATH to \`$GUILE_LOAD_PATH'"

     

       10
       10
        
           fi

     

       11
       11
        
       }

     

       12
       12

+35 -35

pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh

···

       18
       18
        
       export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS

     

       19
       19
        
       

     

       20
       20
        
       test -n "$NIX_LISP_LD_LIBRARY_PATH" &&

     

       21
       21
       -
       	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$NIX_LISP_LD_LIBRARY_PATH"

     

       21
       21
       +
               export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$NIX_LISP_LD_LIBRARY_PATH"

     

       22
       22
        
       

     

       23
       23
        
       declare -a NIX_LISP_FINAL_PARAMETERS;

     

       24
       24
        
       

     

       25
       25
        
       case "$NIX_LISP" in

     

       26
       26
       -
       	sbcl)

     

       27
       27
       -
       		NIX_LISP_LOAD_FILE="--load"

     

       28
       28
       -
       		NIX_LISP_EXEC_CODE="--eval"

     

       26
       26
       +
               sbcl)

     

       27
       27
       +
                       NIX_LISP_LOAD_FILE="--load"

     

       28
       28
       +
                       NIX_LISP_EXEC_CODE="--eval"

     

       29
       29
        
                       NIX_LISP_QUIT="(quit)"

     

       30
       30
        
                       NIX_LISP_NODEBUG='--non-interactive'

     

       31
       31
       -
       		NIX_LISP_FINAL_PARAMETERS=

     

       31
       31
       +
                       NIX_LISP_FINAL_PARAMETERS=

     

       32
       32
        
                       NIX_LISP_FASL_TYPE="fasl"

     

       33
       33
       -
       		;;

     

       34
       34
       -
       	ecl)

     

       35
       35
       -
       		NIX_LISP_LOAD_FILE="-load"

     

       36
       36
       -
       		NIX_LISP_EXEC_CODE="-eval"

     

       33
       33
       +
                       ;;

     

       34
       34
       +
               ecl)

     

       35
       35
       +
                       NIX_LISP_LOAD_FILE="-load"

     

       36
       36
       +
                       NIX_LISP_EXEC_CODE="-eval"

     

       37
       37
        
                       NIX_LISP_QUIT="(quit)"

     

       38
       38
        
                       NIX_LISP_NODEBUG='--nodebug'

     

       39
       39
       -
       		NIX_LISP_FINAL_PARAMETERS=

     

       39
       39
       +
                       NIX_LISP_FINAL_PARAMETERS=

     

       40
       40
        
                       NIX_LISP_FASL_TYPE="fas"

     

       41
       41
       -
       		;;

     

       42
       42
       -
       	clisp)

     

       43
       43
       -
       		NIX_LISP_LOAD_FILE="-c -l"

     

       44
       44
       -
       		NIX_LISP_EXEC_CODE="-x"

     

       41
       41
       +
                       ;;

     

       42
       42
       +
               clisp)

     

       43
       43
       +
                       NIX_LISP_LOAD_FILE="-c -l"

     

       44
       44
       +
                       NIX_LISP_EXEC_CODE="-x"

     

       45
       45
        
                       NIX_LISP_QUIT="(quit)"

     

       46
       46
        
                       NIX_LISP_NODEBUG='-on-error exit'

     

       47
       47
       -
       		NIX_LISP_FINAL_PARAMETERS="-repl"

     

       47
       47
       +
                       NIX_LISP_FINAL_PARAMETERS="-repl"

     

       48
       48
        
                       NIX_LISP_FASL_TYPE="fas"

     

       49
       49
       -
       		;;

     

       50
       50
       -
       	lx86cl64)

     

       51
       51
       -
       		NIX_LISP_LOAD_FILE="-l"

     

       52
       52
       -
       		NIX_LISP_EXEC_CODE="-e"

     

       49
       49
       +
                       ;;

     

       50
       50
       +
               lx86cl64)

     

       51
       51
       +
                       NIX_LISP_LOAD_FILE="-l"

     

       52
       52
       +
                       NIX_LISP_EXEC_CODE="-e"

     

       53
       53
        
                       NIX_LISP_QUIT="(quit)"

     

       54
       54
        
                       NIX_LISP_NODEBUG='-b'

     

       55
       55
       -
       		NIX_LISP_FINAL_PARAMETERS=

     

       55
       55
       +
                       NIX_LISP_FINAL_PARAMETERS=

     

       56
       56
        
                       NIX_LISP_FASL_TYPE="lx64fsl"

     

       57
       57
       -
       		;;

     

       58
       58
       -
       	lx86cl)

     

       59
       59
       -
       		NIX_LISP_LOAD_FILE="-l"

     

       60
       60
       -
       		NIX_LISP_EXEC_CODE="-e"

     

       57
       57
       +
                       ;;

     

       58
       58
       +
               lx86cl)

     

       59
       59
       +
                       NIX_LISP_LOAD_FILE="-l"

     

       60
       60
       +
                       NIX_LISP_EXEC_CODE="-e"

     

       61
       61
        
                       NIX_LISP_QUIT="(quit)"

     

       62
       62
        
                       NIX_LISP_NODEBUG='-b'

     

       63
       63
       -
       		NIX_LISP_FINAL_PARAMETERS=

     

       63
       63
       +
                       NIX_LISP_FINAL_PARAMETERS=

     

       64
       64
        
                       NIX_LISP_FASL_TYPE="lx32fsl"

     

       65
       65
       -
       		;;

     

       66
       66
       -
       	abcl)

     

       67
       67
       -
       		NIX_LISP_LOAD_FILE="--load"

     

       68
       68
       -
       		NIX_LISP_EXEC_CODE="--eval"

     

       65
       65
       +
                       ;;

     

       66
       66
       +
               abcl)

     

       67
       67
       +
                       NIX_LISP_LOAD_FILE="--load"

     

       68
       68
       +
                       NIX_LISP_EXEC_CODE="--eval"

     

       69
       69
        
                       NIX_LISP_QUIT="(quit)"

     

       70
       70
        
                       NIX_LISP_NODEBUG=''

     

       71
       71
       -
       		NIX_LISP_FINAL_PARAMETERS=

     

       71
       71
       +
                       NIX_LISP_FINAL_PARAMETERS=

     

       72
       72
        
                       NIX_LISP_FASL_TYPE="abcl"

     

       73
       73
       -
       		;;

     

       73
       73
       +
                       ;;

     

       74
       74
        
       esac

     

       75
       75
        
       

     

       76
       76
        
       NIX_LISP_ASDF_REGISTRY_CODE="

     
···

       127
       127
        
       

     

       128
       128
        
       if [ -z "$NIX_LISP_SKIP_CODE" ]; then

     

       129
       129
        
           "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \

     

       130
       130
       -
       	                $NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.$NIX_LISP_FASL_TYPE\")"}" \

     

       131
       131
       -
       	                $NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \

     

       132
       132
       -
       	                ${NIX_LISP_FINAL_PARAMETERS[*]:+"${NIX_LISP_FINAL_PARAMETERS[@]}"} \

     

       133
       133
       -
       	                "$@"

     

       130
       130
       +
                               $NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.$NIX_LISP_FASL_TYPE\")"}" \

     

       131
       131
       +
                               $NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \

     

       132
       132
       +
                               ${NIX_LISP_FINAL_PARAMETERS[*]:+"${NIX_LISP_FINAL_PARAMETERS[@]}"} \

     

       133
       133
       +
                               "$@"

     

       134
       134
        
       fi

+2 -2

pkgs/development/lisp-modules/from-quicklisp/asdf-description.sh

···

       11
       11
        
       name="$1"

     

       12
       12
        
       

     

       13
       13
        
       sbcl --noinform --load "$NIX_QUICKLISP_DIR"/setup.lisp --eval "(ql:quickload :$name)" \

     

       14
       14
       -
       	--eval "(format t \"~a~%\" (or (asdf::system-description (asdf::find-system \"$name\")) \"\"))" \

     

       15
       15
       -
       	--eval '(quit)' --script |

     

       14
       14
       +
           --eval "(format t \"~a~%\" (or (asdf::system-description (asdf::find-system \"$name\")) \"\"))" \

     

       15
       15
       +
           --eval '(quit)' --script |

     

       16
       16
        
           tee /dev/stderr | tail -n 1

+3 -3

pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh

···

       122
       122
        
         with (import <nixpkgs> {});

     

       123
       123
        
             fetchdarcs {

     

       124
       124
        
               url=''$url'';

     

       125
       125
       -
       	rev=''$version'';

     

       126
       126
       -
       	sha256=''0000000000000000000000000000000000000000000000000000000000000000'';

     

       125
       125
       +
           rev=''$version'';

     

       126
       126
       +
           sha256=''0000000000000000000000000000000000000000000000000000000000000000'';

     

       127
       127
        
           }" | nix-instantiate - | tail -n 1 |

     

       128
       128
        
           xargs nix-store -r 2>&1 | tee /dev/stderr | grep 'instead has' | tail -n 1 |

     

       129
       129
        
           sed -e 's/.* instead has .//;s/[^0-9a-z].*//')

     
···

       149
       149
        
       }

     

       150
       150
        
       

     

       151
       151
        
       if [ "$ql_src" = '{"error":"Not Found"}' ]; then

     

       152
       152
       -
       	echo "# $name: not found"

     

       152
       152
       +
           echo "# $name: not found"

     

       153
       153
        
       else

     

       154
       154
        
       cat << EOF | grep -Ev '^[ ]+$'

     

       155
       155

+6 -6

pkgs/development/perl-modules/expression-generator/filtered-requirements.sh

···

       3
       3
        
       source lib-cache.sh;

     

       4
       4
        
       

     

       5
       5
        
       print_reqs() {

     

       6
       6
       -
       	module_name="$1";

     

       6
       6
       +
           module_name="$1";

     

       7
       7
        
       

     

       8
       8
       -
       	./requirements.sh "$1"| while read; do

     

       9
       9
       -
       		if let "$(./source-download-link.sh "${REPLY}" | wc -c)" && [ perl != "$REPLY" ]; then

     

       10
       10
       -
       			echo "$REPLY";

     

       11
       11
       -
       		fi;

     

       12
       12
       -
       	done;

     

       8
       8
       +
           ./requirements.sh "$1"| while read; do

     

       9
       9
       +
               if let "$(./source-download-link.sh "${REPLY}" | wc -c)" && [ perl != "$REPLY" ]; then

     

       10
       10
       +
                   echo "$REPLY";

     

       11
       11
       +
               fi;

     

       12
       12
       +
           done;

     

       13
       13
        
       }

     

       14
       14
        
       

     

       15
       15
        
       module_name="$1";

+9 -9

pkgs/development/perl-modules/expression-generator/full-requirements.sh

···

       3
       3
        
       source lib-cache.sh;

     

       4
       4
        
       

     

       5
       5
        
       print_requirements () {

     

       6
       6
       -
       	module_name="$1";

     

       6
       6
       +
           module_name="$1";

     

       7
       7
        
       

     

       8
       8
       -
       	./requirements.sh "$module_name" | while read; do

     

       9
       9
       -
       		echo "$REPLY";

     

       10
       10
       -
       		print_reqs_cache "$REPLY";

     

       11
       11
       -
       	done | sort | uniq

     

       8
       8
       +
           ./requirements.sh "$module_name" | while read; do

     

       9
       9
       +
               echo "$REPLY";

     

       10
       10
       +
               print_reqs_cache "$REPLY";

     

       11
       11
       +
           done | sort | uniq

     

       12
       12
        
       };

     

       13
       13
        
       

     

       14
       14
        
       print_reqs_cache () {

     

       15
       15
       -
       	module_name="$1";

     

       16
       16
       -
       	module_basename="${module_name//::/-}";

     

       17
       17
       -
       	

     

       18
       18
       -
       	cached_output print_requirements "$module_basename" "$module_name" "full.deps";

     

       15
       15
       +
           module_name="$1";

     

       16
       16
       +
           module_basename="${module_name//::/-}";

     

       17
       17
       +
       

     

       18
       18
       +
           cached_output print_requirements "$module_basename" "$module_name" "full.deps";

     

       19
       19
        
       };

     

       20
       20
        
       

     

       21
       21
        
       print_reqs_cache "$@";

+6 -7

pkgs/development/perl-modules/expression-generator/grab-url.sh

···

       3
       3
        
       source lib-cache.sh

     

       4
       4
        
       

     

       5
       5
        
       get_file() {

     

       6
       6
       -
       	url="$1";

     

       6
       6
       +
           url="$1";

     

       7
       7
        
       

     

       8
       8
       -
       	if [ -n "$url" ]; then 

     

       9
       9
       -
       		curl "$1";

     

       10
       10
       -
       	else

     

       11
       11
       -
       		echo -n;

     

       12
       12
       -
       	fi;

     

       8
       8
       +
           if [ -n "$url" ]; then

     

       9
       9
       +
               curl "$1";

     

       10
       10
       +
           else

     

       11
       11
       +
               echo -n;

     

       12
       12
       +
           fi;

     

       13
       13
        
       }

     

       14
       14
        
       

     

       15
       15
        
       url="$1";

     
···

       17
       17
        
       name=${name:-$(basename "$url")}

     

       18
       18
        
       

     

       19
       19
        
       cached_output get_file "${name%%.*}" "$url" "${name#*.}"

     

       20
       20
       -

+10 -11

pkgs/development/perl-modules/expression-generator/lib-cache.sh

···

       4
       4
        
       # Third argument: argument to command

     

       5
       5
        
       # Fourth argument: cache type

     

       6
       6
        
       cached_output () {

     

       7
       7
       -
       	cmd="$1";

     

       8
       8
       -
       	basename="$2";

     

       9
       9
       -
       	arg="$3";

     

       10
       10
       -
       	ext="$4";

     

       11
       11
       -
       	

     

       12
       12
       -
       	if ! [ -e "cache-${ext//./-}/${basename}.${ext}" ]; then

     

       13
       13
       -
       		mkdir -p "cache-${ext//./-}";

     

       14
       14
       -
       		$cmd $arg > "cache-${ext//./-}/${basename}.${ext}";

     

       15
       15
       -
       	fi;

     

       7
       7
       +
           cmd="$1";

     

       8
       8
       +
           basename="$2";

     

       9
       9
       +
           arg="$3";

     

       10
       10
       +
           ext="$4";

     

       11
       11
       +
       

     

       12
       12
       +
           if ! [ -e "cache-${ext//./-}/${basename}.${ext}" ]; then

     

       13
       13
       +
               mkdir -p "cache-${ext//./-}";

     

       14
       14
       +
               $cmd $arg > "cache-${ext//./-}/${basename}.${ext}";

     

       15
       15
       +
           fi;

     

       16
       16
        
       

     

       17
       17
       -
       	cat "cache-${ext//./-}/${basename}.${ext}";

     

       17
       17
       +
           cat "cache-${ext//./-}/${basename}.${ext}";

     

       18
       18
        
       }

     

       19
       19
       -

+6 -6

pkgs/development/perl-modules/expression-generator/requirements.sh

···

       6
       6
        
       module_basename="${1//::/-}";

     

       7
       7
        
       

     

       8
       8
        
       print_requirements () {

     

       9
       9
       -
       	module_name="$1";

     

       10
       10
       -
       	

     

       11
       11
       -
       	./retrieve-meta-yaml.sh "$module_name" |

     

       12
       12
       -
       		sed -re '1,/^requires:/d; /^[a-z]/,$d; s@^\s*@@; s@:\s.*@@';

     

       13
       13
       -
       	./retrieve-meta-yaml.sh "$module_name" |

     

       14
       14
       -
       		sed -re '1,/^build_requires:/d; /^[a-z]/,$d; s@^\s*@@; s@:\s.*@@';

     

       9
       9
       +
           module_name="$1";

     

       10
       10
       +
       

     

       11
       11
       +
           ./retrieve-meta-yaml.sh "$module_name" |

     

       12
       12
       +
               sed -re '1,/^requires:/d; /^[a-z]/,$d; s@^\s*@@; s@:\s.*@@';

     

       13
       13
       +
           ./retrieve-meta-yaml.sh "$module_name" |

     

       14
       14
       +
               sed -re '1,/^build_requires:/d; /^[a-z]/,$d; s@^\s*@@; s@:\s.*@@';

     

       15
       15
        
       };

     

       16
       16
        
       

     

       17
       17
        
       cached_output print_requirements "$module_basename" "$module_name" "direct.deps";

+4 -4

pkgs/development/perl-modules/expression-generator/retrieve-file-link.sh

···

       6
       6
        
       version_regexp="${module_basename}(-[0-9.a-z]+){0,1}";

     

       7
       7
        
       author_regexp="[A-Z0-9]+";

     

       8
       8
        
       

     

       9
       9
       -
       ./retrieve-modulepage.sh "$module_basename" | 

     

       10
       10
       -
       	egrep "[<]a href=\"[a-z0-9/]*/(${author_regexp}/){0,1}${version_regexp}/${file_name}" |

     

       11
       11
       -
       	sed -re "s@.*href=\"@@; s@\".*@@" |

     

       12
       12
       -
       	sed -re 's@^/@http://search.cpan.org/@';

     

       9
       9
       +
       ./retrieve-modulepage.sh "$module_basename" |

     

       10
       10
       +
           egrep "[<]a href=\"[a-z0-9/]*/(${author_regexp}/){0,1}${version_regexp}/${file_name}" |

     

       11
       11
       +
           sed -re "s@.*href=\"@@; s@\".*@@" |

     

       12
       12
       +
           sed -re 's@^/@http://search.cpan.org/@';

     

       13
       13
        
       

     

       14
       14
        
       echo "$link_line";

+4 -4

pkgs/development/perl-modules/expression-generator/retrieve-meta-yaml.sh

···

       3
       3
        
       source lib-cache.sh;

     

       4
       4
        
       

     

       5
       5
        
       print_meta_yaml () {

     

       6
       6
       -
       	module_name="$1";

     

       7
       7
       -
       	module_basename="${module_name//::/-}";

     

       6
       6
       +
           module_name="$1";

     

       7
       7
       +
           module_basename="${module_name//::/-}";

     

       8
       8
        
       

     

       9
       9
       -
       	./grab-url.sh "$(./retrieve-file-link.sh "$module_basename" "META.yml")" \

     

       10
       10
       -
       		"${module_basename}.meta.yml";

     

       9
       9
       +
           ./grab-url.sh "$(./retrieve-file-link.sh "$module_basename" "META.yml")" \

     

       10
       10
       +
               "${module_basename}.meta.yml";

     

       11
       11
        
       };

     

       12
       12
        
       

     

       13
       13
        
       module_name="$1";

+5 -5

pkgs/development/perl-modules/expression-generator/source-download-link.sh

···

       6
       6
        
       module_basename="${module_name//::/-}";

     

       7
       7
        
       

     

       8
       8
        
       write_link() {

     

       9
       9
       -
       	module_basename="$1";

     

       9
       9
       +
           module_basename="$1";

     

       10
       10
        
       

     

       11
       11
       -
       	./retrieve-modulepage.sh "$module_basename" | 

     

       12
       12
       -
       		grep -A 2 "This Release" |

     

       13
       13
       -
       		grep href |

     

       14
       14
       -
       		sed -re 's/.*href="//; s/".*//; s@^/@http://search.cpan.org/@';

     

       11
       11
       +
           ./retrieve-modulepage.sh "$module_basename" |

     

       12
       12
       +
               grep -A 2 "This Release" |

     

       13
       13
       +
               grep href |

     

       14
       14
       +
               sed -re 's/.*href="//; s/".*//; s@^/@http://search.cpan.org/@';

     

       15
       15
        
       }

     

       16
       16
        
       

     

       17
       17
        
       cached_output write_link "$module_basename" "$module_basename" src.link;

+9 -9

pkgs/development/perl-modules/expression-generator/write-nix-expression.sh

···

       5
       5
        
       source lib-cache.sh;

     

       6
       6
        
       

     

       7
       7
        
       print_expression () {

     

       8
       8
       -
       	module_name="$1";

     

       9
       9
       -
       	module_basename="${module_name//::/-}";

     

       10
       10
       -
       	module_compressedname="perl${module_name//::/}";

     

       11
       11
       -
       	sourcelink="$(./source-download-link.sh "${module_name}")";

     

       12
       12
       -
       	version_name="${sourcelink%.tar.*}";

     

       13
       13
       -
       	version_name="${version_name##*/}";

     

       14
       14
       -
       	dependencies="$(./filtered-requirements.sh "$module_name" | sed -e 's/^/perl/; s/:://g' | xargs)";

     

       15
       15
       -
       	source_hash=$(nix-prefetch-url "$sourcelink" 2>/dev/null);

     

       8
       8
       +
           module_name="$1";

     

       9
       9
       +
           module_basename="${module_name//::/-}";

     

       10
       10
       +
           module_compressedname="perl${module_name//::/}";

     

       11
       11
       +
           sourcelink="$(./source-download-link.sh "${module_name}")";

     

       12
       12
       +
           version_name="${sourcelink%.tar.*}";

     

       13
       13
       +
           version_name="${version_name##*/}";

     

       14
       14
       +
           dependencies="$(./filtered-requirements.sh "$module_name" | sed -e 's/^/perl/; s/:://g' | xargs)";

     

       15
       15
       +
           source_hash=$(nix-prefetch-url "$sourcelink" 2>/dev/null);

     

       16
       16
        
       

     

       17
       17
       -
       	cat <<EOF

     

       17
       17
       +
           cat <<EOF

     

       18
       18
        
       

     

       19
       19
        
         ${module_compressedname} = import ../development/perl-modules/generic perl {

     

       20
       20
        
           name = "${version_name}";

+22 -22

pkgs/development/tools/build-managers/tup/setup-hook.sh

···

       1
       1
        
       #!/bin/sh

     

       2
       2
        
       

     

       3
       3
        
       tupConfigurePhase() {

     

       4
       4
       -
       	runHook preConfigure

     

       4
       4
       +
           runHook preConfigure

     

       5
       5
        
       

     

       6
       6
       -
       	echo -n CONFIG_TUP_ARCH= >> tup.config

     

       7
       7
       -
       	case "$system" in

     

       8
       8
       -
       	"i686-*")      echo i386 >> tup.config;;

     

       9
       9
       -
       	"x86_64-*")    echo x86_64 >> tup.config;;

     

       10
       10
       -
       	"powerpc-*")   echo powerpc >> tup.config;;

     

       11
       11
       -
       	"powerpc64-*") echo powerpc64 >> tup.config;;

     

       12
       12
       -
       	"ia64-*")      echo ia64 >> tup.config;;

     

       13
       13
       -
       	"alpha-*")     echo alpha >> tup.config;;

     

       14
       14
       -
       	"sparc-*")     echo sparc >> tup.config;;

     

       15
       15
       -
       	"aarch64-*")   echo arm64 >> tup.config;;

     

       16
       16
       -
       	"arm*")        echo arm >> tup.config;;

     

       17
       17
       -
       	esac

     

       6
       6
       +
           echo -n CONFIG_TUP_ARCH= >> tup.config

     

       7
       7
       +
           case "$system" in

     

       8
       8
       +
           "i686-*")      echo i386 >> tup.config;;

     

       9
       9
       +
           "x86_64-*")    echo x86_64 >> tup.config;;

     

       10
       10
       +
           "powerpc-*")   echo powerpc >> tup.config;;

     

       11
       11
       +
           "powerpc64-*") echo powerpc64 >> tup.config;;

     

       12
       12
       +
           "ia64-*")      echo ia64 >> tup.config;;

     

       13
       13
       +
           "alpha-*")     echo alpha >> tup.config;;

     

       14
       14
       +
           "sparc-*")     echo sparc >> tup.config;;

     

       15
       15
       +
           "aarch64-*")   echo arm64 >> tup.config;;

     

       16
       16
       +
           "arm*")        echo arm >> tup.config;;

     

       17
       17
       +
           esac

     

       18
       18
        
       

     

       19
       19
       -
       	echo "${tupConfig-}" >> tup.config

     

       19
       19
       +
           echo "${tupConfig-}" >> tup.config

     

       20
       20
        
       

     

       21
       21
       -
       	tup init

     

       22
       22
       -
       	tup generate tupBuild.sh

     

       21
       21
       +
           tup init

     

       22
       22
       +
           tup generate tupBuild.sh

     

       23
       23
        
       

     

       24
       24
       -
       	runHook postConfigure

     

       24
       24
       +
           runHook postConfigure

     

       25
       25
        
       }

     

       26
       26
        
       

     

       27
       27
        
       if [ -z "${dontUseTupConfigure-}" -a -z "${configurePhase-}" ]; then

     
···

       30
       30
        
       

     

       31
       31
        
       

     

       32
       32
        
       tupBuildPhase() {

     

       33
       33
       -
       	runHook preBuild

     

       33
       33
       +
           runHook preBuild

     

       34
       34
        
       

     

       35
       35
       -
       	pushd .

     

       36
       36
       -
       	. tupBuild.sh

     

       37
       37
       -
       	popd

     

       35
       35
       +
           pushd .

     

       36
       36
       +
           . tupBuild.sh

     

       37
       37
       +
           popd

     

       38
       38
        
       

     

       39
       39
       -
       	runHook postBuild

     

       39
       39
       +
           runHook postBuild

     

       40
       40
        
       }

     

       41
       41
        
       

     

       42
       42
        
       if [ -z "${dontUseTupBuild-}" -a -z "${buildPhase-}" ]; then

+17 -17

pkgs/games/dwarf-fortress/update.sh

···

       3
       3
        
       

     

       4
       4
        
       # systems to generate hashes for

     

       5
       5
        
       systems='linux linux32 osx osx32

     

       6
       6
       -
       	 win win_s win32 win32_s

     

       6
       6
       +
            win win_s win32 win32_s

     

       7
       7
        
                legacy legacy_s legacy32 legacy32_s'

     

       8
       8
        
       

     

       9
       9
        
       if [ $# -eq 0 ]; then

     

       10
       10
        
           versions="$(curl http://www.bay12games.com/dwarves/ \

     

       11
       11
       -
       		   | grep 'DWARF FORTRESS CLASSIC ' \

     

       12
       12
       -
       		   | sed 's/.*DWARF FORTRESS CLASSIC \([0-9.]*\) .*/\1/')"

     

       11
       11
       +
                  | grep 'DWARF FORTRESS CLASSIC ' \

     

       12
       12
       +
                  | sed 's/.*DWARF FORTRESS CLASSIC \([0-9.]*\) .*/\1/')"

     

       13
       13
        
       else

     

       14
       14
        
           versions="$@"

     

       15
       15
        
       fi

     
···

       18
       18
        
       tmp2="$(mktemp)"

     

       19
       19
        
       for version in $versions; do

     

       20
       20
        
           for system in $systems; do

     

       21
       21
       -
       	echo -n $version,$system,

     

       22
       22
       -
       	ver=$(echo $version | sed -e s,^0\.,, | tr . _)

     

       23
       23
       -
       	if [[ "$system" = *win* ]] || [[ "$system" = *legacy* ]]; then

     

       24
       24
       -
       	    ext=zip

     

       25
       25
       -
       	else

     

       26
       26
       -
       	    ext=tar.bz2

     

       27
       27
       -
       	fi

     

       28
       28
       -
       	nix-prefetch-url \

     

       29
       29
       -
       	    http://www.bay12games.com/dwarves/df_${ver}_${system}.${ext}

     

       21
       21
       +
           echo -n $version,$system,

     

       22
       22
       +
           ver=$(echo $version | sed -e s,^0\.,, | tr . _)

     

       23
       23
       +
           if [[ "$system" = *win* ]] || [[ "$system" = *legacy* ]]; then

     

       24
       24
       +
               ext=zip

     

       25
       25
       +
           else

     

       26
       26
       +
               ext=tar.bz2

     

       27
       27
       +
           fi

     

       28
       28
       +
           nix-prefetch-url \

     

       29
       29
       +
               http://www.bay12games.com/dwarves/df_${ver}_${system}.${ext}

     

       30
       30
        
           done

     

       31
       31
        
       done | jq --slurp --raw-input \

     

       32
       32
       -
       	  'split("\n")  | .[:-1] | map(split(",")) |

     

       32
       32
       +
             'split("\n")  | .[:-1] | map(split(",")) |

     

       33
       33
        
                  map({ "version": .[0], "platform": .[1], "sha256": .[2] }) |

     

       34
       34
       -
       	   group_by(.version) |

     

       35
       35
       -
       	   map(map({"version": .version, (.platform): .sha256}) | add |

     

       36
       36
       -
       	       {(.version): .} | map_values(del(.version))) | add' \

     

       37
       37
       -
       	  > "$tmp1"

     

       34
       34
       +
              group_by(.version) |

     

       35
       35
       +
              map(map({"version": .version, (.platform): .sha256}) | add |

     

       36
       36
       +
                  {(.version): .} | map_values(del(.version))) | add' \

     

       37
       37
       +
             > "$tmp1"

     

       38
       38
        
       

     

       39
       39
        
       # Append $tmp1 to game.json. There should be a better way to handle

     

       40
       40
        
       # this but all other attempts failed for me.

+35 -35

pkgs/os-specific/linux/service-wrapper/service-wrapper.sh

···

       33
       33
        
       

     

       34
       34
        
       

     

       35
       35
        
       is_ignored_file() {

     

       36
       36
       -
       	case "$1" in

     

       37
       37
       -
       		skeleton | README | *.dpkg-dist | *.dpkg-old | rc | rcS | single | reboot | bootclean.sh)

     

       38
       38
       -
       			return 0

     

       39
       39
       -
       		;;

     

       40
       40
       -
       	esac

     

       41
       41
       -
       	return 1

     

       36
       36
       +
           case "$1" in

     

       37
       37
       +
               skeleton | README | *.dpkg-dist | *.dpkg-old | rc | rcS | single | reboot | bootclean.sh)

     

       38
       38
       +
                   return 0

     

       39
       39
       +
               ;;

     

       40
       40
       +
           esac

     

       41
       41
       +
           return 1

     

       42
       42
        
       }

     

       43
       43
        
       

     

       44
       44
        
       VERSION=$(@coreutils@/bin/basename $0)" ver. 19-04"

     
···

       75
       75
        
              if [ -z "${SERVICE}" -a $# -eq 1 -a "${1}" = "--status-all" ]; then

     

       76
       76
        
                 if [ -d "${SERVICEDIR}" ]; then

     

       77
       77
        
                    cd ${SERVICEDIR}

     

       78
       78
       -
       	     for SERVICE in * ; do

     

       79
       79
       -
       	       case "${SERVICE}" in

     

       80
       80
       -
       	         functions | halt | killall | single| linuxconf| kudzu)

     

       81
       81
       -
       	             ;;

     

       82
       82
       -
       	         *)

     

       83
       83
       -
       	           if ! is_ignored_file "${SERVICE}" \

     

       84
       84
       -
       	   	    && [ -x "${SERVICEDIR}/${SERVICE}" ]; then

     

       85
       85
       -
       	                   out=$(env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status 2>&1)

     

       86
       86
       -
       	                   retval=$?

     

       87
       87
       -
       	                   if echo "$out" | egrep -iq "usage:"; then

     

       88
       88
       -
       	                     #printf " %s %-60s %s\n" "[?]" "$SERVICE:" "unknown" 1>&2

     

       89
       89
       -
       	                     echo " [ ? ]  $SERVICE" 1>&2

     

       90
       90
       -
       	                     continue

     

       91
       91
       -
       	                   else

     

       92
       92
       -
       	                     if [ "$retval" = "0" -a -n "$out" ]; then

     

       93
       93
       -
       	                       #printf " %s %-60s %s\n" "[+]" "$SERVICE:" "running"

     

       94
       94
       -
       	                       echo " [ + ]  $SERVICE"

     

       95
       95
       -
       	                       continue

     

       96
       96
       -
       	                     else

     

       97
       97
       -
       	                       #printf " %s %-60s %s\n" "[-]" "$SERVICE:" "NOT running"

     

       98
       98
       -
       	                       echo " [ - ]  $SERVICE"

     

       99
       99
       -
       	                       continue

     

       100
       100
       -
       	                     fi

     

       101
       101
       -
       	                   fi

     

       102
       102
       -
       	             #env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status

     

       103
       103
       -
       	           fi

     

       104
       104
       -
       	           ;;

     

       105
       105
       -
       	       esac

     

       106
       106
       -
       	     done

     

       78
       78
       +
                for SERVICE in * ; do

     

       79
       79
       +
                  case "${SERVICE}" in

     

       80
       80
       +
                    functions | halt | killall | single| linuxconf| kudzu)

     

       81
       81
       +
                        ;;

     

       82
       82
       +
                    *)

     

       83
       83
       +
                      if ! is_ignored_file "${SERVICE}" \

     

       84
       84
       +
                      && [ -x "${SERVICEDIR}/${SERVICE}" ]; then

     

       85
       85
       +
                              out=$(env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status 2>&1)

     

       86
       86
       +
                              retval=$?

     

       87
       87
       +
                              if echo "$out" | egrep -iq "usage:"; then

     

       88
       88
       +
                                #printf " %s %-60s %s\n" "[?]" "$SERVICE:" "unknown" 1>&2

     

       89
       89
       +
                                echo " [ ? ]  $SERVICE" 1>&2

     

       90
       90
       +
                                continue

     

       91
       91
       +
                              else

     

       92
       92
       +
                                if [ "$retval" = "0" -a -n "$out" ]; then

     

       93
       93
       +
                                  #printf " %s %-60s %s\n" "[+]" "$SERVICE:" "running"

     

       94
       94
       +
                                  echo " [ + ]  $SERVICE"

     

       95
       95
       +
                                  continue

     

       96
       96
       +
                                else

     

       97
       97
       +
                                  #printf " %s %-60s %s\n" "[-]" "$SERVICE:" "NOT running"

     

       98
       98
       +
                                  echo " [ - ]  $SERVICE"

     

       99
       99
       +
                                  continue

     

       100
       100
       +
                                fi

     

       101
       101
       +
                              fi

     

       102
       102
       +
                        #env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status

     

       103
       103
       +
                      fi

     

       104
       104
       +
                      ;;

     

       105
       105
       +
                  esac

     

       106
       106
       +
                done

     

       107
       107
        
                 else

     

       108
       108
        
                    systemctl $sctl_args list-units

     

       109
       109
        
                 fi

+13 -13

pkgs/tools/graphics/zxing/zxing.sh

···

       2
       2
        
       choice="$1";

     

       3
       3
        
       shift

     

       4
       4
        
       case "$choice" in

     

       5
       5
       -
       	encode | create | write | CommandLineEncoder)

     

       6
       6
       -
       		zxing-cmdline-encoder "$@";

     

       7
       7
       -
       		;;

     

       8
       8
       -
       	decode | read | run | CommandLineRunner)

     

       9
       9
       -
       		zxing-cmdline-runner "$@";

     

       10
       10
       -
       		;;

     

       11
       11
       -
       	help | usage | --help | --usage | -h)

     

       12
       12
       -
       		zxing read;

     

       13
       13
       -
       		zxing write;

     

       14
       14
       -
       		;;

     

       15
       15
       -
       	*)

     

       16
       16
       -
       		zxing read "$choice" "$@"

     

       17
       17
       -
       		;;

     

       5
       5
       +
           encode | create | write | CommandLineEncoder)

     

       6
       6
       +
               zxing-cmdline-encoder "$@";

     

       7
       7
       +
               ;;

     

       8
       8
       +
           decode | read | run | CommandLineRunner)

     

       9
       9
       +
               zxing-cmdline-runner "$@";

     

       10
       10
       +
               ;;

     

       11
       11
       +
           help | usage | --help | --usage | -h)

     

       12
       12
       +
               zxing read;

     

       13
       13
       +
               zxing write;

     

       14
       14
       +
               ;;

     

       15
       15
       +
           *)

     

       16
       16
       +
               zxing read "$choice" "$@"

     

       17
       17
       +
               ;;

     

       18
       18
        
       esac

+34 -34

pkgs/tools/misc/grub/grub1.patches.sh

···

       13
       13
        
       

     

       14
       14
        
       # https://salsa.debian.org/grub-team/grub-legacy/tree/master/debian/patches

     

       15
       15
        
       SERIES=(

     

       16
       16
       -
       	snapshot.patch

     

       17
       17
       -
       	menu.lst_gnu-hurd.patch

     

       18
       18
       -
       	graphics.patch

     

       19
       19
       -
       	raid.patch

     

       20
       20
       -
       	raid_cciss.patch

     

       21
       21
       -
       	xfs_freeze.patch

     

       22
       22
       -
       	2gb_limit.patch

     

       23
       23
       -
       	grub-special_device_names.patch

     

       24
       24
       -
       	grub-xvd_drives.patch

     

       25
       25
       -
       	initrd_max_address.patch

     

       26
       26
       -
       	splashimage_help.patch

     

       27
       27
       -
       	grub-install_addsyncs.patch

     

       28
       28
       -
       	grub-install_regexp.patch

     

       29
       29
       -
       	grub-install_aoe_support.patch

     

       30
       30
       -
       	grub-install_xvd.patch

     

       31
       31
       -
       	geometry-26kernel.patch

     

       32
       32
       -
       	print_func.patch

     

       33
       33
       -
       	mprotect.patch

     

       34
       34
       -
       	savedefault.patch

     

       35
       35
       -
       	find-grub-dir.patch

     

       36
       36
       -
       	intelmac.patch

     

       37
       37
       -
       	crossreference_manpages.patch

     

       38
       38
       -
       	ext3_256byte_inode.patch

     

       16
       16
       +
           snapshot.patch

     

       17
       17
       +
           menu.lst_gnu-hurd.patch

     

       18
       18
       +
           graphics.patch

     

       19
       19
       +
           raid.patch

     

       20
       20
       +
           raid_cciss.patch

     

       21
       21
       +
           xfs_freeze.patch

     

       22
       22
       +
           2gb_limit.patch

     

       23
       23
       +
           grub-special_device_names.patch

     

       24
       24
       +
           grub-xvd_drives.patch

     

       25
       25
       +
           initrd_max_address.patch

     

       26
       26
       +
           splashimage_help.patch

     

       27
       27
       +
           grub-install_addsyncs.patch

     

       28
       28
       +
           grub-install_regexp.patch

     

       29
       29
       +
           grub-install_aoe_support.patch

     

       30
       30
       +
           grub-install_xvd.patch

     

       31
       31
       +
           geometry-26kernel.patch

     

       32
       32
       +
           print_func.patch

     

       33
       33
       +
           mprotect.patch

     

       34
       34
       +
           savedefault.patch

     

       35
       35
       +
           find-grub-dir.patch

     

       36
       36
       +
           intelmac.patch

     

       37
       37
       +
           crossreference_manpages.patch

     

       38
       38
       +
           ext3_256byte_inode.patch

     

       39
       39
        
           # Breaks on NixOS.

     

       40
       40
       -
       	#use_grub-probe_in_grub-install.patch

     

       41
       41
       -
       	objcopy-absolute.patch

     

       42
       42
       -
       	no-reorder-functions.patch

     

       40
       40
       +
           #use_grub-probe_in_grub-install.patch

     

       41
       41
       +
           objcopy-absolute.patch

     

       42
       42
       +
           no-reorder-functions.patch

     

       43
       43
        
       

     

       44
       44
       -
       	# We aren't building amd64 binaries, see #244498

     

       45
       45
       -
       	#fix_amd64_compile.patch

     

       46
       46
       -
       	modern-automake.patch

     

       47
       47
       -
       	no-combine-stack-adjustments.patch

     

       48
       48
       -
       	no-pie.patch

     

       44
       44
       +
           # We aren't building amd64 binaries, see #244498

     

       45
       45
       +
           #fix_amd64_compile.patch

     

       46
       46
       +
           modern-automake.patch

     

       47
       47
       +
           no-combine-stack-adjustments.patch

     

       48
       48
       +
           no-pie.patch

     

       49
       49
        
       )

     

       50
       50
        
       

     

       51
       51
        
       # Revision mapping to current tip of the 0.97-73 branch.

     
···

       63
       63
        
       EOF

     

       64
       64
        
       

     

       65
       65
        
       for PATCH in "${SERIES[@]}"; do

     

       66
       66
       -
       	URL="$prefix/$PATCH"

     

       67
       67
       -
       	HASH="$(nix-prefetch-url "$URL")"

     

       68
       68
       -
       	echo "{ url = \"\${prefix}/$PATCH\"; sha256 = \"$HASH\"; }" >> "$FILE"

     

       66
       66
       +
           URL="$prefix/$PATCH"

     

       67
       67
       +
           HASH="$(nix-prefetch-url "$URL")"

     

       68
       68
       +
           echo "{ url = \"\${prefix}/$PATCH\"; sha256 = \"$HASH\"; }" >> "$FILE"

     

       69
       69
        
       done

     

       70
       70
        
       echo "]" >> "$FILE"

+16 -16

pkgs/tools/typesetting/lout/builder.sh

···

       15
       15
        
           echo "building \`$doc' document..."

     

       16
       16
        
           if [ ! -f "doc/$doc/outfile.ps" ]

     

       17
       17
        
           then

     

       18
       18
       -
             ( PATH="$PWD:$PATH" ;				\

     

       19
       19
       -
               cd "doc/$doc" && lout -r4 -o outfile.ps all )	\

     

       18
       18
       +
             ( PATH="$PWD:$PATH" ; \

     

       19
       19
       +
               cd "doc/$doc" && lout -r4 -o outfile.ps all ) \

     

       20
       20
        
             || return 1

     

       21
       21
        
           fi

     

       22
       22
       -
           cp "doc/$doc/outfile.ps" "$out/doc/lout/$doc.ps" &&		\

     

       23
       23
       -
           ps2pdf -dPDFSETTINGS=/prepress -sPAPERSIZE=a4		\

     

       22
       22
       +
           cp "doc/$doc/outfile.ps" "$out/doc/lout/$doc.ps" && \

     

       23
       23
       +
           ps2pdf -dPDFSETTINGS=/prepress -sPAPERSIZE=a4 \

     

       24
       24
        
                  "doc/$doc/outfile.ps" "$out/doc/lout/$doc.pdf"

     

       25
       25
        
         done

     

       26
       26
        
       

     

       27
       27
        
         return 0

     

       28
       28
        
       }

     

       29
       29
        
       

     

       30
       30
       -
       unpackPhase &&									\

     

       31
       31
       -
       cd lout-*.* &&									\

     

       32
       32
       -
       cat makefile |									\

     

       33
       33
       -
         sed -e "s|^PREFIX[[:blank:]]*=.*\$|PREFIX = $out|g ;				\

     

       34
       34
       -
                 s|^LOUTLIBDIR[[:blank:]]*=.*$|LOUTLIBDIR = \$(PREFIX)/lib/lout|g ;	\

     

       35
       35
       -
       	  s|^LOUTDOCDIR[[:blank:]]*=.*$|LOUTDOCDIR = \$(PREFIX)/doc/lout|g ;	\

     

       36
       36
       -
       	  s|^MANDIR[[:blank:]]*=.*$|MANDIR = \$(PREFIX)/man|g"			\

     

       37
       37
       -
         > "$nixMakefile" &&								\

     

       38
       38
       -
       mkdir -p "$out/bin" && mkdir -p "$out/lib"					\

     

       39
       39
       -
       mkdir -p "$out/man" && mkdir -p "$out/doc/lout" &&				\

     

       40
       40
       -
       make -f "$nixMakefile" CC=cc install installman &&					\

     

       41
       41
       -
       installDoc &&									\

     

       30
       30
       +
       unpackPhase && \

     

       31
       31
       +
       cd lout-*.* && \

     

       32
       32
       +
       cat makefile | \

     

       33
       33
       +
         sed -e "s|^PREFIX[[:blank:]]*=.*\$|PREFIX = $out|g ; \

     

       34
       34
       +
           s|^LOUTLIBDIR[[:blank:]]*=.*$|LOUTLIBDIR = \$(PREFIX)/lib/lout|g ; \

     

       35
       35
       +
           s|^LOUTDOCDIR[[:blank:]]*=.*$|LOUTDOCDIR = \$(PREFIX)/doc/lout|g ; \

     

       36
       36
       +
           s|^MANDIR[[:blank:]]*=.*$|MANDIR = \$(PREFIX)/man|g" \

     

       37
       37
       +
         > "$nixMakefile" && \

     

       38
       38
       +
       mkdir -p "$out/bin" && mkdir -p "$out/lib" \

     

       39
       39
       +
       mkdir -p "$out/man" && mkdir -p "$out/doc/lout" && \

     

       40
       40
       +
       make -f "$nixMakefile" CC=cc install installman && \

     

       41
       41
       +
       installDoc && \

     

       42
       42
        
       fixupPhase