dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
John Ericson 2018-05-23 16:00:04 -04:00
commit d7144e708b
24 changed files with 803 additions and 1241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/network-filesystems/beegfs.nix
View File

@ -31,7 +31,7 @@ let
connPortShift = ${toString cfg.connPortShift}
storeAllowFirstRunInit = false
${cfg.mgmtd.extraConfig}
${cfg.meta.extraConfig}
'';
configStorage = name: cfg: pkgs.writeText "storage-${name}.conf" ''

32
pkgs/applications/editors/jetbrains/default.nix
View File

@ -250,12 +250,12 @@ in
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
version = "2018.1.2"; /* updated by script */
version = "2018.1.3"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
sha256 = "12rihb1ppl4i1i0j3yj4ih4qx3xf30kfx022pbvng1rjy0bpikp7"; /* updated by script */
sha256 = "0y959p9jsfqlf6cnj2k5m4bxc85yn5lv549rbacwicx4f0g6zp6r"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
update-channel = "datagrip_2018_1";
@ -263,12 +263,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
version = "2018.1.2"; /* updated by script */
version = "2018.1.3"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
sha256 = "1qhhxarvw6mzavyzackzkbq52yfr5437gljxdvlbr6rpi99hgfzb"; /* updated by script */
sha256 = "02nl6dssf2r4lk0fy40cvgm1m0nnfvaz2k6yygwzr35qmbsw2xjq"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "goland_release";
@ -302,12 +302,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2018.1.2"; /* updated by script */
version = "2018.1.4"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "13si8g7n1qvjm5ivbrazsbqlvwwlg65nia78k74nkaqp704z92cs"; /* updated by script */
sha256 = "0rrcsn44va942nrznldjkxymir45q8gq1lf3f8vg1w3k87cfk1zp"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PS2018.1";
@ -315,12 +315,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2018.1.2"; /* updated by script */
version = "2018.1.3"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1phxzsz2qnyk0b0kkccsgjkxx4ak7rbm68k1lpgr59rwyxqnazy3"; /* updated by script */
sha256 = "1cwrqdcp6hwr8wd234g120bblc4bjmhwxwsgj9mmxblj31c7c6an"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm_Release";
@ -328,12 +328,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2018.1.2"; /* updated by script */
version = "2018.1.3"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "08cfmrrmxs67dc61cvjc0ynzng0hnr2i78fv3m888k4x63cy6mv5"; /* updated by script */
sha256 = "1chri4cknfvvqhxy973dyf7dl5linqdxc97zshrzdqhmwq6y7580"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm_Release";
@ -341,25 +341,25 @@ in
rider = buildRider rec {
name = "rider-${version}";
version = "2017.3.1"; /* updated by script */
version = "2018.1"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/resharper/JetBrains.Rider-${version}.tar.gz";
sha256 = "0k9yc00lmk826pylfs9jyxqnlczk9vhq7bs61b8nyfam1dqbgikv"; /* updated by script */
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
sha256 = "0jhzfi9r18hy6mig8rrrr2n55lrfn5ysa7h347w5yv2dm7kx09ib"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "rider_2017_3";
update-channel = "rider_2018_1";
};
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "2018.1.2"; /* updated by script */
version = "2018.1.3"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "0bnzn811rmgn0kig3mzbwgx85490dqg4sg3pmmmk20n8hcph8zca"; /* updated by script */
sha256 = "033rjsx6zjrfbl89i513ms14iw53ip56h4bkilrij32hshb7c2c5"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "rm2018.1";

2
pkgs/applications/misc/sc-im/default.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
description = "SC-IM - Spreadsheet Calculator Improvised - SC fork";
license = licenses.bsdOriginal;
maintainers = [ ];
platforms = platforms.linux; # Cannot test others
platforms = platforms.unix;
};
}

50
pkgs/applications/networking/feedreaders/feedreader/default.nix Normal file
View File

@ -0,0 +1,50 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala_0_40, gettext
, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite
}:
let
pname = "FeedReader";
version = "2.2";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "jangernert";
repo = pname;
rev = "v" + version;
sha256 = "17588hsa7xv92ba55kmbyvnijypp373yrly48kbc391wadp1z939";
};
nativeBuildInputs = [
meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils
glibcLocales wrapGAppsHook
];
buildInputs = [
curl glib json-glib libnotify libsecret sqlite
] ++ (with gnome3; [
gtk libgee libpeas libsoup rest webkitgtk gnome_online_accounts
gsettings_desktop_schemas
]) ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good
]);
# TODO: fix https://github.com/NixOS/nixpkgs/issues/39547
LIBRARY_PATH = stdenv.lib.makeLibraryPath [ curl ];
# vcs_tag function fails with UnicodeDecodeError
LC_ALL = "en_US.UTF-8";
postPatch = ''
patchShebangs meson_post_install.py
'';
meta = with stdenv.lib; {
description = "A modern desktop application designed to complement existing web-based RSS accounts.";
homepage = https://jangernert.github.io/FeedReader/;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ edwtjo ];
platforms = platforms.linux;
};
}

4
pkgs/applications/science/math/gmsh/default.nix
View File

@ -15,11 +15,13 @@ stdenv.mkDerivation {
# that is supposed to work without Fortran but didn't for me.
patches = [ ./CMakeLists.txt.patch ];
buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib libGLU_combined
buildInputs = [ cmake blas liblapack gmm fltk libjpeg zlib libGLU_combined
libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
];
nativeBuildInputs = [ gfortran ];
enableParallelBuilding = true;
meta = {

30
pkgs/build-support/nix-prefetch-github/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ python3
, fetchFromGitHub
, stdenv
}:
python3.pkgs.buildPythonApplication rec {
pname = "nix-prefetch-github";
version = "1.3";
src = fetchFromGitHub {
owner = "seppeljordan";
repo = "nix-prefetch-github";
rev = "${version}";
sha256 = "1rinbv1q4q8m27ih6l81w1lsmwn6cz7q3iyjiycklywpi8684dh6";
};
propagatedBuildInputs = with python3.pkgs; [
attrs
click
effect
jinja2
requests
];
meta = with stdenv.lib; {
description = "Prefetch sources from github";
homepage = https://github.com/seppeljordan/nix-prefetch-github;
license = licenses.gpl3;
maintainers = [ maintainers.seppeljordan ];
};
}

45
pkgs/development/compilers/llvm/3.7/default.nix
View File

@ -1,12 +1,10 @@
{ newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl
, overrideCC, wrapCCWith, darwin
, buildLlvmPackages # ourself, but from the previous stage, for cross
, targetLlvmPackages # ourself, but from the next stage, for cross
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
}:
let
callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl version fetch; });
version = "3.7.1";
fetch = fetch_v version;
@ -18,41 +16,44 @@ let
compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx";
clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa";
self = {
tools = let
callPackage = newScope (tools // { inherit stdenv isl version fetch; });
in {
llvm = callPackage ./llvm.nix {
inherit compiler-rt_src stdenv;
inherit compiler-rt_src;
inherit (targetLlvmLibraries) libcxxabi;
};
clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src stdenv;
inherit clang-tools-extra_src;
};
clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
libstdcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
cc = tools.clang-unwrapped;
extraPackages = [ libstdcxxHook ];
};
libcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
cc = tools.clang-unwrapped;
extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
};
stdenv = stdenv.override (drv: {
allowedRequisites = null;
cc = self.clang;
});
libcxxStdenv = stdenv.override (drv: {
allowedRequisites = null;
cc = buildLlvmPackages.libcxxClang;
});
lldb = callPackage ./lldb.nix {};
};
libraries = let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
in {
stdenv = overrideCC stdenv buildLlvmTools.clang;
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ {};
libcxxabi = callPackage ./libc++abi.nix {};
};
in self
in { inherit tools libraries; } // libraries // tools

