Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2016-10-13 09:53:16 +02:00
110 changed files with 4502 additions and 1735 deletions

View File

@@ -176,5 +176,4 @@ in mkDerivation (rec {
license = stdenv.lib.licenses.bsd3;
platforms = ghc.meta.platforms;
maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
broken = true; # See http://hydra.nixos.org/build/41499439, for example.
})

View File

@@ -35,6 +35,18 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ ncurses zlib ];
# The goal here is to disable LLVM bindings (currently go and ocaml) regardless
# of whether the impure CMake search sheananigans find the compilers in global
# paths. This mostly exists because sandbox builds don't work very well on Darwin
# and sometimes you get weird behavior if CMake finds go in your system path.
# This would be far prettier if there were a CMake option to just disable bindings
# but from what I can tell, there isn't such a thing. The file in question only
# contains `if(WIN32)` conditions to check whether to disable bindings, so making
# those always succeed has the net effect of disabling all bindings.
prePatch = ''
substituteInPlace cmake/config-ix.cmake --replace "if(WIN32)" "if(1)"
'';
# hacky fix: created binaries need to be run before installation
preBuild = ''
mkdir -p $out/

View File

@@ -6,7 +6,7 @@ let
name = "clang-${version}";
unpackPhase = ''
unpackFile ${fetch "cfe" "1ybcac8hlr9vl3wg8s4v6cp0c0qgqnwprsv85lihbkq3vqv94504"}
unpackFile ${fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"}
mv cfe-${version}.src clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}

View File

@@ -2,7 +2,7 @@
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
version = "3.8.0";
version = "3.8.1";
fetch = fetch_v version;
fetch_v = ver: name: sha256: fetchurl {
@@ -10,8 +10,8 @@ let
inherit sha256;
};
compiler-rt_src = fetch "compiler-rt" "1c2nkp9563873ffz22qmhc0wakgj428pch8rmhym8agjamz3ily8";
clang-tools-extra_src = fetch "clang-tools-extra" "1i0yrgj8qrzjjswraz0i55lg92ljpqhvjr619d268vka208aigdg";
compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d";
clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6";
self = {
llvm = callPackage ./llvm.nix {

View File

@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "libc++-${version}";
src = fetch "libcxx" "0yr3fh8vj38289b9cwk37zsy7x98dcd3kjy7xxy8mg20p48lb01n";
src = fetch "libcxx" "1k7f9qk5bgwa02ksh6yr9hccwcbhmcdzl1fpbdw6s2c89iwg7mvp";
postUnpack = ''
unpackFile ${libcxxabi.src}

View File

@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "libc++abi-${version}";
src = fetch "libcxxabi" "0175rv2ynkklbg96kpw13iwhnzyrlw3r12f4h09p9v7nmxqhivn5";
src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1";
buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;

View File

@@ -15,7 +15,7 @@
stdenv.mkDerivation {
name = "lldb-${version}";
src = fetch "lldb" "0dasg12gf5crrd9pbi5rd1y8vwlgqp8nxgw9g4z47w3x2i28zxp3";
src = fetch "lldb" "18z8vhfgh4m57hl66i83cp4d4mv3i86z2hjhbp5rvqs7d88li49l";
postUnpack = ''
# Hack around broken standalone builf as of 3.8
@@ -25,12 +25,9 @@ stdenv.mkDerivation {
cp "$(ls -d llvm-*.src)/lib/Support/regex_impl.h" "$srcDir/tools/lib/Support/"
'';
buildInputs = [ cmake python which swig ncurses zlib libedit ];
buildInputs = [ cmake python which swig ncurses zlib libedit llvm ];
preConfigure = ''
export CXXFLAGS="-pthread"
export LDFLAGS="-ldl"
'';
hardeningDisable = [ "format" ];
cmakeFlags = [
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"

View File

@@ -18,7 +18,7 @@
}:
let
src = fetch "llvm" "0ikfq0gxac8xpvxj23l4hk8f12ydx48fljgrz1gl9xp0ks704nsm";
src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf";
in stdenv.mkDerivation rec {
name = "llvm-${version}";

View File

@@ -0,0 +1,26 @@
{stdenv, fetchFromGitHub, ponyc }:
stdenv.mkDerivation {
name = "pony-stable-2016-10-10";
src = fetchFromGitHub {
owner = "jemc";
repo = "pony-stable";
rev = "fdefa26fed93f4ff81c323f29abd47813c515703";
sha256 = "16inavy697icgryyvn9gcylgh639xxs7lnbrqdzcryvh0ck15qxk";
};
buildInputs = [ ponyc ];
installPhase = ''
make prefix=$out install
'';
meta = {
description = "A simple dependency manager for the Pony language.";
homepage = http://www.ponylang.org;
license = stdenv.lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.dipinhora ];
platforms = stdenv.lib.platforms.unix;
};
}

View File

@@ -1,30 +0,0 @@
{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
, glib, libiconv, libintlOrEmpty
}:
let
major = "0.23";
minor = "2";
sha256 = "0g22ss9qbm3fqhx4fxhsyfmdc5g1hgdw4dz9d37f4489kl0qf8pl";
in
stdenv.mkDerivation rec {
name = "vala-${major}.${minor}";
meta = {
description = "Compiler for GObject type system";
homepage = "http://live.gnome.org/Vala";
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ antono ];
};
src = fetchurl {
url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
inherit sha256;
};
nativeBuildInputs = [ pkgconfig flex bison libxslt ];
buildInputs = [ glib libiconv ]
++ libintlOrEmpty;
}

View File

@@ -1,30 +0,0 @@
{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
, glib, libiconv, libintlOrEmpty
}:
let
major = "0.26";
minor = "2";
sha256 = "37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4";
in
stdenv.mkDerivation rec {
name = "vala-${major}.${minor}";
meta = {
description = "Compiler for GObject type system";
homepage = "http://live.gnome.org/Vala";
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ antono lethalman ];
};
src = fetchurl {
url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
inherit sha256;
};
nativeBuildInputs = [ pkgconfig flex bison libxslt ];
buildInputs = [ glib libiconv ]
++ libintlOrEmpty;
}

View File

@@ -1,30 +0,0 @@
{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
, glib, libiconv, libintlOrEmpty
}:
let
major = "0.28";
minor = "0";
sha256 = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd";
in
stdenv.mkDerivation rec {
name = "vala-${major}.${minor}";
meta = {
description = "Compiler for GObject type system";
homepage = "http://live.gnome.org/Vala";
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ antono lethalman ];
};
src = fetchurl {
url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
inherit sha256;
};
nativeBuildInputs = [ pkgconfig flex bison libxslt ];
buildInputs = [ glib libiconv ]
++ libintlOrEmpty;
}

View File

@@ -1,31 +0,0 @@
{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
, glib, libiconv, libintlOrEmpty
}:
let
major = "0.32";
minor = "1";
sha256 = "1ab1l44abf9fj1wznzq5956431ia136rl5049cggnk5393jlf3fx";
in
stdenv.mkDerivation rec {
name = "vala-${major}.${minor}";
meta = {
description = "Compiler for GObject type system";
homepage = "http://live.gnome.org/Vala";
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ antono lethalman ];
};
src = fetchurl {
url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
inherit sha256;
};
nativeBuildInputs = [ pkgconfig flex bison libxslt ];
buildInputs = [ glib libiconv ]
++ libintlOrEmpty;
}

