Commit Graph

59518 Commits

Author SHA1 Message Date
Shea Levy
19cd9f16a0 Merge branch 'staging' 2015-03-20 09:53:34 -04:00
Jaka Hudoklin
89f41b90fa Merge pull request #6874 from offlinehacker/pkgs/kubernetes/update
kubernetes: update to 0.12.1, fix module
2015-03-20 11:22:48 +01:00
aszlig
3bb0e6df8a
haxe: Add package for the hxcpp runtime library.
I'm not adding this to pkgs/development/libraries because it somewhat is
strongly tied to Haxe itself, because otherwise you can't compile to C++
and in the event that someone is going to create something like
"haxePackages" someday it is easier to notice when it's residing in the
Haxe folder.

In theory it would also work by using imperative haxelib, but you'll get
precompiled libraries which need to be patched on NixOS systems. That's
the main reason I was packaging this, among from the fact that even when
patching the libraries, it still leads to occasional library hell and
instabilities.

The package has two outputs: One with the library itself, needed for
compile time ($out) and another one ($lib) which is needed at runtime,
so after compiling, the $out path can be safely garbage collected.

Right now, I've set meta.platforms to Linux only, because that's where
I've tested it. In order to get it running on other platforms the
targetArch attribute has to be set accordingly.

We also build everything completely from scratch, even though there are
binaries within the source ZIP file. The main reason is to make smaller
library dependencies by avoiding bundled libraries and using the ones we
already ship with nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-20 08:47:11 +01:00
aszlig
d68e9b855c
haxe: Add setup-hook and patch to add haxlib path.
Introduces a new environment variable called HAXELIB_PATH and the patch
for haxelib is trying to search that environment variable for other
libraries. If the haxelib path for a particular library isn't found, it
reverts to the normal behaviour of searching the user's home directory
for a file called .haxelib, which in turn points to a repsitory path and
that in turn has .current/.dev files to point it to the right version
number.

This avoids workarounds like this when using Nix to build Haxe projects:

configurePhase = ''
  export HOME="$(pwd)"
  echo "$(pwd)" > .haxelib

  mkdir dependency1
  echo dev > dependency1/.current
  echo "${dependency1}" > dependency1/.dev

  mkdir dependency2
  echo dev > dependency2/.current
  echo "${dependency2}" > dependency2/.dev
'';

Now every haxelib is expected to be in $out/lib/haxe/$name and whenever
it is listed in buildInputs of another Haxe derivation, HAXELIB_PATH
gets automatically set in the build environment.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-20 08:39:21 +01:00
Austin Seipp
9b41cf0281 nixpkgs: arcanist 20150118 -> 20150318
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-19 17:46:24 -05:00
Vladimír Čunát
cd97c58110 openssl_1_0_1j: fix after updating the main version 2015-03-19 20:28:35 +01:00
Michael Raskin
14fc74054b Update Conkeror. Works now 2015-03-19 22:13:07 +03:00
Ricardo M. Correia
4d2317e6eb nixos/zfs: Don't default to git version for kernels >= 3.19
Stable version 0.6.3-1.3 works with kernels 3.19.x.
2015-03-19 19:37:33 +01:00
Vincent Laporte
20b150b26c Adds ocaml-dolog-1.0
dolog is a minimalistic lazy logger in OCaml

Homepage: https://github.com/UnixJunkie/dolog
2015-03-19 19:14:18 +01:00
Vincent Laporte
d52b6f1d3e ocaml-re: update from 1.3.0 to 1.3.1 2015-03-19 19:14:15 +01:00
Vincent Laporte
e4c0225c29 tuareg-mode: update from 2.0.6 to 2.0.9 2015-03-19 19:14:15 +01:00
Arseniy Seroka
9cfdeba324 Merge pull request #6611 from jagajaga/slurm
Slurm module
2015-03-19 21:06:49 +03:00
Peter Simons
afb0874e06 hackage-packages.nix: re-generate from Hackage 2015-03-19T13:39:37+0100 2015-03-19 17:55:19 +01:00
Arseniy Seroka
48e06786fd Merge pull request #6897 from joachifm/apparmor-revdeps
Change uses of apparmor to libapparmor (v2.9)
2015-03-19 19:53:27 +03:00
Eelco Dolstra
2fe351c7e3 openssl: Update to 1.0.1m
Fixes various "Moderate" / "Low" CVEs:
http://openssl.org/news/secadv_20150319.txt
2015-03-19 15:57:17 +01:00
Eelco Dolstra
cb7b0f3c1b Merge pull request #6898 from joachifm/redundant-params
kernelPatches: remove unused parameters
2015-03-19 15:31:03 +01:00
Joachim Fasting
0e52c562b5 RAppArmor: use AppArmor 2.9 2015-03-19 14:14:28 +01:00
Joachim Fasting
fa843cdf11 lxc: use AppArmor 2.9 2015-03-19 14:12:15 +01:00
Joachim Fasting
cd55b6b5bb kernelPatches: remove unused parameters 2015-03-19 14:08:16 +01:00
Peter Simons
5a2fd23b8a Merge pull request #6896 from NixOS/revert-6886-fix/vlc
Revert "VLC wants a newer version of libdvdnav".
2015-03-19 13:34:35 +01:00
Mateusz Kowalczyk
d56831a9af ghc: update link and version of 7.10 RC3 2015-03-19 12:33:11 +00:00
lethalman
3b6015f40e Merge pull request #6895 from robinbb/sqitch-pg
sqitch-pg
2015-03-19 13:32:39 +01:00
Peter Simons
f30743b86b Revert "VLC wants a newer version of libdvdnav" 2015-03-19 13:19:17 +01:00
Robin Bate Boerop
63d54cf5b7 Remove unnecessary propagatedNativeBuildInputs from AppSqitch 2015-03-19 09:02:46 -03:00
Robin Bate Boerop
91004a3485 Merge branch 'Sqitch' into sqitch-pg 2015-03-19 08:11:31 -03:00
Luca Bruno
80d8d1fc27 Revert "Add a kafka package". Closes #6892
This reverts commit b34a1cc248.