47
pkgs/development/compilers/llvm/3.8/default.nix
View File

@ -1,11 +1,9 @@
{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin
, buildLlvmPackages # ourself, but from the previous stage, for cross
, targetLlvmPackages # ourself, but from the next stage, for cross
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
}:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
version = "3.8.1";
fetch = fetch_v version;
@ -17,43 +15,46 @@ let
compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d";
clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6";
self = {
tools = let
callPackage = newScope (tools // { inherit stdenv isl version fetch; });
in {
llvm = callPackage ./llvm.nix {
inherit compiler-rt_src stdenv;
inherit compiler-rt_src;
inherit (targetLlvmLibraries) libcxxabi;
};
clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src stdenv;
inherit clang-tools-extra_src;
};
libclang = self.clang-unwrapped.lib;
libclang = tools.clang-unwrapped.lib;
clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
libstdcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
cc = tools.clang-unwrapped;
extraPackages = [ libstdcxxHook ];
};
libcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
cc = tools.clang-unwrapped;
extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
};
stdenv = stdenv.override (drv: {
allowedRequisites = null;
cc = self.clang;
});
libcxxStdenv = stdenv.override (drv: {
allowedRequisites = null;
cc = buildLlvmPackages.libcxxClang;
});
lldb = callPackage ./lldb.nix {};
};
libraries = let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
in {
stdenv = overrideCC stdenv buildLlvmTools.clang;
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ {};
libcxxabi = callPackage ./libc++abi.nix {};
};
in self
in { inherit tools libraries; } // libraries // tools

47
pkgs/development/compilers/llvm/3.9/default.nix
View File

@ -1,11 +1,9 @@
{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin
, buildLlvmPackages # ourself, but from the previous stage, for cross
, targetLlvmPackages # ourself, but from the next stage, for cross
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
}:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
version = "3.9.1";
fetch = fetch_v version;
@ -17,43 +15,46 @@ let
compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk";
clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999";
self = {
tools = let
callPackage = newScope (tools // { inherit stdenv isl version fetch; });
in {
llvm = callPackage ./llvm.nix {
inherit compiler-rt_src stdenv;
inherit compiler-rt_src;
inherit (targetLlvmLibraries) libcxxabi;
};
clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src stdenv;
inherit clang-tools-extra_src;
};
libclang = self.clang-unwrapped.lib;
libclang = tools.clang-unwrapped.lib;
clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
libstdcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
cc = tools.clang-unwrapped;
extraPackages = [ libstdcxxHook ];
};
libcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
cc = tools.clang-unwrapped;
extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
};
stdenv = stdenv.override (drv: {
allowedRequisites = null;
cc = self.clang;
});
libcxxStdenv = stdenv.override (drv: {
allowedRequisites = null;
cc = buildLlvmPackages.libcxxClang;
});
lldb = callPackage ./lldb.nix {};
};
libraries = let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
in {
stdenv = overrideCC stdenv buildLlvmTools.clang;
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ {};
libcxxabi = callPackage ./libc++abi.nix {};
};
in self
in { inherit tools libraries; } // libraries // tools

61
pkgs/development/compilers/llvm/4/default.nix
View File

@ -1,13 +1,11 @@
{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
, darwin
, buildLlvmPackages # ourself, but from the previous stage, for cross
, targetLlvmPackages # ourself, but from the next stage, for cross
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
}:
let
callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
release_version = "4.0.1";
version = release_version; # differentiating these is important for rc's
@ -24,47 +22,46 @@ let
let drv-manpages = drv.override { enableManpages = true; }; in
drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
llvm = callPackage ./llvm.nix {
inherit compiler-rt_src stdenv;
};
tools = let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src stdenv;
};
llvm = overrideManOutput (callPackage ./llvm.nix {
inherit compiler-rt_src;
inherit (targetLlvmLibraries) libcxxabi;
});
clang-unwrapped = overrideManOutput (callPackage ./clang {
inherit clang-tools-extra_src;
});
self = {
llvm = overrideManOutput llvm;
clang-unwrapped = overrideManOutput clang-unwrapped;
libclang = tools.clang-unwrapped.lib;
llvm-manpages = lowPrio tools.llvm.man;
clang-manpages = lowPrio tools.clang-unwrapped.man;
libclang = self.clang-unwrapped.lib;
llvm-manpages = lowPrio self.llvm.man;
clang-manpages = lowPrio self.clang-unwrapped.man;
clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
libstdcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
cc = tools.clang-unwrapped;
extraPackages = [ libstdcxxHook ];
};
libcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
cc = tools.clang-unwrapped;
extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
};
stdenv = stdenv.override (drv: {
allowedRequisites = null;
cc = self.clang;
});
libcxxStdenv = stdenv.override (drv: {
allowedRequisites = null;
cc = buildLlvmPackages.libcxxClang;
});
lld = callPackage ./lld.nix {};
lldb = callPackage ./lldb.nix {};
};
libraries = let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
stdenv = overrideCC stdenv buildLlvmTools.clang;
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ {};
@ -73,4 +70,4 @@ let
openmp = callPackage ./openmp.nix {};
};
in self
in { inherit tools libraries; } // libraries // tools

61
pkgs/development/compilers/llvm/5/default.nix
View File

@ -1,13 +1,11 @@
{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
, darwin
, buildLlvmPackages # ourself, but from the previous stage, for cross
, targetLlvmPackages # ourself, but from the next stage, for cross
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
}:
let
callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
release_version = "5.0.2";
version = release_version; # differentiating these is important for rc's
@ -24,47 +22,46 @@ let
let drv-manpages = drv.override { enableManpages = true; }; in
drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
llvm = callPackage ./llvm.nix {
inherit compiler-rt_src stdenv;
};
tools = let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src stdenv;
};
llvm = overrideManOutput (callPackage ./llvm.nix {
inherit compiler-rt_src;
inherit (targetLlvmLibraries) libcxxabi;
});
clang-unwrapped = overrideManOutput (callPackage ./clang {
inherit clang-tools-extra_src;
});
self = {
llvm = overrideManOutput llvm;
clang-unwrapped = overrideManOutput clang-unwrapped;
libclang = tools.clang-unwrapped.lib;
llvm-manpages = lowPrio tools.llvm.man;
clang-manpages = lowPrio tools.clang-unwrapped.man;
libclang = self.clang-unwrapped.lib;
llvm-manpages = lowPrio self.llvm.man;
clang-manpages = lowPrio self.clang-unwrapped.man;
clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
libstdcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
cc = tools.clang-unwrapped;
extraPackages = [ libstdcxxHook ];
};
libcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
cc = tools.clang-unwrapped;
extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
};
stdenv = stdenv.override (drv: {
allowedRequisites = null;
cc = self.clang;
});
libcxxStdenv = stdenv.override (drv: {
allowedRequisites = null;
cc = buildLlvmPackages.libcxxClang;
});
lld = callPackage ./lld.nix {};
lldb = callPackage ./lldb.nix {};
};
libraries = let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
stdenv = overrideCC stdenv buildLlvmTools.clang;
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ {};
@ -73,4 +70,4 @@ let
openmp = callPackage ./openmp.nix {};
};
in self
in { inherit tools libraries; } // libraries // tools

