public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
Hydra: ?compare=1401528
This commit is contained in:
Vladimír Čunát
2017-10-14 10:36:13 +02:00
parent 2a4f47dd1a 2fdfefa2da
commit 6525c22ef1
215 changed files with 6811 additions and 7612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/ghcjs/default.nix
View File

@@ -2,5 +2,5 @@
bootPkgs.callPackage ./base.nix {
inherit bootPkgs;
broken = false;
broken = true; # https://hydra.nixos.org/build/62184741
}

4
pkgs/development/compilers/haxe/default.nix
View File

@@ -72,8 +72,8 @@ in {
'';
};
haxe_3_4 = generic {
version = "3.4.3";
sha256 = "1rrbrc81pilq0d691kp22yjwvvg0kw7q9b9npdghga2ks0hzpr02";
version = "3.4.4";
sha256 = "057psarsmz8q2y9pqv5221vpdya241gcy8xnl2wg9wyscn6z1lx6";
prePatch = ''
sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml
sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/haxelib/client/Main.hx

7
pkgs/development/compilers/hhvm/default.nix
View File

@@ -2,8 +2,8 @@
, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
, libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
, libvpx, imagemagick, fribidi, gperf, which
, libxslt, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
, libvpx, imagemagick, fribidi, gperf, which, ocamlPackages
}:
stdenv.mkDerivation rec {
@@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
[ cmake pkgconfig boost libunwind mariadb.client libmemcached pcre gdb git perl
libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5
gmp libyaml libedit libvpx imagemagick fribidi gperf which
ocamlPackages.ocaml ocamlPackages.ocamlbuild
];
patches = [

5
pkgs/development/compilers/obliv-c/default.nix
View File

@@ -1,8 +1,9 @@
{stdenv, fetchurl, ocaml, libgcrypt, fetchFromGitHub, ocamlPackages, perl}:
{ stdenv, fetchurl, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
stdenv.mkDerivation rec {
name = "obliv-c-${version}";
version = "0.0pre20170827";
buildInputs = [ ocaml ocamlPackages.findlib perl ];
buildInputs = [ perl ]
++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]);
propagatedBuildInputs = [ libgcrypt ];
src = fetchFromGitHub {
owner = "samee";

4
pkgs/development/compilers/ponyc/default.nix
View File

@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
version = "0.19.2";
version = "0.19.3";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
sha256 = "04vbhkkgpjh19pv2bq4b60lgnk5ck8axqs6fgw4l44j3lvxwlwrh";
sha256 = "0aishczaasp877z1a17iq0vk6pp369bv7yz5mvinr7wm44930qr3";
};
buildInputs = [ llvm makeWrapper which ];

59
pkgs/development/coq-modules/HoTT/default.nix Normal file
View File

@@ -0,0 +1,59 @@
{ stdenv, fetchFromGitHub, autoconf, automake, coq }:
if !stdenv.lib.versionAtLeast coq.coq-version "8.6"
then throw "This version of HoTT requires Coq 8.6"
else stdenv.mkDerivation rec {
name = "coq${coq.coq-version}-HoTT-${version}";
version = "20170921";
src = fetchFromGitHub {
owner = "HoTT";
repo = "HoTT";
rev = "e3557740a699167e6adb1a65855509d55a392fa1";
sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v";
};
buildInputs = [ autoconf automake coq ];
enableParallelBuilding = true;
preConfigure = ''
patchShebangs ./autogen.sh
./autogen.sh
mkdir -p "$out/bin"
'';
configureFlags = [
"--bindir=$(out)/bin"
];
patchPhase = ''
patchShebangs etc
patchShebangs hoqc hoqchk hoqdep hoqide hoqtop
'';
postBuild = ''
patchShebangs hoq-config
'';
# Currently, all the scripts like hoqc and hoqtop assume that the *.vo files are
# either (1) in the same directory as the scripts, or (2) in /usr/share/hott.
# We fulfill (1), which means that these files are only accessible via hoqtop,
# hoqc, etc and not via coqtop, coqc, etc.
postInstall = ''
mv $out/share/hott/* "$out/bin"
rmdir $out/share/hott
rmdir $out/share
'';
installFlags = [
"COQBIN=${coq}/bin"
];
meta = with stdenv.lib; {
homepage = http://homotopytypetheory.org/;
description = "Homotopy type theory";
maintainers = with maintainers; [ siddharthist ];
platforms = coq.meta.platforms;
};
}

13
pkgs/development/haskell-modules/configuration-common.nix
View File

@@ -212,12 +212,7 @@ self: super: {
double-conversion = if !pkgs.stdenv.isDarwin
then super.double-conversion
else addExtraLibrary (overrideCabal super.double-conversion (drv:
{
postPatch = ''
substituteInPlace double-conversion.cabal --replace stdc++ c++
'';
})) pkgs.libcxx;
else addExtraLibrary super.double-conversion pkgs.libcxx;
inline-c-cpp = if !pkgs.stdenv.isDarwin
then super.inline-c-cpp
@@ -941,12 +936,6 @@ self: super: {
sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7";
});
# happy 1.19.6+ broke the Agda build. Sticking with the previous version
# avoided that issue, but now the build fails with a segmentation fault
# during the install phase for no apparent reason:
# https://hydra.nixos.org/build/60678124
Agda = markBroken (super.Agda.override { happy = self.happy_1_19_5; });
# cryptol-2.5.0 doesn't want happy 1.19.6+.
cryptol = super.cryptol.override { happy = self.happy_1_19_5; };

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

@@ -37,7 +37,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 9.6
# LTS Haskell 9.8
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -167,7 +167,7 @@ default-package-overrides:
- amqp ==0.15.1
- annotated-wl-pprint ==0.7.0
- anonymous-sums ==0.6.0.0
- ansigraph ==0.3.0.3
- ansigraph ==0.3.0.4
- ansi-terminal ==0.6.3.1
- ansi-wl-pprint ==0.6.7.3
- api-field-json-th ==0.1.0.2
@@ -271,7 +271,7 @@ default-package-overrides:
- bits ==0.5.1
- bitx-bitcoin ==0.11.0.1
- blake2 ==0.2.0
- blank-canvas ==0.6
- blank-canvas ==0.6.1
- BlastHTTP ==1.2.1
- blastxml ==0.3.2
- blaze-bootstrap ==0.1.0.1
@@ -333,7 +333,7 @@ default-package-overrides:
- cabal-rpm ==0.11.2
- cache ==0.1.0.0
- cacophony ==0.10.0
- cairo ==0.13.3.1
- cairo ==0.13.4.1
- calendar-recycling ==0.0
- call-stack ==0.1.0
- carray ==0.1.6.8
@@ -421,7 +421,7 @@ default-package-overrides:
- concurrent-output ==1.9.2
- concurrent-split ==0.0.1
- concurrent-supply ==0.1.8
- conduit ==1.2.12
- conduit ==1.2.12.1
- conduit-combinators ==1.1.1
- conduit-connection ==0.1.0.3
- conduit-extra ==1.1.17
@@ -526,7 +526,7 @@ default-package-overrides:
- Decimal ==0.4.2
- declarative ==0.5.1
- deepseq-generics ==0.2.0.0
- dejafu ==0.7.2.0
- dejafu ==0.7.3.0
- dependent-map ==0.2.4.0
- dependent-sum ==0.4
- derive ==2.6.3
@@ -552,7 +552,7 @@ default-package-overrides:
- digits ==0.3.1
- dimensional ==1.0.1.3
- directory-tree ==0.12.1
- direct-sqlite ==2.3.20
- direct-sqlite ==2.3.21
- discord-gateway ==0.2.2
- discord-hs ==0.4.2
- discord-rest ==0.2.2
@@ -612,9 +612,9 @@ default-package-overrides:
- either ==4.4.1.1
- either-unwrap ==1.1
- ekg ==0.4.0.14
- ekg-core ==0.1.1.2
- ekg-core ==0.1.1.3
- ekg-json ==0.1.0.6
- ekg-statsd ==0.2.1.1
- ekg-statsd ==0.2.2.0
- ekg-wai ==0.1.0.2
- elerea ==2.9.0
- elm-bridge ==0.4.1
@@ -627,7 +627,7 @@ default-package-overrides:
- encoding-io ==0.0.1
- engine-io ==1.2.17
- engine-io-wai ==1.0.6
- EntrezHTTP ==1.0.4
- EntrezHTTP ==1.0.3
- entropy ==0.3.8
- enummapset ==0.5.2.1
- enummapset-th ==0.6.1.1
@@ -669,7 +669,7 @@ default-package-overrides:
- expiring-cache-map ==0.0.6.1
- explicit-exception ==0.1.9
- exp-pairs ==0.1.5.2
- extensible ==0.4.4
- extensible ==0.4.5
- extensible-effects ==1.11.1.0
- extensible-exceptions ==0.1.1.4
- extra ==1.5.3
@@ -689,7 +689,7 @@ default-package-overrides:
- feed ==0.3.12.0
- FenwickTree ==0.1.2.1
- fft ==0.1.8.6
- fgl ==5.5.4.0
- fgl ==5.5.3.1
- fgl-arbitrary ==0.2.0.3
- filecache ==0.2.9
- file-embed ==0.0.10
@@ -698,8 +698,8 @@ default-package-overrides:
- file-modules ==0.1.2.4
- fileplow ==0.1.0.0
- filter-logger ==0.6.0.0
- find-clumpiness ==0.2.3.0
- fingertree ==0.1.1.0
- find-clumpiness ==0.2.3.1
- fingertree ==0.1.2.1
- fingertree-psqueue ==0.3
- finite-typelits ==0.1.2.0
- fixed ==0.2.1.1
@@ -739,7 +739,7 @@ default-package-overrides:
- freetype2 ==0.1.2
- free-vl ==0.1.4
- friendly-time ==0.4.1
- frisby ==0.2
- frisby ==0.2.1
- from-sum ==0.2.1.0
- frontmatter ==0.1.0.2
- fsnotify ==0.2.1.1
@@ -808,7 +808,7 @@ default-package-overrides:
- glazier-react ==0.6.0.0
- glazier-react-widget ==0.6.0.0
- GLFW-b ==1.4.8.1
- glib ==0.13.4.1
- glib ==0.13.5.0
- Glob ==0.8.0
- glob-posix ==0.1.0.1
- gloss ==1.11.1.1
@@ -936,10 +936,9 @@ default-package-overrides:
- grouped-list ==0.2.1.3
- groupoids ==4.0
- groups ==0.4.0.0
- gtk ==0.14.6
- gtk2hs-buildtools ==0.13.2.2
- gtk3 ==0.14.6
- gtksourceview3 ==0.13.3.1
- gtk ==0.14.7
- gtk2hs-buildtools ==0.13.3.0
- gtk3 ==0.14.7
- H ==0.9.0.1
- h2c ==1.0.0
- hackage-db ==1.22
@@ -965,11 +964,11 @@ default-package-overrides:
- happstack-server-tls ==7.1.6.4
- happy ==1.19.7
- harp ==0.4.3
- hasbolt ==0.1.2.1
- hasbolt ==0.1.3.0
- hashable ==1.2.6.1
- hashable-time ==0.2.0.1
- hashmap ==1.3.2
- hashtables ==1.2.2.0
- hashtables ==1.2.2.1
- haskeline ==0.7.4.0
- haskell-gi ==0.20.3
- haskell-gi-base ==0.20.4
@@ -1134,7 +1133,7 @@ default-package-overrides:
- htaglib ==1.1.1
- HTF ==0.13.2.2
- html ==1.0.1.2
- html-conduit ==1.2.1.1
- html-conduit ==1.2.1.2
- html-email-validate ==0.2.0.0
- htoml ==1.0.0.3
- HTTP ==4000.3.7
@@ -1210,7 +1209,7 @@ default-package-overrides:
- inline-java ==0.6.5
- inline-r ==0.9.0.1
- insert-ordered-containers ==0.2.1.0
- instance-control ==0.1.1.1
- instance-control ==0.1.2.0
- integer-logarithms ==1.0.2
- integration ==0.2.1
- intero ==0.1.23
@@ -1272,7 +1271,7 @@ default-package-overrides:
- jwt ==0.7.2
- kan-extensions ==5.0.2
- kansas-comet ==0.4
- katip ==0.5.0.2
- katip ==0.5.0.3
- kawhi ==0.3.0
- kdt ==0.2.4
- keter ==1.4.3.2
@@ -1304,7 +1303,7 @@ default-package-overrides:
- lattices ==1.5.0
- lazyio ==0.1.0.4
- lca ==0.3
- leancheck ==0.6.5
- leancheck ==0.6.7
- leapseconds-announced ==2017
- lens ==4.15.4
- lens-action ==0.2.2
@@ -1339,7 +1338,7 @@ default-package-overrides:
- linked-list-with-iterator ==0.1.1.0
- linux-file-extents ==0.2.0.0
- linux-namespaces ==0.1.2.0
- List ==0.6.1
- List ==0.6.2
- list-fusion-probe ==0.1.0.6
- ListLike ==4.5.1
- list-prompt ==0.1.1.0
@@ -1350,7 +1349,7 @@ default-package-overrides:
- lmdb ==0.2.5
- loch-th ==0.2.1
- log ==0.9.0.1
- log-base ==0.7.2.0
- log-base ==0.7.3.0
- log-domain ==0.11.2
- log-elasticsearch ==0.9.1.0
- logfloat ==0.13.3.3
@@ -1363,7 +1362,7 @@ default-package-overrides:
- loop ==0.3.0
- lrucache ==1.2.0.0
- lrucaching ==0.3.2
- lucid ==2.9.8.1
- lucid ==2.9.9
- lucid-svg ==0.7.0.0
- lzma-conduit ==1.1.3.3
- machines ==0.6.3
@@ -1483,7 +1482,7 @@ default-package-overrides:
- multistate ==0.7.1.2
- murmur-hash ==0.1.0.9
- mushu ==0.1.1
- MusicBrainz ==0.3
- MusicBrainz ==0.3.1
- mustache ==2.2.3
- mutable-containers ==0.3.3
- mwc-probability ==1.3.0
@@ -1523,7 +1522,7 @@ default-package-overrides:
- network-transport-composed ==0.2.0.1
- network-transport-inmemory ==0.5.2
- network-transport-tcp ==0.5.1
- network-transport-tests ==0.2.4.1
- network-transport-tests ==0.2.4.2
- network-uri ==2.6.1.0
- newtype ==0.2
- newtype-generics ==0.5.1
@@ -1598,7 +1597,7 @@ default-package-overrides:
- pandoc ==1.19.2.4
- pandoc-citeproc ==0.10.5.1
- pandoc-types ==1.17.0.5
- pango ==0.13.3.1
- pango ==0.13.4.0
- papillon ==0.1.0.4
- parallel ==3.2.1.1
- parallel-io ==0.3.3
@@ -1656,7 +1655,7 @@ default-package-overrides:
- pipes-cacophony ==0.5.0
- pipes-category ==0.2.0.1
- pipes-concurrency ==2.0.8
- pipes-extras ==1.0.10
- pipes-extras ==1.0.11
- pipes-fluid ==0.5.0.3
- pipes-group ==1.0.8
- pipes-misc ==0.3.0.0
@@ -1749,7 +1748,7 @@ default-package-overrides:
- proxied ==0.3
- psql-helpers ==0.1.0.0
- PSQueue ==1.1
- psqueues ==0.2.3.0
- psqueues ==0.2.4.0
- publicsuffix ==0.20170508
- pure-io ==0.2.1
- pureMD5 ==2.1.3
@@ -1802,9 +1801,9 @@ default-package-overrides:
- recursion-schemes ==5.0.2
- redis-io ==0.7.0
- redis-resp ==0.4.0
- reducers ==3.12.1
- reducers ==3.12.2
- refact ==0.3.0.2
- references ==0.3.2.2
- references ==0.3.3.0
- ref-fd ==0.4.0.1
- refined ==0.1.2.1
- reflection ==2.1.2
@@ -1894,7 +1893,7 @@ default-package-overrides:
- search-algorithms ==0.2.0
- securemem ==0.1.9
- SegmentTree ==0.3
- selda ==0.1.11.0
- selda ==0.1.11.1
- selda-postgresql ==0.1.7.0
- selda-sqlite ==0.1.6.0
- semigroupoid-extras ==5
@@ -1923,7 +1922,7 @@ default-package-overrides:
- servant-purescript ==0.8.0.1
- servant-ruby ==0.2.1.0
- servant-server ==0.11
- servant-static-th ==0.1.0.5
- servant-static-th ==0.1.0.6
- servant-subscriber ==0.6.0.0
- servant-swagger ==1.1.3.1
- servant-swagger-ui ==0.2.4.3.0.20
@@ -1990,7 +1989,7 @@ default-package-overrides:
- sox ==0.2.2.7
- soxlib ==0.0.3
- sparkle ==0.5.0.1
- sparse-linear-algebra ==0.2.9.7
- sparse-linear-algebra ==0.2.9.8
- spdx ==0.2.2.0
- speculation ==1.5.0.3
- speedy-slice ==0.3.0
@@ -2030,7 +2029,7 @@ default-package-overrides:
- stm-conduit ==3.0.0
- stm-containers ==0.2.16
- stm-delay ==0.1.1.1
- stm-extras ==0.1.0.2
- stm-extras ==0.1.0.3
- STMonadTrans ==0.4.3
- stm-split ==0.0.2
- stm-stats ==0.2.0.0
@@ -2039,7 +2038,7 @@ default-package-overrides:
- storable-complex ==0.2.2
- storable-endian ==0.2.6
- storable-record ==0.0.3.1
- storable-tuple ==0.0.3.2
- storable-tuple ==0.0.3.3
- storablevector ==0.2.12.1
- storablevector-carray ==0.0
- store ==0.4.3.2
@@ -2071,7 +2070,7 @@ default-package-overrides:
- superbuffer ==0.3.1.1
- superrecord ==0.3.0.0
- svg-builder ==0.1.0.2
- SVGFonts ==1.6.0.2
- SVGFonts ==1.6.0.3
- svg-tree ==0.6.2
- swagger ==0.3.0
- swagger2 ==2.1.6
@@ -2117,7 +2116,7 @@ default-package-overrides:
- tasty-stats ==0.2.0.3
- tasty-tap ==0.0.4
- tasty-th ==0.1.7
- Taxonomy ==1.0.3
- Taxonomy ==1.0.2
- TCache ==0.12.1
- tce-conf ==1.3
- tcp-streams ==0.6.0.0
@@ -2145,7 +2144,7 @@ default-package-overrides:
- test-framework-smallcheck ==0.2
- test-framework-th ==0.2.4
- testing-feat ==0.4.0.3
- texmath ==0.9.4.2
- texmath ==0.9.4.4
- text ==1.2.2.2
- text-all ==0.4.1.1
- text-binary ==0.2.1.1
@@ -2180,7 +2179,7 @@ default-package-overrides:
- threepenny-editors ==0.4.1
- threepenny-gui ==0.8.2.0
- threepenny-gui-flexbox ==0.4.2
- th-reify-compat ==0.0.1.2
- th-reify-compat ==0.0.1.3
- th-reify-many ==0.1.8
- through-text ==0.1.0.0
- throwable-exceptions ==0.1.0.9
@@ -2290,7 +2289,7 @@ default-package-overrides:
- unordered-containers ==0.2.8.0
- unsafe ==0.0
- uri-bytestring ==0.2.3.3
- uri-bytestring-aeson ==0.1.0.2
- uri-bytestring-aeson ==0.1.0.4
- uri-encode ==1.5.0.5
- uri-templater ==0.2.2.0
- url ==2.1.3
@@ -2327,7 +2326,7 @@ default-package-overrides:
- versions ==3.1.1
- vhd ==0.2.2
- ViennaRNAParser ==1.3.2
- viewprof ==0.0.0.8
- viewprof ==0.0.0.9
- vinyl ==0.5.3
- vinyl-utils ==0.3.0.0
- void ==0.7.2
@@ -2437,9 +2436,9 @@ default-package-overrides:
- xml-basic ==0.1.2
- xml-conduit ==1.5.1
- xml-conduit-parse ==0.3.1.1
- xml-conduit-writer ==0.1.1.1
- xml-conduit-writer ==0.1.1.2
- xmlgen ==0.6.2.1
- xml-hamlet ==0.4.1
- xml-hamlet ==0.4.1.1
- xml-html-qq ==0.1.0.1
- xml-indexed-cursor ==0.1.1.0
- xml-lens ==0.1.6.3
@@ -2853,9 +2852,11 @@ dont-distribute-packages:
AMI: [ i686-linux, x86_64-linux, x86_64-darwin ]
ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ]
amqp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
amqp-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
analyze-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
anansi-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ]
anatomy: [ i686-linux, x86_64-linux, x86_64-darwin ]
android-activity: [ i686-linux, x86_64-linux, x86_64-darwin ]
android-lint-summary: [ i686-linux, x86_64-linux, x86_64-darwin ]
android: [ i686-linux, x86_64-linux, x86_64-darwin ]
AndroidViewHierarchyImporter: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2954,11 +2955,13 @@ dont-distribute-packages:
AttoBencode: [ i686-linux, x86_64-linux, x86_64-darwin ]
AttoJson: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-data: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-ip: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-text-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-time: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-trans: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-uri: [ i686-linux, x86_64-linux, x86_64-darwin ]
attosplit: [ i686-linux, x86_64-linux, x86_64-darwin ]
Attrac: [ i686-linux, x86_64-linux, x86_64-darwin ]
atuin: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3121,6 +3124,7 @@ dont-distribute-packages:
binembed: [ i686-linux, x86_64-linux, x86_64-darwin ]
bio: [ i686-linux, x86_64-linux, x86_64-darwin ]
Biobase: [ i686-linux, x86_64-linux, x86_64-darwin ]
BiobaseBlast: [ i686-linux, x86_64-linux, x86_64-darwin ]
BiobaseDotP: [ i686-linux, x86_64-linux, x86_64-darwin ]
BiobaseFasta: [ i686-linux, x86_64-linux, x86_64-darwin ]
BiobaseFR3D: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3318,6 +3322,7 @@ dont-distribute-packages:
cassandra-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ]
cassava-megaparsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
cassava-streams: [ i686-linux, x86_64-linux, x86_64-darwin ]
Cassava: [ i686-linux, x86_64-linux, x86_64-darwin ]
cassy: [ i686-linux, x86_64-linux, x86_64-darwin ]
castle: [ i686-linux, x86_64-linux, x86_64-darwin ]
casui: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3940,6 +3945,7 @@ dont-distribute-packages:
DOH: [ i686-linux, x86_64-linux, x86_64-darwin ]
doi: [ i686-linux, x86_64-linux, x86_64-darwin ]
DOM: [ i686-linux, x86_64-linux, x86_64-darwin ]
domain-auth: [ i686-linux, x86_64-linux, x86_64-darwin ]
domplate: [ i686-linux, x86_64-linux, x86_64-darwin ]
dot-linker: [ i686-linux, x86_64-linux, x86_64-darwin ]
dotfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4384,6 +4390,7 @@ dont-distribute-packages:
gbu: [ i686-linux, x86_64-linux, x86_64-darwin ]
gc-monitoring-wai: [ i686-linux, x86_64-linux, x86_64-darwin ]
gcodehs: [ i686-linux, x86_64-linux, x86_64-darwin ]
gdax: [ i686-linux, x86_64-linux, x86_64-darwin ]
gdiff-ig: [ i686-linux, x86_64-linux, x86_64-darwin ]
gdiff-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
GeBoP: [ "x86_64-darwin" ]
@@ -5129,6 +5136,7 @@ dont-distribute-packages:
hledger-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-iadd: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5460,6 +5468,7 @@ dont-distribute-packages:
hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-kafka-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-prim-bits: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ]
hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ]
hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5971,7 +5980,6 @@ dont-distribute-packages:
liquid: [ i686-linux, x86_64-linux, x86_64-darwin ]
liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ]
liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ]
list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6065,6 +6073,7 @@ dont-distribute-packages:
lvish: [ i686-linux, x86_64-linux, x86_64-darwin ]
lvmlib: [ i686-linux, x86_64-linux, x86_64-darwin ]
lxc: [ i686-linux, x86_64-linux, x86_64-darwin ]
lxd-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
lye: [ i686-linux, x86_64-linux, x86_64-darwin ]
Lykah: [ i686-linux, x86_64-linux, x86_64-darwin ]
lz4-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6569,6 +6578,7 @@ dont-distribute-packages:
opaleye-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ]
open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ]
open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ]
open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ]
OpenAL: [ "x86_64-darwin" ]
opench-meteo: [ i686-linux, x86_64-linux, x86_64-darwin ]
OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6626,6 +6636,7 @@ dont-distribute-packages:
pack: [ i686-linux, x86_64-linux, x86_64-darwin ]
package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ]
packed-dawg: [ i686-linux, x86_64-linux, x86_64-darwin ]
packed-multikey-map: [ i686-linux, x86_64-linux, x86_64-darwin ]
packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ]
packman: [ i686-linux, x86_64-linux, x86_64-darwin ]
pacman-memcache: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6899,6 +6910,7 @@ dont-distribute-packages:
procrastinating-structure: [ i686-linux, x86_64-linux, x86_64-darwin ]
procrastinating-variable: [ i686-linux, x86_64-linux, x86_64-darwin ]
procstat: [ i686-linux, x86_64-linux, x86_64-darwin ]
producer: [ i686-linux, x86_64-linux, x86_64-darwin ]
prof2dot: [ i686-linux, x86_64-linux, x86_64-darwin ]
prof2pretty: [ i686-linux, x86_64-linux, x86_64-darwin ]
progress: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7259,6 +7271,7 @@ dont-distribute-packages:
rowrecord: [ i686-linux, x86_64-linux, x86_64-darwin ]
rpc-framework: [ i686-linux, x86_64-linux, x86_64-darwin ]
rpc: [ i686-linux, x86_64-linux, x86_64-darwin ]
rpf: [ i686-linux, x86_64-linux, x86_64-darwin ]
rpm: [ i686-linux, x86_64-linux, x86_64-darwin ]
rsagl-frp: [ i686-linux, x86_64-linux, x86_64-darwin ]
rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7811,6 +7824,7 @@ dont-distribute-packages:
sync-mht: [ i686-linux, x86_64-linux, x86_64-darwin ]
sync: [ i686-linux, x86_64-linux, x86_64-darwin ]
syncthing-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
syntactic: [ i686-linux, x86_64-linux, x86_64-darwin ]
syntax-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
syntax-example-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
syntax-example: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7933,6 +7947,7 @@ dont-distribute-packages:
test-sandbox-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ]
test-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ]
testbench: [ i686-linux, x86_64-linux, x86_64-darwin ]
testCom: [ i686-linux, x86_64-linux, x86_64-darwin ]
testloop: [ i686-linux, x86_64-linux, x86_64-darwin ]
testpack: [ i686-linux, x86_64-linux, x86_64-darwin ]
testpattern: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7940,6 +7955,7 @@ dont-distribute-packages:
testrunner: [ i686-linux, x86_64-linux, x86_64-darwin ]
TeX-my-math: [ i686-linux, x86_64-linux, x86_64-darwin ]
tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ]
texbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-and-plots: [ 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 ]

2
pkgs/development/haskell-modules/configuration-nix.nix
View File

@@ -501,4 +501,6 @@ self: super: builtins.intersectAttrs super {
# Without this override, the builds lacks pkg-config.
opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; });
# Written against the 6.X series of megaparsec
htoml-megaparsec = super.htoml-megaparsec.override { megaparsec = self.megaparsec_6_2_0; };
}

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

File diff suppressed because it is too large Load Diff

4
pkgs/development/libraries/babl/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "babl-0.1.28";
name = "babl-0.1.34";
src = fetchurl {
url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
sha256 = "00w6xfcv960c98qvxv81gcbj8l1jiab9sggmdl77m19awwiyvwv3";
sha256 = "0nwakj313l2dh5npx18avkg4z17i2prkxbl6vj547a08n6ry1gsy";
};
meta = with stdenv.lib; {

23
pkgs/development/libraries/easyloggingpp/default.nix Normal file
View File

@@ -0,0 +1,23 @@
{ stdenv, fetchFromGitHub, cmake, gtest }:
stdenv.mkDerivation rec {
name = "easyloggingpp-${version}";
version = "9.95.0";
src = fetchFromGitHub {
owner = "muflihun";
repo = "easyloggingpp";
rev = "v${version}";
sha256 = "0gzmznw6ffag9x55lixxffy6x7mvb7691x0md4q9rbh88zkws7kq";
};
nativeBuildInputs = [cmake];
buildInputs = [gtest];
cmakeFlags = [ "-Dtest=ON" "-Dbuild_static_lib=ON"];
NIX_CFLAGS_COMPILE = "-std=c++11" +
stdenv.lib.optionalString stdenv.isLinux " -pthread";
meta = {
description = "C++ logging library";
homepage = https://muflihun.github.io/easyloggingpp/;
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [acowley];
platforms = stdenv.lib.platforms.all;
};
}

12
pkgs/development/libraries/geoclue/2.0.nix
View File

@@ -1,23 +1,23 @@
{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip
, dbus, dbus_glib, modemmanager, avahi
, dbus, dbus_glib, modemmanager, avahi, glib_networking, wrapGAppsHook
}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "geoclue-2.4.3";
name = "geoclue-2.4.7";
src = fetchurl {
url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz";
sha256 = "0pk07k65dlw37nz8z5spksivsv5nh96xmbi336rf2yfxf2ldpadd";
sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi";
};
nativeBuildInputs = [
pkgconfig
pkgconfig intltool wrapGAppsHook
];
buildInputs = libintlOrEmpty ++
[ intltool glib json_glib libsoup geoip
[ glib json_glib libsoup geoip
dbus dbus_glib avahi
] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl";
propagatedBuildInputs = [ dbus dbus_glib glib ];
propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ];
meta = with stdenv.lib; {
description = "Geolocation framework and some data providers";

29
pkgs/development/libraries/kmsxx/default.nix Normal file
View File

@@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }:
stdenv.mkDerivation rec {
name = "kmsxx-2017-10-10";
src = fetchFromGitHub {
owner = "tomba";
repo = "kmsxx";
fetchSubmodules = true;
rev = "f32b82c17cd357ae1c8ed2636266113955293feb";
sha256 = "14panqdqq83wh6wym5afdiyrr78mb12ga63pgrppj27kgv398yjj";
};
enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libdrm python ];
pythonPath = [ ];
passthru.python = python;
meta = with stdenv.lib; {
description = "C++11 library, utilities and python bindings for Linux kernel mode setting";
homepage = https://github.com/tomba/kmsxx;
license = licenses.mpl20;
maintainers = with maintainers; [ gnidorah ];
platforms = platforms.linux;
};
}

2
pkgs/development/libraries/libav/default.nix
View File

@@ -29,7 +29,7 @@ let
result = {
libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f";
libav_11 = libavFun "11.10" "38db6721ca8423682e4d614c170eccc33ba32e00";
libav_12 = libavFun "12.1" "df048240318b888e3938f649422b967f62e43e3c";
libav_12 = libavFun "12.2" "3784b15f88076ca0ab8fb6b0377e975b83a5c9f5";
};
libavFun = version : sha1 : stdenv.mkDerivation rec {

18
pkgs/development/libraries/libgnurl/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoreconfHook, perl, zlib, gnutls, gss, openssl
, libssh2, libidn, libpsl, openldap }:
, libidn }:
stdenv.mkDerivation rec {
version = "7.54.1";
@@ -12,20 +12,20 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ perl gnutls gss openssl zlib libidn libssh2 libpsl openldap ];
buildInputs = [ perl gnutls gss openssl zlib libidn ];
preConfigure = ''
sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
'';
configureFlags = [
"--with-zlib"
"--with-gssapi"
"--with-libssh2"
"--with-libidn"
"--with-libpsl"
"--enable-ldap"
"--enable-ldaps"
"--enable-ipv6" "--with-gnutls" "--without-libmetalink" "--without-winidn"
"--without-librtmp" "--without-nghttp2" "--without-nss" "--without-cyassl"
"--without-polarssl" "--without-ssl" "--without-winssl"
"--without-darwinssl" "--disable-sspi" "--disable-ntlm-wb" "--disable-ldap"
"--disable-rtsp" "--disable-dict" "--disable-telnet" "--disable-tftp"
"--disable-pop3" "--disable-imap" "--disable-smtp" "--disable-gopher"
"--disable-file" "--disable-ftp" "--disable-smb"
];
meta = with stdenv.lib; {

8
pkgs/development/libraries/libmediainfo/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
stdenv.mkDerivation rec {
version = "0.7.97";
version = "0.7.99";
name = "libmediainfo-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
sha256 = "0rpxxbszi7i4hspdzdif9inhlwxdkf0iggaim6682clqb6pv7sld";
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
sha256 = "126nkxrzs6dxzm3hzx6smvw6xgrqr3zs6hdqvl2xmvqy10p8z6pc";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Shared library for mediainfo";
homepage = http://mediaarea.net/;
homepage = https://mediaarea.net/;
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = [ maintainers.devhell ];

4
pkgs/development/libraries/libqalculate/default.nix
View File

@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "libqalculate-${version}";
version = "2.0.0";
version = "2.1.0";
src = fetchurl {
url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz";
sha256 = "1ziw48djccsgfcjd1h3834sihr89pyb3mna096cpm47bc71saqvh";
sha256 = "036f284bssvavyz6pgpcdafvxa59h2wdrh8xl7nmxxnw9v7n2n7l";
};
outputs = [ "out" "dev" "doc" ];

2
pkgs/development/libraries/nss/default.nix
View File

@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
sed -e "s,%prefix%,$PREFIX," \
-e "s,%exec_prefix%,$PREFIX," \
-e "s,%libdir%,$PREFIX/lib64," \
-e "s,%includedir%,$PREFIX/include/nss," \
-e "s,%includedir%,$dev/include/nss," \
-e "s,%NSS_VERSION%,$NSS_MAJOR_VERSION.$NSS_MINOR_VERSION.$NSS_PATCH_VERSION,g" \
-e "s,%NSPR_VERSION%,4.16,g" \
pkg/pkg-config/nss.pc.in > $out/lib/pkgconfig/nss.pc

19
pkgs/development/libraries/pcl/default.nix
View File

@@ -1,34 +1,29 @@
{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4
{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase
, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL
}:
stdenv.mkDerivation rec {
name = "pcl-1.8.0";
name = "pcl-1.8.1";
src = fetchFromGitHub {
owner = "PointCloudLibrary";
repo = "pcl";
rev = name;
sha256 = "1pki4y7mc2dryxc8wa7rs4hg74qab80rpy90jnw3j8fzf09kxcll";
sha256 = "05wvqqi2fyk5innw4mg356r71c1hmc9alc7xkf4g81ds3b3867xq";
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake qhull flann boost eigen libusb1 libpcap
libpng vtk qt4 libXt ]
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qhull flann boost eigen libusb1 libpcap
libpng vtk qtbase libXt ]
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ];
cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
"-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET="
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
];
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed "s,[[:space:]]*-F$NIX_STORE/[[:alnum:]]*-CF-osx-[[:digit:].]*/Library/Frameworks,,g")
sed -i 's,^\( target_link_libraries("''${LIB_NAME}" "-framework Cocoa")\),\1\n target_link_libraries("''${LIB_NAME}" "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"),' visualization/CMakeLists.txt
sed -i 's,^\(set(SUBSYS_DEPS common io kdtree geometry search)\),\1\nset(CMAKE_OSX_SYSROOT "")\nset(CMAKE_OSX_DEPLOYMENT_TARGET ""),' visualization/CMakeLists.txt
'';
meta = {
homepage = http://pointclouds.org/;
description = "Open project for 2D/3D image and point cloud processing";

33
pkgs/development/libraries/phonon/default.nix
View File

@@ -7,6 +7,9 @@ with lib;
let
v = "4.9.1";
soname = if withQt5 then "phonon4qt5" else "phonon";
buildsystemdir = "share/cmake/${soname}";
in
assert withQt5 -> qtbase != null;
@@ -36,17 +39,41 @@ stdenv.mkDerivation rec {
[ cmake pkgconfig ]
++ optional withQt5 extra-cmake-modules;
outputs = [ "out" "dev" ];
NIX_CFLAGS_COMPILE = "-fPIC";
cmakeFlags =
[ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]
++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
preConfigure = ''
cmakeFlags+=" -DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs"
cmakeFlags+=" -DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix"
cmakeFlags+=" -DPHONON_QT_PLUGIN_INSTALL_DIR=''${!outputBin}/$qtPluginPrefix/designer"
'';
postPatch = ''
sed -i PhononConfig.cmake.in \
-e "/get_filename_component(rootDir/ s/^.*$//" \
-e "/^set(PHONON_INCLUDE_DIR/ s,\''${rootDir},''${!outputDev}," \
-e "/^set(PHONON_LIBRARY_DIR/ s,\''${rootDir}/,," \
-e "/^set(PHONON_BUILDSYSTEM_DIR/ s,\''${rootDir},''${!outputDev},"
-e "/^set(PHONON_INCLUDE_DIR/ s|\''${rootDir}/||" \
-e "/^set(PHONON_LIBRARY_DIR/ s|\''${rootDir}/||" \
-e "/^set(PHONON_BUILDSYSTEM_DIR/ s|\''${rootDir}|''${!outputDev}|"
sed -i cmake/FindPhononInternal.cmake \
-e "/set(INCLUDE_INSTALL_DIR/ c set(INCLUDE_INSTALL_DIR \"''${!outputDev}/include\")"
${optionalString withQt5 ''
sed -i cmake/FindPhononInternal.cmake \
-e "/set(PLUGIN_INSTALL_DIR/ c set(PLUGIN_INSTALL_DIR \"$qtPluginPrefix/..\")"
''}
sed -i CMakeLists.txt \
-e "/set(BUILDSYSTEM_INSTALL_DIR/ c set(BUILDSYSTEM_INSTALL_DIR \"''${!outputDev}/${buildsystemdir}\")"
'';
postFixup = ''
sed -i "''${!outputDev}/lib/pkgconfig/${soname}.pc" \
-e "/^exec_prefix=/ c exec_prefix=''${!outputBin}/bin"
'';
}

34
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@@ -183,10 +183,38 @@ stdenv.mkDerivation rec {
sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release
'';
postInstall =
''
installPhase = optionalString stdenv.isDarwin ''
runHook preInstall
cp -r lib $out
mkdir -p $out/Applications
mv bin/*.app $out/Applications
rm -rf bin/*.app
cp -r bin $out
mkdir -p $out/share/doc/${name}
mkdir -p $out/lib
mkdir -p $out/lib/qt4/plugins
mkdir -p $out/lib/qt4/imports
mkdir -p $out/bin
mkdir -p $out/include
mkdir -p $out/share/${name}
cp -r mkspecs $out/share/${name}
cp -r translations $out/share/${name}
cp -r tools/linguist/phrasebooks $out/share/${name}
cp tools/porting/src/q3porting.xml $out/share/${name}
cp -r plugins $out/lib/qt4
cp -r imports $out/lib/qt4
cp -r doc/* $out/share/doc/${name}
runHook postInstall
'';
postInstall = optionalString (!stdenv.isDarwin) ''
rm -rf $out/tests
'';
'';
crossAttrs = {
# I've not tried any case other than i686-pc-mingw32.

2
pkgs/development/libraries/qt-5/5.9/fetch.sh
View File

@@ -1,2 +1,2 @@
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \
WGET_ARGS=( https://download.qt.io/archive/qt/5.9/5.9.2/submodules/ \
-A '*.tar.xz' )

3
pkgs/development/libraries/qt-5/5.9/qtbase/darwin-series Normal file
View File

@@ -0,0 +1,3 @@
mkspecs-common-mac.patch
mkspecs-features-mac.patch
darwin-cf.patch

20
pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
View File

@@ -3,7 +3,7 @@
src, version, qtCompatVersion,
coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
ruby,
ruby, which,
# darwin support
darwin, libiconv, libcxx,
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
libjpeg libpng libtiff
]
++ lib.optional mesaSupported mesa
++ lib.optional (mesaSupported && !stdenv.isDarwin) mesa
++ lib.optionals (!stdenv.isDarwin) [
dbus glib udev
@@ -73,14 +73,14 @@ stdenv.mkDerivation {
++ lib.optional (postgresql != null) postgresql;
nativeBuildInputs =
[ bison flex gperf lndir perl pkgconfig python2 ]
[ bison flex gperf lndir perl pkgconfig python2 which ]
++ lib.optional (!stdenv.isDarwin) patchelf;
outputs = [ "out" "dev" "bin" ];
patches =
copyPathsToStore (lib.readPathsFromFile ./. ./series)
++ stdenv.lib.optional stdenv.isDarwin ./darwin-cf.patch;
++ stdenv.lib.optional stdenv.isDarwin (copyPathsToStore (lib.readPathsFromFile ./. ./darwin-series));
postPatch =
''
@@ -94,7 +94,7 @@ stdenv.mkDerivation {
sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
''
+ lib.optionalString mesaSupported ''
+ lib.optionalString (mesaSupported && !stdenv.isDarwin) ''
sed -i mkspecs/common/linux.conf \
-e "/^QMAKE_INCDIR_OPENGL/ s|$|${mesa.dev or mesa}/include|" \
-e "/^QMAKE_LIBDIR_OPENGL/ s|$|${mesa.out}/lib|"
@@ -110,10 +110,10 @@ stdenv.mkDerivation {
-e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
-e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \
./configure
sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf
sed -i '27,$d' ./mkspecs/features/mac/default_post.prf
sed -i '1,$d' ./mkspecs/features/mac/sdk.prf
sed -i 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' ./mkspecs/common/mac.conf
substituteInPlace ./mkspecs/common/mac.conf \
--replace "/System/Library/Frameworks/OpenGL.framework/" "${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework/"
substituteInPlace ./mkspecs/common/mac.conf \
--replace "/System/Library/Frameworks/AGL.framework/" "${darwin.apple_sdk.frameworks.AGL}/Library/Frameworks/AGL.framework/"
'';
# Note on the above: \x27 is a way if including a single-quote
# character in the sed string arguments.
@@ -144,7 +144,7 @@ stdenv.mkDerivation {
''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
]
++ lib.optional mesaSupported
++ lib.optional (mesaSupported && !stdenv.isDarwin)
''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"''
++ lib.optionals (!stdenv.isDarwin)

11
pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-common-mac.patch Normal file
View File

@@ -0,0 +1,11 @@
--- qtbase-opensource-src-5.9.1.orig/mkspecs/common/mac.conf 2017-09-16 16:40:30.000000000 +0800
+++ qtbase-opensource-src-5.9.1/mkspecs/common/mac.conf 2017-09-16 16:41:27.000000000 +0800
@@ -23,7 +23,7 @@
QMAKE_FIX_RPATH = install_name_tool -id
-QMAKE_LFLAGS_RPATH = -Wl,-rpath,
+QMAKE_LFLAGS_RPATH =
QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip
QMAKE_LFLAGS_REL_RPATH =

278
pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch Normal file
View File

@@ -0,0 +1,278 @@
diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_post.prf
--- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf 2017-09-16 16:40:30.000000000 +0800
+++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_post.prf 2017-09-16 16:41:03.000000000 +0800
@@ -24,165 +24,3 @@
}
}
}
-
-# Add the same default rpaths as Xcode does for new projects.
-# This is especially important for iOS/tvOS/watchOS where no other option is possible.
-!no_default_rpath {
- QMAKE_RPATHDIR += @executable_path/Frameworks
- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks
-}
-
-# Don't pass -headerpad_max_install_names when using Bitcode.
-# In that case the linker emits a warning stating that the flag is ignored when
-# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962).
-# Using this flag is also unnecessary in practice on UIKit platforms since they
-# are sandboxed, and only UIKit platforms support bitcode to begin with.
-!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD
-
-app_extension_api_only {
- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
-}
-
-macx-xcode {
- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) {
- debug_information_format.name = DEBUG_INFORMATION_FORMAT
- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT
- debug_information_format.build = debug
- QMAKE_MAC_XCODE_SETTINGS += debug_information_format
- }
-
- QMAKE_XCODE_ARCHS =
-
- arch_device.name = "ARCHS[sdk=$${device.sdk}*]"
- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS
- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS
- QMAKE_MAC_XCODE_SETTINGS += arch_device
-
- simulator {
- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]"
- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS
- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS
- QMAKE_MAC_XCODE_SETTINGS += arch_simulator
- }
-
- only_active_arch.name = ONLY_ACTIVE_ARCH
- only_active_arch.value = YES
- only_active_arch.build = debug
- QMAKE_MAC_XCODE_SETTINGS += only_active_arch
-} else {
- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS
- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS
- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS
-
- isEmpty(VALID_ARCHS): \
- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture")
-
- single_arch: VALID_ARCHS = $$first(VALID_ARCHS)
-
- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS))
- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch))
-
- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS
-
- arch_flags = $(EXPORT_ARCH_ARGS)
-
- QMAKE_CFLAGS += $$arch_flags
- QMAKE_CXXFLAGS += $$arch_flags
- QMAKE_LFLAGS += $$arch_flags
-
- QMAKE_PCH_ARCHS = $$VALID_ARCHS
-
- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET
- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET
- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET
- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET
-
- # If we're doing a simulator and device build, device and simulator
- # architectures use different paths and flags for the sysroot and
- # deployment target switch, so we must multiplex them across multiple
- # architectures using -Xarch. Otherwise we fall back to the simple path.
- # This is not strictly necessary, but results in cleaner command lines
- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit
- # individual rules to a different set of architecture(s) from the overall
- # build (such as machtest in QtCore).
- simulator:device {
- QMAKE_XARCH_CFLAGS =
- QMAKE_XARCH_LFLAGS =
- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS
-
- for (arch, VALID_ARCHS) {
- contains(VALID_SIMULATOR_ARCHS, $$arch) {
- sdk = $$simulator.sdk
- version_identifier = $$simulator.deployment_identifier
- } else {
- sdk = $$device.sdk
- version_identifier = $$device.deployment_identifier
- }
-
- version_min_flags = \
- -Xarch_$${arch} \
- -m$${version_identifier}-version-min=$$deployment_target
- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \
- -Xarch_$${arch} \
- -isysroot$$xcodeSDKInfo(Path, $$sdk)
- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \
- -Xarch_$${arch} \
- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk)
-
- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch})
- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch})
-
- QMAKE_EXTRA_VARIABLES += \
- QMAKE_XARCH_CFLAGS_$${arch} \
- QMAKE_XARCH_LFLAGS_$${arch}
- }
-
- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS)
- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS)
- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS)
- } else {
- simulator: \
- version_identifier = $$simulator.deployment_identifier
- else: \
- version_identifier = $$device.deployment_identifier
- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag
- }
-
- # Enable precompiled headers for multiple architectures
- QMAKE_CFLAGS_USE_PRECOMPILE =
- for (arch, VALID_ARCHS) {
- icc_pch_style: \
- use_flag = "-pch-use "
- else: \
- use_flag = -include
-
- # Only use Xarch with multi-arch, as the option confuses ccache
- count(VALID_ARCHS, 1, greaterThan): \
- QMAKE_CFLAGS_USE_PRECOMPILE += \
- -Xarch_$${arch}
-
- QMAKE_CFLAGS_USE_PRECOMPILE += \
- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}}
- }
- icc_pch_style {
- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT}
- QMAKE_CFLAGS_USE_PRECOMPILE =
- } else {
- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
- }
-
- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT}
-}
-
-cache(QMAKE_XCODE_DEVELOPER_PATH, stash)
-cache(QMAKE_XCODE_VERSION, stash)
-
-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()
diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_pre.prf
--- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf 2017-09-16 16:40:30.000000000 +0800
+++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_pre.prf 2017-09-16 16:40:45.000000000 +0800
@@ -1,51 +1,2 @@
CONFIG = asset_catalogs rez $$CONFIG
load(default_pre)
-
-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
- # Get path of Xcode's Developer directory
- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null")
- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \
- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.")
-
- # Make sure Xcode path is valid
- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \
- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
-
- # Make sure Xcode is set up properly
- isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
- error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
-}
-
-isEmpty(QMAKE_XCODE_VERSION) {
- # Extract Xcode version using xcodebuild
- xcode_version = $$system("/usr/bin/xcodebuild -version")
- QMAKE_XCODE_VERSION = $$member(xcode_version, 1)
- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.")
- unset(xcode_version)
-}
-
-isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) {
- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist
- exists($$QMAKE_XCODE_PREFERENCES_FILE): \
- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null")
-
- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \
- cache(QMAKE_TARGET_BUNDLE_PREFIX)
-}
-
-QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon
-
-# Make the default debug info format for static debug builds
-# DWARF instead of DWARF with dSYM. This cuts down build times
-# for application debug builds significantly, as Xcode doesn't
-# have to pull out all the DWARF info from the Qt static libs
-# and put it into a dSYM file. We don't need that dSYM file in
-# the first place, since the information is available in the
-# object files inside the archives (static libraries).
-macx-xcode:qtConfig(static): \
- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf
-
-# This variable is used by the xcode_dynamic_library_suffix
-# feature, which allows Xcode to choose the Qt libraries to link to
-# at build time, depending on the current Xcode SDK and configuration.
-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX
diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/sdk.prf
--- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf 2017-09-16 16:40:30.000000000 +0800
+++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/sdk.prf 2017-09-16 16:41:16.000000000 +0800
@@ -1,49 +0,0 @@
-
-isEmpty(QMAKE_MAC_SDK): \
- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")
-
-contains(QMAKE_MAC_SDK, .*/.*): \
- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)")
-
-defineReplace(xcodeSDKInfo) {
- info = $$1
- sdk = $$2
- isEmpty(sdk): \
- sdk = $$QMAKE_MAC_SDK
-
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcodebuild -sdk $$sdk -version $$info 2>/dev/null")
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}): error("Could not resolve SDK $$info for \'$$sdk\'")
- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
- }
-
- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info}))
-}
-
-QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path)
-QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath)
-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)
-
-sysrootified =
-for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val
-QMAKE_INCDIR_OPENGL = $$sysrootified
-
-QMAKESPEC_NAME = $$basename(QMAKESPEC)
-
-# Resolve SDK version of various tools
-for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL)) {
- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool}
- !isEmpty($$tool_variable) {
- $$tool = $$eval($$tool_variable)
- next()
- }
-
- value = $$eval($$tool)
- isEmpty(value): next()
-
- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null")
- isEmpty(sysrooted): next()
-
- $$tool = $$sysrooted $$member(value, 1, -1)
- cache($$tool_variable, set stash, $$tool)
-}
Common subdirectories: qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/unsupported and qtbase-opensource-src-5.9.1/mkspecs/features/mac/unsupported

