swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-18 03:33:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
86792 commits 5 branches 0 tags 31 GiB
Commit graph

86792 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjørn Forsman 8c2d888401 jenkins: move $out/{lib => webapps}/jenkins.war 
As pointed out by @danbst, the tomcat NixOS module expects packages
listed in services.tomcat.webapps to either be direct .war file paths or
have .war files inside a "webapps" directory.

Commit 4075c10a59
("jenkins: move .war file from $out to $out/lib/jenkins.war") broke
jenkins + tomcat. Fix it by moving jenkins.war to $out/webapps/.
 2016-07-15 17:18:44 +02:00
Joachim Fasting e228023b14
linux_grsec_nixos: fix build 
The grsec patch fails to apply cleanly when combined with the hiddev CVE patch
(added in dde259dfb5).  To fix this and future
problems, we set all our patches explicitly rather than inherit from the base
kernel.
 2016-07-15 16:55:41 +02:00
Peter Simons 9fc0347c93 Merge pull request #16262 from basvandijk/fix-inline-c-cpp-darwin 
inline-c-cpp: fix build on darwin
 2016-07-15 16:21:46 +02:00
Eelco Dolstra f402c6321a Merge pull request #16921 from mimadrid/update/git-2.9.1 
git: 2.9.0 -> 2.9.1
 2016-07-15 15:52:46 +02:00
Bjørn Forsman 4075c10a59 jenkins: move .war file from $out to $out/lib/jenkins.war 
Fixes #14137, also known as:

  $ nix-shell -p jenkins
  bash: source: /nix/store/ln1yw6c2v8bb2cjqfr1z5aqcssw054wa-jenkins-2.3:
  cannot execute binary file
  [nix-shell exited with error]

The problem is that jenkins.war is not installed inside the directory
$out, but rather _as the file_ $out. Fix it by moving the file to
$out/lib/jenkins.war.

While at it, move buildCommand so that the "meta" section is at the end
of the expression (standard style), and quote shell variables.
 2016-07-15 15:12:52 +02:00
Frederik Rietdijk 2e986016d0 Merge pull request #16946 from phanimahesh/fix-16198 
Fix typo: s/propogate/propagate/
 2016-07-15 15:00:01 +02:00