View File

@@ -0,0 +1,61 @@
{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
, glib, libiconv, libintlOrEmpty
}:
let
generic = { major, minor, sha256 }:
stdenv.mkDerivation rec {
name = "vala-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
inherit sha256;
};
nativeBuildInputs = [ pkgconfig flex bison libxslt ];
buildInputs = [ glib libiconv ] ++ libintlOrEmpty;
meta = with stdenv.lib; {
description = "Compiler for GObject type system";
homepage = "http://live.gnome.org/Vala";
license = licenses.lgpl21Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ antono lethalman peterhoeg ];
};
};
in rec {
vala_0_23 = generic {
major = "0.23";
minor = "2";
sha256 = "0g22ss9qbm3fqhx4fxhsyfmdc5g1hgdw4dz9d37f4489kl0qf8pl";
};
vala_0_26 = generic {
major = "0.26";
minor = "2";
sha256 = "1i03ds1z5hivqh4nhf3x80fg7n0zd22908w5minkpaan1i1kzw9p";
};
vala_0_28 = generic {
major = "0.28";
minor = "0";
sha256 = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd";
};
vala_0_32 = generic {
major = "0.32";
minor = "1";
sha256 = "1ab1l44abf9fj1wznzq5956431ia136rl5049cggnk5393jlf3fx";
};
vala_0_34 = generic {
major = "0.34";
minor = "1";
sha256 = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m";
};
vala = vala_0_34;
}

View File