320
pkgs/development/libraries/qt-5/5.9/srcs.nix
View File

@@ -3,275 +3,283 @@
{
qt3d = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz";
sha256 = "15j9znfnxch1n6fwz9ngi30msdzh0wlpykl53cs8g2fp2awfa7sg";
name = "qt3d-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qt3d-opensource-src-5.9.2.tar.xz";
sha256 = "10q7npsl087sja0g2n3v0cg4n75y7sbrs3mfjcsg1wpkw8psjmf9";
name = "qt3d-opensource-src-5.9.2.tar.xz";
};
};
qtactiveqt = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz";
sha256 = "07zq60xg7nnlny7qgj6dk1ibg3fzhbdh78gpd0s6x1n822iyislg";
name = "qtactiveqt-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtactiveqt-opensource-src-5.9.2.tar.xz";
sha256 = "1kz59ns6afnd8s73ys7hqffg9ki9g7px009b2ab72nq7f8cqsib0";
name = "qtactiveqt-opensource-src-5.9.2.tar.xz";
};
};
qtandroidextras = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtandroidextras-opensource-src-5.9.1.tar.xz";
sha256 = "0nq879jsa2z1l5q3n0hhiv15mzfm5c6s7zfblcc10sgim90p5mjj";
name = "qtandroidextras-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtandroidextras-opensource-src-5.9.2.tar.xz";
sha256 = "1hsx16v17iqjhs20xn7an2ad7g8djwrmxachscjhji1dvk4682nl";
name = "qtandroidextras-opensource-src-5.9.2.tar.xz";
};
};
qtbase = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz";
sha256 = "1ikm896jzyfyjv2qv8n3fd81sxb4y24zkygx36865ygzyvlj36mw";
name = "qtbase-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz";
sha256 = "16v0dny4rcyd5p8qsnsfg89w98k8kqk3rp9x3g3k7xjmi53bpqkz";
name = "qtbase-opensource-src-5.9.2.tar.xz";
};
};
qtcanvas3d = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz";
sha256 = "10fy8wqfw2yhha6lyky5g1a72137aj8pji7mk0wjnggh629z12sb";
name = "qtcanvas3d-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtcanvas3d-opensource-src-5.9.2.tar.xz";
sha256 = "1siyzgm1mjx90rwyzzq9vw2s2xzyf6n7q0vn8gw7mdim5indda44";
name = "qtcanvas3d-opensource-src-5.9.2.tar.xz";
};
};
qtcharts = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcharts-opensource-src-5.9.1.tar.xz";
sha256 = "180df5v7i1ki8hc3lgi6jcfdyz7f19pb73dvfkw402wa2gfcna3k";
name = "qtcharts-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtcharts-opensource-src-5.9.2.tar.xz";
sha256 = "193a3imkgryw42s0gbwaj9gpqd673h3jrg86jvmy33l2fc5gfyjf";
name = "qtcharts-opensource-src-5.9.2.tar.xz";
};
};
qtconnectivity = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz";
sha256 = "1mbzmqix0388iq20a1ljd1pgdq259rm1xzp9kx8gigqpamqqnqs0";
name = "qtconnectivity-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtconnectivity-opensource-src-5.9.2.tar.xz";
sha256 = "1k7kjmlny0ykm40qx796wbsg3310v6b8hqizkbr597cmxjbrax9c";
name = "qtconnectivity-opensource-src-5.9.2.tar.xz";
};
};
qtdatavis3d = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdatavis3d-opensource-src-5.9.1.tar.xz";
sha256 = "14d1q07winh6n1bkc616dapwfnsfkcjyg5zngdqjdj9mza8ang13";
name = "qtdatavis3d-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdatavis3d-opensource-src-5.9.2.tar.xz";
sha256 = "1cmjjbbmdqdix1f8b7qyc2vwhj9pvchc8r4lp65qw11dhycmdbh6";
name = "qtdatavis3d-opensource-src-5.9.2.tar.xz";
};
};
qtdeclarative = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz";
sha256 = "1zwlxrgraxhlsdkwsai3pjbz7f3a6rsnsg2mjrpay6cz3af6rznj";
name = "qtdeclarative-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdeclarative-opensource-src-5.9.2.tar.xz";
sha256 = "020bha6q8byxc8cj5zw7gms5rgsjg71hv31hv1rr2fy7x56zsh0d";
name = "qtdeclarative-opensource-src-5.9.2.tar.xz";
};
};
qtdoc = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdoc-opensource-src-5.9.1.tar.xz";
sha256 = "1d2kk9wzm2261ap87nyf743a4662gll03gz5yh5qi7k620lk372x";
name = "qtdoc-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdoc-opensource-src-5.9.2.tar.xz";
sha256 = "0dfva8h8f9wpszih285qcxlfcijy52qcbfy1zy20gxh72nfi86c9";
name = "qtdoc-opensource-src-5.9.2.tar.xz";
};
};
qtgamepad = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgamepad-opensource-src-5.9.1.tar.xz";
sha256 = "055w4649zi93q1sl32ngqwgnl2vxw1idnm040s9gjgjb67gi81zi";
name = "qtgamepad-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtgamepad-opensource-src-5.9.2.tar.xz";
sha256 = "0lm5v43psf7r8zc79dcjdmmdnz4jm30ylgkvsyv8k88mj06yklbn";
name = "qtgamepad-opensource-src-5.9.2.tar.xz";
};
};
qtgraphicaleffects = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz";
sha256 = "1zsr3a5dsmpvrb5h4m4h42wqmkvkks3d8mmyrx4k0mfr6s7c71jz";
name = "qtgraphicaleffects-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtgraphicaleffects-opensource-src-5.9.2.tar.xz";
sha256 = "0xpvigfiqfqvf05ywj8x69y57rp8dwq2hs1kpxlxs15pniz4wn8l";
name = "qtgraphicaleffects-opensource-src-5.9.2.tar.xz";
};
};
qtimageformats = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz";
sha256 = "0iwa3dys5rv706cpxwhmgircv783pmlyl1yrsc5i0rha643y7zkr";
name = "qtimageformats-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtimageformats-opensource-src-5.9.2.tar.xz";
sha256 = "1wwxxcl24mk1p4w6knyfai09axmwqsm6cgsbkjsmdz3zmjh6qqis";
name = "qtimageformats-opensource-src-5.9.2.tar.xz";
};
};
qtlocation = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz";
sha256 = "058mgvlaml9rkfhkpr1n3avhi12zlva131sqhbwj4lwwyqfkri2b";
name = "qtlocation-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtlocation-opensource-src-5.9.2.tar.xz";
sha256 = "033b6l6jbvmc0k5qvbgh5vkzvfga7npqcphrywrrqkmx9vj446n8";
name = "qtlocation-opensource-src-5.9.2.tar.xz";
};
};
qtmacextras = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmacextras-opensource-src-5.9.1.tar.xz";
sha256 = "0096g9l2hwsiwlzfjkw7rhkdnyvb5gzjzyjjg9kqfnsagbwscv11";
name = "qtmacextras-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtmacextras-opensource-src-5.9.2.tar.xz";
sha256 = "0f14xkardmidvwljccrv6adcs4nyn8rzry9k74mwqn0ikvycs3my";
name = "qtmacextras-opensource-src-5.9.2.tar.xz";
};
};
qtmultimedia = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz";
sha256 = "1r76zvbv6wwb7lgw9jwlx382iyw34i1amxaypb5bg3j1niqvx3z4";
name = "qtmultimedia-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtmultimedia-opensource-src-5.9.2.tar.xz";
sha256 = "0815hi3cxy5zy6yc5fkdpx2xd6rk7968j1ziwl2g4wa80802g9n9";
name = "qtmultimedia-opensource-src-5.9.2.tar.xz";
};
};
qtnetworkauth = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtnetworkauth-opensource-src-5.9.1.tar.xz";
sha256 = "1fgax3p7lqcz29z2n1qxnfpkj3wxq1x9bfx61q6nss1fs74pxzra";
name = "qtnetworkauth-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtnetworkauth-opensource-src-5.9.2.tar.xz";
sha256 = "16i33m8x5yii22ciq97bpfmnw0lwhvgv84i2az30a1ikm9dg00x0";
name = "qtnetworkauth-opensource-src-5.9.2.tar.xz";
};
};
qtpurchasing = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtpurchasing-opensource-src-5.9.1.tar.xz";
sha256 = "0b1hlaq6rb7d6b6h8kqd26klcpzf9vcdjrv610kdj0drb00jg3ss";
name = "qtpurchasing-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtpurchasing-opensource-src-5.9.2.tar.xz";
sha256 = "04f28y7qcr4kd0pw26mm515qj7haxr0i8lijn1q47wkikxyhawca";
name = "qtpurchasing-opensource-src-5.9.2.tar.xz";
};
};
qtquickcontrols = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz";
sha256 = "0bpc465q822phw3dcbddn70wj1fjlc2hxskkp1z9gl7r23hx03jj";
name = "qtquickcontrols-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtquickcontrols-opensource-src-5.9.2.tar.xz";
sha256 = "07xxhkfsljwdwlp9jfp88pwkrig02y2pnwhdsaz8mkcackwfq2az";
name = "qtquickcontrols-opensource-src-5.9.2.tar.xz";
};
};
qtquickcontrols2 = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz";
sha256 = "1zq86kqz85wm3n84jcxkxw5x1mrhkqzldkigf8xm3l8j24rf0fr0";
name = "qtquickcontrols2-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtquickcontrols2-opensource-src-5.9.2.tar.xz";
sha256 = "1ln83afxyp5dmvdnq6n7as82xrd5k3xvfx7b1jxnljivslyxsm9b";
name = "qtquickcontrols2-opensource-src-5.9.2.tar.xz";
};
};
qtremoteobjects = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtremoteobjects-opensource-src-5.9.1.tar.xz";
sha256 = "10kwq0fgmi6zsqhb6s1nkcydpyl8d8flzdpgmyj50c4h2xhg2km0";
name = "qtremoteobjects-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtremoteobjects-opensource-src-5.9.2.tar.xz";
sha256 = "1ylphdwis34y4pm9xiwh2xqfd0hh2gp8kkawlps2q5mh2bm11376";
name = "qtremoteobjects-opensource-src-5.9.2.tar.xz";
};
};
qtscript = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz";
sha256 = "13qq2mjfhqdcvkmzrgxg1gr5kww1ygbwb7r71xxl6rjzbn30hshp";
name = "qtscript-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtscript-opensource-src-5.9.2.tar.xz";
sha256 = "1wa0rnbphkhgydnwkf5bjwn0llskl6hgs0964nh0jik8qaspv027";
name = "qtscript-opensource-src-5.9.2.tar.xz";
};
};
qtscxml = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscxml-opensource-src-5.9.1.tar.xz";
sha256 = "1m3b6wg5hqasdfc5igpj9bq3czql5kkvvn3rx1ig508kdlh5i5s0";
name = "qtscxml-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtscxml-opensource-src-5.9.2.tar.xz";
sha256 = "0pdimqwdrj8hckm81lwy1z58ji4bdv0bzgv336m0a8v3pj914awx";
name = "qtscxml-opensource-src-5.9.2.tar.xz";
};
};
qtsensors = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz";
sha256 = "1772x7r6y9xv2sv0w2dfz2yhagsq5bpa9kdpzg0qikccmabr7was";
name = "qtsensors-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtsensors-opensource-src-5.9.2.tar.xz";
sha256 = "1lxmhi19dbb8vjhpjph0l0ss6zh72hb4908lp4s1pgf8r641ai3r";
name = "qtsensors-opensource-src-5.9.2.tar.xz";
};
};
qtserialbus = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz";
sha256 = "1hzk377c3zl4dm5hxwvpxg2w096m160448y9df6v6l8xpzpzxafa";
name = "qtserialbus-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtserialbus-opensource-src-5.9.2.tar.xz";
sha256 = "025yv7zajz5scrmkjkmgkyvxpgkliqvrzc88is0gr481zpd4phmv";
name = "qtserialbus-opensource-src-5.9.2.tar.xz";
};
};
qtserialport = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz";
sha256 = "0sbsc7n701kxl16r247a907zg2afmbx1xlml5jkc6a9956zqbzp1";
name = "qtserialport-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtserialport-opensource-src-5.9.2.tar.xz";
sha256 = "0hndc9z7qzxazzjvc6k5yd58afw13444plk70b05nqdi5p19rvah";
name = "qtserialport-opensource-src-5.9.2.tar.xz";
};
};
qtspeech = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtspeech-opensource-src-5.9.1.tar.xz";
sha256 = "00daxkf8iwf6n9rhkkv3isv5qa8wijwzb0zy1f6zlm3vcc8fz75c";
name = "qtspeech-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtspeech-opensource-src-5.9.2.tar.xz";
sha256 = "0cq33dffi7q7dnvzhdivky5prakb8xnwap0b76fwgirhbbn88ypg";
name = "qtspeech-opensource-src-5.9.2.tar.xz";
};
};
qtsvg = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz";
sha256 = "1rg2q4snh2g4n93zmk995swwkl0ab1jr9ka9xpj56ddifkw99wlr";
name = "qtsvg-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtsvg-opensource-src-5.9.2.tar.xz";
sha256 = "020icrl9vi8jh8ygsssqrx2bl8bx28m15dwmf9a969qdnvxyp5ms";
name = "qtsvg-opensource-src-5.9.2.tar.xz";
};
};
qttools = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz";
sha256 = "1s50kh3sg5wc5gqhwwznnibh7jcnfginnmkv66w62mm74k7mdsy4";
name = "qttools-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz";
sha256 = "06nqsa5mj0mc9w9xbm7mgdkb66x4wlvkhnas32f97sb8ic8rdf9b";
name = "qttools-opensource-src-5.9.2.tar.xz";
};
};
qttranslations = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttranslations-opensource-src-5.9.1.tar.xz";
sha256 = "0sdjiqli15fmkbqvhhgjfavff906sg56jx5xf8bg6xzd2j5544ja";
name = "qttranslations-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qttranslations-opensource-src-5.9.2.tar.xz";
sha256 = "0byi4s07lfnzzlr2c4sc5qg3hrysswmakwmf80q2mx50kpgnvwax";
name = "qttranslations-opensource-src-5.9.2.tar.xz";
};
};
qtvirtualkeyboard = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz";
sha256 = "0k79sqa8bg6gkbsk16320gnila1iiwpnl3vx03rysm5bqdnnlx3b";
name = "qtvirtualkeyboard-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtvirtualkeyboard-opensource-src-5.9.2.tar.xz";
sha256 = "1z66chp5746cb0rwy2isnpbvwjj44qvp2hg56n3g47dj901wldp8";
name = "qtvirtualkeyboard-opensource-src-5.9.2.tar.xz";
};
};
qtwayland = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz";
sha256 = "1yizvbmh26mx1ffq0qaci02g2wihy68ld0y7r3z8nx3v5acb236g";
name = "qtwayland-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwayland-opensource-src-5.9.2.tar.xz";
sha256 = "1ipn4xh0dj1kjg5i4vfl4gpx3hg2377w5gls47xpv1ikz41lshzn";
name = "qtwayland-opensource-src-5.9.2.tar.xz";
};
};
qtwebchannel = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz";
sha256 = "003h09mla82f2znb8jjigx13ivc68ikgv7w04594yy7qdmd5yhl0";
name = "qtwebchannel-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebchannel-opensource-src-5.9.2.tar.xz";
sha256 = "09iss70c1iqgf8qpik35qlgrdw5y9935v0fm2ppgkmxdxkpls6ww";
name = "qtwebchannel-opensource-src-5.9.2.tar.xz";
};
};
qtwebengine = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz";
sha256 = "00b4d18m54pbxa1hm6ijh2mrd4wmrs7lkplys8b4liw8j7mpx8zn";
name = "qtwebengine-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebengine-opensource-src-5.9.2.tar.xz";
sha256 = "0251qk04yif4lsn8qvkc2kmzzmaw1v3pfh5ypr06d04zb3j6kc6a";
name = "qtwebengine-opensource-src-5.9.2.tar.xz";
};
};
qtwebsockets = {
version = "5.9.2";
src = fetchurl {
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebsockets-opensource-src-5.9.2.tar.xz";
sha256 = "0x0nx1ampqsgj9qlc3l32z3ham1a5vq7m2lnxk5pr92yj6yw3pdg";
name = "qtwebsockets-opensource-src-5.9.2.tar.xz";
};
};
qtwebkit = {
@@ -290,44 +298,36 @@
name = "qtwebkit-examples-opensource-src-5.9.1.tar.xz";
};
};
qtwebsockets = {
version = "5.9.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz";
sha256 = "0r1lya2jj3wfci82zfn0vk6vr8sk9k7xiphnkb0panhb8di769q1";
name = "qtwebsockets-opensource-src-5.9.1.tar.xz";
};
};
qtwebview = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebview-opensource-src-5.9.1.tar.xz";
sha256 = "0qmxrh4y3i9n8x6yhrlnahcn75cc2xwlc8mi4g8n2d83c3x7pxyn";
name = "qtwebview-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebview-opensource-src-5.9.2.tar.xz";
sha256 = "1cdqw6pjfqagnwxrha0s18zadjnm65dsildxj07h2qiwqxwyrjpw";
name = "qtwebview-opensource-src-5.9.2.tar.xz";
};
};
qtwinextras = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz";
sha256 = "1x7f944f3g2ml3mm594qv6jlvl5dzzsxq86yinp7av0lhnyrxk0s";
name = "qtwinextras-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwinextras-opensource-src-5.9.2.tar.xz";
sha256 = "07qq9rxl6hhl300w7qxsjjbdd5fwpszfk3rbinxklg20f6c6ixml";
name = "qtwinextras-opensource-src-5.9.2.tar.xz";
};
};
qtx11extras = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz";
sha256 = "00fn3bps48gjyw0pdqvvl9scknxdpmacby6hvdrdccc3jll0wgd6";
name = "qtx11extras-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtx11extras-opensource-src-5.9.2.tar.xz";
sha256 = "1ias745j5lfnrfkgyk0pr8n8zlkqs08gq7yyzaj1c645sh54b1fv";
name = "qtx11extras-opensource-src-5.9.2.tar.xz";
};
};
qtxmlpatterns = {
version = "5.9.1";
version = "5.9.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz";
sha256 = "094wwap2fsl23cys6rxh2ciw0gxbbiqbshnn4qs1n6xdjrj6i15m";
name = "qtxmlpatterns-opensource-src-5.9.1.tar.xz";
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtxmlpatterns-opensource-src-5.9.2.tar.xz";
sha256 = "0knk4bplqhvsxar1wv16bzfw57q0aja12gdaxz7m8mvx121sm9ha";
name = "qtxmlpatterns-opensource-src-5.9.2.tar.xz";
};
};
}