61
pkgs/development/compilers/llvm/6/default.nix
View File

@ -1,13 +1,11 @@
{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
, darwin
, buildLlvmPackages # ourself, but from the previous stage, for cross
, targetLlvmPackages # ourself, but from the next stage, for cross
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
}:
let
callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
release_version = "6.0.0";
version = release_version; # differentiating these is important for rc's
@ -24,47 +22,46 @@ let
let drv-manpages = drv.override { enableManpages = true; }; in
drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
llvm = callPackage ./llvm.nix {
inherit compiler-rt_src stdenv;
};
tools = let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src stdenv;
};
llvm = overrideManOutput (callPackage ./llvm.nix {
inherit compiler-rt_src;
inherit (targetLlvmLibraries) libcxxabi;
});
clang-unwrapped = overrideManOutput (callPackage ./clang {
inherit clang-tools-extra_src;
});
self = {
llvm = overrideManOutput llvm;
clang-unwrapped = overrideManOutput clang-unwrapped;
libclang = tools.clang-unwrapped.lib;
llvm-manpages = lowPrio tools.llvm.man;
clang-manpages = lowPrio tools.clang-unwrapped.man;
libclang = self.clang-unwrapped.lib;
llvm-manpages = lowPrio self.llvm.man;
clang-manpages = lowPrio self.clang-unwrapped.man;
clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
libstdcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
cc = tools.clang-unwrapped;
extraPackages = [ libstdcxxHook ];
};
libcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
cc = tools.clang-unwrapped;
extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
};
stdenv = stdenv.override (drv: {
allowedRequisites = null;
cc = self.clang;
});
libcxxStdenv = stdenv.override (drv: {
allowedRequisites = null;
cc = buildLlvmPackages.libcxxClang;
});
lld = callPackage ./lld.nix {};
lldb = callPackage ./lldb.nix {};
};
libraries = let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
stdenv = overrideCC stdenv buildLlvmTools.clang;
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ {};
@ -73,4 +70,4 @@ let
openmp = callPackage ./openmp.nix {};
};
in self
in { inherit tools libraries; } // libraries // tools

