diff options
author | Orivej Desh <orivej@gmx.fr> | 2018-06-04 03:50:03 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2018-06-04 03:50:03 +0000 |
commit | 4869ddf883fa493314927395bb30cbefd766a757 (patch) | |
tree | 491e513fdb56275134b63102390bcf2d01a86455 /pkgs/top-level | |
parent | 33ed2af2a7c6f90f5abb691cecce66b4382b00b0 (diff) | |
parent | 6db9f4685a310f1ae65e35afacd977d2ed8fb01d (diff) | |
download | nixlib-4869ddf883fa493314927395bb30cbefd766a757.tar nixlib-4869ddf883fa493314927395bb30cbefd766a757.tar.gz nixlib-4869ddf883fa493314927395bb30cbefd766a757.tar.bz2 nixlib-4869ddf883fa493314927395bb30cbefd766a757.tar.lz nixlib-4869ddf883fa493314927395bb30cbefd766a757.tar.xz nixlib-4869ddf883fa493314927395bb30cbefd766a757.tar.zst nixlib-4869ddf883fa493314927395bb30cbefd766a757.zip |
Merge branch 'master' into staging
* master: (26 commits) python.pkgs.cairocffi: update tests for Cairo 1.15.12 python.pkgs.cairocffi: 0.8.0 -> 0.8.1 freecell-solver: fix build perlPackages.CPANPLUS: restore build inputs removed in #41394 Fix GHCJS 8.4/8.2 in sandboxed builds (#41411) dockerTools.pullImage: expose image* attributes (#41366) rust: disable tests on darwin python.pkgs.detox: 0.11 -> 0.12 certbot: disable check on darwin freeimage: fix build with glibc 2.27 shadowsocks-libev: supports darwin (#41421) pythonPackages.jira: fix build (#41419) SDL: propagate libiconv schema2ldif: Init at 1.3 nixos/exim: Add unit restart trigger (#41418) Add myself as maintainer for dnsdist Add myself as maintainer synapse-bt: init at 2018-06-04 (#41402) skim: 0.3.2 -> 0.4.0 (#41417) ctags: fix source url (#41382) ...
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c0ca1092547..16890121590a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3370,6 +3370,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + medfile = callPackage ../development/libraries/medfile { + hdf5 = hdf5_1_8; + }; + memtester = callPackage ../tools/system/memtester { }; minergate = callPackage ../applications/misc/minergate { }; @@ -4911,6 +4915,8 @@ with pkgs; sharutils = callPackage ../tools/archivers/sharutils { }; + schema2ldif = callPackage ../tools/text/schema2ldif { }; + shocco = callPackage ../tools/text/shocco { }; shotwell = callPackage ../applications/graphics/shotwell { }; @@ -15972,7 +15978,7 @@ with pkgs; fomp = callPackage ../applications/audio/fomp { }; - freecad = callPackage ../applications/graphics/freecad { }; + freecad = callPackage ../applications/graphics/freecad { mpi = openmpi; }; freemind = callPackage ../applications/misc/freemind { }; @@ -17135,6 +17141,8 @@ with pkgs; inherit (gnome3) libgee; }; + synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { }; + synfigstudio = callPackage ../applications/graphics/synfigstudio { fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; inherit (gnome3) defaultIconTheme; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5043c8cbd325..ee30e1620adf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2920,7 +2920,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; sha256 = "1ahddfs9jc2z3h7z6lkf9ppmrgw2kjnzcpbrhvwq3rlpxa9xshhq"; }; - doCheck = false; + propagatedBuildInputs = [ ArchiveExtract LogMessage ModulePluggable ObjectAccessor PackageConstants ]; meta = { homepage = https://github.com/jib/cpanplus-devel; description = "Ameliorated interface to the CPAN"; |