3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

87401 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
Michael Raskin c84d0dd419 Merge pull request #22421 from orivej/unison-fsmonitor
unison: install unison-fsmonitor
2017-02-05 19:02:41 +00:00
Michael Raskin 6642e5d873 Merge pull request #22146 from dasuxullebt/gbsplay
gbsplay: init at version 2016-12-17
2017-02-05 19:01:47 +00:00
Alexey Shmalko 3bdfd75681 Merge pull request #22462 from andsild/ansicolor
ansicolor: init at 0.2.4
2017-02-05 20:56:12 +02: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
Joachim F 8012ead681 Merge pull request #22447 from rnhmjoj/fish
fish: 2.3.1 -> 2.5.0
2017-02-05 19:09:43 +01:00
Pascal Wittmann 5cded7db86
rrdtool: 1.5.6 -> 1.6.0 2017-02-05 19:06:29 +01:00
Jascha Geerds ffb91cc697 docker_compose: Remove upper bound version limitations 2017-02-05 18:39:30 +01:00
Joachim F 09b6d2eaed Merge pull request #22432 from peterhoeg/d/freerdp
freerdp: 20160909 -> 20170201 and rename freerdpStable to freerdp_legacy
2017-02-05 17:08:19 +01:00
Joachim F 4459f26ad8 Merge pull request #22175 from dancek/illum
illum: init at 0.4
2017-02-05 16:41:30 +01:00
Vladimír Čunát 94c73dab1d
Merge #22416: wget: 1.18 -> 1.19 2017-02-05 15:51:24 +01:00
asildnes 102e4eed6f
ansicolor: init at 0.2.4 2017-02-05 15:06:11 +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 6d9a37bfc8 CLX and StumpWM no longer need a pinned SBCL 2017-02-05 13:03:03 +01:00
Michael Raskin 5d6f798efc stumpwm: use fresh SBCL 2017-02-05 13:03:03 +01:00
Michael Raskin 64666a402f lispPackages.clx: git-20150117 -> git-20170201 2017-02-05 13:03:03 +01:00
Nikolay Amiantov 90bc1a8595 Merge pull request #22353 from abbradar/bluetooth
Bluetooth improvements
2017-02-05 13:18:48 +03: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
Eelco Dolstra 702dc35803 Merge pull request #22423 from NeQuissimus/git_2_11_1
git: 2.11.0 -> 2.11.1
2017-02-05 11:06:27 +01:00
Benjamin Staffin 39339bd41c Merge pull request #22444 from Ralith/matrix-synapse
matrix-synapse: 0.18.7-rc2 -> 0.19.0
2017-02-05 04:04:11 -05:00
Benjamin Staffin 7faa125946 Merge pull request #22460 from peterhoeg/f/gwenview
gwenview: add support for TIFF images
2017-02-05 04:02:13 -05:00
Benjamin Staffin 2a6b0bd13d Merge pull request #22459 from volth/scala-2.12-requires-jre8
scala 2.12 requires jre8
2017-02-05 04:00:55 -05: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
Peter Hoeg 4b6114e0b9 gwenview: add support for TIFF images 2017-02-05 14:31:58 +08:00
Volth f5bbecc5c5 scala 2.12 requires jre8 2017-02-05 06:24:56 +00:00
Peter Hoeg 94b0128cc6 remmina: 1.2.0-rcgit.15 -> 1.2.0-rcgit.17
We also drop the embedded freerdp in favour of freerdp from upstream.
2017-02-05 14:05:31 +08:00
Peter Hoeg 5dbbdce047 kde4.krdc: depend on freerdp_legacy 2017-02-05 14:05:10 +08:00
Peter Hoeg e881a21ada weston: depend on freerdp_legacy 2017-02-05 14:04:51 +08:00
Peter Hoeg 05684f313e freerdp: 20160909 -> 20170201 and rename old freerdp to freerdp_legacy
The former "stable" version of FreeRDP was actually not stable - it just
happened to have a released version while being both buggy and insecure.

The "unstable" branch hasn't seen a release in years, but everybody
should be using this instead and I have been using it as a daily driver
for ages.

This new version works beautifully here.

If/when at some point upstream does a normal release, we can bring back
stable/unstable if needed.

As I am quite dependent on FreeRDP working properly, I will be commit to
keeping this updated.

The commit used for this release follows the Arch Linux release.
2017-02-05 14:03:59 +08: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
Joachim F d0279311e7 Merge pull request #22451 from ianml/emboss
emboss: 6.0.1 -> 6.6.0
2017-02-05 05:15:31 +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
Joachim F e480521c5b Merge pull request #22443 from rnhmjoj/btfs
btfs: 2.12 -> 2.13
2017-02-05 01:28:51 +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
Joachim F 1e2ce1fffb Merge pull request #22449 from mdorman/emacs-updates
Automated emacs package updates
2017-02-05 01:15:09 +01:00
Ian Lancaster 5f67b7b30a emboss: 6.0.1 -> 6.6.0 2017-02-04 19:05:48 -05:00
Rahul Gopinath 594b533a7c Merge pull request #22441 from rnhmjoj/bdf2psf
bdf2psf: 1.152 -> 1.158
2017-02-04 15:18:51 -08:00
Michael Alan Dorman 339089fa28 melpa-packages: 2017-02-04 2017-02-04 16:57:43 -05:00
Michael Alan Dorman 04f50f2466 melpa-stable-packages: 2017-02-04 2017-02-04 16:57:42 -05:00
Tuomas Tynkkynen b2343099ab make-bootstrap-tools{,-cross}.nix: Fix build after binutils changes
Broken after commit 17a344a ("binutils: Add lib output").
2017-02-04 23:39:25 +02: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
rnhmjoj b0f1881440
fish: 2.3.1 -> 2.5.0 2017-02-04 20:58:55 +01:00
Vladimír Čunát 73d798549f
protobuf, perf: fix my bad condition on gcc version 2017-02-04 20:58:47 +01:00
Vladimír Čunát d2a571aacd
audacity: fixup build also with default gcc
and enableParallelBuilding.
2017-02-04 20:58:18 +01:00
rnhmjoj c9f4358e37
vapoursynth: R35 -> R36 2017-02-04 19:56:50 +01:00