6
pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
View File

@@ -2,6 +2,12 @@ qtPluginPrefix=@qtPluginPrefix@
qtQmlPrefix=@qtQmlPrefix@
qtDocPrefix=@qtDocPrefix@
_qtRmCMakeLink() {
find "${!outputLib}" -name "*.cmake" -type l | xargs rm
}
postInstallHooks+=(_qtRmCMakeLink)
addToSearchPathOnceWithCustomDelimiter() {
local delim="$1"
local search="$2"

15
pkgs/development/libraries/spdlog/default.nix
View File

@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "spdlog-${version}";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "gabime";
repo = "spdlog";
rev = "v${version}";
sha256 = "0pfagrkq6afpkl269vbi1fd6ckakzpr5b5cbapb8rr7hgsrilxza";
owner = "gabime";
repo = "spdlog";
rev = "v${version}";
sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q";
};
buildInputs = [ cmake ];
nativeBuildInputs = [ cmake ];
# cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ];
@@ -28,8 +28,5 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ obadz ];
platforms = platforms.all;
# This is a header-only library, no point in hydra building it:
hydraPlatforms = [];
};
}

6
pkgs/development/libraries/v8/3.24.10.nix
View File

@@ -1,6 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "3.24.10";
sha256 = "1blz5h9syk93bb4x3shcai3s2jhh6ai4bpymr9rz0f1ysvg60x75";
})