@@ -43,7 +43,7 @@ self: super: {
src = pkgs.fetchFromGitHub {
owner = "joeyh";
repo = "git-annex";
sha256 = "11xgnryvwh3a1dcd5bczrh6wwf23xa74p31cqvnhf2s6q8cb0aai";
sha256 = "1j29ydbw86j3qd4qb4l348pcnjd24irgdra9ss2afi6w2pn60yjn";
rev = drv.version;
};
doCheck = false; # version 6.20160907 has a test suite failure; reported upstream

View File

@@ -168,6 +168,7 @@ self: super: {
# haddock-api >= 2.17 is GHC 8.0 only
haddock-api = self.haddock-api_2_16_1;
haddock-library = self.haddock-library_1_2_1;
# lens-family-th >= 0.5.0.0 is GHC 8.0 only
lens-family-th = self.lens-family-th_0_4_1_0;

View File

@@ -32,7 +32,7 @@ core-packages:
- xhtml-3000.2.1
default-package-overrides:
# LTS Haskell 7.2
# LTS Haskell 7.3
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Vector ==2.3.2
@@ -138,7 +138,7 @@ default-package-overrides:
- ansi-wl-pprint ==0.6.7.3
- ansigraph ==0.2.0.0
- api-field-json-th ==0.1.0.1
- app-settings ==0.2.0.7
- app-settings ==0.2.0.8
- appar ==0.1.4
- apply-refact ==0.3.0.0
- arbtt ==0.9.0.10
@@ -164,7 +164,7 @@ default-package-overrides:
- auto ==0.4.3.0
- auto-update ==0.1.4
- autoexporter ==0.2.2
- aws ==0.14.0
- aws ==0.14.1
- b9 ==0.5.21
- bake ==0.4
- bank-holidays-england ==0.1.0.5
@@ -195,7 +195,7 @@ default-package-overrides:
- binary-tagged ==0.1.4.0
- binary-typed ==1.0
- bindings-DSL ==1.0.23
- bindings-GLFW ==3.1.2.1
- bindings-GLFW ==3.1.2.2
- bindings-libzip ==1.0.1
- bioace ==0.0.1
- bioalign ==0.0.5
@@ -248,7 +248,7 @@ default-package-overrides:
- bytestring-conversion ==0.3.1
- bytestring-handle ==0.1.0.4
- bytestring-lexing ==0.5.0.2
- bytestring-progress ==1.0.6
- bytestring-progress ==1.0.7
- bytestring-tree-builder ==0.2.7.1
- bytestring-trie ==0.2.4.1
- bzlib ==0.5.0.5
@@ -261,10 +261,11 @@ default-package-overrides:
- cabal-install ==1.24.0.0
- cabal-rpm ==0.10.0
- cabal-sort ==0.0.5.3
- cabal-src ==0.3.0.1
- cabal-src ==0.3.0.2
- cache ==0.1.0.0
- cacophony ==0.8.0
- cairo ==0.13.3.0
- call-stack ==0.1.0
- camfort ==0.900
- carray ==0.1.6.5
- cartel ==0.18.0.2
@@ -311,10 +312,10 @@ default-package-overrides:
- classy-prelude-conduit ==1.0.0
- classy-prelude-yesod ==1.0.0
- clay ==0.11
- clckwrks ==0.23.19.1
- clckwrks ==0.23.19.2
- clckwrks-cli ==0.2.16
- clckwrks-plugin-media ==0.6.16
- clckwrks-plugin-page ==0.4.3.4
- clckwrks-plugin-page ==0.4.3.5
- clckwrks-theme-bootstrap ==0.4.2
- cli ==0.1.2
- clientsession ==0.9.1.2
@@ -344,7 +345,7 @@ default-package-overrides:
- concurrent-output ==1.7.7
- concurrent-supply ==0.1.8
- conduit ==1.2.8
- conduit-combinators ==1.0.8
- conduit-combinators ==1.0.8.1
- conduit-extra ==1.1.13.3
- conduit-iconv ==0.1.1.1
- conduit-parse ==0.1.2.0
@@ -451,7 +452,7 @@ default-package-overrides:
- directory-tree ==0.12.1
- discount ==0.1.1
- disk-free-space ==0.1.0.1
- distributed-closure ==0.3.2.0
- distributed-closure ==0.3.3.0
- distributed-static ==0.3.5.0
- distribution-nixpkgs ==1.0.0.1
- distributive ==0.5.0.2
@@ -545,7 +546,7 @@ default-package-overrides:
- fay-text ==0.3.2.2
- fay-uri ==0.2.0.0
- fb ==1.0.13
- fclabels ==2.0.3
- fclabels ==2.0.3.1
- feature-flags ==0.1.0.1
- feed ==0.3.11.1
- FenwickTree ==0.1.2.1
@@ -571,8 +572,8 @@ default-package-overrides:
- fmlist ==0.9
- fn ==0.3.0.1
- focus ==0.1.5
- fold-debounce ==0.2.0.2
- fold-debounce-conduit ==0.1.0.2
- fold-debounce ==0.2.0.3
- fold-debounce-conduit ==0.1.0.4
- foldl ==1.2.1
- FontyFruity ==0.5.3.2
- force-layout ==0.4.0.5
@@ -643,9 +644,9 @@ default-package-overrides:
- gitson ==0.5.2
- gl ==0.7.8.1
- glabrous ==0.1.2.0
- GLFW-b ==1.4.8.0
- GLFW-b ==1.4.8.1
- glib ==0.13.4.0
- Glob ==0.7.11
- Glob ==0.7.12
- gloss ==1.10.2.3
- gloss-rendering ==1.10.3.3
- GLURaw ==2.0.0.2
@@ -779,9 +780,9 @@ default-package-overrides:
- HandsomeSoup ==0.4.2
- handwriting ==0.1.0.3
- hapistrano ==0.2.1.2
- happstack-authenticate ==2.3.4.4
- happstack-authenticate ==2.3.4.5
- happstack-clientsession ==7.3.1
- happstack-hsp ==7.3.7
- happstack-hsp ==7.3.7.1
- happstack-jmacro ==7.0.11
- happstack-server ==7.4.6.2
- happstack-server-tls ==7.1.6.2
@@ -808,7 +809,7 @@ default-package-overrides:
- HaskellNet-SSL ==0.3.3.0
- haskintex ==0.6.0.1
- haskoin-core ==0.4.0
- hasql ==0.19.15.1
- hasql ==0.19.15.2
- hastache ==0.6.1
- hasty-hamiltonian ==1.1.3
- HaTeX ==3.17.0.2
@@ -824,7 +825,7 @@ default-package-overrides:
- heap ==1.0.3
- heaps ==0.3.3
- hebrew-time ==0.1.1
- hedis ==0.9.3
- hedis ==0.9.4
- here ==1.2.8
- heredoc ==0.2.0.0
- hex ==0.1.2
@@ -843,7 +844,7 @@ default-package-overrides:
- histogram-fill ==0.8.4.1
- hit ==0.6.3
- hjsmin ==0.2.0.2
- hjsonpointer ==1.0.0.0
- hjsonpointer ==1.0.0.1
- hjsonschema ==1.1.0.1
- hledger ==0.27.1
- hledger-interest ==1.4.4
@@ -891,13 +892,13 @@ default-package-overrides:
- hsemail ==1.7.7
- HSet ==0.0.0
- hset ==2.2.0
- hsexif ==0.6.0.8
- hsexif ==0.6.0.9
- hsignal ==0.2.7.4
- hslogger ==1.2.10
- hslua ==0.4.1
- hsndfile ==0.8.0
- hsndfile-vector ==0.5.2
- HsOpenSSL ==0.11.1.1
- HsOpenSSL ==0.11.2.4
- HsOpenSSL-x509-system ==0.1.0.3
- hsp ==0.10.0
- hspec ==2.2.3
@@ -1026,7 +1027,7 @@ default-package-overrides:
- jose ==0.4.0.3
- jose-jwt ==0.7.3
- js-flot ==0.8.3
- js-jquery ==3.1.0
- js-jquery ==3.1.1
- json ==0.9.1
- json-autotype ==1.0.14
- json-rpc-generic ==0.2.1.2
@@ -1048,7 +1049,7 @@ default-package-overrides:
- kraken ==0.0.3
- lackey ==0.4.1
- language-c ==0.5.0
- language-c-quote ==0.11.6.3
- language-c-quote ==0.11.7
- language-dockerfile ==0.3.4.0
- language-ecmascript ==0.17.1.0
- language-fortran ==0.5.1
@@ -1155,7 +1156,7 @@ default-package-overrides:
- monad-extras ==0.5.11
- monad-http ==0.1.0.0
- monad-journal ==0.7.2
- monad-logger ==0.3.19
- monad-logger ==0.3.20
- monad-logger-json ==0.1.0.0
- monad-logger-prefix ==0.1.6
- monad-logger-syslog ==0.1.2.0
@@ -1183,7 +1184,7 @@ default-package-overrides:
- mono-traversable-instances ==0.1.0.0
- monoid-extras ==0.4.2
- monoid-subclasses ==0.4.2.1
- monoidal-containers ==0.3.0.0
- monoidal-containers ==0.3.0.1
- morte ==1.6.2
- mountpoints ==1.0.2
- mtl ==2.2.1
@@ -1256,7 +1257,7 @@ default-package-overrides:
- opaleye-trans ==0.3.3
- open-browser ==0.2.1.0
- OpenGL ==3.0.1.0
- OpenGLRaw ==3.2.2.0
- OpenGLRaw ==3.2.3.0
- openpgp-asciiarmor ==0.1
- opensource ==0.1.0.0
- openssl-streams ==1.2.1.0
@@ -1354,7 +1355,7 @@ default-package-overrides:
- polyparse ==1.12
- posix-realtime ==0.0.0.4
- post-mess-age ==0.2.1.0
- postgresql-binary ==0.9.1
- postgresql-binary ==0.9.1.1
- postgresql-libpq ==0.9.2.0
- postgresql-query ==3.0.1
- postgresql-schema ==0.1.10
@@ -1446,7 +1447,7 @@ default-package-overrides:
- reform-blaze ==0.2.4.1
- reform-hamlet ==0.0.5.1
- reform-happstack ==0.2.5.1
- reform-hsp ==0.2.7
- reform-hsp ==0.2.7.1
- RefSerialize ==0.3.1.4
- regex-applicative ==0.3.3
- regex-applicative-text ==0.1.0.1
@@ -1479,7 +1480,7 @@ default-package-overrides:
- rest-stringmap ==0.2.0.6
- rest-types ==1.14.1.1
- rest-wai ==0.2.0.1
- result ==0.2.5.1
- result ==0.2.6.0
- rethinkdb ==2.2.0.7
- rethinkdb-client-driver ==0.0.23
- retry ==0.7.4.1
@@ -1532,7 +1533,7 @@ default-package-overrides:
- servant-js ==0.8.1
- servant-JuicyPixels ==0.3.0.2
- servant-lucid ==0.7.1
- servant-mock ==0.8.1
- servant-mock ==0.8.1.1
- servant-purescript ==0.3.1.5
- servant-server ==0.8.1
- servant-subscriber ==0.5.0.2
@@ -1554,7 +1555,7 @@ default-package-overrides:
- shakespeare ==2.0.11.1
- shell-conduit ==4.5.2
- ShellCheck ==0.4.4
- shelly ==1.6.8
- shelly ==1.6.8.1
- shortcut-links ==0.4.2.0
- should-not-typecheck ==2.1.0
- show-type ==0.1.1
@@ -1629,7 +1630,7 @@ default-package-overrides:
- stm-delay ==0.1.1.1
- stm-stats ==0.2.0.0
- STMonadTrans ==0.3.3
- stopwatch ==0.1.0.2
- stopwatch ==0.1.0.3
- storable-complex ==0.2.2
- storable-endian ==0.2.5
- storable-record ==0.0.3.1
@@ -1661,7 +1662,7 @@ default-package-overrides:
- svg-tree ==0.5.1.2
- SVGFonts ==1.5.0.1
- swagger ==0.2.2
- swagger2 ==2.1.2.1
- swagger2 ==2.1.3
- syb ==0.6
- syb-with-class ==0.6.1.7
- symbol ==0.2.4
@@ -1704,7 +1705,7 @@ default-package-overrides:
- terminal-progress-bar ==0.0.1.4
- terminal-size ==0.3.2.1
- terminfo ==0.4.0.2
- test-fixture ==0.4.0.0
- test-fixture ==0.4.1.0
- test-framework ==0.8.1.1
- test-framework-hunit ==0.3.0.2
- test-framework-quickcheck2 ==0.3.0.3
@@ -1903,7 +1904,7 @@ default-package-overrides:
- weigh ==0.0.3
- werewolf ==1.5.1.1
- werewolf-slack ==1.0.2.0
- wikicfp-scraper ==0.1.0.3
- wikicfp-scraper ==0.1.0.4
- Win32 ==2.3.1.1
- Win32-extras ==0.2.0.1
- Win32-notify ==0.3.0.1
@@ -1926,9 +1927,9 @@ default-package-overrides:
- wuss ==1.1.1
- X11 ==1.6.1.2
- x509 ==1.6.4
- x509-store ==1.6.1
- x509-system ==1.6.3
- x509-validation ==1.6.4
- x509-store ==1.6.2
- x509-system ==1.6.4
- x509-validation ==1.6.5
- Xauth ==0.1
- xdcc ==1.1.3
- xdg-basedir ==0.2.2
@@ -1962,7 +1963,7 @@ default-package-overrides:
- yesod-auth-basic ==0.1.0.2
- yesod-auth-hashdb ==1.5.1.3
- yesod-auth-oauth2 ==0.2.2
- yesod-bin ==1.4.18.5
- yesod-bin ==1.4.18.7
- yesod-core ==1.4.25
- yesod-eventsource ==1.4.0.1
- yesod-fay ==0.8.0
@@ -1971,7 +1972,7 @@ default-package-overrides:
- yesod-form-richtext ==0.1.0.0
- yesod-gitrepo ==0.2.1.0
- yesod-gitrev ==0.1.0.0
- yesod-job-queue ==0.3.0.0
- yesod-job-queue ==0.3.0.1
- yesod-newsfeed ==1.6
- yesod-persistent ==1.4.0.6
- yesod-sitemap ==1.4.0.1
@@ -2010,6 +2011,7 @@ extra-packages:
- haddock < 2.17 # required on GHC 7.10.x
- haddock-api == 2.15.* # required on GHC 7.8.x
- haddock-api == 2.16.* # required on GHC 7.10.x
- haddock-library == 1.2.* # required for haddock-api-2.16.x
- hoogle < 5 # required by current implementation of ghcWithHoogle
- mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
@@ -2110,6 +2112,7 @@ dont-distribute-packages:
cufft: [ i686-linux, x86_64-linux, x86_64-darwin ]
gloss-raster-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ]
libnvvm: [ i686-linux, x86_64-linux, x86_64-darwin ]
nvvm: [ i686-linux, x86_64-linux, x86_64-darwin ]
Obsidian: [ i686-linux, x86_64-linux, x86_64-darwin ]
patch-image: [ i686-linux, x86_64-linux, x86_64-darwin ]
yices-easy: [ i686-linux, x86_64-linux, x86_64-darwin ]

File diff suppressed because it is too large Load Diff

View File

@@ -25,7 +25,7 @@ with stdenv.lib;
let
majorVersion = "3.6";
minorVersion = "0";
minorVersionSuffix = "b1";
minorVersionSuffix = "b2";
pythonVersion = majorVersion;
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
sha256 = "0hjdlwkjanjagz4qggbfgal8ggmas26mx2jlgjx1z2mzi950jfx8";
sha256 = "1sk990n2xm5vhn3ys2cp427dx0z14cx3sz1za5f2fcwrp524bz9s";
};
NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

