Commit Graph

34867 Commits

Author SHA1 Message Date
Peter Simons
1f18f65650 callCabal2nix: take "name" parameter as a function argument
The callCabal2nix function cannot reliably determine the appropriate "name" for
the package it's processing. Attempts to derive this information have led to
plenty of evaluation errors, and so I'd like to go for the obvious and reliable
solution now and let the caller specify that bit of information.

Here is an example that demonstrates how to use callCabal2nix.

    let
      pkgs = import <nixpkgs> {};
      src = pkgs.fetchFromGitHub {
        owner = "gtk2hs";
        repo = "gtk2hs";
        rev = "eee61d84edf1dd44f8d380d7d7cae2405de50124";
        sha256 = "12i53grimni0dyjqjydl120z5amcn668w4pfhl8dxscjh4a0l5nb";
      };
    in
      pkgs.haskellPackages.callCabal2nix "gtkhs-tools" "${src}/tools" {}
2017-02-05 21:18:27 +01:00
Peter Simons
956c1fe3e8 Merge pull request #22427 from 3noch/fix-callCabal2nix
haskellPackages.callCabal2nix: provide fallback name
2017-02-05 19:37:19 +01:00
Jascha Geerds
ffb91cc697 docker_compose: Remove upper bound version limitations 2017-02-05 18:39:30 +01:00
Nikolay Amiantov
c226a93a9e pythonPackages.pyqt5: enable qtwebengine support 2017-02-05 15:05:53 +03:00
Nikolay Amiantov
41c1534aed qt5.qtwebengine: fix ca bundle path 2017-02-05 15:05:51 +03:00
Michael Raskin
64666a402f lispPackages.clx: git-20150117 -> git-20170201 2017-02-05 13:03:03 +01:00
Pascal Wittmann
91869fb848 Merge pull request #22452 from kirelagin/libnfc-osx
libnfc: Add missing dependency on readline
2017-02-05 11:15:33 +01:00
Tuomas Tynkkynen
321b639d76 gnu-efi: Remove unneeded aarch64 patch
Not needed after the upgrade to 3.0.5. Yay!
2017-02-05 09:34:31 +02:00
Joachim F
8ba043a540 Merge pull request #22456 from peterhoeg/u/wp
wp-cli: 1.0.0 -> 1.1.0
2017-02-05 05:52:04 +01:00
Thomas Tuegel
f9c684e152 Merge pull request #22404 from cpages/jsoncpp
jsoncpp: update and drop old version
2017-02-04 20:06:53 -06:00
Joachim F
f050f3b9cf Merge pull request #22446 from rnhmjoj/vapoursynth
vapoursynth: R35 -> R36
2017-02-05 01:53:54 +01:00
Joachim F
c8a19af1a0 Merge pull request #22445 from rnhmjoj/zimg
zimg: 2.3 -> 2.4
2017-02-05 01:29:22 +01:00
Kirill Elagin
ade80db751 libnfc: Add missing dependency on readline
readline is used by the pn53x-tamashell example.
2017-02-05 03:21:59 +03:00
Tuomas Tynkkynen
01d03cb5e7 binutils: Fix cross build
Broken after commit 17a344a ("binutils: Add lib output").
2017-02-04 23:39:25 +02:00
Jake Waksbaum
927b8159aa nodePackages: Add tern (#22418)
* nodePackages: Add tern

* Remove duplicate tapable
2017-02-04 22:18:28 +01:00
Vladimír Čunát
a2c867fd39
Merge branch 'staging' 2017-02-04 21:02:46 +01:00
Vladimír Čunát
73d798549f
protobuf, perf: fix my bad condition on gcc version 2017-02-04 20:58:47 +01:00
rnhmjoj
c9f4358e37
vapoursynth: R35 -> R36 2017-02-04 19:56:50 +01:00
Michael Raskin
98eb852dee libzmf: configure with --disable-werror, needed on i686 2017-02-04 19:52:05 +01:00
rnhmjoj
4e83364a1d
zimg: 2.3 -> 2.4 2017-02-04 19:33:46 +01:00
Carles Pagès
67dcb6aa4c jsoncpp: fix build on darwin
Also, fixed maintainer attrib
2017-02-04 19:05:12 +01:00
volth
762cc106b4 virt-top: init at 1.0.8 (#21536) 2017-02-04 16:07:45 +01:00
Joachim F
43453eb94b Merge pull request #22289 from frontsideair/flow-37.4
flow: 0.37.1 -> 0.37.4
2017-02-04 15:33:22 +01:00
Bjørn Forsman
5b4a857126 hydra: 2016-12-09 -> 2017-02-03
Unbreaks the build since commit dea81956fc
("nixUnstable: 1.12pre4911_b30d1e7 -> 1.12pre4997_1351b0d").
2017-02-04 14:23:41 +01:00
Vladimír Čunát
94a7a80f0b
Revert "spidermonkey_24: remove"
This reverts commit 5dacc53af3.
2017-02-04 11:53:23 +01:00
Vladimír Čunát
45fcefd4be
qt4: another attempt to fix build on Darwin 2017-02-04 11:28:33 +01:00
Tim Steinbach
39ac62293c
kotlin: 1.0.5-2 -> 1.0.6 2017-02-04 10:53:53 +01:00
Jörg Thalheim
f5db07b158 Merge pull request #22426 from khumba/squirrel-sql
squirrel-sql: init at 3.7.1
2017-02-04 08:40:36 +01:00
Bryan Gardiner
7d3db4f491
squirrel-sql: init at 3.7.1 2017-02-03 23:29:18 -08:00
Jörg Thalheim
39064f1218 Merge pull request #22425 from Mic92/mysql-simple
haskellPackages.mysql-simple: skip check
2017-02-04 08:22:20 +01:00
3noch
8454a9e753
haskellPackages.callCabal2nix: provide fallback name if source is not package 2017-02-04 02:01:10 -05:00
Peter Hoeg
fc54532252 wp-cli: 1.0.0 -> 1.1.0 2017-02-04 11:51:10 +08:00
Rushmore Mushambi
e4fe2165a0 Merge pull request #22403 from retrry/master
rustc, cargo: 1.14.0 -> 1.15.0, 0.15 -> 0.16
2017-02-04 03:00:45 +02:00
Jörg Thalheim
c45f572c68
haskellPackages.mysql-simple: skip check 2017-02-04 01:41:45 +01:00
Pascal Wittmann
7a6aac9076
ocaml-lablgl: use camlp5 2017-02-03 22:12:53 +01:00
Pascal Wittmann
2352099a96
ocaml-4.04: dont strip to obtain a working compiler 2017-02-03 22:12:53 +01:00
Frederik Rietdijk
e3f710466f Merge pull request #22325 from lsix/update_pep257
update pythonPackages.pep257
2017-02-03 21:54:26 +01:00
Pascal Wittmann
ef3fc82fc4
mujs: 2016-11-30 -> 2017-01-24 2017-02-03 19:42:14 +01:00
Michael Raskin
4cc9aaccdd Merge pull request #22347 from dtzWill/fix/julia-pax
julia: fix build and execution on PaX.
2017-02-03 16:26:50 +00:00
Thomas Tuegel
74f5672a1c Merge pull request #22406 from abbradar/qtenv
Qt 5: Use buildEnv for env, don't use it for packages
2017-02-03 09:57:58 -06:00
Nikolay Amiantov
99a83fbe1d qt5.env: use buildEnv
This both simplifies the code and ensures that libraries are linked too.
2017-02-03 18:16:51 +03:00
Nikolay Amiantov
b02799a020 qtcreator: 4.2.0 -> 4.2.1 2017-02-03 17:48:17 +03:00
Vladimír Čunát
2ba076e99c
Merge branch 'master' into staging
>11k more build jobs on master, just for Linux :-/
This way staging will never catch up.
2017-02-03 15:32:08 +01:00
Tadas Barzdzius
5ba2afe9ba racerd: 2016-08-23 -> 2016-12-24 2017-02-03 15:53:42 +02:00
Tadas Barzdzius
c4bb0c7bb4 rustc, cargo: 1.14.0 -> 1.15.0, 0.15.0 -> 0.16.0 2017-02-03 15:53:09 +02:00
Carles Pagès
ba596c9ce9 jsoncpp: remove unused 1.6 version 2017-02-03 13:21:57 +01:00
Carles Pagès
0cde365745 jsoncpp: 1.7.2->1.8.0
I also re-added some stuff lost in previous update (83fd63995a), like
darwin support and maintainers info.
2017-02-03 13:21:56 +01:00
Michael Raskin
d042a831a3 libzmf: init at 0.0.1 2017-02-03 13:14:39 +01:00
Michael Raskin
ae5a279836 libmwaw: 0.3.9 -> 0.3.10 2017-02-03 13:14:39 +01:00
Michael Raskin
426dddd83d harfbuzz: 1.4.1 -> 1.4.2 2017-02-03 13:14:39 +01:00