nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-14 09:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,624 Commits 200 Branches 125 Tags 8.9 GiB
3ec413cece
Commit Graph

2050 Commits

Author SHA1 Message Date
Vladimír Čunát
3ec413cece WIP 2014-08-25 15:30:46 +02:00
Vladimír Čunát
77da5efc78 merge the rest of multiple-outputs 
Conflicts:
	pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
	pkgs/development/tools/misc/patchelf/default.nix (easy)
	pkgs/stdenv/generic/setup.sh (previous merge taken)
 2014-08-25 10:41:49 +02:00
Vladimír Čunát
694fa543af Merge 'staging' 
Conflicts:
	pkgs/servers/x11/xorg/default.nix
 2014-08-24 10:50:22 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
 2014-08-23 16:04:53 +02:00
Eelco Dolstra
2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-08-22 00:07:05 +02:00
Vladimír Čunát
d4e9fd2a90 Merge recent master into staging 
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
 2014-08-21 15:09:31 +02:00
Peter Simons
128039217e haskell-hdevtools: fix patch checksum one more time 
It appears that upstream has re-based the pull request, thereby changing the hash.
 2014-08-20 20:26:57 +02:00
Peter Simons
e910c8d6c9 Disable Hydra builds for broken Haskell packages. 
The following packages are broken with GHC 7.8.3:

 - filesystem-conduit version 1.0.0.2
 - ghc-events-analyze version 0.2.0
 - haskelldb version 2.2.2
 - haskell-mpi version 1.2.1
 - haxr-th version 3000.5
 - hoauth version 0.3.5
 - holy-project version 0.1.1.0
 - hoogle version 4.2.32
 - hspread version 0.3.3
 - instant-generics version 0.4
 - ivor version 0.1.14.1
 - jmacro-rpc-happstack version 0.3
 - lambdacube-engine version 0.2.4
 - language-c-inline version 0.6.0.0
 - lockfree-queue version 0.2.3
 - monad-peel version 0.1.1
 - network-transport-tests version 0.1.0.1
 - poppler version 0.12.3
 - profiteur version 0.1.2.1
 - prolog-graph-lib version 0.2.0.1
 - semigroupoid-extras version 4.0
 - setlocale version 0.0.3
 - sized-types version 0.5.0
 - snaplet-postgresql-simple version 0.5
 - snap-loader-dynamic version 0.10.0.2
 - uhc git version 20120502
 - uniqueid version 0.1.1
 - unix-process-conduit version 0.2.2.3
 - vado version 0.0.1
 - vcsgui version 0.0.4
 - xml-html-conduit-lens version 0.3.2.0

The following packages depend on one of the broken ones above:

 - hoodle-builder version 0.3
 - hoodle-core version 0.14
 - hoodle-extra version 0.1
 - hoodle-parser version 0.3
 - hoodle-render version 0.4
 - hoodle-types version 0.3
 - hoodle version 0.3
 - kansas-lava version 0.2.4
 - liblastfm version 0.4.0.0
 - prolog-graph version 0.1.0.2
 - vacuum-cairo version 0.5
 - wcwidth version 0.0.2
 2014-08-20 20:26:57 +02:00
Shea Levy
908bd66407 Merge branch 'master' of git://github.com/ip1981/nixpkgs 
jq: make sure libjq is in library search path
 2014-08-20 11:33:25 -04:00
Rickard Nilsson
7c06bb13be re2c: Fix license reference 2014-08-20 15:30:18 +02:00
Peter Simons
4bbe6a39bb Merge pull request #3686 from ts468/hdevtool 
Fix: hdevtools: correct sha256 hash of patch
 2014-08-20 12:40:37 +02:00
Eelco Dolstra
5c53f22492 Revert "binutils: Enable sysroot support" 
This reverts commit 773595540b. It
breaks stuff and we don't need it anymore.

http://hydra.nixos.org/build/13517591
 2014-08-20 11:13:46 +02:00
Austin Seipp
528a1c0f56 ninja: 1.4.0 -> 1.5.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 01:13:33 -05:00
Austin Seipp
9f5eba94d8 re2c: 0.13.6 -> 0.13.7.4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 01:12:21 -05:00
Thomas Strobel
1fbf590713 Fix: hdevtools: correct sha256 hash of patch 2014-08-20 01:17:16 +02:00
Peter Simons
f700bcaf06 haskell-cabal-bounds: update to version 0.8.4 2014-08-19 23:47:59 +02:00
Peter Simons
08bb0c8a81 haskell-happy-meta: update to version 0.2.0.7 2014-08-19 23:47:58 +02:00
Igor Pashev
628ae1c63e jq: make sure libjq is in library search path 
Fixes runtime error:

jq: error while loading shared libraries: libjq.so.1:
cannot open shared object file: No such file or directory
 2014-08-18 16:22:51 +02:00
Pascal Wittmann
f06419e1a8 inotify-tools: update from 3.13 to 3.14 and add myself to maintainers 
note: project has moved to github on 23 November 2009
 2014-08-17 23:13:12 +02:00
