diff options
Diffstat (limited to 'pkgs')
22 files changed, 111 insertions, 89 deletions
diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix index ebf78be7a08..93453cad8ac 100644 --- a/pkgs/applications/misc/aminal/default.nix +++ b/pkgs/applications/misc/aminal/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { name = "aminal-${version}"; - version = "0.7.4"; + version = "0.7.6"; goPackagePath = "github.com/liamg/aminal"; @@ -36,7 +36,7 @@ buildGoPackage rec { owner = "liamg"; repo = "aminal"; rev = "v${version}"; - sha256 = "0wnzxjlv98pi3gy4hp3d19pwpa4kf1h5rqy03s9bcqdbpb1v1b7v"; + sha256 = "0fg8k4xzs5nxjggqpn25mia4z8dlpzfk0qzfk503cyx0kfmynxf7"; }; preBuild = '' diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index c81c7934985..2d9692c0528 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation { # update with: # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped passthru.updateScript = import ./update.nix { - inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl; + inherit stdenv name channel writeScript xidel coreutils gnused gnugrep gnupg curl; baseUrl = if channel == "devedition" then "http://archive.mozilla.org/pub/devedition/releases/" diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index df928f88c38..ee022e329f9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -1,4 +1,5 @@ -{ name +{ stdenv +, name , channel , writeScript , xidel @@ -17,6 +18,7 @@ let channel != "release"; in writeScript "update-${name}" '' + #!${stdenv.shell} PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin set -eux pushd ${basePath} diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index a831d823118..07ae2c040e6 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -1,4 +1,5 @@ { writeScript +, stdenv , lib , xidel , common-updater-scripts @@ -13,6 +14,7 @@ }: writeScript "update-${attrPath}" '' + #!${stdenv.shell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]} url=${baseUrl} diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 5b6271db83b..aa9317d2ffd 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation { dontStrip = true; dontPatchElf = true; - updateScript = import ./update.nix { inherit writeScript; }; + updateScript = import ./update.nix { inherit stdenv writeScript; }; meta = with stdenv.lib; { homepage = http://www.mendeley.com; diff --git a/pkgs/applications/office/mendeley/update.nix b/pkgs/applications/office/mendeley/update.nix index cb9ee02702d..147c95b8e7b 100644 --- a/pkgs/applications/office/mendeley/update.nix +++ b/pkgs/applications/office/mendeley/update.nix @@ -1,6 +1,7 @@ -{ writeScript }: +{ stdenv, writeScript }: writeScript "update-mendeley" '' + #!${stdenv.shell} function follow() { local URL=$1 while true; do diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index a2f0c8ae414..fb85bb7da46 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -1,40 +1,32 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, git }: +{ stdenv, fetchFromGitHub, makeWrapper, git, coreutils }: -let +stdenv.mkDerivation rec { + name = "git-secrets-${version}"; version = "1.2.1"; - repo = "git-secrets"; - -in stdenv.mkDerivation { - name = "${repo}-${version}"; src = fetchFromGitHub { - inherit repo; owner = "awslabs"; + repo = "git-secrets"; rev = "${version}"; sha256 = "14jsm4ks3k5d9iq3jr23829izw040pqpmv7dz8fhmvx6qz8fybzg"; }; - buildInputs = [ makeWrapper git]; + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; - # buildPhase = '' - # make man # TODO: need rst2man.py - # ''; - installPhase = '' - install -D git-secrets $out/bin/git-secrets + install -m755 -Dt $out/bin git-secrets + install -m444 -Dt $out/share/man/man1 git-secrets.1 wrapProgram $out/bin/git-secrets \ - --prefix PATH : "${lib.makeBinPath [ git ]}" - - # TODO: see above note on rst2man.py - # mkdir $out/share - # cp -r man $out/share + --prefix PATH : "${stdenv.lib.makeBinPath [ git coreutils ]}" ''; - meta = { - description = "Prevents you from committing passwords and other sensitive information to a git repository"; + meta = with stdenv.lib; { + description = "Prevents you from committing secrets and credentials into git repositories"; homepage = https://github.com/awslabs/git-secrets; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; + license = licenses.asl20; + platforms = platforms.all; }; } diff --git a/pkgs/desktops/deepin/update.nix b/pkgs/desktops/deepin/update.nix index 761ead015c6..22a6acb8ce3 100644 --- a/pkgs/desktops/deepin/update.nix +++ b/pkgs/desktops/deepin/update.nix @@ -1,4 +1,4 @@ -{ lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }: +{ stdenv, lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }: { name, ignored-versions ? "^2014\\.|^v[0-9]+" }: let @@ -9,6 +9,7 @@ let in writeScript "update-${packageName}" '' + #!${stdenv.shell} set -o errexit set -x diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix index b7a6ce16d11..2ee72d46993 100644 --- a/pkgs/desktops/gnome-3/update.nix +++ b/pkgs/desktops/gnome-3/update.nix @@ -1,11 +1,16 @@ -{ lib, writeScript, python3, common-updater-scripts, coreutils, gnugrep, gnused }: +{ stdenv, lib, writeScript, python3, common-updater-scripts, coreutils, gnugrep, gnused }: { packageName, attrPath ? packageName, versionPolicy ? "odd-unstable" }: let python = python3.withPackages (p: [ p.requests ]); -in writeScript "update-${packageName}" '' - set -o errexit - PATH=${lib.makeBinPath [ common-updater-scripts coreutils gnugrep gnused python ]} - latest_tag=$(python "${./find-latest-version.py}" "${packageName}" "${versionPolicy}" "stable") - update-source-version "${attrPath}" "$latest_tag" -'' + updateScript = writeScript "gnome-update-script" '' + #!${stdenv.shell} + set -o errexit + package_name="$1" + attr_path="$2" + version_policy="$3" + PATH=${lib.makeBinPath [ common-updater-scripts coreutils gnugrep gnused python ]} + latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable") + update-source-version "$attr_path" "$latest_tag" + ''; +in [ updateScript packageName attrPath versionPolicy ] diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 2c8fe186612..efbf8561b7f 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }: let - rev= "f8e08c89dd98b7b8dba318d245dcd4abd3328ae2"; + rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4"; in stdenv.mkDerivation rec { name = "manticore-${version}"; - version = "2017.08.22"; + version = "2018.09.29"; src = fetchFromGitHub { owner = "ManticoreProject"; repo = "manticore"; - sha256 = "06icq0qdzwyzbsyms53blxpb9i26n2vn7ci8p9xvvnq687hxhr73"; + sha256 = "1prrgp7ldkdnrdbj224qqkirw8bj72460ix97c96fy264j9c97cn"; inherit rev; }; diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix index fad5c7d73fe..2fe1f1f3f5a 100644 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "smlnj-bootstrap-${version}"; - version = "110.80"; + version = "110.84"; src = fetchurl { url = "http://smlnj.cs.uchicago.edu/dist/working/${version}/smlnj-x86-${version}.pkg"; - sha256 = "1709xpgmxa6v73h77y7vn9wf5vlfdk75p61w28nzgfdsdc8f8l65"; + sha256 = "17fpnlxcfwx2ysg6y9c5wwx6s3jca981nb0pawfcg6xg9wcapyfz"; }; buildInputs = [ cpio rsync makeWrapper ]; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.jwiegley ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index 9b4816bb282..a2a03328b6d 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -1,31 +1,32 @@ { stdenv, fetchurl, darwin }: let - version = "110.79"; + version = "110.84"; baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; sources = map fetchurl [ - { url = "${baseurl}/config.tgz"; sha256 = "1siahy5sxz20bdy88s7zjj6gn55np1h54dalmg0nwzqq1rc048xb"; } - { url = "${baseurl}/cm.tgz"; sha256 = "174g71hvk1wfdmrg1mbx3p5j04ywnbbjapnnr9sgjd99pqqqsmdz"; } - { url = "${baseurl}/compiler.tgz"; sha256 = "001wi97ghj3mym4bk73gzzzrh7584hd79jn08cnq1wssdcfpn4mw"; } - { url = "${baseurl}/runtime.tgz"; sha256 = "0lavdzg25nbdzdyyf6wm304k0gsbb5bng2nlcx8gcfl743vl13r0"; } - { url = "${baseurl}/system.tgz"; sha256 = "00j34m5n8m30p51kajd0sxamy7gpwxaxrlgw5agxh0wi83vqfaki"; } - { url = "${baseurl}/MLRISC.tgz"; sha256 = "19q3gp7yfby4n8z6jn9m9q8g0a9kvb13arj8f2j0x9jnh3y2is78"; } - { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "0frkc23zh9h1c2lvkidh92lsp56liyb3hyv17503nchmkxrlsi09"; } - { url = "${baseurl}/old-basis.tgz"; sha256 = "1ka7w4nvkmaf86dkdzgbwiw8kay6gxhcyx4q17m33wdzsjbq56lh"; } - { url = "${baseurl}/ckit.tgz"; sha256 = "1z8xf5pqwayqd8j6xhfhqs4axkb4dx7vdqi2a7gq3zbx2fd3s7pw"; } - { url = "${baseurl}/nlffi.tgz"; sha256 = "1544m7ildyd0d60wfy2hl700jnslpxqb7brgh8p0bmkvhhvvc96v"; } - { url = "${baseurl}/cml.tgz"; sha256 = "11blq65zlsbh6iwq502jww1z4iyk9pf2iv3d437cgnpb3sn9mx72"; } - { url = "${baseurl}/eXene.tgz"; sha256 = "14yl8a5xwms1m9bvfwfiz6rhg49225l52lqqq9sbxbf57615n9yg"; } - { url = "${baseurl}/ml-lpt.tgz"; sha256 = "118s7v2f73ym91ymvnmswjxm2pw5n4q1d4hvbs1cmm43dv28pw7m"; } - { url = "${baseurl}/ml-lex.tgz"; sha256 = "0lf5ir12v8j6n11mblrl00jgm583ak077vgbabc1dfmz47rd566b"; } - { url = "${baseurl}/ml-yacc.tgz"; sha256 = "0dmifbbq1wxkxf479jv61nsy79sr78ad9fq6561rvgi4h12lzh7k"; } - { url = "${baseurl}/ml-burg.tgz"; sha256 = "1b5z18azik1kpaafi1vjgaf181yv32h88zm3z5fqxs96pwb86h1d"; } - { url = "${baseurl}/pgraph.tgz"; sha256 = "15g06hl7zn98qas3b6r6lrl75g9d1galqxdyai7d5z9q5lq71j2v"; } - { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0jwilcv2ycfpcy3cgs8ndaj16yqm8m2q63sipcigfycacpyqfsiw"; } - { url = "${baseurl}/heap2asm.tgz"; sha256 = "0wylsw1dkls9l86j226ilfb50mfk4h4zz4r9zdj104a1mqvvbgfk"; } - { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1xr89r1nhzg53hk0v0fk1livphwpgmzh1dgjqxl4w8dx9qhk9yf0"; } - { url = "${baseurl}/doc.tgz"; sha256 = "1fz4l3019n1rkrww98w59cdhlrz9jg635hmdq59xryc0j78y4ga1"; } - { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "0nka4dhklhilrsw4byr5vixiap28zp67ai0vjkwhqh03amkcr8zq"; } + { url = "${baseurl}/config.tgz"; sha256 = "0cpqrvixqwf64fa94wzwf59p0lnnmwxgkwm3qwhf28l2fv5d640q"; } + { url = "${baseurl}/cm.tgz"; sha256 = "0qq6kdi8xqi3w1rsmi4rgjdbjr9m4crizb1ma5xg51x8h42ccmbh"; } + { url = "${baseurl}/compiler.tgz"; sha256 = "11zfdwr7a10ylzvap2j0c1py11zi500hfnmhd5lvy9spwzray8vd"; } + { url = "${baseurl}/runtime.tgz"; sha256 = "0v2dv0hh0gxnzzxz8vzqn5avxh7mynaj4g9kkbv4gcnxxaylpksz"; } + { url = "${baseurl}/system.tgz"; sha256 = "0612a6qls202l6wbckcd6dklh7nb75fk4c4qmbs9h2h0j3kisszl"; } + { url = "${baseurl}/MLRISC.tgz"; sha256 = "0wnhvy677p2f7pxlk8mmk3gi605nawy1zzn2cf4619wg04v54g6s"; } + { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1pg9y0lcp18fc91y45yb2lysnrzml00xdhcilkc1cx17am394mik"; } + { url = "${baseurl}/old-basis.tgz"; sha256 = "14zdkzfri4a7mj7zck2c43aqkg0y7kppp2nkbihg069g4ifgw5fg"; } + { url = "${baseurl}/ckit.tgz"; sha256 = "0dlccmnchs38www0a3ibrjxipf8xi03d7pgriynjqdyjjgik89by"; } + { url = "${baseurl}/nlffi.tgz"; sha256 = "0c9z2fq8d7ln4flzc5pkfym9rkjhjymjm60v1avh1c337lmai5lb"; } + { url = "${baseurl}/cml.tgz"; sha256 = "16jn5fn8khxnjj0kwjzavx2ms3kv16zy35wamh8k51nv8v3i0qam"; } + { url = "${baseurl}/eXene.tgz"; sha256 = "1701l155aiprzxh5p5whb9qbg368cqq0bzdwkwsxgrrllfhwdq9z"; } + { url = "${baseurl}/ml-lpt.tgz"; sha256 = "19dk9yqq6f5ayqlf7p95aakc4swj6x1j8m0ka2slzzb9g93f2q1g"; } + { url = "${baseurl}/ml-lex.tgz"; sha256 = "0w20w17rd67n6zgxzwq89k9ywc78l3ydxcax0pniwzv6m5d08znc"; } + { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1fdxhy4f2dgs19p20vg7yysi9gxp6hc1ggs97k4zq448y2ssxsyg"; } + { url = "${baseurl}/ml-burg.tgz"; sha256 = "066r0zy5rc60y8kzh2c06hy1b217lh6qffvxlwz8w1w86yqkgsk2"; } + { url = "${baseurl}/pgraph.tgz"; sha256 = "1jy1g9xiv14jj9svb5wgbdm520qbdhamfmxlf31xnh552gg18bxa"; } + { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0nkawi2mdmsw24a1pkwp2brixrvxyqgxzsylp7w7ak35p20l5igc"; } + { url = "${baseurl}/heap2asm.tgz"; sha256 = "159y8c8xnim7p4pyynjirqhwi73lkrq0fksk8wnpcdh5clmwacrx"; } + { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1sgfdnvkqa6wmwg027wg8lvg7zxq36p83bkymy8qkjdlxhxm2nhl"; } + { url = "${baseurl}/doc.tgz"; sha256 = "083h5h937gkhfq3xk982vmng903c83d98yh5fps53f62wib99mhf"; } + { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "10nf79jzmv64ag8c11fxd9ggw21a9kdn9shqkiz1kni3lq63p7m2"; } + { url = "${baseurl}/asdl.tgz"; sha256 = "13jvdgv63h4s8p9q563hyisbz464y88y2flvwyxvi1n11lh15rwb"; } ]; in stdenv.mkDerivation { name = "smlnj-${version}"; diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index 159bad4c68e..d09e45a2d1e 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = '' + #!${stdenv.shell} cd ${toString ./.} ${toString path}/pkgs/build-support/upstream-updater/update-walker.sh default.nix ''; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 5294c779a32..415e57e5d3c 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, cmake, google-gflags, which -, lsb-release, glog, protobuf, cbc, zlib }: +, lsb-release, glog, protobuf, cbc, zlib, python3 }: stdenv.mkDerivation rec { name = "or-tools-${version}"; - version = "v6.9.1"; + version = "v6.10"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = version; - sha256 = "099j1mc7vvry0a2fiz9zvk6divivglzphv48wbw0c6nd5w8hb27c"; + sha256 = "11k3671rpv968dsglc6bgarr9yi8ijaaqm2wq3m0rn4wy8fj7za2"; }; # The original build system uses cmake which does things like pull @@ -25,32 +25,23 @@ stdenv.mkDerivation rec { EOF ''; - buildPhase = '' - make cc - ''; + makeFlags = [ "prefix=${placeholder "out"}" ]; + buildFlags = [ "cc" ]; - installPhase = '' - make install_cc prefix=$out - ''; + checkTarget = "test_cc"; + doCheck = true; - patches = [ - # In "expected" way of compilation, the glog package is compiled - # with gflags support which then makes gflags header transitively - # included through glog. However in nixpkgs we don't compile glog - # with gflags so we have to include it ourselves. Upstream should - # always include gflags to support both ways I think. - # - # Upstream ticket: https://github.com/google/or-tools/issues/902 - ./gflags-include.patch - ]; + installTargets = [ "install_cc" ]; nativeBuildInputs = [ - cmake lsb-release which zlib + cmake lsb-release which zlib python3 ]; propagatedBuildInputs = [ google-gflags glog protobuf cbc ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://github.com/google/or-tools; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix new file mode 100644 index 00000000000..7b084e61688 --- /dev/null +++ b/pkgs/development/ocaml-modules/opti/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "opti"; + version = "1.0.3"; + + src = fetchurl { + url = "https://github.com/magnusjonsson/opti/releases/download/${version}/opti-${version}.tbz"; + sha256 = "ed9ba56dc06e9d2b1bf097964cc65ea37db787d4f239c13d0dd74693f5b50a1e"; + }; + + meta = with stdenv.lib; { + description = "DSL to generate fast incremental C code from declarative specifications"; + license = licenses.bsd3; + maintainers = [ maintainers.jmagnusj ]; + homepage = https://github.com/magnusjonsson/opti; + }; +} diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index f6d5b7b9b59..7fd80148831 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { cp -r python/bin $out/bin ''; passthru.updateScript = '' + #!${stdenv.shell} set -e echo cd ${toString ./.} diff --git a/pkgs/development/web/nodejs/update.nix b/pkgs/development/web/nodejs/update.nix index 9ff11982b65..bf6951dc688 100644 --- a/pkgs/development/web/nodejs/update.nix +++ b/pkgs/development/web/nodejs/update.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , writeScript , coreutils , curl @@ -11,6 +12,7 @@ }: writeScript "update-nodejs" '' + #!${stdenv.shell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq gnupg nix ]} HOME=`mktemp -d` diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 25eeb889cc2..89c6639748d 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.updateScript = import ./update.nix { - inherit lib writeScript coreutils gnugrep jq curl common-updater-scripts; + inherit stdenv lib writeScript coreutils gnugrep jq curl common-updater-scripts; }; meta = { diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix index 94eb44b744c..1b6dfd90b1e 100644 --- a/pkgs/os-specific/linux/tp_smapi/update.nix +++ b/pkgs/os-specific/linux/tp_smapi/update.nix @@ -1,6 +1,7 @@ -{ lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }: +{ stdenv, lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }: writeScript "update-tp_smapi" '' +#!${stdenv.shell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq ]} tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags` diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index f5d62b250e2..063c173a401 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -26,6 +26,7 @@ let self = stdenv.mkDerivation rec { let impl = import "${self}/share/nix/api.nix" { inherit pkgs pinConfig; }; in { inherit (impl) augmentedPkgs pins callPackage; }; updateScript = '' + #!${stdenv.shell} set -e echo cd ${toString ./.} diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix index e7eb497b4b9..7584496f258 100644 --- a/pkgs/tools/package-management/nix-update-source/default.nix +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }: +{ stdenv, lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }: python3Packages.buildPythonApplication rec { version = "0.6.3"; name = "nix-update-source-${version}"; @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec { overrideSrc = drv: lib.overrideDerivation drv (orig: { inherit src; }); }; updateScript = '' + #!${stdenv.shell} set -e echo cd ${toString ./.} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index cf06b52c5ba..dfe90b34b4c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -552,6 +552,8 @@ let opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { }; + opti = callPackage ../development/ocaml-modules/opti { }; + otfm = callPackage ../development/ocaml-modules/otfm { }; otr = callPackage ../development/ocaml-modules/otr { }; |