171
pkgs/development/libraries/v8/6_x.nix Normal file
View File

@@ -0,0 +1,171 @@
{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig
, doCheck ? false
, snapshot ? true
}:
let
arch = if stdenv.isArm
then if stdenv.is64bit
then"arm64"
else "arm"
else if stdenv.is64bit
then"x64"
else "ia32";
git_url = "https://chromium.googlesource.com";
deps = {
"base/trace_event/common" = fetchgit {
url = "${git_url}/chromium/src/base/trace_event/common.git";
rev = "65d1d42a5df6c0a563a6fdfa58a135679185e5d9";
sha256 = "0ikk0dj12adzr0138jrmwzhx8n9sl5qzs86a3mc3gva08a8wc84p";
};
"build" = fetchgit {
url = "${git_url}/chromium/src/build.git";
rev = "48a2b7b39debc7c77c868c9ddb0a360af1ebc367";
sha256 = "0aj554dfdbwnikwaapznfq55wkwbvg4114h7qamixy8ryjkaiy0k";
};
"buildtools" = fetchgit {
url = "${git_url}/chromium/buildtools.git";
rev = "5af0a3a8b89827a8634132080a39ab4b63dee489";
sha256 = "1841803m40w1hmnmm7qzdpk4b6q1m8cb7q4hsflqfpddpf4lp3v1";
};
"test/benchmarks/data" = fetchgit {
url = "${git_url}/v8/deps/third_party/benchmarks.git";
rev = "05d7188267b4560491ff9155c5ee13e207ecd65f";
sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl";
};
"test/mozilla/data" = fetchgit {
url = "${git_url}/v8/deps/third_party/mozilla-tests.git";
rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be";
sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn";
};
"test/test262/data" = fetchgit {
url = "${git_url}/external/github.com/tc39/test262.git";
rev = "1b911a8f8abf4cb63882cfbe72dcd4c82bb8ad91";
sha256 = "1hbp7vv41k7jka8azc78hhw4qng7gckr6dz1van7cyd067znwvr4";
};
"test/test262/harness" = fetchgit {
url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git";
rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd";
sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp";
};
"test/wasm-js" = fetchgit {
url = "${git_url}/external/github.com/WebAssembly/spec.git";
rev = "17b4a4d98c80b1ec736649d5a73496a0e6d12d4c";
sha256 = "03nyrrqffzj6xrmqi1v7f9m9395bdk53x301fy5mcq4hhpq6rsjr";
};
"testing/gmock" = fetchgit {
url = "${git_url}/external/googlemock.git";
rev = "0421b6f358139f02e102c9c332ce19a33faf75be";
sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp";
};
"testing/gtest" = fetchgit {
url = "${git_url}/external/github.com/google/googletest.git";
rev = "6f8a66431cb592dad629028a50b3dd418a408c87";
sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw";
};
"third_party/icu" = fetchgit {
url = "${git_url}/chromium/deps/icu.git";
rev = "08cb956852a5ccdba7f9c941728bb833529ba3c6";
sha256 = "0vn2iv068kmcjqqx5cgyha80x9iraz11hpx3q4n3rkvrlvbb3d7b";
};
"third_party/instrumented_libraries" = fetchgit {
url = "${git_url}/chromium/src/third_party/instrumented_libraries.git";
rev = "644afd349826cb68204226a16c38bde13abe9c3c";
sha256 = "0d1vkwilgv1a4ghazn623gwmm7h51padpfi94qrmig1y748xfwfa";
};
# templates of code generator require jinja2 2.8 (while nixpkgs has 2.9.5, which breaks the template)
"third_party/jinja2" = fetchgit {
url = "${git_url}/chromium/src/third_party/jinja2.git";
rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0";
sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd";
};
"third_party/markupsafe" = fetchgit {
url = "${git_url}/chromium/src/third_party/markupsafe.git";
rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz";
};
"tools/clang" = fetchgit {
url = "${git_url}/chromium/src/tools/clang.git";
rev = "40f69660bf3cd407e72b8ae240fdd6c513dddbfe";
sha256 = "1plkb9dcn34yd6lad7w59s9vqwmcc592dasgdk232spkafpg8qcf";
};
};
in
stdenv.mkDerivation rec {
name = "v8-${version}";
version = "6.2.414.27";
inherit doCheck;
src = fetchFromGitHub {
owner = "v8";
repo = "v8";
rev = version;
sha256 = "15zrb9bcpnhljhrilqnjaak3a4xnhj8li6ra12g3gkrw3fzir9a2";
};
postUnpack = ''
${lib.concatStringsSep "\n" (
lib.mapAttrsToList (n: v: ''
mkdir -p $sourceRoot/${n}
cp -r ${v}/* $sourceRoot/${n}
'') deps)}
'';
prePatch = ''
# use our gn, not the bundled one
sed -i -e 's#gn_path = .*#gn_path = "${gn}/bin/gn"#' tools/mb/mb.py
# disable tests
if [ "$doCheck" = "" ]; then sed -i -e '/"test:gn_all",/d' BUILD.gn; fi
# disable sysroot usage
chmod u+w build/config build/config/sysroot.gni
sed -i build/config/sysroot.gni \
-e '/use_sysroot =/ { s#\(use_sysroot =\).*#\1 false#; :a n; /current_cpu/ { s/^/#/; ba }; }'
# patch shebangs (/usr/bin/env)
patchShebangs tools/dev/v8gen.py
'';
configurePhase = ''
tools/dev/v8gen.py -vv ${arch}.release -- \
is_component_build=true \
${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false" } \
is_clang=false \
linux_use_bundled_binutils=false \
treat_warnings_as_errors=false
'';
nativeBuildInputs = [ gn ninja pkgconfig ];
buildInputs = [ python glib ];
buildPhase = ''
ninja -C out.gn/${arch}.release/
'';
enableParallelBuilding = true;
installPhase = ''
install -vD out.gn/${arch}.release/d8 "$out/bin/d8"
install -vD out.gn/${arch}.release/mksnapshot "$out/bin/mksnapshot"
mkdir -p "$out/lib"
for f in libicui18n.so libicuuc.so libv8_libbase.so libv8_libplatform.so libv8.so; do
install -vD out.gn/${arch}.release/$f "$out/lib/$f"
done
install -vD out.gn/${arch}.release/icudtl.dat "$out/lib/icudtl.dat"
mkdir -p "$out/include"
cp -vr include/*.h "$out/include"
cp -vr include/libplatform "$out/include"
'';
meta = with lib; {
description = "Google's open source JavaScript engine";
maintainers = with maintainers; [ cstrahan proglodyte ];
platforms = platforms.linux;
license = licenses.bsd3;
};
}

79
pkgs/development/libraries/v8/generic.nix
View File

@@ -1,79 +0,0 @@
{ stdenv, fetchurl, gyp, readline, python, which, icu
, version
, sha256
, ...
}:
assert readline != null;
let
arch = if stdenv.is64bit then "x64" else "ia32";
in
stdenv.mkDerivation rec {
name = "v8-${version}";
inherit version;
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
+ "${name}.tar.bz2";
inherit sha256;
};
patchPhase = ''
sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8
'';
configurePhase = ''
PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \
build/gyp_v8 \
-f make \
--generator-output="out" \
-Dflock_index=0 \
-Dv8_enable_i18n_support=1 \
-Duse_system_icu=1 \
-Dconsole=readline \
-Dcomponent=shared_library \
-Dv8_target_arch=${arch}
'';
nativeBuildInputs = [ which ];
buildInputs = [ readline python icu ];
NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
buildFlags = [
"LINK=g++"
"-C out"
"builddir=$(CURDIR)/Release"
"BUILDTYPE=Release"
];
postPatch = stdenv.lib.optionalString (!stdenv.cc.isClang) ''
sed -i build/standalone.gyp -e 's,-Wno-format-pedantic,,g'
'';
enableParallelBuilding = true;
installPhase = ''
install -vD out/Release/d8 "$out/bin/d8"
${if stdenv.system == "x86_64-darwin" then ''
install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
'' else ''
install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
''}
cp -vr include "$out/"
'';
postFixup = if stdenv.isDarwin then ''
install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8
install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
'' else null;
meta = with stdenv.lib; {
description = "Google's open source JavaScript engine";
platforms = platforms.linux;
license = licenses.bsd3;
};
}

47
pkgs/development/libraries/v8/update.sh Executable file
View File

@@ -0,0 +1,47 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p curl -p nix-prefetch-git
VERSION_OVERVIEW=https://omahaproxy.appspot.com/all?os=linux
TARGET_CHANNEL=beta
FILE_PATH=6_x.nix
set -eo pipefail
v8_version=$(curl -s "$VERSION_OVERVIEW" | awk -F "," "\$2 ~ /${TARGET_CHANNEL}/ { print \$11 }")
echo "Using V8 version --> $v8_version"
sed -e "s#\\(version = \\)\"[0-9\.]*\"#\1\"$v8_version\"#" -i ${FILE_PATH}
sha256=$(nix-prefetch-git --no-deepClone https://github.com/v8/v8.git "refs/tags/${v8_version}" \
| sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }')
sed -e "/repo = \"v8\"/ { n;n; s#\".*\"#\"${sha256}\"# }" -i ${FILE_PATH}
deps="$(mktemp)"
curl -s -o "$deps" "https://raw.githubusercontent.com/v8/v8/${v8_version}/DEPS"
echo $deps
sed -ne '/= fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${FILE_PATH} | while read dep; do
echo "Processing dependency --> $dep"
escaped_dep=$(echo "$dep" | sed -e 's#/#\\/#g')
dep_rev=$(sed -ne "/\"v8\/${escaped_dep}\":/ { n; s#.*+ \"##; s#\".*##; p }" "$deps")
if [ "$dep_rev" = "" ]; then
echo "Failed to resolve dependency $dep, not listed in DEPS file"
rm -f "$deps"
exit 2
fi
repo_url=$(sed -ne "/\"${escaped_dep}\" = fetchgit/ { n; s/.*\"\(.*\)\".*/\1/; s#\${git_url}#https://chromium.googlesource.com#; p }" ${FILE_PATH})
sha256=$(nix-prefetch-git --no-deepClone "$repo_url" "$dep_rev" 2>/dev/null | sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }')
if [ "$sha256" = "" ]; then
echo "Failed to get sha256 via nix-prefetch-git $repo_url $dep_rev"
rm -f "$deps"
exit 2
fi
sed -e "/\"${escaped_dep}\" = fetchgit/ { n; n; s/\".*\"/\"${dep_rev}\"/; n; s/\".*\"/\"${sha256}\"/ }" -i ${FILE_PATH}
done
rm -f "$deps"
echo done.

1
pkgs/development/libraries/xmlsec/default.nix
View File

@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
# otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909
NIX_LDFLAGS = [ "-lgcrypt" ];
NIX_CFLAGS_COMPILE = [ "-I${nss.dev}/include/nss" ];
postInstall = ''
moveToOutput "bin/xmlsec1-config" "$dev"

2
pkgs/development/ocaml-modules/ocaml-gettext/default.nix
View File

@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true;
dontStrip = true;
meta = with stdenv.lib; {
description = "OCaml Bindings to gettext";
homepage = https://forge.ocamlcore.org/projects/ocaml-gettext;

4
pkgs/development/python-modules/django/1.10-gis-libs.template.patch
View File

@@ -6,7 +6,7 @@ diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgda
except (AttributeError, EnvironmentError,
ImportError, ImproperlyConfigured):
- lib_path = None
+ lib_path = "@gdal@/lib/libgdal.so"
+ lib_path = "@gdal@/lib/libgdal@extension@"
if lib_path:
lib_names = None
@@ -18,7 +18,7 @@ diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeo
except (AttributeError, EnvironmentError,
ImportError, ImproperlyConfigured):
- lib_path = None
+ lib_path = "@geos@/lib/libgeos_c.so"
+ lib_path = "@geos@/lib/libgeos_c@extension@"
# Setting the appropriate names for the GEOS-C library.
if lib_path:

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

@@ -2,6 +2,7 @@
pythonOlder,
geos, gdal, pytz
}:
buildPythonPackage rec {
pname = "Django";
name = "${pname}-${version}";
@@ -19,6 +20,7 @@ buildPythonPackage rec {
src = ./1.10-gis-libs.template.patch;
geos = geos;
gdal = gdal;
extension = stdenv.hostPlatform.extensions.sharedLibrary;
})
];

25
pkgs/development/python-modules/guzzle_sphinx_theme/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, buildPythonPackage, sphinx, fetchPypi }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "guzzle_sphinx_theme";
version = "0.7.11";
src = fetchPypi {
inherit pname version;
sha256 = "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v";
};
doCheck = false; # no tests
propagatedBuildInputs = [ sphinx ];
meta = with stdenv.lib; {
description = "Sphinx theme used by Guzzle: http://guzzlephp.org";
homepage = https://github.com/guzzle/guzzle_sphinx_theme/;
license = licenses.mit;
maintainers = with maintainers; [ flokli ];
platforms = platforms.unix;
};
}

79
pkgs/development/python-modules/pandas/0.17.1.nix Normal file
View File

@@ -0,0 +1,79 @@
{ buildPythonPackage
, fetchPypi
, python
, stdenv
, fetchurl
, pytest
, glibcLocales
, cython
, dateutil
, scipy
, numexpr
, pytz
, xlrd
, bottleneck
, sqlalchemy
, lxml
, html5lib
, beautifulsoup4
, openpyxl
, tables
, xlwt
, libcxx ? null
}:
let
inherit (stdenv.lib) optional optionalString concatStringsSep;
inherit (stdenv) isDarwin;
in buildPythonPackage rec {
pname = "pandas";
version = "0.17.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837";
};
LC_ALL = "en_US.UTF-8";
buildInputs = [ pytest glibcLocales ] ++ optional isDarwin libcxx;
propagatedBuildInputs = [
cython
dateutil
scipy
numexpr
pytz
xlrd
bottleneck
sqlalchemy
lxml
html5lib
beautifulsoup4
openpyxl
tables
xlwt
];
doCheck = false;
# For OSX, we need to add a dependency on libcxx, which provides
# `complex.h` and other libraries that pandas depends on to build.
postPatch = optionalString isDarwin ''
cpp_sdk="${libcxx}/include/c++/v1";
echo "Adding $cpp_sdk to the setup.py common_include variable"
substituteInPlace setup.py \
--replace "['pandas/src/klib', 'pandas/src']" \
"['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
'';
meta = {
# https://github.com/pandas-dev/pandas/issues/14866
# pandas devs are no longer testing i686 so safer to assume it's broken
broken = stdenv.isi686;
homepage = http://pandas.pydata.org/;
description = "Python Data Analysis Library";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ shlevy ];
platforms = stdenv.lib.platforms.unix;
};
}