136
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -38,7 +38,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 11.9
# LTS Haskell 11.10
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -67,7 +67,7 @@ default-package-overrides:
- aeson-better-errors ==0.9.1.0
- aeson-casing ==0.1.0.5
- aeson-compat ==0.3.7.1
- aeson-diff ==1.1.0.4
- aeson-diff ==1.1.0.5
- aeson-extra ==0.4.1.0
- aeson-generic-compat ==0.0.1.2
- aeson-injector ==1.1.0.0
@ -152,7 +152,7 @@ default-package-overrides:
- base-compat ==0.9.3
- basement ==0.0.7
- base-orphans ==0.7
- base-prelude ==1.2.0.1
- base-prelude ==1.2.1
- base-unicode-symbols ==0.2.2.4
- basic-prelude ==0.7.0
- bbdb ==0.8
@ -180,7 +180,7 @@ default-package-overrides:
- binary-search ==1.0.0.3
- binary-shared ==0.8.3
- binary-tagged ==0.1.4.2
- bindings-DSL ==1.0.24
- bindings-DSL ==1.0.25
- bindings-GLFW ==3.1.2.4
- bindings-libzip ==1.0.1
- bindings-uname ==0.1
@ -234,7 +234,7 @@ default-package-overrides:
- brittany ==0.9.0.1
- broadcast-chan ==0.1.1
- bsb-http-chunked ==0.0.0.2
- bson ==0.3.2.3
- bson ==0.3.2.6
- bson-lens ==0.1.1
- btrfs ==0.1.2.3
- buchhaltung ==0.0.7
@ -260,7 +260,7 @@ default-package-overrides:
- Cabal ==2.0.1.1
- cabal-doctest ==1.0.6
- cabal-file-th ==0.2.4
- cabal-rpm ==0.12.2
- cabal-rpm ==0.12.3
- cabal-toolkit ==0.0.5
- cache ==0.1.1.0
- cairo ==0.13.5.0
@ -278,7 +278,7 @@ default-package-overrides:
- cassava-records ==0.1.0.4
- cassette ==0.1.0
- cast ==0.1.0.2
- cayley-client ==0.4.5
- cayley-client ==0.4.6
- cereal ==0.5.5.0
- cereal-conduit ==0.8.0
- cereal-text ==0.1.0.2
@ -308,7 +308,7 @@ default-package-overrides:
- circle-packing ==0.1.0.6
- cisco-spark-api ==0.1.0.3
- clang-compilation-database ==0.1.0.1
- classyplate ==0.3.0.2
- classyplate ==0.3.1.0
- classy-prelude ==1.4.0
- classy-prelude-conduit ==1.4.0
- classy-prelude-yesod ==1.4.0
@ -415,7 +415,7 @@ default-package-overrides:
- crypto-random-api ==0.2.0
- crypt-sha512 ==0
- csp ==1.3.1
- css-syntax ==0.0.5
- css-syntax ==0.0.7
- css-text ==0.1.3.0
- csv ==0.1.2
- csv-conduit ==0.6.8.1
@ -481,7 +481,7 @@ default-package-overrides:
- dependent-sum ==0.4
- dependent-sum-template ==0.0.0.6
- deque ==0.2.1
- deriving-compat ==0.4.1
- deriving-compat ==0.4.2
- descriptive ==0.9.4
- dhall ==1.11.1
- dhall-json ==1.0.13
@ -511,11 +511,11 @@ default-package-overrides:
- distributive ==0.5.3
- diversity ==0.8.1.0
- djinn-ghc ==0.0.2.3
- djinn-lib ==0.0.1.2
- djinn-lib ==0.0.1.3
- dlist ==0.8.0.4
- dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1
- dns ==3.0.2
- dns ==3.0.3
- docker ==0.5.1.1
- docker-build-cacher ==1.9.2
- dockerfile ==0.1.0.1
@ -540,7 +540,7 @@ default-package-overrides:
- dynamic-state ==0.3
- dyre ==0.8.12
- Earley ==0.12.1.0
- easy-file ==0.2.1
- easy-file ==0.2.2
- Ebnf2ps ==1.0.15
- echo ==0.1.3
- ed25519 ==0.0.5.0
@ -593,7 +593,7 @@ default-package-overrides:
- eventsource-geteventstore-store ==1.1.0
- eventsource-store-specs ==1.1.1
- eventsource-stub-store ==1.0.3
- eventstore ==1.1.2
- eventstore ==1.1.3
- every ==0.0.1
- exact-combinatorics ==0.2.0.8
- exact-pi ==0.4.1.3
@ -607,7 +607,7 @@ default-package-overrides:
- expiring-cache-map ==0.0.6.1
- explicit-exception ==0.1.9.2
- exp-pairs ==0.1.6.0
- extensible ==0.4.8
- extensible ==0.4.9
- extensible-effects ==2.4.0.0
- extensible-exceptions ==0.1.1.4
- extra ==1.6.6
@ -682,7 +682,7 @@ default-package-overrides:
- from-sum ==0.2.1.0
- frontmatter ==0.1.0.2
- fsnotify ==0.2.1.1
- fsnotify-conduit ==0.1.0.0
- fsnotify-conduit ==0.1.1.0
- funcmp ==1.9
- functor-classes-compat ==1
- fuzzcheck ==0.1.1
@ -732,7 +732,7 @@ default-package-overrides:
- ghcjs-perch ==0.3.3.2
- ghc-parser ==0.2.0.2
- ghc-paths ==0.1.0.9
- ghc-prof ==1.4.1.1
- ghc-prof ==1.4.1.2
- ghc-syb-utils ==0.2.3.3
- ghc-tcplugins-extra ==0.2.5
- ghc-typelits-extra ==0.2.4
@ -740,7 +740,7 @@ default-package-overrides:
- ghc-typelits-natnormalise ==0.5.10
- ghost-buster ==0.1.1.0
- gi-atk ==2.0.15
- gi-cairo ==1.0.15
- gi-cairo ==1.0.17
- gi-glib ==2.0.16
- gi-gobject ==2.0.16
- gi-javascriptcore ==4.0.15
@ -798,7 +798,7 @@ default-package-overrides:
- hackage-db ==2.0
- hackage-security ==0.5.3.0
- haddock-library ==1.4.5
- hailgun ==0.4.1.7
- hailgun ==0.4.1.8
- hailgun-simple ==0.1.0.0
- hakyll ==4.12.2.0
- half ==0.2.2.3
@ -841,7 +841,7 @@ default-package-overrides:
- hasmin ==1.0.2
- hasql ==1.1.1
- hasql-migration ==0.1.3
- hasql-optparse-applicative ==0.3
- hasql-optparse-applicative ==0.3.0.1
- hasql-pool ==0.4.3
- hasql-transaction ==0.6
- hastache ==0.6.1
@ -875,7 +875,7 @@ default-package-overrides:
- hexml-lens ==0.2.1
- hexpat ==0.20.13
- hexstring ==0.11.1
- hformat ==0.3.1.0
- hformat ==0.3.2.0
- hfsevents ==0.1.6
- hid ==0.2.2
- hidapi ==0.1.4
@ -931,8 +931,8 @@ default-package-overrides:
- hsdns ==1.7.1
- hsebaysdk ==0.4.0.0
- hsemail ==2
- hset ==2.2.0
- HSet ==0.0.1
- hset ==2.2.0
- hsexif ==0.6.1.5
- hs-GeoIP ==0.3
- hsignal ==0.2.7.5
@ -1013,7 +1013,7 @@ default-package-overrides:
- hw-mquery ==0.1.0.1
- hworker ==0.1.0.1
- hw-parser ==0.0.0.3
- hw-prim ==0.5.0.3
- hw-prim ==0.5.0.5
- hw-rankselect ==0.10.0.3
- hw-rankselect-base ==0.2.0.2
- hw-string-parse ==0.0.0.4
@ -1082,7 +1082,7 @@ default-package-overrides:
- io-streams-haproxy ==1.0.0.2
- ip ==1.1.2
- ip6addr ==0.5.3
- iproute ==1.7.4
- iproute ==1.7.5
- IPv6Addr ==1.0.3
- IPv6DB ==0.2.6
- ipython-kernel ==0.9.0.2
@ -1113,12 +1113,12 @@ default-package-overrides:
- json ==0.9.2
- json-autotype ==1.0.18
- json-builder ==0.3
- json-rpc-generic ==0.2.1.3
- json-rpc-generic ==0.2.1.4
- json-schema ==0.7.4.1
- json-stream ==0.4.2.3
- JuicyPixels ==3.2.9.5
- JuicyPixels-extra ==0.3.0
- JuicyPixels-scale-dct ==0.1.1.2
- JuicyPixels-scale-dct ==0.1.2
- justified-containers ==0.3.0.0
- jvm ==0.4.2
- jvm-batching ==0.1.1
@ -1297,7 +1297,7 @@ default-package-overrides:
- mmap ==0.5.9
- mmark ==0.0.5.6
- mmark-cli ==0.0.3.0
- mmark-ext ==0.2.0.0
- mmark-ext ==0.2.1.0
- mmorph ==1.1.2
- mnist-idx ==0.1.2.8
- mockery ==0.3.5
@ -1344,7 +1344,7 @@ default-package-overrides:
- monoid-transformer ==0.0.4
- mono-traversable ==1.0.8.1
- mono-traversable-instances ==0.1.0.0
- morte ==1.6.18
- morte ==1.6.19
- mountpoints ==1.0.2
- mstate ==0.2.7
- mtl ==2.2.2
@ -1394,7 +1394,7 @@ default-package-overrides:
- network-ip ==0.3.0.2
- network-multicast ==0.2.0
- Network-NineP ==0.4.3
- network-simple ==0.4.0.5
- network-simple ==0.4.1
- network-transport ==0.5.2
- network-transport-composed ==0.2.1
- network-transport-inmemory ==0.5.2
@ -1418,7 +1418,7 @@ default-package-overrides:
- NoTrace ==0.3.0.2
- nsis ==0.3.2
- n-tuple ==0.0.2.0
- numbers ==3000.2.0.1
- numbers ==3000.2.0.2
- numeric-extras ==0.1
- numeric-prelude ==0.4.3
- numhask ==0.1.4.0
@ -1438,11 +1438,11 @@ default-package-overrides:
- once ==0.2
- one-liner ==0.9.2
- one-liner-instances ==0.1.2.1
- OneTuple ==0.2.1
- OneTuple ==0.2.2
- online ==0.2.1.0
- Only ==0.1
- oo-prototypes ==0.1.0.0
- opaleye ==0.6.1.0
- opaleye ==0.6.7000.0
- OpenAL ==1.7.0.4
- open-browser ==0.2.1.0
- openexr-write ==0.1.0.1
@ -1525,7 +1525,7 @@ default-package-overrides:
- picoparsec ==0.1.2.3
- picosat ==0.1.4
- pid1 ==0.1.2.0
- pinboard ==0.9.12.9
- pinboard ==0.9.12.10
- pinch ==0.3.2.0
- pipes ==4.3.9
- pipes-aeson ==0.4.1.8
@ -1540,7 +1540,7 @@ default-package-overrides:
- pipes-group ==1.0.10
- pipes-misc ==0.4.0.1
- pipes-mongodb ==0.1.0.0
- pipes-network ==0.6.4.1
- pipes-network ==0.6.5
- pipes-parse ==3.0.8
- pipes-random ==1.0.0.4
- pipes-safe ==2.2.9
@ -1562,7 +1562,7 @@ default-package-overrides:
- pooled-io ==0.0.2.1
- PortMidi ==0.1.6.1
- posix-paths ==0.2.1.5
- postgresql-binary ==0.12.1
- postgresql-binary ==0.12.1.1
- postgresql-libpq ==0.9.4.1
- postgresql-schema ==0.1.14
- postgresql-simple ==0.5.3.0
@ -1653,14 +1653,14 @@ default-package-overrides:
- raaz ==0.2.0
- rainbow ==0.28.0.4
- rainbox ==0.18.0.10
- rakuten ==0.1.1.2
- rakuten ==0.1.1.3
- ramus ==0.1.2
- random ==1.1
- random-fu ==0.2.7.0
- random-shuffle ==0.0.4
- random-source ==0.3.0.6
- random-tree ==0.6.0.5
- range-set-list ==0.1.2.0
- range-set-list ==0.1.2.1
- rank1dynamic ==0.4.0
- rank2classes ==1.0.2
- rank-product ==0.2.0.1
@ -1837,7 +1837,7 @@ default-package-overrides:
- signal ==0.1.0.4
- silently ==1.2.5
- simple ==0.11.2
- simple-log ==0.9.3
- simple-log ==0.9.4
- simple-reflect ==0.3.3
- simple-sendfile ==0.2.27
- simple-session ==0.10.1.1
@ -1852,7 +1852,7 @@ default-package-overrides:
- slack-web ==0.2.0.4
- slave-thread ==1.0.2
- slug ==0.1.7
- smallcheck ==1.1.3.1
- smallcheck ==1.1.4
- smoothie ==0.4.2.8
- smtp-mail ==0.1.4.6
- snap ==1.1.0.0
@ -1977,7 +1977,7 @@ default-package-overrides:
- tar-conduit ==0.2.3
- tardis ==0.4.1.0
- tasty ==1.0.1.1
- tasty-ant-xml ==1.1.3
- tasty-ant-xml ==1.1.4
- tasty-auto ==0.2.0.0
- tasty-dejafu ==1.1.0.2
- tasty-discover ==4.2.0
@ -1990,10 +1990,10 @@ default-package-overrides:
- tasty-kat ==0.0.3
- tasty-program ==1.0.5
- tasty-quickcheck ==0.9.2
- tasty-rerun ==1.1.11
- tasty-rerun ==1.1.12
- tasty-silver ==3.1.11
- tasty-smallcheck ==0.8.1
- tasty-stats ==0.2.0.3
- tasty-stats ==0.2.0.4
- tasty-th ==0.1.7
- TCache ==0.12.1
- tce-conf ==1.3
@ -2042,7 +2042,7 @@ default-package-overrides:
- these ==0.7.4
- th-expand-syns ==0.4.4.0
- th-extras ==0.0.0.4
- th-lift ==0.7.8
- th-lift ==0.7.10
- th-lift-instances ==0.1.11
- th-orphans ==0.13.5
- thread-hierarchy ==0.3.0.0
@ -2239,7 +2239,7 @@ default-package-overrides:
- wai-predicates ==0.10.0
- wai-route ==0.3.1.2
- wai-routing ==0.13.0
- wai-session ==0.3.2
- wai-session ==0.3.3
- wai-session-postgresql ==0.2.1.2
- wai-slack-middleware ==0.2.0
- wai-transformers ==0.0.7
@ -2262,8 +2262,8 @@ default-package-overrides:
- websockets ==0.12.4.1
- websockets-rpc ==0.6.0
- websockets-simple ==0.0.6.3
- websockets-snap ==0.10.2.5
- weigh ==0.0.11
- websockets-snap ==0.10.3.0
- weigh ==0.0.12
- wide-word ==0.1.0.6
- wikicfp-scraper ==0.1.0.9
- wild-bind ==0.1.2.0
@ -2343,7 +2343,7 @@ default-package-overrides:
- yesod-auth ==1.6.3
- yesod-auth-fb ==1.9.0
- yesod-auth-hashdb ==1.7
- yesod-bin ==1.6.0.2
- yesod-bin ==1.6.0.3
- yesod-core ==1.6.5
- yesod-csp ==0.2.4.0
- yesod-eventsource ==1.6.0
@ -2718,6 +2718,7 @@ dont-distribute-packages:
AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ]
affection: [ i686-linux, x86_64-linux, x86_64-darwin ]
affine-invariant-ensemble-mcmc: [ i686-linux, x86_64-linux, x86_64-darwin ]
affine: [ i686-linux, x86_64-linux, x86_64-darwin ]
afv: [ i686-linux, x86_64-linux, x86_64-darwin ]
Agata: [ i686-linux, x86_64-linux, x86_64-darwin ]
Agda-executable: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2894,6 +2895,8 @@ dont-distribute-packages:
Animas: [ i686-linux, x86_64-linux, x86_64-darwin ]
animascii: [ i686-linux, x86_64-linux, x86_64-darwin ]
animate-example: [ i686-linux, x86_64-linux, x86_64-darwin ]
animate-preview: [ i686-linux, x86_64-linux, x86_64-darwin ]
animate-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ]
animate: [ i686-linux, x86_64-linux, x86_64-darwin ]
annah: [ i686-linux, x86_64-linux, x86_64-darwin ]
anonymous-sums-tests: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3102,6 +3105,7 @@ dont-distribute-packages:
battlenet-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ]
battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ]
battleplace-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
battleplace: [ i686-linux, x86_64-linux, x86_64-darwin ]
battleships: [ i686-linux, x86_64-linux, x86_64-darwin ]
bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ]
BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3319,6 +3323,7 @@ dont-distribute-packages:
bytable: [ i686-linux, x86_64-linux, x86_64-darwin ]
bytestring-class: [ i686-linux, x86_64-linux, x86_64-darwin ]
bytestring-csv: [ i686-linux, x86_64-linux, x86_64-darwin ]
bytestring-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ]
bytestring-read: [ i686-linux, x86_64-linux, x86_64-darwin ]
bytestring-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ]
bytestring-strict-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3641,6 +3646,8 @@ dont-distribute-packages:
competition: [ i686-linux, x86_64-linux, x86_64-darwin ]
compilation: [ i686-linux, x86_64-linux, x86_64-darwin ]
complexity: [ i686-linux, x86_64-linux, x86_64-darwin ]
componentm-devel: [ i686-linux, x86_64-linux, x86_64-darwin ]
componentm: [ i686-linux, x86_64-linux, x86_64-darwin ]
compose-trans: [ i686-linux, x86_64-linux, x86_64-darwin ]
composite-aeson-refined: [ i686-linux, x86_64-linux, x86_64-darwin ]
composite-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3699,6 +3706,7 @@ dont-distribute-packages:
constrained-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ]
constrained-monads: [ i686-linux, x86_64-linux, x86_64-darwin ]
constraint-manip: [ i686-linux, x86_64-linux, x86_64-darwin ]
constraint-reflection: [ i686-linux, x86_64-linux, x86_64-darwin ]
constraint: [ i686-linux, x86_64-linux, x86_64-darwin ]
ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ]
constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3986,6 +3994,7 @@ dont-distribute-packages:
derive-trie: [ i686-linux, x86_64-linux, x86_64-darwin ]
derive: [ i686-linux, x86_64-linux, x86_64-darwin ]
derp-lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
descript-lang: [ i686-linux, x86_64-linux, x86_64-darwin ]
deterministic-game-engine: [ i686-linux, x86_64-linux, x86_64-darwin ]
deunicode: [ i686-linux, x86_64-linux, x86_64-darwin ]
dewdrop: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3996,8 +4005,13 @@ dont-distribute-packages:
dhall-bash: [ i686-linux, x86_64-linux, x86_64-darwin ]
dhall-check: [ i686-linux, x86_64-linux, x86_64-darwin ]
dhall-nix: [ i686-linux, x86_64-linux, x86_64-darwin ]
dhall-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
dhall-to-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
dhcp-lease-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
di-df1: [ i686-linux, x86_64-linux, x86_64-darwin ]
di-handle: [ i686-linux, x86_64-linux, x86_64-darwin ]
di-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
di: [ i686-linux, x86_64-linux, x86_64-darwin ]
diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ]
diagrams-braille: [ i686-linux, x86_64-linux, x86_64-darwin ]
diagrams-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4027,6 +4041,7 @@ dont-distribute-packages:
dicom: [ i686-linux, x86_64-linux, x86_64-darwin ]
dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ]
diffcabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
difference-monoid: [ i686-linux, x86_64-linux, x86_64-darwin ]
DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ]
DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ]
difftodo: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4207,6 +4222,7 @@ dont-distribute-packages:
ehs: [ i686-linux, x86_64-linux, x86_64-darwin ]
eibd-client-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
Eight-Ball-Pool-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ]
either-both: [ i686-linux, x86_64-linux, x86_64-darwin ]
EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ]
ekg-cloudwatch: [ i686-linux, x86_64-linux, x86_64-darwin ]
ekg-elastic: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4337,6 +4353,7 @@ dont-distribute-packages:
explore: [ i686-linux, x86_64-linux, x86_64-darwin ]
exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ]
expressions-z3: [ i686-linux, x86_64-linux, x86_64-darwin ]
expressions: [ i686-linux, x86_64-linux, x86_64-darwin ]
extcore: [ i686-linux, x86_64-linux, x86_64-darwin ]
extemp: [ i686-linux, x86_64-linux, x86_64-darwin ]
extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4558,6 +4575,7 @@ dont-distribute-packages:
friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ]
frown: [ i686-linux, x86_64-linux, x86_64-darwin ]
frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ]
frpnow-gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ]
frpnow-vty: [ i686-linux, x86_64-linux, x86_64-darwin ]
fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ]
fsh-csv: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4585,6 +4603,7 @@ dont-distribute-packages:
functor-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
functor: [ i686-linux, x86_64-linux, x86_64-darwin ]
functorm: [ i686-linux, x86_64-linux, x86_64-darwin ]
funflow: [ i686-linux, x86_64-linux, x86_64-darwin ]
Fungi: [ i686-linux, x86_64-linux, x86_64-darwin ]
funion: [ i686-linux, x86_64-linux, x86_64-darwin ]
funpat: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4708,6 +4727,7 @@ dont-distribute-packages:
ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-syntax-highlighter: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-time-alloc-prof: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-vis: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghci-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4990,6 +5010,7 @@ dont-distribute-packages:
grammar-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ]
GrammarProducts: [ i686-linux, x86_64-linux, x86_64-darwin ]
grammatical-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ]
grapefruit-ui-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ]
graph-matchings: [ i686-linux, x86_64-linux, x86_64-darwin ]
graph-rewriting-cl: [ i686-linux, x86_64-linux, x86_64-darwin ]
graph-rewriting-gl: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5246,6 +5267,7 @@ dont-distribute-packages:
haskarrow: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskbot-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskdeep: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskdogs: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskeem: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskeline-class: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskelisp: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5352,6 +5374,7 @@ dont-distribute-packages:
haskore-synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskore: [ i686-linux, x86_64-linux, x86_64-darwin ]
HaskRel: [ i686-linux, x86_64-linux, x86_64-darwin ]
hasktags: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskus-binary: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskus-system-build: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskus-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5497,6 +5520,7 @@ dont-distribute-packages:
hevolisa: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexchat: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexif: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexmino: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexml-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexpat-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5573,6 +5597,7 @@ dont-distribute-packages:
hinquire: [ i686-linux, x86_64-linux, x86_64-darwin ]
hinstaller: [ i686-linux, x86_64-linux, x86_64-darwin ]
hint-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
hinter: [ i686-linux, x86_64-linux, x86_64-darwin ]
hinterface: [ i686-linux, x86_64-linux, x86_64-darwin ]
hinvaders: [ i686-linux, x86_64-linux, x86_64-darwin ]
hinze-streams: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5727,6 +5752,7 @@ dont-distribute-packages:
hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ]
hPDB-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
hPDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
HPDF: [ i686-linux, x86_64-linux, x86_64-darwin ]
hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ]
HPhone: [ i686-linux, x86_64-linux, x86_64-darwin ]
HPi: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6108,6 +6134,7 @@ dont-distribute-packages:
instapaper-sender: [ i686-linux, x86_64-linux, x86_64-darwin ]
int-multimap: [ i686-linux, x86_64-linux, x86_64-darwin ]
integer-pure: [ i686-linux, x86_64-linux, x86_64-darwin ]
integreat: [ i686-linux, x86_64-linux, x86_64-darwin ]
intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ]
interleavableGen: [ i686-linux, x86_64-linux, x86_64-darwin ]
interleavableIO: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6316,6 +6343,7 @@ dont-distribute-packages:
KiCS: [ i686-linux, x86_64-linux, x86_64-darwin ]
kif-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
kit: [ i686-linux, x86_64-linux, x86_64-darwin ]
kleene: [ i686-linux, x86_64-linux, x86_64-darwin ]
kmeans-par: [ i686-linux, x86_64-linux, x86_64-darwin ]
kmp-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ]
knead-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6495,6 +6523,7 @@ dont-distribute-packages:
libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ]
LibZip: [ i686-linux, x86_64-linux, x86_64-darwin ]
lifted-protolude: [ i686-linux, x86_64-linux, x86_64-darwin ]
lifted-stm: [ i686-linux, x86_64-linux, x86_64-darwin ]
lifter: [ i686-linux, x86_64-linux, x86_64-darwin ]
ligature: [ i686-linux, x86_64-linux, x86_64-darwin ]
lightning-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6577,6 +6606,7 @@ dont-distribute-packages:
lock-file: [ i686-linux, x86_64-linux, x86_64-darwin ]
locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ]
lockpool: [ i686-linux, x86_64-linux, x86_64-darwin ]
log-effect-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ]
log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ]
log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ]
log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7387,6 +7417,7 @@ dont-distribute-packages:
PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ]
periodic: [ i686-linux, x86_64-linux, x86_64-darwin ]
perm: [ i686-linux, x86_64-linux, x86_64-darwin ]
permutations: [ i686-linux, x86_64-linux, x86_64-darwin ]
permute: [ i686-linux, x86_64-linux, x86_64-darwin ]
PermuteEffects: [ i686-linux, x86_64-linux, x86_64-darwin ]
persist2er: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8281,6 +8312,7 @@ dont-distribute-packages:
shellish: [ i686-linux, x86_64-linux, x86_64-darwin ]
shellmate-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ]
shivers-cfg: [ i686-linux, x86_64-linux, x86_64-darwin ]
shoap: [ i686-linux, x86_64-linux, x86_64-darwin ]
shopify: [ i686-linux, x86_64-linux, x86_64-darwin ]
shorten-strings: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8592,6 +8624,7 @@ dont-distribute-packages:
stego-uuid: [ i686-linux, x86_64-linux, x86_64-darwin ]
stemmer-german: [ i686-linux, x86_64-linux, x86_64-darwin ]
stemmer: [ i686-linux, x86_64-linux, x86_64-darwin ]
step-function: [ i686-linux, x86_64-linux, x86_64-darwin ]
stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ]
stgi: [ i686-linux, x86_64-linux, x86_64-darwin ]
stitch: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8648,6 +8681,7 @@ dont-distribute-packages:
subhask: [ i686-linux, x86_64-linux, x86_64-darwin ]
subleq-toolchain: [ i686-linux, x86_64-linux, x86_64-darwin ]
submark: [ i686-linux, x86_64-linux, x86_64-darwin ]
subsample: [ i686-linux, x86_64-linux, x86_64-darwin ]
suffix-array: [ i686-linux, x86_64-linux, x86_64-darwin ]
suffixarray: [ i686-linux, x86_64-linux, x86_64-darwin ]
SuffixStructures: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8732,6 +8766,7 @@ dont-distribute-packages:
Tablify: [ i686-linux, x86_64-linux, x86_64-darwin ]
tablize: [ i686-linux, x86_64-linux, x86_64-darwin ]
tabloid: [ i686-linux, x86_64-linux, x86_64-darwin ]
taffybar: [ i686-linux, x86_64-linux, x86_64-darwin ]
tag-bits: [ i686-linux, x86_64-linux, x86_64-darwin ]
tagged-exception-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
tagged-list: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8843,6 +8878,7 @@ dont-distribute-packages:
text-containers: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-icu-translit: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-markup: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8881,6 +8917,7 @@ dont-distribute-packages:
thimk: [ i686-linux, x86_64-linux, x86_64-darwin ]
Thingie: [ i686-linux, x86_64-linux, x86_64-darwin ]
thorn: [ i686-linux, x86_64-linux, x86_64-darwin ]
threadscope: [ i686-linux, x86_64-linux, x86_64-darwin ]
threepenny-gui-contextmenu: [ i686-linux, x86_64-linux, x86_64-darwin ]
Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ]
thrift: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -9016,6 +9053,7 @@ dont-distribute-packages:
tsuntsun: [ i686-linux, x86_64-linux, x86_64-darwin ]
tsvsql: [ i686-linux, x86_64-linux, x86_64-darwin ]
ttask: [ i686-linux, x86_64-linux, x86_64-darwin ]
tttool: [ i686-linux, x86_64-linux, x86_64-darwin ]
tuntap: [ i686-linux, x86_64-linux, x86_64-darwin ]
tup-functor: [ i686-linux, x86_64-linux, x86_64-darwin ]
tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -9108,6 +9146,7 @@ dont-distribute-packages:
unbounded-delays-units: [ i686-linux, x86_64-linux, x86_64-darwin ]
unboxed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ]
unbreak: [ i686-linux, x86_64-linux, x86_64-darwin ]
unexceptionalio-trans: [ i686-linux, x86_64-linux, x86_64-darwin ]
uni-events: [ i686-linux, x86_64-linux, x86_64-darwin ]
uni-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ]
uni-htk: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -9220,6 +9259,7 @@ dont-distribute-packages:
verbalexpressions: [ i686-linux, x86_64-linux, x86_64-darwin ]
verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
verdict: [ i686-linux, x86_64-linux, x86_64-darwin ]
verifiable-expressions: [ i686-linux, x86_64-linux, x86_64-darwin ]
verify: [ i686-linux, x86_64-linux, x86_64-darwin ]
verilog: [ i686-linux, x86_64-linux, x86_64-darwin ]
vicinity: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -9372,6 +9412,7 @@ dont-distribute-packages:
woffex: [ i686-linux, x86_64-linux, x86_64-darwin ]
wolf: [ i686-linux, x86_64-linux, x86_64-darwin ]
word2vec-model: [ i686-linux, x86_64-linux, x86_64-darwin ]
word: [ i686-linux, x86_64-linux, x86_64-darwin ]
WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ]
wordchoice: [ i686-linux, x86_64-linux, x86_64-darwin ]
Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -9455,6 +9496,7 @@ dont-distribute-packages:
xml-tydom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
xml2json: [ i686-linux, x86_64-linux, x86_64-darwin ]
xml2x: [ i686-linux, x86_64-linux, x86_64-darwin ]
XML: [ i686-linux, x86_64-linux, x86_64-darwin ]
xmlbf-xeno: [ i686-linux, x86_64-linux, x86_64-darwin ]
xmlbf-xmlhtml: [ i686-linux, x86_64-linux, x86_64-darwin ]
XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ]

