JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
235,853 Commits 1 Branch 0 Tags 12 GiB
ec160da46f
Commit Graph

235853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yoctocell
ec160da46f lf: 14 -> 15 2020-07-26 11:08:37 +02:00
Adrian
a6133b7a39
writers.makeScriptWriter: fix on Darwin\MacOS (#93757) 
* writers.makeScriptWriter: fix on Darwin\MacOS

On Darwin a script cannot be used as an interpreter in a shebang line, which
causes scripts produced with makeScriptWriter (and its derivatives) to fail at
run time if the used interpreter was wrapped with makeWrapper (as in the case
of python3.withPackages).

This commit fixes the problem by detecting if the interpreter is a script
and prepending its shebang to the final interpreter line.

For example if used interpreter is;
```
/nix/store/ynwv137n2650qy39swcflxbcygk5jwv1-python3-3.8.3-env/bin/python
```

which is a script with following shebang:
```
#! /nix/store/knd85yc7iwli8344ghav3zli8d9gril0-bash-4.4-p23/bin/bash -e
```

then the shebang line in the produced script will be
```
#! /nix/store/knd85yc7iwli8344ghav3zli8d9gril0-bash-4.4-p23/bin/bash -e /nix/store/ynwv137n2650qy39swcflxbcygk5jwv1-python3-3.8.3-env/bin/python
```

This works on Darwin since there does not seem to be a limit to the length
of the shabang line and the shebang lines support multiple arguments to
the interpreters (as opposed to linux where the kernel imposes a strict limit
on shebang lengh and everything following the interpreter is passed to it
as a single string).

fixes; #93609
related to: #65351 #11133 (and probably a bunch of others)

NOTE: scripts produced on platforms other than Darwin will remain unmodified
by this PR. However it might worth considering extending this fix to BSD systems
in general. I didn't do it since I have no way of testing it on systems other
than MacOS and linux.

* writers.makeScriptWriter: fix typo in comment

* writers.makeScriptWriter: fail build if interpreter of interpreter is a script
 2020-07-25 11:47:20 +02:00
Lassulus
a2ba53f4e1
Merge pull request #93758 from adrian-gierakowski/improve-writers.writePython 
writers.writePython2 and writePython3: use "bare" python if no deps are needed
 2020-07-25 11:43:56 +02:00
Lassulus
032775d0ac
Merge pull request #93788 from chkno/syncthing-test 
nixos/tests: Add test for syncthing
 2020-07-25 11:40:06 +02:00
Daniël de Kok
bd437f83ba
Merge pull request #93775 from r-ryantm/auto-update/clib 
clib: 1.11.3 -> 1.11.4
 2020-07-25 11:39:22 +02:00
Daniël de Kok
e74c497824
Merge pull request #93783 from equirosa/tut 
tut: 0.0.13 -> 0.0.14
 2020-07-25 11:33:17 +02:00
Daniël de Kok
95fabdf3e3
Merge pull request #93803 from vaibhavsagar/bump-polyml 
polyml: 5.8 -> 5.8.1
 2020-07-25 11:28:39 +02:00
Vaibhav Sagar
c177c436af polyml: 5.8 -> 5.8.1 2020-07-25 18:31:43 +10:00
Sebastien Bourdeauducq
ecafef0dd8 pam_p11: add 2020-07-25 09:37:48 +02:00
Vincent Laporte
f4a95e8465 ocamlPackages.markup: 0.7.5 → 0.8.2 2020-07-25 06:06:41 +02:00
Marek Mahut
941f2eab00
Merge pull request #93529 from xtruder/pkgs/cloud-hypervisor/init 
cloud-hypervisor: init at 0.8.0
 2020-07-25 04:56:05 +02:00
Sebastien Bariteau
9ab83c6eed
ugrep: init at 2.4.1 (#93296) 2020-07-25 11:16:21 +10:00
lewo
703cbe11af
Merge pull request #93727 from r-ryantm/auto-update/docker-credential-gcr 
docker-credential-gcr: 2.0.1 -> 2.0.2
 2020-07-25 02:35:01 +02:00
Scott Worley
140247cd8a nixos/tests: Add test for syncthing 2020-07-24 15:51:14 -07:00
Vladyslav M
7adb91df59
Merge pull request #93786 from r-ryantm/auto-update/fio 
fio: 3.20 -> 3.21
 2020-07-24 23:56:37 +03:00
R. RyanTM
563d5fa7cc fio: 3.20 -> 3.21 2020-07-24 20:27:33 +00:00
Peter Simons
dbacb52ad8
Merge pull request #92461 from NixOS/haskell-updates 
Update Haskell package set to LTS 16.6 (plus other fixes)
 2020-07-24 22:13:40 +02:00
Peter Simons
c8c80478e1 sad: comment out the broken build 
I cannot mark this package broken in a way that doesn't break OfBorg.
 2020-07-24 22:01:00 +02:00
Peter Simons
e8e0ca289c haskell-shower: jailbreak to fix the build with ghc-8.10.x 2020-07-24 21:58:58 +02:00
Peter Simons
3b46d9a65e all-cabal-hashes: update to Hackage at 2020-07-24T00:16:27Z 2020-07-24 21:38:22 +02:00
Benjamin Hipple
fd0febffda
Merge pull request #93741 from r-ryantm/auto-update/luigi 
luigi: 3.0.0 -> 3.0.1
 2020-07-24 15:34:16 -04:00
Maximilian Bosch
5345c19cf1
diffoscope: 152 -> 153 
Closes #93785
ChangeLog: https://diffoscope.org/news/diffoscope-153-released/
 2020-07-24 21:28:03 +02:00
Peter Simons
f4d4fdcbf0 haskell-dhall: use latest version for ghc-8.10.x so that we can build with the latest repline library 2020-07-24 21:13:25 +02:00
Daniël de Kok
3b772b681c
Merge pull request #93780 from 06kellyjac/deno_1.2.1 
deno: 1.2.0 -> 1.2.1
 2020-07-24 21:03:57 +02:00
Daniël de Kok
deeb49ee4c
Merge pull request #93776 from Pamplemousse/codeql 
codeql: 2.2.3 -> 2.2.4
 2020-07-24 21:02:28 +02:00
Peter Simons
b5613e78fd hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.15.5-11-g7fa9100-dirty from Hackage revision
8af27e77a0.
 2020-07-24 20:56:38 +02:00
Peter Simons
1d96606e34 haskell-dhall: clean up and drop obsolete overrides 2020-07-24 20:55:19 +02:00
Peter Simons
dd74d6ba9a hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.15.5-11-g7fa9100 from Hackage revision
8af27e77a0.
 2020-07-24 20:55:07 +02:00
Peter Simons
4c8da32eae hackage2nix: update list of broken builds 
Ping @cdepillabout because of termonad.
 2020-07-24 20:55:02 +02:00
Peter Simons
5f8e67bffd
Merge pull request #93772 from maralorn/fix-bluespec 
[haskell-updates] bluespec: Fix build without ghc 844
 2020-07-24 20:24:32 +02:00
Jaka Hudoklin
fea9351d81
Merge pull request #92719 from pjjw/update/mongodb-42 
mongodb: 4.0.12 -> 4.2.8
 2020-07-24 20:15:29 +02:00
Léo Gaspard
0c075ce453
Merge pull request #93715 from lovesegfault/roon-server-revamp 
roon-server: revamp
 2020-07-24 20:11:01 +02:00
Eduardo Quiros
ec7c9a072b
tut: 0.0.13 -> 0.0.14 
new release: https://github.com/RasmusLindroth/tut/releases/tag/0.0.14
 2020-07-24 11:47:33 -06:00
Ryan Mulligan
1857422901
Merge pull request #93730 from r-ryantm/auto-update/doctl 
doctl: 1.45.1 -> 1.46.0
 2020-07-24 10:02:49 -07:00
Maximilian Bosch
caef648994
Merge pull request #93755 from r-ryantm/auto-update/shadowsocks-rust 
shadowsocks-rust: 1.8.12 -> 1.8.13
 2020-07-24 18:45:18 +02:00
Jörg Thalheim
af854940a6
Merge pull request #93750 from r-ryantm/auto-update/pwndbg 2020-07-24 17:24:08 +01:00
Maximilian Bosch
c3f203227e
Merge pull request #93673 from doronbehar/update-gotify 
gotify-server: 2.0.16 -> 2.0.17
 2020-07-24 18:22:12 +02:00
06kellyjac
3c45c69f49 deno: 1.2.0 -> 1.2.1 2020-07-24 16:10:55 +00:00
Maximilian Bosch
9627ef0283
Merge pull request #93707 from B4dM4n/flake-nix-lib-extend 
flake.nix: use lib.extend
 2020-07-24 18:09:21 +02:00
Maximilian Bosch
c15c29ee31
Merge pull request #93766 from jansol/renderdoc 
renderdoc: 1.8 -> 1.9
 2020-07-24 18:03:47 +02:00
Pamplemousse
d14d094189 codeql: 2.2.3 -> 2.2.4 
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
 2020-07-24 09:03:05 -07:00
Jörg Thalheim
0216dbd769
Merge pull request #93165 from jbedo/singularity 
singularity: 3.2.1 -> 3.6.1
 2020-07-24 16:57:59 +01:00
Maximilian Bosch
4f5278b2de
Merge pull request #93689 from gnidorah/rambox 
rambox: use gappsWrapperArgs
 2020-07-24 17:46:41 +02:00
Peter Woodman
dbd0f3e957
mongodb: 4.0.12 -> 4.2.8 
Not strictly an upgrade, but adds a new mongodb-4_2 target with the
current mongodb from that branch.

Use matching client and server versions in mongodb tests- tests were
using the mongo 3.4 client to connect, and this finally doesn't work
with server 4.2.

Per reviewer suggestion, adding myself as cheetah3 maintainer.

Additionally, reestore comments describing the purpose of the
build-dependencies patch
 2020-07-24 11:44:16 -04:00
Martin Weinelt
c4fff129f0
Merge pull request #93657 from mweinelt/hass-0.113 
homeassistant: 0.112.3 -> 0.113.0
 2020-07-24 17:34:47 +02:00
R. RyanTM
355cb1f451 clib: 1.11.3 -> 1.11.4 2020-07-24 15:28:37 +00:00
Malte Brandy
8605e1c404
bluespec: Fix build without ghc 844 
ghc 8.4.4 was only required before the merge of

https://github.com/B-Lang-org/bsc/pull/42

which actually is already contained in the commit we are using.
 2020-07-24 17:02:47 +02:00
maralorn
359d2e6892
Merge pull request #93768 from maralorn/hls 
[haskell-updates] haskellPackages.haskell-language-server: 0.2.0.0 -> 0.2.2.0
 2020-07-24 15:54:06 +02:00
maralorn
7841ad9663
Merge pull request #93762 from maralorn/fix-neuron 
[haskell-updates] haskellPackages.neuron: Fix deps and build
 2020-07-24 15:53:31 +02:00
Marek Mahut
1d097a6c9b
Merge pull request #93767 from mmilata/trezorctl-shell-completion 
pythonPackages.trezor: enable shell completion
 2020-07-24 15:38:16 +02:00