10
pkgs/development/python-modules/pelican/default.nix
View File

@@ -45,6 +45,16 @@ buildPythonPackage rec {
LC_ALL="en_US.UTF-8";
# We only want to patch shebangs in /bin, and not those
# of the project scripts that are created by Pelican.
# See https://github.com/NixOS/nixpkgs/issues/30116
dontPatchShebangs = true;
postFixup = ''
patchShebangs $out/bin
'';
meta = with stdenv.lib; {
description = "A tool to generate a static blog from reStructuredText or Markdown input files";
homepage = http://getpelican.com/;

42
pkgs/development/python-modules/pypcap/default.nix Normal file
View File

@@ -0,0 +1,42 @@
{ stdenv, lib, writeText, buildPythonPackage, fetchPypi, isPy3k, libpcap, dpkt }:
buildPythonPackage rec {
pname = "pypcap";
version = "1.1.6";
name = "${pname}-${version}";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1cx7qm0w2a91g5z8k3kmlwz0b8dkr0h8dlb64rwgyhp2laa33syi";
};
patches = [
# The default setup.py searchs for pcap.h in a static list of default
# folders. So we have to add the path to libpcap in the nix-store.
(writeText "libpcap-path.patch"
''
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,8 @@ def recursive_search(path, target_files):
def get_extension():
# A list of all the possible search directories
- dirs = ['/usr', sys.prefix] + glob.glob('/opt/libpcap*') + \
+ dirs = ['${libpcap}', '/usr', sys.prefix] + \
+ glob.glob('/opt/libpcap*') + \
glob.glob('../libpcap*') + glob.glob('../wpdpack*') + \
glob.glob('/Applications/Xcode.app/Contents/Developer/Platforms/' +
'MacOSX.platform/Developer/SDKs/*')
'')
];
buildInputs = [ libpcap dpkt ];
meta = {
homepage = https://github.com/pynetwork/pypcap;
description = "Simplified object-oriented Python wrapper for libpcap";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ geistesk ];
};
}