Conflicts:
	pkgs/top-level/all-packages.nix

Duplicate package kafka, already existed and used in the nixos service.

Retained the boothead addition to maintainers.
2015-03-19 11:54:40 +01:00
lethalman
5c025c1bea Merge pull request #6851 from ragnard/update-apache-kafka
apache-kafka: Update apache kafka to version 0.8.2.1
2015-03-19 11:02:44 +01:00
lethalman
515bd937f9 Merge pull request #6868 from lancelotsix/add_checkbashisms
Add checkbashisms package
2015-03-19 10:42:00 +01:00
Jaka Hudoklin
1b99f0aeb6 Merge pull request #6873 from offlinehacker/pkgs/panamax/update
panamax: update, fix module
2015-03-19 09:18:48 +01:00
Ricardo M. Correia
5b074d20f8 zfs: Update from 0.6.3-1.2 -> 0.6.3-1.3 2015-03-19 06:08:08 +01:00
Ricardo M. Correia
1e28cd0c83 spl: Update from 0.6.3-1.2 -> 0.6.3-1.3
Removed time.patch (applied upstream).
2015-03-19 06:07:54 +01:00
Mateusz Kowalczyk
2b8fd8d4e9 Merge pull request #6857 from k0ral/mpv
mpv: 0.8.2 -> 0.8.3
2015-03-19 00:16:03 +00:00
Arseniy Seroka
15f7afa6b4 Merge pull request #6885 from hrdinka/update-nsd
nsd: Update from 4.1.0 -> 4.1.1
2015-03-19 03:15:35 +03:00
Arseniy Seroka
f122393e5d Merge pull request #6884 from offlinehacker/pkgs/t/add
Add t, command line tool for twitter
2015-03-19 03:14:58 +03:00
Arseniy Seroka
ace5a6b8c8 Merge pull request #6887 from lancelotsix/add_networkx_python_module
Add networkx python package
2015-03-19 03:13:51 +03:00
Arseniy Seroka
ce0cea8938 Merge pull request #6888 from KaiSforza/fixvim
vim: Fix vim_configurable options
2015-03-19 03:12:22 +03:00
Vladimír Čunát
80c7a6f107 nmap: extend platforms
Tested briefly by @jcf on darwin, web site claims BSDs are also supported.
2015-03-18 23:51:19 +01:00
William Giokas
9e2d8fd259 vim: Fix vim_configurable options
mzscheme and tcl were using `--enable-mzscheme` and `--enable-tcl` when
those are not actual flags. They should be set to `*interp` instead.
2015-03-18 15:50:37 -07:00
Domen Kožar
38db12b96d Merge pull request #6886 from pjones/fix/vlc
VLC wants a newer version of libdvdnav
2015-03-18 22:54:58 +01:00
Lancelot SIX
8e0134c2cd Add networkx python package 2015-03-18 21:42:50 +01:00
Peter Jones
05d6d77c8e VLC wants a newer version of libdvdnav
* Updated libdvdnav/libdvdread to latest versions

  * Removed libdvdnav patches since they have been incorporated into the
    latest release

  * Added `--enable-dvdnav` configure flag to VLC to ensure that if this
    happens again VLC will fail to build
2015-03-18 14:37:12 -06:00
Bjørn Forsman
5c59b23cef alsa-firmware: longDescription => description 2015-03-18 21:26:20 +01:00
Bjørn Forsman
cf0dfec106 alsa-firmware: align attrname with pkgname
The expression was added only two days ago, so I don't think we need to
keep a copy of the old attribute around.
2015-03-18 21:26:19 +01:00
Rickard Nilsson
bdbdaee3c0 scollector module: Add extraOpts option 2015-03-18 21:16:31 +01:00
Rickard Nilsson
e8892b3ba5 bosun/scollector: Update to rev 20150311224711 2015-03-18 21:16:30 +01:00
Jaka Hudoklin
c84c281508 Merge pull request #6881 from offlinehacker/pkgs/rippled/update
rippled: update to 0.27.3-sp2
2015-03-18 21:08:22 +01:00
Lancelot SIX
7bf0458cb6 Add checkbashisms package 2015-03-18 21:03:30 +01:00
Christoph Hrdinka
6db8155e37 nsd: Update from 4.1.0 -> 4.1.1 2015-03-18 21:01:35 +01:00
Jaka Hudoklin
414dbacfa7 Add t, command line tool for twitter 2015-03-18 21:00:04 +01:00
Jaka Hudoklin
12fde06cdd rippled: update to 0.27.3-sp2 2015-03-18 20:31:05 +01:00