View File

@@ -1,8 +1,15 @@
{ kdeFramework, lib, ecm, shared_mime_info }:
{ kdeFramework, lib, fetchurl, ecm, shared_mime_info }:
kdeFramework {
name = "kcoreaddons";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
patches = [
(fetchurl {
url = "https://packaging.neon.kde.org/frameworks/kcoreaddons.git/plain/debian/patches/0001-Fix-very-old-bug-when-we-remove-space-in-url-as-foo-.patch?id=ab7258dd8a87668ba63c585a69f41f291254aa43";
sha256 = "0svdqbikmslc0n2gdwwlbdyi61m5qgy0lxxv9iglbs3ja09xqs0p";
name = "kcoreaddons-CVE-2016-7966.patch";
})
];
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ shared_mime_info ];
}

View File

@@ -1,12 +1,19 @@
{ stdenv, fetchurl }:
{ stdenv, fetchFromGitHub, cmake, bison, flex }:
stdenv.mkDerivation rec {
name = "libcue-1.4.0";
src = fetchurl {
url = "mirror://sourceforge/libcue/${name}.tar.bz2";
sha256 = "17kjd7rjz1bvfn44n3n2bjb7a1ywd0yc0g4sqp5ihf9b5bn7cwlb";
name = "libcue-${version}";
version = "2.1.0";
src = fetchFromGitHub {
owner = "lipnitsk";
repo = "libcue";
rev = "v${version}";
sha256 = "14a84d6sq3yp8s8i05lxvifjpkgpjwfpchrqf3bbpbwa8gvrc0rj";
};
nativeBuildInputs = [ cmake bison flex ];
meta = {
description = "A library to parse a cue sheet";
description = "CUE Sheet Parser Library";
longDescription = ''
libcue is intended to parse a so called cue sheet from a char string or
a file pointer. For handling of the parsed data a convenient API is

View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libelf }:
stdenv.mkDerivation rec {
name = "libdwarf-20160613";
name = "libdwarf-20161001";
src = fetchurl {
url = "http://www.prevanders.net/${name}.tar.gz";
sha256 = "1nfdfn5xf3n485pvpb853awyxxnvrg207i0wmrr7bhk8fcxdxbn0";
sha512 = "2c522ae0b6e2afffd09e2e79562987fd819b197c9bce4900b6a4fd176b5ff229e88c6b755cfbae7831e7160ddeb3bfe2afbf39d756d7e75ec31ace0668554048";
};
configureFlags = " --enable-shared --disable-nonshared";

View File

@@ -0,0 +1,39 @@
{stdenv, fetchFromGitHub, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}:
stdenv.mkDerivation rec {
name = "libhttpseverywhere-${version}";
version = "0.1.0";
src = fetchFromGitHub {
owner = "grindhold";
repo = "libhttpseverywhere";
rev = "${version}";
sha256 = "1b8bcg4jp2h3nwk1g7jgswsipqzkjq2gb017v07wb7nvl6kdi0rc";
};
nativeBuildInputs = [ gnome3.vala valadoc gobjectIntrospection meson ninja pkgconfig ];
buildInputs = [ glib gnome3.libgee libxml2 json_glib libsoup libarchive ];
patches = [ ./meson.patch ];
configurePhase = ''
mkdir build
cd build
meson.py --prefix "$out" ..
'';
buildPhase = ''
ninja
ninja devhelp
'';
installPhase = "ninja install";
meta = {
description = "library to use HTTPSEverywhere in desktop applications";
homepage = https://github.com/grindhold/libhttpseverywhere;
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
};
}

View File

@@ -0,0 +1,13 @@
diff --git a/meson.build b/meson.build
index c20c2f9..f40bb2b 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,7 @@
# If not, see http://www.gnu.org/licenses/.
#*********************************************************************
-project ('httpseverywhere', ['vala','c'])
+project ('httpseverywhere', 'vala','c')
pkgconfig = import('pkgconfig')

View File

@@ -4,10 +4,10 @@ let
inherit (stdenv.lib) optional optionals optionalString;
in stdenv.mkDerivation rec {
name = "libmikmod-3.3.7";
name = "libmikmod-3.3.10";
src = fetchurl {
url = "mirror://sourceforge/mikmod/${name}.tar.gz";
sha256 = "18nrkf5l50hfg0y50yxr7bvik9f002lhn8c00nbcp6dgm5011x2c";
sha256 = "0j7g4jpa2zgzw7x6s3rldypa7zlwjvn97rwx0sylx1iihhlzbcq0";
};
buildInputs = [ texinfo ]

View File

@@ -1,13 +1,16 @@
{stdenv, fetchurl}:
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "libmpcdec-1.2.6";
src = fetchurl {
url = http://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2;
md5 = "7f7a060e83b4278acf4b77d7a7b9d2c0";
sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab";
};
meta = {
description = "Musepack SV7 decoder library";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.bsd3;
};
}

View File

@@ -4,20 +4,18 @@ let
inherit (stdenv.lib) optionals optionalString;
in stdenv.mkDerivation rec {
name = "libsamplerate-0.1.8";
name = "libsamplerate-0.1.9";
src = fetchurl {
url = "http://www.mega-nerd.com/SRC/${name}.tar.gz";
sha256 = "01hw5xjbjavh412y63brcslj5hi9wdgkjd3h9csx5rnm8vglpdck";
sha256 = "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libsndfile ]
++ optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
# maybe interesting configure flags:
#--disable-fftw disable usage of FFTW
#--disable-cpu-clip disable tricky cpu specific clipper
configureFlags = [ "--disable-fftw" ];
outputs = [ "bin" "dev" "out" ];

View File

@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }:
stdenv.mkDerivation rec {
rev = "0.6.20";
rev = "0.6.23";
name = "libsolv-${rev}";
src = fetchFromGitHub {
inherit rev;
owner = "openSUSE";
repo = "libsolv";
sha256 = "1gammarbnjbbkw2vlgcj9ynp1kgi5nns6xcl6ab8b5i4zgq91v2p";
sha256 = "08ba7yx0br421lk6zf5mp0yl6nznkmc2vbka20qwm2lx5f0a25xg";
};
cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true";

View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ];
buildInputs = [ libiconv ];
propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
configureFlags = [
"--with-libiconv-prefix=${libiconv}"

View File

@@ -1,5 +1,6 @@
{ stdenv, fetchurl, perl
, withCryptodev ? false, cryptodevHeaders }:
, withCryptodev ? false, cryptodevHeaders
, enableSSL2 ? false }:
with stdenv.lib;
@@ -44,7 +45,7 @@ let
] ++ stdenv.lib.optionals withCryptodev [
"-DHAVE_CRYPTODEV"
"-DUSE_CRYPTODEV_DIGESTS"
];
] ++ stdenv.lib.optional enableSSL2 "enable-ssl2";
makeFlags = [ "MANDIR=$(man)/share/man" ];

View File

@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "libva-intel-driver-1.7.0";
name = "libva-intel-driver-1.7.2";
src = fetchurl {
url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
sha256 = "032w8d0whymi5ac8fk7c5d8nnxxsjgwymw644g7gp959i73xc6cx";
sha256 = "1g371q9p31i57fkidjp2akvrbaadpyx3bwmg5kn72sc2mbv7p7h9";
};
patchPhase = ''

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "zeroc-ice-${version}";
version = "3.6.1";
version = "3.6.3";
src = fetchFromGitHub {
owner = "zeroc-ice";
repo = "ice";
rev = "v${version}";
sha256 = "044511zbhwiach1867r3xjz8i4931wn7c1l3nz4kcpgks16kqhhz";
sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2";
};
buildInputs = [ mcpp bzip2 expat openssl db5 ];

View File

@@ -1,8 +1,9 @@
{ stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper
, platformTools, buildTools, support, supportRepository, platforms, sysimages, addons
, platformTools, buildTools, support, supportRepository, platforms, sysimages, addons, sources
, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib
, freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus
, zlib, glxinfo, xkeyboardconfig
, includeSources
}:
{ platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }:
@@ -165,6 +166,22 @@ stdenv.mkDerivation rec {
cd ../..
# Symlink required sources
mkdir -p sources
cd sources
${if includeSources then
stdenv.lib.concatMapStrings (platformVersion:
if (builtins.hasAttr ("source_"+platformVersion) sources) then
let
source = builtins.getAttr ("source_"+platformVersion) sources;
in
"ln -s ${source}/* android-${platformVersion}\n"
else "") platformVersions
else ""}
cd ..
# Symlink required platforms
mkdir -p platforms

View File

@@ -1,4 +1,4 @@
{pkgs, pkgs_i686}:
{pkgs, pkgs_i686, includeSources ? true}:
rec {
platformTools = import ./platform-tools.nix {
@@ -39,12 +39,16 @@ rec {
inherit (pkgs) stdenv fetchurl unzip;
};
sources = import ./sources.nix {
inherit (pkgs) stdenv fetchurl unzip;
};
androidsdk = import ./androidsdk.nix {
inherit (pkgs) stdenv fetchurl unzip makeWrapper;
inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk mesa file alsaLib jdk coreutils libpulseaudio dbus;
inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig;
inherit platformTools buildTools support supportRepository platforms sysimages addons;
inherit platformTools buildTools support supportRepository platforms sysimages addons sources includeSources;
stdenv_32bit = pkgs_i686.stdenv;
};

View File

@@ -12,3 +12,4 @@ curl -o sys-img.xml https://dl.google.com/android/repository/sys-img/andro
./generate-addons.sh
./generate-platforms.sh
./generate-sysimages.sh
./generate-sources.sh

View File

@@ -0,0 +1,3 @@
#!/bin/sh -e
xsltproc generate-sources.xsl repository-11.xml > sources.nix

View File

@@ -0,0 +1,52 @@
<?xml version="1.0"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:sdk="http://schemas.android.com/sdk/android/repository/11">
<xsl:output omit-xml-declaration="yes" indent="no" />
<xsl:template name="repository-url">
<xsl:variable name="raw-url" select="sdk:archives/sdk:archive/sdk:url"/>
<xsl:choose>
<xsl:when test="starts-with($raw-url, 'http')">
<xsl:value-of select="$raw-url"/>
</xsl:when>
<xsl:otherwise>
<xsl:text>https://dl.google.com/android/repository/</xsl:text>
<xsl:value-of select="$raw-url"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="/sdk:sdk-repository">
# This file is generated from generate-sources.sh. DO NOT EDIT.
# Execute generate-sources.sh or fetch.sh to update the file.
{stdenv, fetchurl, unzip}:
let
buildSource = args:
stdenv.mkDerivation (args // {
buildInputs = [ unzip ];
buildCommand = ''
mkdir -p $out
cd $out
unzip $src
'';
});
in
{
<xsl:for-each select="sdk:source"><xsl:sort select="sdk:api-level" data-type="number"/>
source_<xsl:value-of select="sdk:api-level" /> = buildSource {
name = "android-source-<xsl:value-of select="sdk:api-level" />";
src = fetchurl {
url = <xsl:call-template name="repository-url"/>;
sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
};
meta = {
description = "Source code for Android API <xsl:value-of select="sdk:api-level" />";
};
};
</xsl:for-each>
}
</xsl:template>
</xsl:stylesheet>

View File

@@ -0,0 +1,140 @@
# This file is generated from generate-sources.sh. DO NOT EDIT.
# Execute generate-sources.sh or fetch.sh to update the file.
{stdenv, fetchurl, unzip}:
let
buildSource = args:
stdenv.mkDerivation (args // {
buildInputs = [ unzip ];
buildCommand = ''
mkdir -p $out
cd $out
unzip $src
'';
});
in
{
source_14 = buildSource {
name = "android-source-14";
src = fetchurl {
url = https://dl.google.com/android/repository/sources-14_r01.zip;
sha1 = "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555";
};
meta = {
description = "Source code for Android API 14";
};
};
source_15 = buildSource {
name = "android-source-15";
src = fetchurl {
url = https://dl.google.com/android/repository/sources-15_r02.zip;
sha1 = "e5992a5747c9590783fbbdd700337bf0c9f6b1fa";
};
meta = {
description = "Source code for Android API 15";
};
};
source_16 = buildSource {
name = "android-source-16";
src = fetchurl {
url = https://dl.google.com/android/repository/sources-16_r02.zip;
sha1 = "0f83c14ed333c45d962279ab5d6bc98a0269ef84";
};
meta = {
description = "Source code for Android API 16";
};
};
source_17 = buildSource {
name = "android-source-17";
src = fetchurl {
url = https://dl.google.com/android/repository/sources-17_r01.zip;
sha1 = "6f1f18cd2d2b1852d7f6892df9cee3823349d43a";
};
meta = {
description = "Source code for Android API 17";
};
};
source_18 = buildSource {
name = "android-source-18";
src = fetchurl {
url = https://dl.google.com/android/repository/sources-18_r01.zip;
sha1 = "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78";
};
meta = {
description = "Source code for Android API 18";
};
};
source_19 = buildSource {
name = "android-source-19";
src = fetchurl {
url = https://dl.google.com/android/repository/sources-19_r02.zip;
sha1 = "433a1d043ef77561571250e94cb7a0ef24a202e7";
};
meta = {
description = "Source code for Android API 19";
};
};
source_20 = buildSource {
name = "android-source-20";
src = fetchurl {
url = https://dl.google.com/android/repository/sources-20_r01.zip;
sha1 = "8da3e40f2625f9f7ef38b7e403f49f67226c0d76";
};
meta = {
description = "Source code for Android API 20";
};
};
source_21 = buildSource {
name = "android-source-21";
src = fetchurl {
url = https://dl.google.com/android/repository/sources-21_r01.zip;
sha1 = "137a5044915d32bea297a8c1552684802bbc2e25";
};
meta = {
description = "Source code for Android API 21";
};
};
source_22 = buildSource {
name = "android-source-22";
src = fetchurl {
url = https://dl.google.com/android/repository/sources-22_r01.zip;
sha1 = "98320e13976d11597a4a730a8d203ac9a03ed5a6";
};
meta = {
description = "Source code for Android API 22";
};
};
source_23 = buildSource {
name = "android-source-23";
src = fetchurl {
url = https://dl.google.com/android/repository/sources-23_r01.zip;
sha1 = "b0f15da2762b42f543c5e364c2b15b198cc99cc2";
};
meta = {
description = "Source code for Android API 23";
};
};
source_24 = buildSource {
name = "android-source-24";
src = fetchurl {
url = https://dl.google.com/android/repository/sources-24_r01.zip;
sha1 = "6b96115830a83d654479f32ce4b724ca9011148b";
};
meta = {
description = "Source code for Android API 24";
};
};
}

View File

@@ -2,11 +2,11 @@
, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3 }:
stdenv.mkDerivation rec {
name = "intel-gpu-tools-1.14";
name = "intel-gpu-tools-1.16";
src = fetchurl {
url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2";
sha256 = "030g1akybk19y3jcxd8pp573ymrd4w7mmzxbspp064lwdv9y35im";
sha256 = "1q9sfb15081zm1rq4z67sfj13ryvbdha4fa6pdzdsfd9261nvgn6";
};
buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11

View File

@@ -0,0 +1,43 @@
{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng, CoreServices, CoreGraphics, ImageIO }:
let
googletest = fetchFromGitHub {
owner = "google";
repo = "googletest";
rev = "43359642a1c16ad3f4fc575c7edd0cb935810815";
sha256 = "0y4xaah62fjr3isaryc3vfz3mn9xflr00vchdimj8785milxga4q";
};
linenoise = fetchFromGitHub {
owner = "antirez";
repo = "linenoise";
rev = "c894b9e59f02203dbe4e2be657572cf88c4230c3";
sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w";
};
in stdenv.mkDerivation rec {
name = "xcbuild-${stdenv.lib.substring 0 8 version}";
version = "49f8a5923f1381f87ac03ad4c1b138d1d2b74369";
src = fetchFromGitHub {
owner = "facebook";
repo = "xcbuild";
rev = version;
sha256 = "0l107xkh7dab2xc58dqyrrhpd1gp12cpzh0wrx0i9jbh0idbwnk0";
};
prePatch = ''
rmdir ThirdParty/*
cp -r --no-preserve=all ${googletest} ThirdParty/googletest
cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise
'';
enableParallelBuilding = true;
# TODO: instruct cmake not to put it in /usr, rather than cleaning up
postInstall = ''
mv $out/usr/* $out
rmdir $out/usr
'';
buildInputs = [ cmake zlib libxml2 libpng CoreServices CoreGraphics ImageIO ];
}