2
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -171,7 +171,7 @@ let
nativeBuildInputs = [ ghc nativeGhc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
buildTools ++ libraryToolDepends ++ executableToolDepends;
propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
allPkgconfigDepends ++
optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends);

1327
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/interpreters/elixir/1.6.nix
View File

@ -1,7 +1,7 @@
{ mkDerivation }:
mkDerivation rec {
version = "1.6.4";
sha256 = "0li2zb5ha7fdkjnzjbj3dxb9xls8xn6xr23fqwl7gp2697vcw3ws";
version = "1.6.5";
sha256 = "0il1fraz6c8qbqv4wrp16jqrkf3xglfa9f3sdm6q4vv8kjf3lxxb";
minimumOTPVersion = "18";
}

4
pkgs/development/python-modules/django/1_11.nix
View File

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
version = "1.11.12";
version = "1.11.13";
disabled = pythonOlder "2.7";
src = fetchurl {
url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
sha256 = "1szjha338grhf9dq0wpbrqwvak597shsx474pm5j67kn09xqqfad";
sha256 = "19d4c1rlbhmbvbxvskvqjb2aw4dnf2cqi1hhdh11ykdy1a7gxba6";
};
patches = stdenv.lib.optionals withGdal [

33
pkgs/development/python-modules/effect/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ buildPythonPackage
, fetchPypi
, lib
, six
, attrs
, pytest
, testtools
}:
buildPythonPackage rec {
version = "0.11.0";
pname = "effect";
src = fetchPypi {
inherit pname version;
sha256 = "1q75w4magkqd8ggabhhzzxmxakpdnn0vdg7ygj89zdc9yl7561q6";
};
checkInputs = [
pytest
testtools
];
propagatedBuildInputs = [
six
attrs
];
checkPhase = ''
pytest .
'';
meta = with lib; {
description = "Pure effects for Python";
homepage = https://github.com/python-effect/effect;
license = licenses.mit;
};
}