Eelco Dolstra
773595540b binutils: Enable sysroot support 2014-08-17 17:25:12 +02:00
Peter Simons
0f78da8878 haskell-cabal-bounds: update to version 0.8.3 2014-08-17 00:20:13 +02:00
Peter Simons
7f875a328f haskell-happy-meta: update to version 0.2.0.6 2014-08-17 00:20:12 +02:00
Peter Simons
3b12f59ead Merge pull request #3610 from ts468/hdevtools 
Fix for hdevtools: update patch to build with ghc 7.8.3
 2014-08-15 15:25:20 +02:00
Thomas Strobel
5f14d3cceb Fix for hdevtools: update patch to build with ghc 7.8.3 2014-08-15 15:05:46 +02:00
Mateusz Kowalczyk
bd957f8038 haskell-cabal-bounds: update to 0.8.1 2014-08-15 02:16:33 +01:00
Luca Bruno
36bef2b267 gobject-introspection: refer to shlibs with absolute paths in typelibs 
After this, LD_LIBRARY_PATH should not be required anymore.
The patch has been applied only for .la files, so there may
be some other cases missing.
 2014-08-14 23:16:51 +02:00
Peter Simons
1c29dba62a haskell-pointfree: re-generate with cabal2nix 2014-08-14 14:41:22 +02:00
Peter Simons
423f789602 haskell-pointful: re-generate with cabal2nix 2014-08-14 14:41:22 +02:00
Peter Simons
09d214dfbf haskell-hscope: re-generate with cabal2nix 2014-08-14 14:41:22 +02:00
Peter Simons
4e45e7c60f haskell-docs: re-generate with cabal2nix 2014-08-14 14:41:22 +02:00
Thomas Strobel
637ed1642e Add Haskell package: pointfree 2014-08-14 14:41:22 +02:00
Peter Simons
758838df2b Merge pull request #3579 from ts468/haskell-haskell-docs 
Add Haskell package: haskell-docs
 2014-08-14 13:56:24 +02:00
Peter Simons
91ce5a47a6 Merge pull request #3578 from ts468/haskell-hscope 
Add Haskell packages: hscope and pure-cdb
 2014-08-14 13:55:55 +02:00
Michael Raskin
8da8c805bb Update luarocks 2014-08-14 10:14:21 +04:00
Thomas Strobel
aab5ab8711 Add Haskell package: haskell-docs 2014-08-14 01:00:31 +02:00
Thomas Strobel
f2e30cb9b2 Add Haskell package: pointful 2014-08-14 00:40:33 +02:00
Thomas Strobel
26bda4eb00 Add Haskell packages: hscope and pure-cdb 2014-08-14 00:35:32 +02:00
Austin Seipp
6bd1b35509 arcanist: 20140717 -> 20140812 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-12 21:52:35 -05:00
Peter Simons
d3c68cd723 haskell-cabal2nix: update to version 1.68 2014-08-12 16:09:22 +02:00
Moritz Ulrich
e3bf7253b0 rebar: Bump to 2.5.1. 2014-08-12 13:47:59 +02:00
Moritz Ulrich
1f221a72de dfu-programmer: Bump to 0.7. 2014-08-12 13:42:10 +02:00
Peter Simons
e823c123a8 Don't build broken Haskell packages on Hydra. 
These packages don't compile:

 - cabal-delete
 - cabal-file-th
 - categories
 - cmdtheline
 - codec-image-devil
 - concurrent-extra
 - cryptol 1.8.x
 - data-lens
 - diagrams-postscript
 - djinn
 - download
 - dstring
 - enummapset
 - git-date
 - github-backup
 - gtkglext
 - happyy-meta
 - haskeline-class
 - pakcs

These packages depend on some of the packages listed before:

 - Chart-diagrams
 - data-lens-template
 - hp2any-manager
 - purescript
 - repr

These packages fail with GHC 7.8.3 but still compile with older compilers:

 - happy: 1.18.4, 1.18.5, 1.18.6
 2014-08-12 12:37:44 +02:00
Mateusz Kowalczyk
e7832f4b80 haskell-cabal-bounds: update to 0.8 
doCheck = false; remains due to
https://github.com/dan-t/cabal-bounds/issues/3
 2014-08-11 14:34:10 +02:00
Mateusz Kowalczyk
bb5841875d haskell-threadscope: mark as broken 
Needs updating for the gtk/glib/pango API change. Ticket at
https://github.com/haskell/ThreadScope/issues/38 .
 2014-08-11 13:58:39 +02:00
Mateusz Kowalczyk
9cb34308da haskell-PastePipe: add version 1.5 2014-08-11 07:03:19 +02:00
John Wiegley
326ca0f690 Many minor fixes to get things building after recent compiler changes 2014-08-10 23:18:57 -05:00
Peter Simons
43fd39de43 Merge pull request #3520 from pavelkogan/SourceGraph 
new packages: SourceGraph + dependency
 2014-08-10 22:42:56 +02:00
Pavel Kogan
a00209a38e Add SourceGraph: Haskell code analysis tool 2014-08-10 16:13:35 +01:00
Eelco Dolstra
0acc4e6b26 cmake: Fix setup hook on bash < 4.0 
This matters in nix-shell and stdenvNative on Darwin.

Fixes #3204.
 2014-08-09 23:14:01 +02:00
Peter Simons
5ebc4d829b Re-generate Haskell expressions with latest cabal2nix. 2014-08-09 13:49:24 +02:00