Vincent Laporte a4adca78ef monodevelop: use makeLibraryPath in wrapper (fixes #16844) 2016-07-15 14:22:33 +02:00
Alexei Robyn c30d4e07c5 libvirt: revert to full systemd dependency 
Fixes issue with virt-manager failing to list 'USB Host Devices' and
'PCI Host Devices' with the error "Connection does not support host
device enumeration".
 2016-07-15 12:47:26 +02:00
Bjørn Forsman 2ad0a84751 Revert "openssh: Use the default privilege separation dir (/var/empty)" 
This reverts commit a927709a35 because it
doesn't build:

$ nix-build -A openssh
...
mkdir /nix/store/yl2xap8n1by3dqxgc4rmrc4s753676a3-openssh-7.2p2/libexec
(umask 022 ; ./mkinstalldirs /var/empty)
mkdir /var
mkdir: cannot create directory '/var': Permission denied
mkdir /var/empty
mkdir: cannot create directory '/var/empty': No such file or directory
make: *** [Makefile:304: install-files] Error 1
builder for ‘/nix/store/ifygp4mqpv7l8cgp0njp8w7lmrl6brpp-openssh-7.2p2.drv’ failed with exit code 2
 2016-07-15 12:42:37 +02:00
Frederik Rietdijk cfb4a19f51 Merge pull request #16967 from davidak/caddy-fix 
caddy service: fix nix store output path
 2016-07-15 12:26:18 +02:00
Frederik Rietdijk 81d798bc36 Merge pull request #16463 from FRidh/secp 
secp256k1: init (native lib, and python ffi bindings at 0.12.1)
 2016-07-15 12:23:20 +02:00
Eelco Dolstra 55eb18d212 Add some more info to the nixos-version manpage 2016-07-15 12:02:39 +02:00
Frederik Rietdijk 14bd7b7931 Merge pull request #16843 from k0ral/glances 
glances 2.4.2 -> 2.6.2, and dependencies
 2016-07-15 11:48:08 +02:00
Frederik Rietdijk 641c535bd5 Merge pull request #16931 from RamKromberg/init/lenmus 
lenmus: init at 5.4.1
 2016-07-15 11:36:57 +02:00
Frederik Rietdijk 7d69e5dda2 Merge pull request #16929 from siddharthist/terraform/0.6.15->0.6.16 
terraform: 0.6.15 -> 0.6.16
 2016-07-15 11:19:28 +02:00
Alexey Shmalko 5eaeb97a46 qbittorrent: fix build 2016-07-15 10:26:26 +02:00
Eelco Dolstra 6149dc36bd Merge pull request #16966 from rickynils/openssh_privsep_dir 
openssh: Use the default privilege separation dir (/var/empty)
 2016-07-15 10:23:29 +02:00
John Ericson bed2a14afa makeRustPlatform: Remove self argument 2016-07-15 10:13:21 +02:00
Rok Garbas 0ad8d0b127 pypi2nix: should be using python35 2016-07-15 06:39:10 +02:00
Luca Bruno 4b8c31d981 gnome3: enable X libinput by default 
See https://bugzilla.gnome.org/show_bug.cgi?id=764257#c12
 2016-07-14 22:06:18 +01:00
Peter Simons 6af0f57f91 haskell-binary: update to latest version 2016-07-14 22:13:48 +02:00
Peter Simons d477991c48 hackage-packages.nix: update Haskell package set 
This update was generated by hackage2nix v2.0-4-gb156b94 using the following inputs:

  - Hackage: 5bb0a1b20f
  - LTS Haskell: a5a99cf176
  - Stackage Nightly: 3664752ea8
 2016-07-14 22:13:09 +02:00
davidak d2164cfcda caddy service: fix nix store output path 
systemd[11376]: caddy.service: Failed at step EXEC spawning /nix/store/ghpcwj6paccc92l1gk7ykb6gf2i2w6fi-go1.6-caddy-0.8.3/bin/caddy: No such file or directory
 2016-07-14 22:04:55 +02:00
Nikolay Amiantov 7529b2c661 Merge pull request #16947 from RamKromberg/fix/flashplayer 
flashplayer: 11.2.202.626 -> 11.2.202.632 APSB16-25
 2016-07-14 23:17:41 +04:00
Rickard Nilsson a927709a35 openssh: Use the default privilege separation dir (/var/empty) 
If running NixOS inside a container where the host's root-owned files
and directories have been mapped to some other uid (like nobody), the
ssh daemon fails to start, producing this error message:

fatal: /nix/store/...-openssh-7.2p2/empty must be owned by root and not group or world-writable.

The reason for this is that when openssh is built, we explicitly set
`--with-privsep-path=$out/empty`. This commit removes that flag which
causes the default directory /var/empty to be used instead. Since NixOS'
activation script correctly sets up that directory, the ssh daemon now
also works within containers that have a non-root-owned nix store.
 2016-07-14 20:54:06 +02:00
Arseniy Seroka c1a600e8df Merge pull request #16936 from andrewrk/glfw 
glfw: 3.1.2 -> 3.2
 2016-07-14 22:20:41 +04:00
Arseniy Seroka 4060133812 Merge pull request #16956 from zimbatm/zerotier-1.1.12 
zerotierone: 1.1.6 -> 1.1.12
 2016-07-14 22:20:18 +04:00
Arseniy Seroka 5a9a71fb2c Merge pull request #16957 from holidaycheck/galen-2.3.0 
galen: 2.2.4 -> 2.3.0
 2016-07-14 22:19:58 +04:00
Arseniy Seroka 658579cc57 Merge pull request #16961 from womfoo/bump/eventstat-0.03.02 
eventstat: 0.02.02 -> 0.03.02
 2016-07-14 22:19:33 +04:00
Arseniy Seroka aa138041f7 Merge pull request #16960 from womfoo/bump/urweb-20160621 
urweb: 20151220 -> 20160621
 2016-07-14 22:19:12 +04:00
Tobias Geerinckx-Rice 93d0a4d311 Merge pull request #16962 from womfoo/bump/stress-ng-0.06.11 
stress-ng: 0.06.01 -> 0.06.11
 2016-07-14 19:41:05 +02:00
Kranium Gikos Mendoza 121a8c0646 stress-ng: 0.06.01 -> 0.06.11 2016-07-15 00:06:54 +08:00
Kranium Gikos Mendoza cbeb320c47 eventstat: 0.02.02 -> 0.03.02 2016-07-15 00:06:39 +08:00
Tobias Pflug cb7d8822e9 w3m: fix build on darwin (#16955) 2016-07-14 18:01:27 +02:00
Kranium Gikos Mendoza 2c169f83e7 urweb: 20151220 -> 20160621 2016-07-14 23:14:15 +08:00
Arseniy Seroka 11a2edc2ea Merge pull request #16952 from binarin/viber-6.0.1.5 
viber: 4.2.2.6 -> 6.0.1.5
 2016-07-14 17:56:13 +04:00
Kranium Gikos Mendoza 9aee153f2b zerofree: 1.0.3 -> 1.0.4 2016-07-14 15:43:09 +02:00
zimbatm dc6306a69d zerotierone: 1.1.6 -> 1.1.12 2016-07-14 14:02:54 +01:00
Sander van der Burg c3ffae4777 nodejs: implement a darwin-specific fix that properly refers to tr1/type_traits 2016-07-14 12:57:17 +00:00
Tuomas Tynkkynen c787d2786e Merge pull request #16935 from ebzzry/emem-0.2.16 
emem: 0.2.15 -> 0.2.16
 2016-07-14 15:51:44 +03:00
Alexey Lebedeff 52ed165c91 viber: 4.2.2.6 -> 6.0.1.5 
- Use Qt provided by viber itself -> no longer broken
- Remove notes about obsolete bugs
 2016-07-14 15:36:29 +03:00
Tuomas Tynkkynen 13160d9c10 buildInLinuxVM: Workaround bug #16742 
This is blocking the channel update: #16949
 2016-07-14 15:12:50 +03:00
Tuomas Tynkkynen 4a9f778118 kde4: Use ffmpeg_2 to fix ffmpegthumbs build 2016-07-14 15:12:50 +03:00
Vladimír Čunát 1b5ac05845 Merge branch 'staging' 
Includes security fixes in gd and libarchive.
 2016-07-14 15:51:28 +02:00
Vladimír Čunát ab9515092b symlinkJoin: truly pass the defaulted parameters 
The catch is that in nix the @-pattern binds the set that was *explicitly*
passed to the function, i.e. default values are *not* taken into account.
 2016-07-14 15:36:53 +02:00
J Phani Mahesh bbd0a47950 vim-plugin:YouCompleteMe: propogatedBuildInputs -> propagatedBuildInputs 2016-07-14 17:26:19 +05:30
J Phani Mahesh ac19f09122 wicd: propogatedBuildInputs -> propagatedBuildInputs 2016-07-14 17:23:06 +05:30
J Phani Mahesh 79312dc614 xflux-gui: propogatedBuildInputs -> propagatedBuildInputs 2016-07-14 15:53:09 +05:30
J Phani Mahesh 2f00cea5df zscroll: propogatedBuildInputs -> propagatedBuildInputs 2016-07-14 15:52:00 +05:30
Stefan Junker efe4d48e8e rkt: 1.9.1 -> 1.10.1 (#16895) 2016-07-14 12:18:07 +02:00