21
pkgs/development/python-modules/pylibconfig2/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, buildPythonPackage, fetchPypi, pyparsing }:
buildPythonPackage rec {
pname = "pylibconfig2";
version = "0.2.5";
src = fetchPypi {
inherit pname version;
sha256 = "1iwm11v0ghv2pq2cyvly7gdwrhxsx6iwi581fz46l0snhgcd4sqq";
};
# tests not included in the distribution
doCheck = false;
propagatedBuildInputs = [ pyparsing ];
meta = with stdenv.lib; {
homepage = https://github.com/heinzK1X/pylibconfig2;
description = "Pure python library for libconfig syntax";
license = licenses.gpl3;
};
}

2
pkgs/development/tools/misc/strace/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional libunwind.supportsHost [ libunwind ]; # support -k
buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k
configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check";

4
pkgs/tools/networking/stunnel/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "stunnel-${version}";
version = "5.44";
version = "5.45";
src = fetchurl {
url = "https://www.stunnel.org/downloads/${name}.tar.gz";
sha256 = "990a325dbb47d77d88772dd02fbbd27d91b1fea3ece76c9ff4461eca93f12299";
sha256 = "1qrfb418skdcm7b3v30ixng1ng907f4rfv54zvgz8jwakf1l90jl";
# please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
# not the output of `nix-prefetch-url`
};