6
pkgs/development/python-modules/shapely/default.nix
View File

@@ -6,11 +6,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "Shapely";
version = "1.5.15";
version = "1.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "0lfqxb3kpdn0g9zzlhzg79yc8iyy4fpsk0p5nd80gar1mmhr8pg7";
sha256 = "1iyhrkm6g233gwbd20sf4aq4by0kg52cz1d2k7imnqgzjpmkgqas";
};
buildInputs = [ geos glibcLocales cython ];
@@ -27,7 +27,7 @@ buildPythonPackage rec {
libc = if stdenv.isDarwin then "libc.dylib" else "libc.so.6";
in ''
sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}'])|" shapely/geos.py
sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${stdenv.cc.libc}']).free|" shapely/geos.py
sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${libc}']).free|" shapely/geos.py
'';
# tests/test_voctorized fails because the vectorized extension is not

12
pkgs/development/python-modules/tensorflow/default.nix
View File

@@ -1,4 +1,5 @@
{ stdenv
, symlinkJoin
, lib
, fetchurl
, buildPythonPackage
@@ -35,6 +36,13 @@ buildPythonPackage rec {
format = "wheel";
disabled = ! (isPy35 || isPy36 || isPy27);
# cudatoolkit is split (see https://github.com/NixOS/nixpkgs/commit/bb1c9b027d343f2ce263496582d6b56af8af92e6)
# However this means that libcusolver is not loadable by tensor flow. So we undo the split here.
cudatoolkit_joined = symlinkJoin {
name = "unsplit_cudatoolkit";
paths = [ cudatoolkit.out
cudatoolkit.lib ];};
src = let
tfurl = sys: proc: pykind:
let
@@ -112,7 +120,7 @@ buildPythonPackage rec {
propagatedBuildInputs =
[ numpy six protobuf mock backports_weakref ]
++ lib.optional (!isPy36) tensorflow-tensorboard
++ lib.optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ];
++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn stdenv.cc ];
# tensorflow-gpu depends on tensorflow_tensorboard, which cannot be
# built at the moment (some of its dependencies do not build
@@ -126,7 +134,7 @@ buildPythonPackage rec {
postFixup = let
rpath = stdenv.lib.makeLibraryPath
(if cudaSupport then
[ stdenv.cc.cc.lib zlib cudatoolkit cudnn
[ stdenv.cc.cc.lib zlib cudatoolkit_joined cudnn
linuxPackages.nvidia_x11 ]
else
[ stdenv.cc.cc.lib zlib ]

4
pkgs/development/tools/analysis/flow/default.nix
View File

@@ -3,14 +3,14 @@
with lib;
stdenv.mkDerivation rec {
version = "0.56.0";
version = "0.57.0";
name = "flow-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "0979hcz5qqblcnkc4whkklzdhm4f45gzfl6y4zp0wbq0qi1gv7x4";
sha256 = "1y2znwiwc3zkwz17a2m0m28dpknw7hpjd7ih4h7zf6p8nnqd3k6d";
};
installPhase = ''

8
pkgs/development/tools/analysis/radare2/default.nix
View File

@@ -13,14 +13,14 @@ let
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec {
version = "1.6.0";
version = "2.0.0";
name = "radare2-${version}";
src = fetchFromGitHub {
owner = "radare";
repo = "radare2";
rev = version;
sha256 = "0kb7y0b5kw2p1kxpzjgc8pnwdkqyzkijzp5d2a9zs2ira96668zd";
sha256 = "1ahai9x6jc15wjzdbdkri3rc88ark2i5s8nv2pxcp0wwldvawlzi";
};
postPatch = let
@@ -34,10 +34,6 @@ stdenv.mkDerivation rec {
substituteInPlace shlr/Makefile --replace CS_RELEASE=0 CS_RELEASE=1
cp ${capstone} shlr/capstone-${cs_ver}.tar.gz
# make compiler happy (fixed in upstream 2017-08-11)
substituteInPlace libr/asm/arch/hexagon/gnu/hexagon-dis.c --replace \
'(*info->fprintf_func) (info->stream, errmsg);' \
'(*info->fprintf_func) (info->stream, "%s", errmsg);'
'';
nativeBuildInputs = [ pkgconfig ];

77
pkgs/development/tools/build-managers/gn/default.nix Normal file
View File

@@ -0,0 +1,77 @@
{ stdenv, lib, fetchgit, fetchurl, libevent, ninja, python }:
let
depsGit = {
"tools/gn" = fetchgit {
url = "https://chromium.googlesource.com/chromium/src/tools/gn";
rev = "d0c518db129975ce88ff1de26c857873b0619c4b";
sha256 = "0l15vzmjyx6bwlz1qhn3fy7yx3qzzxr3drnkj3l0p0fmyxza52vx";
};
"base" = fetchgit {
url = "https://chromium.googlesource.com/chromium/src/base";
rev = "bc6e3ce8ca01b894751e1f7b22b561e3ae2e7f17";
sha256 = "1yl49v6nxbrfms52xf7fiwh7d4301m2aj744pa3hzzh989c5j6g5";
};
"build" = fetchgit {
url = "https://chromium.googlesource.com/chromium/src/build";
rev = "e934a19ae908081fba13769924e4ea45a7a451ce";
sha256 = "0jhy418vaiin7djg9zvk83f8zhasigki4442x5j7gkmgmgmyc4am";
};
"config" = fetchgit {
url = "https://chromium.googlesource.com/chromium/src/build/config";
rev = "df16c6a2c070704b0a25efe46ee9af16de1e65b3";
sha256 = "1x18syzz1scwhd8lf448hy5lnfpq118l403x9qmwm0np318w09wg";
};
"testing/gtest" = fetchgit {
url = "https://chromium.googlesource.com/chromium/testing/gtest";
rev = "585ec31ea716f08233a815e680fc0d4699843938";
sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc";
};
};
in
stdenv.mkDerivation rec {
name = "gn";
version = "0.0.0.20170629";
sourceRoot = ".";
unpackPhase = ''
${lib.concatStringsSep "\n" (
lib.mapAttrsToList (n: v: ''
mkdir -p $sourceRoot/${n}
cp -r ${v}/* $sourceRoot/${n}
'') depsGit)}
'';
postPatch = ''
# Patch shebands (for sandbox build)
chmod u+w -R build
patchShebangs build
# Patch out Chromium-bundled libevent
chmod u+w tools/gn/bootstrap tools/gn/bootstrap/bootstrap.py
sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \
tools/gn/bootstrap/bootstrap.py
'';
NIX_LDFLAGS = "-levent";
nativeBuildInputs = [ ninja python ];
buildInputs = [ libevent ];
buildPhase = ''
python tools/gn/bootstrap/bootstrap.py -s
'';
installPhase = ''
install -vD out/Release/gn "$out/bin/gn"
'';
meta = with stdenv.lib; {
description = "A meta-build system that generates NinjaBuild files";
homepage = https://chromium.googlesource.com/chromium/src/tools/gn;
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = [ maintainers.stesie ];
};
}

1
pkgs/development/tools/haskell/tinc/default.nix
View File

@@ -38,4 +38,5 @@ mkDerivation {
license = stdenv.lib.licenses.mit;
hydraPlatforms = [ "x86_64-linux" ];
maintainers = [ stdenv.lib.maintainers.robbinch ];
broken = true;
}

10
pkgs/development/tools/misc/dbench/default.nix
View File

@@ -13,10 +13,18 @@ stdenv.mkDerivation rec {
preConfigure = ''
./autogen.sh
configureFlagsArray+=("--datadir=$out/share/dbench")
'';
postInstall = ''
cp -R loadfiles/ $out/share/
cp -R loadfiles/* $out/share/dbench/doc/dbench/loadfiles
# dbench looks here for the file
ln -s doc/dbench/loadfiles/client.txt $out/share/dbench/client.txt
# backwards compatible to older nixpkgs packaging introduced by
# 3f27be8e5d5861cd4b9487d6c5212d88bf24316d
ln -s dbench/doc/dbench/loadfiles $out/share/loadfiles
'';
meta = with stdenv.lib; {

5
pkgs/development/tools/misc/gdb/default.nix
View File

@@ -60,10 +60,7 @@ stdenv.mkDerivation rec {
configureFlags = with stdenv.lib; [
"--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-system-readline"
"--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}"
] ++ stdenv.lib.optional hostPlatform.isLinux
# TODO(@Ericson2314): make this conditional on whether host platform is NixOS
"--with-separate-debug-dir=/run/current-system/sw/lib/debug"
++ stdenv.lib.optional (!pythonSupport) "--without-python"
] ++ stdenv.lib.optional (!pythonSupport) "--without-python"
++ stdenv.lib.optional multitarget "--enable-targets=all";
postInstall =

3
pkgs/development/tools/ocaml/camlp4/default.nix
View File

@@ -13,6 +13,9 @@ let param = {
"4.05" = {
version = "4.05+1";
sha256 = "0wm795hpwvwpib9c9z6p8kw2fh7p7b2hml6g15z8zry3y7w738sv"; };
"4.06" = {
version = "4.06+1";
sha256 = "0fazfw2l7wdmbwnqc22xby5n4ri1wz27lw9pfzhsbcdrighykysf"; };
}."${ocaml.meta.branch}";
in

2
pkgs/development/tools/parsing/antlr/4.7.nix
View File

@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
walk parse trees.
'';
homepage = http://www.antlr.org/;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

8
pkgs/development/tools/selenium/chromedriver/default.nix
View File

@@ -6,17 +6,17 @@ let
allSpecs = {
"i686-linux" = {
system = "linux32";
sha256 = "1qi49rcm7r4b8yqx4akmirilp4ifip89n7inji0pihdqzaw604d4";
sha256 = "13fngjg2v0l3vhlmjnffy785ckgk2kbpm7307li75vinkcly91cj";
};
"x86_64-linux" = {
system = "linux64";
sha256 = "1845nh7kj8scgn85yqwp4nsx7fabcb09w23jp8xa1cxyfvv2wdry";
sha256 = "0x5vnmnw6mws6iw9s0kcm4crx9gfgy0vjjpk1v0wk7jpn6d0bl47";
};
"x86_64-darwin" = {
system = "mac64";
sha256 = "0zyv8i4dbzyk58g4hr5143akgsfaaq9659bwj1m41jwi965grcxa";
sha256 = "09y8ijj75q5a7snzchxinxfq2ad2sw0f30zi0p3hqf1n88y28jq6";
};
};
@@ -33,7 +33,7 @@ let
in
stdenv.mkDerivation rec {
name = "chromedriver-${version}";
version = "2.31";
version = "2.33";
src = fetchurl {
url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";

6
pkgs/development/tools/selenium/htmlunit-driver/default.nix
View File

@@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "htmlunit-driver-standalone-${version}";
version = "2.21";
version = "2.27";
src = fetchurl {
url = "https://github.com/SeleniumHQ/htmlunit-driver/releases/download/${version}/htmlunit-driver-standalone-${version}.jar";
sha256 = "1wrbam0hb036717z3y73lsw4pwp5sdiw2i1818kg9pvc7i3fb3yn";
url = "https://github.com/SeleniumHQ/htmlunit-driver/releases/download/${version}/htmlunit-driver-${version}-with-dependencies.jar";
sha256 = "1sd3cwpamcbq9pv0mvcm8x6minqrlb4i0r12q3jg91girqswm2dp";
};
unpackPhase = "true";

2
pkgs/development/tools/selenium/selendroid/default.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \
--add-flags "-Dfile.encoding=UTF-8" \
--add-flags "-cp \"$out/share/lib/selendroid/${name}.jar:${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar\"" \
--add-flags "org.openqa.grid.selenium.GridLauncher"
--add-flags "org.openqa.grid.selenium.GridLauncherV3"
'';
meta = {

12
pkgs/development/tools/selenium/server/default.nix
View File

@@ -4,17 +4,19 @@
with stdenv.lib;
let
minorVersion = "3.6";
patchVersion = "0";
arch = if stdenv.system == "x86_64-linux" then "amd64"
else if stdenv.system == "i686-linux" then "i386"
else "";
in stdenv.mkDerivation rec {
name = "selenium-server-standalone-${version}";
version = "2.53.0";
version = "${minorVersion}.${patchVersion}";
src = fetchurl {
url = "http://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-${version}.jar";
sha256 = "0dp0n5chl1frjy9pcyjvpcdgv1f4dkslh2bpydpxwc5isfzqrf37";
url = "http://selenium-release.storage.googleapis.com/${minorVersion}/selenium-server-standalone-${version}.jar";
sha256 = "11v340nm8vzqc2bkmbjfm9a7j4dj0bi9bfk8wdpfan0fb8prf772";
};
unpackPhase = "true";
@@ -25,9 +27,9 @@ in stdenv.mkDerivation rec {
mkdir -p $out/share/lib/${name}
cp $src $out/share/lib/${name}/${name}.jar
makeWrapper ${jre}/bin/java $out/bin/selenium-server \
--add-flags "-cp ${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar:$out/share/lib/${name}/${name}.jar" \
--add-flags "-cp $out/share/lib/${name}/${name}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \
--add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \
--add-flags "org.openqa.grid.selenium.GridLauncher"
--add-flags "org.openqa.grid.selenium.GridLauncherV3"
'';
meta = {

12
pkgs/development/tools/xcbuild/default.nix
View File

@@ -16,13 +16,16 @@ let
};
in stdenv.mkDerivation rec {
name = "xcbuild-${version}";
version = "0.1.1";
# Once a version is released that includes https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710,
# we can stop doing this -pre thing.
version = "0.1.2-pre";
src = fetchFromGitHub {
owner = "facebook";
repo = "xcbuild";
rev = version;
sha256 = "0i98c6lii8r3bgs5gj7div12pxyzjvm4qqzmmzgr7dyhj00qa8r5";
rev = "32b9fbeb69bfa2682bd0351ec2f14548aaedd554";
sha256 = "1xxwg2849jizxv0g1hy0b1m3i7iivp9bmc4f5pi76swsn423d41m";
};
prePatch = ''
@@ -31,9 +34,6 @@ in stdenv.mkDerivation rec {
cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise
'';
# See https://github.com/facebook/xcbuild/issues/238 and remove once that's in
patches = [ ./return-false.patch ];
# Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
sed 1i'#include <sys/sysmacros.h>' \

56
pkgs/development/tools/xcbuild/platform.nix
View File

@@ -101,6 +101,22 @@ let
Name = "$(EXECUTABLE_NAME)";
};
}
{
Identifier = "com.apple.package-type.static-library";
Type = "PackageType";
Name = "Mach-O Static Library";
DefaultBuildSettings = {
EXECUTABLE_PREFIX = "lib";
EXECUTABLE_SUFFIX = ".a";
EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)";
EXECUTABLE_PATH = "$(EXECUTABLE_NAME)";
};
ProductReference = {
FileType = "archive.ar";
Name = "$(EXECUTABLE_NAME)";
IsLaunchable = "NO";
};
}
{
Identifier = "com.apple.package-type.wrapper";
Type = "PackageType";
@@ -172,6 +188,42 @@ let
Type = "ProductType";
Name = "Dynamic Library";
PackageTypes = [ "com.apple.package-type.mach-o-dylib" ];
DefaultBuildProperties = {
FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)";
MACH_O_TYPE = "mh_dylib";
REZ_EXECUTABLE = "YES";
EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)";
EXECUTABLE_EXTENSION = "dylib";
DYLIB_COMPATIBILITY_VERSION = "1";
DYLIB_CURRENT_VERSION = "1";
FRAMEWORK_FLAG_PREFIX = "-framework";
LIBRARY_FLAG_PREFIX = "-l";
LIBRARY_FLAG_NOSPACE = "YES";
STRIP_STYLE = "debugging";
GCC_INLINES_ARE_PRIVATE_EXTERN = "YES";
CODE_SIGNING_ALLOWED = "YES";
CODE_SIGNING_REQUIRED = "NO";
};
}
{
Identifier = "com.apple.product-type.library.static";
Type = "ProductType";
Name = "Static Library";
PackageTypes = [ "com.apple.package-type.static-library" ];
DefaultBuildProperties = {
FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)";
MACH_O_TYPE = "staticlib";
REZ_EXECUTABLE = "YES";
EXECUTABLE_PREFIX = "lib";
EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)";
EXECUTABLE_EXTENSION = "a";
FRAMEWORK_FLAG_PREFIX = "-framework";
LIBRARY_FLAG_PREFIX = "-l";
LIBRARY_FLAG_NOSPACE = "YES";
STRIP_STYLE = "debugging";
SEPARATE_STRIP = "YES";
CLANG_ENABLE_MODULE_DEBUGGING = "NO";
};
}
{
Type = "ProductType";
@@ -211,7 +263,7 @@ let
in
stdenv.mkDerivation {
name = "nixpkgs.platform";
name = "MacOSX.platform";
buildInputs = [ xcbuild ];
buildCommand = ''
mkdir -p $out/
@@ -228,6 +280,6 @@ stdenv.mkDerivation {
mkdir -p $out/Developer/SDKs/
cd $out/Developer/SDKs/
cp -r ${sdk} nix.nixpkgs.sdk
cp -r ${sdk} ${sdk.name}
'';
}

13
pkgs/development/tools/xcbuild/return-false.patch
View File

@@ -1,13 +0,0 @@
diff --git a/Libraries/dependency/Tools/dependency-info-tool.cpp b/Libraries/dependency/Tools/dependency-info-tool.cpp
index 006f53c7..d469f068 100644
--- a/Libraries/dependency/Tools/dependency-info-tool.cpp
+++ b/Libraries/dependency/Tools/dependency-info-tool.cpp
@@ -271,7 +271,7 @@ main(int argc, char **argv)
*/
std::vector<uint8_t> makefileContents = std::vector<uint8_t>(contents.begin(), contents.end());
if (!filesystem.write(makefileContents, *options.output())) {
- return false;
+ return -1;
}
return 0;

2
pkgs/development/tools/xcbuild/sdk.nix
View File

@@ -19,7 +19,7 @@ let
in
stdenv.mkDerivation {
name = "nix.nixpkgs.sdk";
name = "MacOSX.sdk";
buildInputs = [ xcbuild ];
buildCommand = ''
mkdir -p $out/

9
pkgs/development/tools/xcbuild/wrapper.nix
View File

@@ -58,11 +58,14 @@ stdenv.mkDerivation {
wrapProgram $out/bin/xcodebuild \
--add-flags "-xcconfig ${xcconfig}" \
--add-flags "DERIVED_DATA_DIR=." \
--set DEVELOPER_DIR "$out"
--set DEVELOPER_DIR "$out" \
--set SDKROOT ${sdkName}
wrapProgram $out/bin/xcrun \
--set DEVELOPER_DIR "$out"
--set DEVELOPER_DIR "$out" \
--set SDKROOT ${sdkName}
wrapProgram $out/bin/xcode-select \
--set DEVELOPER_DIR "$out"
--set DEVELOPER_DIR "$out" \
--set SDKROOT ${sdkName}
'';
inherit (xcbuild) meta;

4
pkgs/development/tools/yarn/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "yarn-${version}";
version = "1.0.1";
version = "1.2.1";
src = fetchzip {
url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
sha256 = "1adp5wzxbq5glxbmqfvmjn3vld93mvl65y4bmhjn8clzj7n25piq";
sha256 = "0jsaszykgmli503jgwdk79qks44krjgjr0qmizh3y7z4lplqdjip";
};
buildInputs = [makeWrapper nodejs];