4
pkgs/tools/security/tor/default.nix
View File

@ -15,11 +15,11 @@
}:
stdenv.mkDerivation rec {
name = "tor-0.3.2.10";
name = "tor-0.3.3.6";
src = fetchurl {
url = "https://dist.torproject.org/${name}.tar.gz";
sha256 = "1vnb2wkcmm8rnz0fqi3k7arl60mpycs8rjn8hvbgv56g3p1pgpv0";
sha256 = "1drk2h8zd05xrfpx7xn77pcxz0hs4nrq6figw56qk5gkvgv5kg4r";
};
outputs = [ "out" "geoip" ];

44
pkgs/top-level/all-packages.nix
View File

@ -2317,6 +2317,8 @@ with pkgs;
fdm = callPackage ../tools/networking/fdm {};
feedreader = callPackage ../applications/networking/feedreaders/feedreader {};
ferm = callPackage ../tools/networking/ferm { };
fgallery = callPackage ../tools/graphics/fgallery {
@ -6690,51 +6692,51 @@ with pkgs;
llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 ({
isl = isl_0_12;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6;
stdenv = overrideCC stdenv buildPackages.gcc6;
});
llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({
isl = isl_0_14;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6;
stdenv = overrideCC stdenv buildPackages.gcc6;
});
llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmPackages = buildPackages.llvmPackages_37;
targetLlvmPackages = targetPackages.llvmPackages_37;
buildLlvmTools = buildPackages.llvmPackages_37.tools;
targetLlvmLibraries = targetPackages.llvmPackages_37.libraries;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6;
stdenv = overrideCC stdenv buildPackages.gcc6;
});
llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmPackages = buildPackages.llvmPackages_38;
targetLlvmPackages = targetPackages.llvmPackages_38;
buildLlvmTools = buildPackages.llvmPackages_38.tools;
targetLlvmLibraries = targetPackages.llvmPackages_38.libraries;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6;
stdenv = overrideCC stdenv buildPackages.gcc6;
});
llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmPackages = buildPackages.llvmPackages_39;
targetLlvmPackages = targetPackages.llvmPackages_39;
buildLlvmTools = buildPackages.llvmPackages_39.tools;
targetLlvmLibraries = targetPackages.llvmPackages_39.libraries;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6;
stdenv = overrideCC stdenv buildPackages.gcc6;
});
llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmPackages = buildPackages.llvmPackages_4;
targetLlvmPackages = targetPackages.llvmPackages_4;
buildLlvmTools = buildPackages.llvmPackages_4.tools;
targetLlvmLibraries = targetPackages.llvmPackages_4.libraries;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6;
stdenv = overrideCC stdenv buildPackages.gcc6;
});
llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmPackages = buildPackages.llvmPackages_5;
targetLlvmPackages = targetPackages.llvmPackages_5;
buildLlvmTools = buildPackages.llvmPackages_5.tools;
targetLlvmLibraries = targetPackages.llvmPackages_5.libraries;
} // stdenv.lib.optionalAttrs stdenv.isDarwin {
cmake = cmake.override {
isBootstrap = true;
@ -6743,15 +6745,15 @@ with pkgs;
libxml2 = libxml2.override { pythonSupport = false; };
python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
});
llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmPackages = buildPackages.llvmPackages_6;
targetLlvmPackages = targetPackages.llvmPackages_6;
buildLlvmTools = buildPackages.llvmPackages_6.tools;
targetLlvmLibraries = targetPackages.llvmPackages_6.libraries;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
});
manticore = callPackage ../development/compilers/manticore { };
@ -20793,6 +20795,8 @@ with pkgs;
nix-pin = callPackage ../tools/package-management/nix-pin { };
nix-prefetch-github = callPackage ../build-support/nix-prefetch-github {};
inherit (callPackages ../tools/package-management/nix-prefetch-scripts { })
nix-prefetch-bzr
nix-prefetch-cvs

21
pkgs/top-level/python-packages.nix
View File

@ -5162,6 +5162,7 @@ in {
};
};
effect = callPackage ../development/python-modules/effect {};
elpy = buildPythonPackage rec {
name = "elpy-${version}";
@ -9892,25 +9893,7 @@ in {
pybase64 = callPackage ../development/python-modules/pybase64 { };
pylibconfig2 = buildPythonPackage rec {
name = "pylibconfig2-${version}";
version = "0.2.4";
src = pkgs.fetchurl {
url = "mirror://pypi/p/pylibconfig2/${name}.tar.gz";
sha256 = "0kyg6gldj6hi2jhc5xhi834bb2mcaiy24dvfik963shnldqr7kqg";
};
doCheck = false;
propagatedBuildInputs = with self ; [ pyparsing ];
meta = {
homepage = https://github.com/heinzK1X/pylibconfig2;
description = "Pure python library for libconfig syntax";
license = licenses.gpl3;
};
};
pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { };
pylibmc = callPackage ../development/python-modules/pylibmc {};