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

Merge branch 'master' into staging

Browse Source 
Hydra nixpkgs: ?compare=1287298
This commit is contained in:
Vladimír Čunát
2016-08-14 12:02:12 +02:00
parent 4bceaca196 329589c7fd
commit 4fbb37c517
314 changed files with 6648 additions and 3713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/arduino/arduino-core/default.nix
View File

@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
description = "Open-source electronics prototyping platform";
homepage = http://arduino.cc/;
license = stdenv.lib.licenses.gpl2;
platforms = platforms.all;
platforms = platforms.linux;
maintainers = with maintainers; [ antono robberer bjornfor ];
};
}

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

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "compcert-${version}";
version = "2.6";
version = "2.7.1";
src = fetchurl {
url = "http://compcert.inria.fr/release/${name}.tgz";
sha256 = "05sdxgg2w7ykw6xbcq6dl2kzxdz4qzhjajiawpy6490wqiji7wm1";
sha256 = "1vhbs1fmr9x2imqyd6yfvkbz763jhjfm9wk4nizf9rn1cvxrjqa4";
};
buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]);

3
pkgs/development/compilers/gcc/4.9/default.nix
View File

@@ -189,6 +189,9 @@ let version = "4.9.4";
# To keep ABI compatibility with upstream mingw-w64
" --enable-fully-dynamic-string"
else (if cross.libc == "uclibc" then
# libsanitizer requires netrom/netrom.h which is not
# available in uclibc.
" --disable-libsanitizer" +
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
" --disable-libgomp" else "") +

3
pkgs/development/compilers/gcc/5/default.nix
View File

@@ -189,6 +189,9 @@ let version = "5.4.0";
# To keep ABI compatibility with upstream mingw-w64
" --enable-fully-dynamic-string"
else (if cross.libc == "uclibc" then
# libsanitizer requires netrom/netrom.h which is not
# available in uclibc.
" --disable-libsanitizer" +
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
" --disable-libgomp" else "") +

3
pkgs/development/compilers/gcc/6/default.nix
View File

@@ -188,6 +188,9 @@ let version = "6.1.0";
# To keep ABI compatibility with upstream mingw-w64
" --enable-fully-dynamic-string"
else (if cross.libc == "uclibc" then
# libsanitizer requires netrom/netrom.h which is not
# available in uclibc.
" --disable-libsanitizer" +
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
" --disable-libgomp" else "") +

4
pkgs/development/compilers/go/1.6.nix
View File

@@ -15,11 +15,11 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
version = "1.6.2";
version = "1.6.3";
src = fetchurl {
url = "https://github.com/golang/go/archive/go${version}.tar.gz";
sha256 = "17sfhg3xfnakk666wlsbhxp4vbn19hlywf5cn1zfcd4zqkcyx30h";
sha256 = "1plakydixx0xrp0z3n8ahnwg66psn31791dh56yl4ry41phq0axm";
};
# perl is used for testing go vet

6
pkgs/development/compilers/jsonnet/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, emscripten }:
let version = "0.8.7"; in
let version = "0.8.9"; in
stdenv.mkDerivation {
name = "jsonnet-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
rev = "v${version}";
owner = "google";
repo = "jsonnet";
sha256 = "0adg7ijz10mc4xs5lfrby5g9sx96icf6cg39hvkh4wqjl85c6i9g";
sha256 = "0phk8dzby5v60r7fwd1qf4as2jdpmdmksjw3g4p3mkkr7sc81119";
};
buildInputs = [ emscripten ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
meta = {
description = "Purely-functional configuration language that helps you define JSON data";
maintainers = [ lib.maintainers.benley ];
maintainers = with lib.maintainers; [ benley copumpkin ];
license = lib.licenses.asl20;
homepage = https://github.com/google/jsonnet;
platforms = lib.platforms.unix;

25
pkgs/development/compilers/rust/beta.nix
View File

@@ -3,13 +3,15 @@
rec {
rustc = callPackage ./rustc.nix {
shortVersion = "beta-1.10.0";
shortVersion = "beta-1.11.0";
forceBundledLLVM = false;
needsCmake = true;
configureFlags = [ "--release-channel=beta" ];
srcRev = "d18e321abeecc69e4d1bf9cafba4fba53ddf267d";
srcSha = "1ck8mbjrq0bzq5xzwgaqdilakwm2ab0xpzqibjycds62ad4yw774";
patches = [ ./patches/disable-lockfile-check.patch ]
++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
srcRev = "9333c420da0da6291740c313d5af3d620b55b8bc";
srcSha = "05z6i4s5jjw3c5ypap6kzxk81bg4dib47h51znvsvcvr0svsnkgs";
patches = [
./patches/disable-lockfile-check.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
inherit targets;
inherit targetPatches;
inherit targetToolchains;
@@ -17,10 +19,15 @@ rec {
};
cargo = callPackage ./cargo.nix rec {
version = "0.10.0";
srcRev = "refs/tags/${version}";
srcSha = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2";
depsSha256 = "0js4697n7v93wnqnpvamhp446w58llj66za5hkd6wannmc0gsy3b";
# TODO: We're temporarily tracking master here as Darwin needs the
# `http.cainfo` option from .cargo/config which isn't released
# yet.
version = "beta-2016-07-25";
srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc";
inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo
};

20
pkgs/development/compilers/rust/bootstrap.nix
View File

@@ -1,6 +1,8 @@
{ stdenv, fetchurl, makeWrapper, cacert, zlib }:
let
inherit (stdenv.lib) optionalString;
platform =
if stdenv.system == "i686-linux"
then "i686-unknown-linux-gnu"
@@ -24,6 +26,8 @@ let
then "d59b5509e69c1cace20a57072e3b3ecefdbfd8c7e95657b0ff2ac10aa1dfebe6"
else throw "missing boostrap hash for platform ${stdenv.system}";
needsPatchelf = stdenv.isLinux;
src = fetchurl {
url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz";
sha256 = bootstrapHash;
@@ -46,9 +50,11 @@ rec {
./install.sh --prefix=$out \
--components=rustc,rust-std-${platform},rust-docs
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/rustc"
${optionalString needsPatchelf ''
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/rustc"
''}
# Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
# (or similar) here. It causes strange effects where rustc loads
@@ -71,9 +77,11 @@ rec {
./install.sh --prefix=$out \
--components=cargo
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/cargo"
${optionalString needsPatchelf ''
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/cargo"
''}
wrapProgram "$out/bin/cargo" \
--suffix PATH : "${rustc}/bin"

19
pkgs/development/compilers/rust/cargo.nix
View File

@@ -1,6 +1,7 @@
{ stdenv, fetchgit, file, curl, pkgconfig, python, openssl, cmake, zlib
, makeWrapper, libiconv, cacert, rustPlatform, rustc
, version, srcRev, srcSha, depsSha256 }:
, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
, version, srcRev, srcSha, depsSha256
, patches ? []}:
rustPlatform.buildRustPackage rec {
name = "cargo-${version}";
@@ -13,11 +14,14 @@ rustPlatform.buildRustPackage rec {
};
inherit depsSha256;
inherit patches;
passthru.rustc = rustc;
buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]
++ stdenv.lib.optional stdenv.isDarwin libiconv;
buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper libgit2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
LIBGIT2_SYS_USE_PKG_CONFIG=1;
configurePhase = ''
./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.rust.cargo}/bin/cargo
@@ -37,9 +41,14 @@ rustPlatform.buildRustPackage rec {
"$out/lib/rustlib/uninstall.sh" \
"$out/lib/rustlib/manifest-cargo"
# NOTE: We override the `http.cainfo` option usually specified in
# `.cargo/config`. This is an issue when users want to specify
# their own certificate chain as environment variables take
# precedence
wrapProgram "$out/bin/cargo" \
--suffix PATH : "${rustc}/bin" \
--run "export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt" \
--set CARGO_HTTP_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \
--set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \
${stdenv.lib.optionalString stdenv.isDarwin ''--suffix DYLD_LIBRARY_PATH : "${rustc}/lib"''}
'';

13
pkgs/development/compilers/rust/default.nix
View File

@@ -23,10 +23,15 @@ rec {
};
cargo = callPackage ./cargo.nix rec {
version = "0.11.0";
srcRev = "refs/tags/${version}";
srcSha = "0ic2093bmwiw6vl2l9yhip87ni6dbz7dhrizy9wdx61229k16hc4";
depsSha256 = "0690sgn6fcay7sazlmrbbn4jbhnvmznrpz5z3rvkbaifkjrg4w6d";
# TODO: We're temporarily tracking master here as Darwin needs the
# `http.cainfo` option from .cargo/config which isn't released
# yet.
version = "master-2016-07-25";
srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4";
inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo
};

26
pkgs/development/compilers/rust/head.nix
View File

@@ -3,13 +3,18 @@
rec {
rustc = callPackage ./rustc.nix {
shortVersion = "master-1.11.0";
shortVersion = "master-1.12.0";
forceBundledLLVM = false;
srcRev = "298730e7032cd55809423773da397cd5c7d827d4";
srcSha = "0hyz5j1z75sjkgsifzgxviv3b1lhgaz8wqwvmq80xx5vd78yd0c1";
patches = [ ./patches/disable-lockfile-check.patch
./patches/use-rustc-1.9.0.patch ]
++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
needsCmake = true;
configureFlags = [ "--release-channel=nightly" ];
srcRev = "d9a911d236cbecb47775276ba51a5f9111bdbc9c";
srcSha = "07wybqvnw99fljmcy33vb9iwirmp10cwy47n008p396s7pb852hv";
patches = [
./patches/disable-lockfile-check.patch
# Drop this patch after
# https://github.com/rust-lang/rust/pull/35140 gets merged
./patches/tcp-stress-test-run-a-smaller-number-of-threads.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
inherit targets;
inherit targetPatches;
inherit targetToolchains;
@@ -17,10 +22,11 @@ rec {
};
cargo = callPackage ./cargo.nix rec {
version = "2016.06.07";
srcRev = "3e70312a2a4ebedace131fc63bb8f27463c5db28";
srcSha = "0nibzyfjkiqfnq0c00hhqvs856l5qls8wds252p97q5q92yvp40f";
depsSha256 = "1xbb33aqnf5yyws6gjys9w8kznbh9rh6hw8mpg1hhq1ahipc2j1f";
version = "master-2016-07-25";
srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4";
inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo
};

44
pkgs/development/compilers/rust/patches/tcp-stress-test-run-a-smaller-number-of-threads.patch Normal file
View File

@@ -0,0 +1,44 @@
From b6202b5d602ca8216febe8ce9078581faa32955e Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 30 Jul 2016 09:01:13 +0200
Subject: [PATCH] tcp-stress-test: Run a smaller number of threads.
---
src/test/run-pass/tcp-stress.rs | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/test/run-pass/tcp-stress.rs b/src/test/run-pass/tcp-stress.rs
index dfc8649..df8cdc9 100644
--- a/src/test/run-pass/tcp-stress.rs
+++ b/src/test/run-pass/tcp-stress.rs
@@ -21,6 +21,8 @@ use std::sync::mpsc::channel;
use std::time::Duration;
use std::thread::{self, Builder};
+const TARGET_CNT: usize = 256;
+
fn main() {
// This test has a chance to time out, try to not let it time out
thread::spawn(move|| -> () {
@@ -42,8 +44,9 @@ fn main() {
});
let (tx, rx) = channel();
+
let mut spawned_cnt = 0;
- for _ in 0..1000 {
+ for _ in 0..TARGET_CNT {
let tx = tx.clone();
let res = Builder::new().stack_size(64 * 1024).spawn(move|| {
match TcpStream::connect(addr) {
@@ -66,6 +69,6 @@ fn main() {
for _ in 0..spawned_cnt {
rx.recv().unwrap();
}
- assert_eq!(spawned_cnt, 1000);
+ assert_eq!(spawned_cnt, TARGET_CNT);
process::exit(0);
}
--
2.9.1

66
pkgs/development/compilers/rust/rustc.nix
View File

@@ -1,7 +1,8 @@
{ stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
, llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git
, llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git, cmake, curl
, isRelease ? false
, needsCmake ? false
, shortVersion
, forceBundledLLVM ? false
, srcSha, srcRev
@@ -13,26 +14,28 @@
} @ args:
let
version = if isRelease then
"${shortVersion}"
else
"${shortVersion}-g${builtins.substring 0 7 srcRev}";
inherit (stdenv.lib) optional optionalString;
name = "rustc-${version}";
version = if isRelease then
"${shortVersion}"
else
"${shortVersion}-g${builtins.substring 0 7 srcRev}";
procps = if stdenv.isDarwin then darwin.ps else args.procps;
name = "rustc-${version}";
llvmShared = llvm.override { enableSharedLibraries = true; };
procps = if stdenv.isDarwin then darwin.ps else args.procps;
target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
llvmShared = llvm.override { enableSharedLibraries = true; };
meta = with stdenv.lib; {
homepage = http://www.rust-lang.org/;
description = "A safe, concurrent, practical language";
maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
license = [ licenses.mit licenses.asl20 ];
platforms = platforms.linux ++ platforms.darwin;
};
target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
meta = with stdenv.lib; {
homepage = http://www.rust-lang.org/;
description = "A safe, concurrent, practical language";
maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
license = [ licenses.mit licenses.asl20 ];
platforms = platforms.linux ++ platforms.darwin;
};
in
stdenv.mkDerivation {
@@ -42,7 +45,7 @@ stdenv.mkDerivation {
__impureHostDeps = [ "/usr/lib/libedit.3.dylib" ];
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
src = fetchgit {
url = https://github.com/rust-lang/rust;
@@ -55,11 +58,12 @@ stdenv.mkDerivation {
++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
# ++ [ "--jemalloc-root=${jemalloc}/lib"
++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang"
++ stdenv.lib.optional (targets != []) "--target=${target}"
++ stdenv.lib.optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
++ optional (stdenv.cc.cc ? isClang) "--enable-clang"
++ optional (targets != []) "--target=${target}"
++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
patches = patches ++ targetPatches;
passthru.target = target;
postPatch = ''
@@ -73,7 +77,7 @@ stdenv.mkDerivation {
--replace "\$\$(subst /,//," "\$\$(subst /,/,"
# Fix dynamic linking against llvm
${stdenv.lib.optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''}
${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''}
# Fix the configure script to not require curl as we won't use it
sed -i configure \
@@ -84,6 +88,9 @@ stdenv.mkDerivation {
#[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs
#[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
# Disable fragile linker-output-non-utf8 test
rm -vr src/test/run-make/linker-output-non-utf8/
# Useful debugging parameter
#export VERBOSE=1
'';
@@ -94,10 +101,17 @@ stdenv.mkDerivation {
configureFlagsArray+=("--infodir=$out/share/info")
'';
# New -beta and -unstable unfortunately need cmake for compiling
# llvm-rt but don't use it for the normal build. This disables cmake
# in Nix.
dontUseCmakeConfigure = needsCmake;
# ps is needed for one of the test cases
nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git ];
nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git ]
++ stdenv.lib.optional needsCmake [ cmake curl ];
buildInputs = [ ncurses ] ++ targetToolchains
++ stdenv.lib.optional (!forceBundledLLVM) llvmShared;
++ optional (!forceBundledLLVM) llvmShared;
# https://github.com/rust-lang/rust/issues/30181
# enableParallelBuilding = false; # missing files during linking, occasionally
@@ -105,8 +119,12 @@ stdenv.mkDerivation {
outputs = [ "out" "doc" ];
setOutputFlags = false;
preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
preCheck = ''
export TZDIR=${tzdata}/share/zoneinfo
${optionalString stdenv.isDarwin "export TMPDIR=/tmp"}
'';
# Disable doCheck on Darwin to work around upstream issue
doCheck = true;
dontSetConfigureCross = true;
}

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

@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
name = "sbcl-${version}";
version = "1.3.7";
version = "1.3.8";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
sha256 = "0fjdqnb2rsm2vi9794ywp27jr239ddvzc4xfr0dk49jd4v7p2kc5";
sha256 = "0jfhrzsydgxzx0g90bl3fjys0i5biah76lkxjgh16l7h7577y8rh";
};
patchPhase = ''

9
pkgs/development/go-modules/generic/default.nix
View File

@@ -55,13 +55,8 @@ let
else abort "Unrecognized package fetch type";
};
importGodeps = { depsFile, filterPackages ? [] }:
let
deps = lib.importJSON depsFile;
external = filter (d: d ? include) deps;
direct = filter (d: d ? goPackagePath && (length filterPackages == 0 || elem d.goPackagePath filterPackages)) deps;
in
concatLists (map importGodeps (map (d: { depsFile = ./. + d.include; filterPackages = d.packages; }) external)) ++ (map dep2src direct);
importGodeps = { depsFile }:
map dep2src (lib.importJSON depsFile);
goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs
else extraSrcs;

1820
pkgs/development/go-modules/libs.json
View File

File diff suppressed because it is too large Load Diff

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

@@ -973,4 +973,21 @@ self: super: {
# us when we patch the cabal file (Link options will be recored in the ghc package registry).
GLUT = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut;
# https://github.com/gwern/mueval/issues/14
mueval = overrideCabal super.mueval (drv: {
revision = null;
editedCabalFile = null;
patches = [(pkgs.fetchpatch {
url = "https://github.com/gwern/mueval/commit/866f895e0b671bcaa232b46ed93dd7d47a4b32b2.patch";
sha256 = "16pb9nfr52hwidxv0f7j4yg8yd86959kzbcw9lmnzpvgdy5qyvkg";
})];
});
# remove if a version > 0.1.0.1 ever gets released
stunclient = overrideCabal super.stunclient (drv: {
postPatch = (drv.postPatch or "") + ''
substituteInPlace source/Network/Stun/MappedAddress.hs --replace "import Network.Endian" ""
'';
});
}

7
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@@ -63,6 +63,8 @@ self: super: {
nats = dontHaddock super.nats;
bytestring-builder = dontHaddock super.bytestring-builder;
hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
# Setup: At least the following dependencies are missing: base <4.8
hspec-expectations = overrideCabal super.hspec-expectations (drv: {
postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
@@ -115,6 +117,8 @@ self: super: {
license = pkgs.stdenv.lib.licenses.bsd3;
}) {};
mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
# diagrams/monoid-extras#19
monoid-extras = overrideCabal super.monoid-extras (drv: {
prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal";
@@ -186,7 +190,8 @@ self: super: {
vty-ui = enableCabalFlag super.vty-ui "no-tests";
# https://github.com/fpco/stackage/issues/1112
vector-algorithms = dontCheck super.vector-algorithms;
vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms)
[ self.mtl self.mwc-random ];
# Trigger rebuild to mitigate broken packaes on Hydra.
amazonka-core = triggerRebuild super.amazonka-core 1;

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

@@ -107,6 +107,7 @@ package-maintainers:
- shakespeare
abbradar:
- Agda
- lambdabot
dont-distribute-packages:
# hard restrictions that really belong into meta.platforms
@@ -2212,7 +2213,6 @@ dont-distribute-packages:
hinotify-bytestring: [ x86_64-darwin ]
hinstaller: [ i686-linux, x86_64-linux ]
hint-server: [ i686-linux, x86_64-darwin, x86_64-linux ]
hint: [ i686-linux, x86_64-darwin, x86_64-linux ]
hinvaders: [ i686-linux, x86_64-darwin, x86_64-linux ]
hinze-streams: [ i686-linux, x86_64-darwin, x86_64-linux ]
hip: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2797,15 +2797,6 @@ dont-distribute-packages:
lambda-devs: [ i686-linux, x86_64-darwin, x86_64-linux ]
lambda-toolbox: [ i686-linux, x86_64-linux ]
lambdaBase: [ i686-linux, x86_64-darwin, x86_64-linux ]
lambdabot-core: [ i686-linux, x86_64-darwin, x86_64-linux ]
lambdabot-haskell-plugins: [ i686-linux, x86_64-darwin, x86_64-linux ]
lambdabot-irc-plugins: [ i686-linux, x86_64-darwin, x86_64-linux ]
lambdabot-misc-plugins: [ i686-linux, x86_64-darwin, x86_64-linux ]
lambdabot-novelty-plugins: [ i686-linux, x86_64-darwin, x86_64-linux ]
lambdabot-reference-plugins: [ i686-linux, x86_64-darwin, x86_64-linux ]
lambdabot-social-plugins: [ i686-linux, x86_64-darwin, x86_64-linux ]
lambdabot-utils: [ i686-linux, x86_64-linux ]
lambdabot: [ i686-linux, x86_64-darwin, x86_64-linux ]
LambdaCalculator: [ i686-linux, x86_64-linux ]
lambdacat: [ i686-linux, x86_64-linux ]
lambdacms-core: [ i686-linux, x86_64-linux ]

4
pkgs/development/interpreters/angelscript/default.nix
View File

@@ -3,10 +3,10 @@ let
s = # Generated upstream information
rec {
baseName="angelscript";
version = "2.31.0";
version = "2.31.1";
name="${baseName}-${version}";
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
sha256 = "03a0gmz95di62552dv873iwwy1ym96kpyrc0s708assjlslr9716";
sha256 = "00z0x2w1dnfd2h8xvmq3qy2n8gqxyi9gxwnsz0q420by8vnrljmh";
};
buildInputs = [
unzip

9
pkgs/development/interpreters/lolcode/default.nix
View File

@@ -1,17 +1,18 @@
{ stdenv, fetchurl, pkgconfig, doxygen, cmake }:
{ stdenv, fetchurl, pkgconfig, doxygen, cmake, readline }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "lolcode-${version}";
version = "0.10.5";
version = "0.11.2";
src = fetchurl {
url = "https://github.com/justinmeza/lci/archive/v${version}.tar.gz";
sha256 = "0g6k1jxnvgjxyidrvgk8pdb8y8mai456j9zpzmvhm6fr22c4skrc";
sha256 = "1li7ikcrs7wqah7gqkirg0k61n6pm12w7pydin966x1sdn9na46b";
};
buildInputs = [ pkgconfig doxygen cmake ];
nativeBuildInputs = [ pkgconfig cmake doxygen ];
buildInputs = [ readline ];
# Maybe it clashes with lci scientific logic software package...
postInstall = "mv $out/bin/lci $out/bin/lolcode-lci";

12
pkgs/development/libraries/SDL_mixer/default.nix
View File

@@ -14,7 +14,17 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi " --enable-music-native-midi-gpl";
postInstall = "ln -s $out/include/SDL/SDL_mixer.h $out/include/";
postInstall = ''
ln -s $out/include/SDL/SDL_mixer.h $out/include/
for f in $out/include/SDL/SDL_mixer.h
do
for i in SDL_types.h SDL_rwops.h SDL_audio.h SDL_endian.h SDL_version.h begin_code.h close_code.h
do
substituteInPlace $f --replace "#include \"$i\"" "#include <SDL/$i>"
done
done
'';
meta = with stdenv.lib; {
description = "SDL multi-channel audio mixer library";

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

@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
description = "A utility library to help manage common tasks with OpenAL applications";
homepage = http://kcat.strangesoft.net/alure.html;
license = licenses.mit;
platforms = platforms.unix;
platforms = platforms.linux;
};
}

4
pkgs/development/libraries/appstream-glib/default.nix
View File

@@ -5,13 +5,13 @@
}:
stdenv.mkDerivation rec {
name = "appstream-glib-0.5.11";
name = "appstream-glib-0.5.12";
src = fetchFromGitHub {
owner = "hughsie";
repo = "appstream-glib";
rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
sha256 = "1rvfncm9z29h70pd718j73cd263g6yyxkxrg7zfzy0gj6wwzvhkh";
sha256 = "00b0441f409vzgy0znn42k093w7hwv3495qvsakxnhvk1h1ws23s";
};
nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ];

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

@@ -2,7 +2,7 @@
callPackage ./generic.nix (args // {
baseVersion = "1.10";
revision = "12";
sha256 = "09xcbrs48c9sgy6cj37qbc69gi6wlkjd6r3fi4zr8xwmj5wkmz5g";
revision = "13";
sha256 = "144vl65z7bys43sxgb09mbisyf2nmh49wh0d957y0ksa9cyrgv13";
extraConfigureFlags = "--with-gnump";
})

4
pkgs/development/libraries/botan/unstable.nix
View File

@@ -2,8 +2,8 @@
callPackage ./generic.nix (args // {
baseVersion = "1.11";
revision = "29";
sha256 = "157bp8716h17agrxyj7xpsj2i5sqhafj1nfx4gpzccx7y2kyq176";
revision = "30";
sha256 = "09d1cvg6dnfi225wipc1fw691bq7xxdcmgkq8smldc5kivf3mbwd";
openssl = null;
postPatch = "sed '1i#include <cmath>' -i src/tests/test_bigint.cpp";
})

7
pkgs/development/libraries/ffmpeg/3.1.nix
View File

@@ -1,7 +1,12 @@
{ callPackage, ... } @ args:
{ callPackage
# Darwin frameworks
, Cocoa, CoreMedia
, ...
}@args:
callPackage ./generic.nix (args // rec {
version = "${branch}.1";
branch = "3.1";
sha256 = "1d5knh87cgnla5zawy56gkrpb48qhyiq7i0pm8z9hyx3j05abg55";
darwinFrameworks = [ Cocoa CoreMedia ];
})

4
pkgs/development/libraries/ffmpeg/generic.nix
View File

@@ -13,7 +13,7 @@
, optimizationsDeveloper ? true
, extraWarningsDeveloper ? false
# Darwin frameworks
, Cocoa
, Cocoa, darwinFrameworks ? [ Cocoa ]
# Inherit generics
, branch, sha256, version, patches ? [], ...
}:
@@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
++ optional ((isLinux || isFreeBSD) && !isArm) libva
++ optional isLinux alsaLib
++ optional isDarwin Cocoa
++ optionals isDarwin darwinFrameworks
++ optional vdpauSupport libvdpau
++ optional sdlSupport SDL;

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

@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
doCheck = true;
configureFlags = [ "--enable-libgdbm-compat" ];
meta = with stdenv.lib; {
description = "GNU dbm key/value database library";

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

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, cmake, vtk }:
stdenv.mkDerivation rec {
version = "2.4.6";
version = "2.6.4";
name = "gdcm-${version}";
src = fetchurl {
url = "mirror://sourceforge/gdcm/${name}.tar.bz2";
sha256 = "0rgqgkjyqgld0hpa311z8cddp42v9ihzidyanwyxqpv3jmcrlsfk";
sha256 = "14bysjdldq7xb9k1ayskxijm08dy2n45v9bg379dqrcz1q5xq5mi";
};
dontUseCmakeBuildDir = true;

4
pkgs/development/libraries/gegl/3.0.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
, librsvg, pango, gtk, bzip2, intltool, libtool, automake, autoconf, json_glib }:
, librsvg, pango, gtk, bzip2, intltool, libtool, automake, autoconf, json_glib , libraw }:
stdenv.mkDerivation rec {
name = "gegl-0.3.6";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-docs";
buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool
autoconf automake libtool which json_glib ];
autoconf automake libtool which json_glib libraw ];
nativeBuildInputs = [ pkgconfig ];

14
pkgs/development/libraries/git2/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }:
{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }:
stdenv.mkDerivation (rec {
version = "0.24.1";
@@ -10,10 +10,20 @@ stdenv.mkDerivation (rec {
sha256 = "0rw80480dx2f6a2wbb1bwixygg1iwq3r7vwhxdmkkf4lpxd35jhd";
};
# TODO: `cargo` (rust's package manager) surfaced a serious bug in
# libgit2 when the `Security.framework` transport is used on Darwin.
# The upstream issue is tracked at
# https://github.com/libgit2/libgit2/issues/3885 - feel free to
# remove this patch as soon as it's resolved (i.E. when cargo is
# working fine without this patch)
patches = stdenv.lib.optionals stdenv.isDarwin [
./disable-security.framework.patch
];
cmakeFlags = "-DTHREADSAFE=ON";
nativeBuildInputs = [ cmake python pkgconfig ];
buildInputs = [ zlib libssh2 openssl http-parser ];
buildInputs = [ zlib libssh2 openssl http-parser curl ];
meta = {
description = "The Git linkable library";

58
pkgs/development/libraries/git2/disable-security.framework.patch Normal file
View File

@@ -0,0 +1,58 @@
From fbc2ea65406236a740b8734dd41dc5ddbc24f8c9 Mon Sep 17 00:00:00 2001
From: mulrich <mulrich@entwicklerheld.local>
Date: Mon, 8 Aug 2016 15:36:07 +0200
Subject: [PATCH] disable security.framework
---
CMakeLists.txt | 7 +++----
src/curl_stream.c | 9 ++++++++-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93a9e47..331e148 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,8 @@ ENDIF()
IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
SET( USE_ICONV ON )
- FIND_PACKAGE(Security)
+ # FIND_PACKAGE(Security)
+ SET(SECURITY_FOUND "NO")
FIND_PACKAGE(CoreFoundation REQUIRED)
ENDIF()
@@ -87,9 +88,7 @@ IF(MSVC)
OPTION(MSVC_CRTDBG "Enable CRTDBG memory leak reporting" OFF)
ENDIF()
-IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- OPTION( USE_OPENSSL "Link with and use openssl library" ON )
-ENDIF()
+OPTION( USE_OPENSSL "Link with and use openssl library" ON )
CHECK_STRUCT_HAS_MEMBER ("struct stat" st_mtim "sys/types.h;sys/stat.h"
HAVE_STRUCT_STAT_ST_MTIM LANGUAGE C)
diff --git a/src/curl_stream.c b/src/curl_stream.c
index 98de187..a8a9f4c 100644
--- a/src/curl_stream.c
+++ b/src/curl_stream.c
@@ -309,7 +309,14 @@ int git_curl_stream_new(git_stream **out, const char *host, const char *port)
curl_easy_setopt(handle, CURLOPT_HTTPPROXYTUNNEL, 1);
curl_easy_setopt(handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
- /* curl_easy_setopt(handle, CURLOPT_VERBOSE, 1); */
+ const char* cainfo = getenv("SSL_CERT_FILE");
+ if(cainfo != NULL) {
+ curl_easy_setopt(handle, CURLOPT_CAINFO, cainfo);
+ }
+
+ /*
+ curl_easy_setopt(handle, CURLOPT_VERBOSE, 1);
+ */
st->parent.version = GIT_STREAM_VERSION;
st->parent.encrypted = 0; /* we don't encrypt ourselves */
--
2.3.8 (Apple Git-58)

20
pkgs/development/libraries/globalplatform/default.nix Normal file
View File

@@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, zlib, openssl, pcsclite }:
stdenv.mkDerivation rec {
name = "globalplatform-${version}";
version = "6.0.0";
src = fetchurl {
url = "mirror://sourceforge/globalplatform/${name}.tar.gz";
sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy";
};
buildInputs = [ zlib pkgconfig openssl pcsclite ];
meta = with stdenv.lib; {
homepage = https://sourceforge.net/p/globalplatform/wiki/Home/;
description = "Library for interacting with smart card devices";
license = licenses.gpl3;
platforms = platforms.all;
};
}

20
pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix Normal file
View File

@@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, globalplatform, openssl, pcsclite }:
stdenv.mkDerivation rec {
name = "gppcscconnectionplugin-${version}";
version = "1.1.0";
src = fetchurl {
url = "mirror://sourceforge/globalplatform/${name}.tar.gz";
sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad";
};
buildInputs = [ pkgconfig globalplatform openssl pcsclite ];
meta = with stdenv.lib; {
homepage = https://sourceforge.net/p/globalplatform/wiki/Home/;
description = "GlobalPlatform pcsc connection plugin";
license = [ licenses.lgpl3 licenses.gpl3 ];
platforms = platforms.all;
};
}

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

@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="libatomic_ops";
version="7.4.2";
version="7.4.4";
name="${baseName}-${version}";
hash="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4";
url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.2.tar.gz";
sha256="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4";
hash="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz";
url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.4.tar.gz";
sha256="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz";
};
buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];

31
pkgs/development/libraries/libircclient/default.nix Normal file
View File

@@ -0,0 +1,31 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "1.9";
pname = "libircclient";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
sha256 = "0r60i76jh4drjh2jgp5sx71chagqllmkaq49zv67nrhqwvp9ghw1";
};
outputs = [ "out" "dev" ];
configureFlags = [ "--enable-shared" ];
postPatch = ''
substituteInPlace src/Makefile.in \
--replace "@prefix@/include" "@prefix@/include/libircclient" \
--replace "@libdir@" "@prefix@/lib" \
--replace "cp " "install "
'';
meta = with stdenv.lib; {
description = "A small but extremely powerful library which implements the client IRC protocol";
homepage = http://www.ulduzsoft.com/libircclient/;
license = licenses.lgpl3;
maintainers = with maintainers; [ obadz ];
platforms = platforms.all;
};
}

14
pkgs/development/libraries/libmikmod/default.nix
View File

@@ -1,6 +1,9 @@
{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio }:
{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }:
stdenv.mkDerivation rec {
let
inherit (stdenv.lib) optional optionals optionalString;
in stdenv.mkDerivation rec {
name = "libmikmod-3.3.7";
src = fetchurl {
url = "mirror://sourceforge/mikmod/${name}.tar.gz";
@@ -8,11 +11,12 @@ stdenv.mkDerivation rec {
};
buildInputs = [ texinfo ]
++ stdenv.lib.optional stdenv.isLinux [ alsaLib libpulseaudio ];
++ optionals stdenv.isLinux [ alsaLib libpulseaudio ]
++ optional stdenv.isDarwin CoreAudio;
propagatedBuildInputs =
stdenv.lib.optional stdenv.isLinux libpulseaudio;
optional stdenv.isLinux libpulseaudio;
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lasound";
NIX_LDFLAGS = optionalString stdenv.isLinux "-lasound";
meta = with stdenv.lib; {
description = "A library for playing tracker music module files";

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

@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="libmwaw";
version="0.3.7";
version="0.3.8";
name="${baseName}-${version}";
hash="1yg8zvv71r6wsrj71as1ngavj07527d8vrzdrf7s4yf2f7l12xh5";
url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.7/libmwaw-0.3.7.tar.xz";
sha256="1yg8zvv71r6wsrj71as1ngavj07527d8vrzdrf7s4yf2f7l12xh5";
hash="019vk8cj3lgbrpgj48zy25mpkgmllwxznkfd94hh9vbb1cjvpz3a";
url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.8/libmwaw-0.3.8.tar.xz";
sha256="019vk8cj3lgbrpgj48zy25mpkgmllwxznkfd94hh9vbb1cjvpz3a";
};
buildInputs = [
boost pkgconfig cppunit zlib libwpg libwpd librevenge

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

@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "18fygk896gxbx47nh2rn5jp4skisgkl6pdfjqb7h0zn39hd6b6g5";
};
buildInputs = [ lcms2 jasper ];
buildInputs = [ jasper ];
propagatedBuildInputs = [ lcms2 ];
nativeBuildInputs = [ pkgconfig ];

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

@@ -1,10 +1,10 @@
{stdenv, fetchurl, zlib, openssl}:
stdenv.mkDerivation rec {
version = "0.4.16";
version = "0.4.17";
name = "libre-${version}";
src=fetchurl {
url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
sha256 = "0aabz9hjw47xqis2xr3rvxw1slpig4hq9wkl8fbdpgq2fgrzqdmw";
sha256 = "1630228xbsmasbmkx3s7g4r8mzkdlzila4j2f6m2mp0996v8kq1c";
};
buildInputs = [zlib openssl];
makeFlags = [

23
pkgs/development/libraries/libsamplerate/default.nix
View File

@@ -1,6 +1,9 @@
{ stdenv, fetchurl, pkgconfig, libsndfile }:
{ stdenv, fetchurl, pkgconfig, libsndfile, ApplicationServices, Carbon, CoreServices }:
stdenv.mkDerivation rec {
let
inherit (stdenv.lib) optionals optionalString;
in stdenv.mkDerivation rec {
name = "libsamplerate-0.1.8";
src = fetchurl {
@@ -9,7 +12,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libsndfile ];
buildInputs = [ libsndfile ]
++ optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
# maybe interesting configure flags:
#--disable-fftw disable usage of FFTW
@@ -17,14 +21,13 @@ stdenv.mkDerivation rec {
outputs = [ "dev" "bin" "out" ];
postConfigure = stdenv.lib.optionalString stdenv.isDarwin
''
# need headers from the Carbon.framework in /System/Library/Frameworks to
# compile this on darwin -- not sure how to handle
NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"
postConfigure = optionalString stdenv.isDarwin ''
# need headers from the Carbon.framework in /System/Library/Frameworks to
# compile this on darwin -- not sure how to handle
NIX_CFLAGS_COMPILE+=" -I${Carbon}/Library/Frameworks/Carbon.framework/Headers"
substituteInPlace examples/Makefile --replace "-fpascal-strings" ""
'';
substituteInPlace examples/Makefile --replace "-fpascal-strings" ""
'';
meta = with stdenv.lib; {
description = "Sample Rate Converter for audio";

5
pkgs/development/libraries/libshout/default.nix
View File

@@ -4,11 +4,11 @@
# need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc
stdenv.mkDerivation rec {
name = "libshout-2.3.1";
name = "libshout-2.4.1";
src = fetchurl {
url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz";
sha256 = "cf3c5f6b4a5e3fcfbe09fb7024aa88ad4099a9945f7cb037ec06bcee7a23926e";
sha256 = "0kgjpf8jkgyclw11nilxi8vyjk4s8878x23qyxnvybbgqbgbib7k";
};
nativeBuildInputs = [ pkgconfig ];
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
homepage = http://www.icecast.org;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ jcumming ];
platforms = with stdenv.lib.platforms; unix;
};
}

39
pkgs/development/libraries/libsidplayfp/default.nix Normal file
View File

@@ -0,0 +1,39 @@
{ stdenv, fetchurl, pkgconfig
, docSupport ? true, doxygen ? null, graphviz ? null }:
assert docSupport -> doxygen != null && graphviz != null;
stdenv.mkDerivation rec {
pname = "libsidplayfp";
major = "1";
minor = "8";
level = "6";
version = "${major}.${minor}.${level}";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${name}.tar.gz";
sha256 = "0lzivfdq0crmfr01c6f5h883yr7wvagq198xkk3srdmvshhxmwnw";
};
nativeBuildInputs = [ pkgconfig ]
++ stdenv.lib.optionals docSupport [ doxygen graphviz ];
installTargets = [ "install" ]
++ stdenv.lib.optionals docSupport [ "doc" ];
outputs = [ "out" ] ++ stdenv.lib.optionals docSupport [ "doc" ];
postInstall = stdenv.lib.optionalString docSupport ''
mkdir -p $doc/share/doc/libsidplayfp
mv docs/html $doc/share/doc/libsidplayfp/
'';
meta = with stdenv.lib; {
description = "A library to play Commodore 64 music derived from libsidplay2";
homepage = https://sourceforge.net/projects/sidplay-residfp/;
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ ramkromberg ];
platforms = with platforms; unix;
};
}

17
pkgs/development/libraries/mdds/0.12.1.nix Normal file
View File

@@ -0,0 +1,17 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "0.12.1";
name = "mdds-${version}";
src = fetchurl {
url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2";
sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
};
meta = {
homepage = https://code.google.com/p/multidimalgorithm/;
description = "A collection of multi-dimensional data structure and indexing algorithm";
platforms = stdenv.lib.platforms.all;
};
}

6
pkgs/development/libraries/mdds/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "0.12.1";
version = "1.2.1";
name = "mdds-${version}";
src = fetchurl {
url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2";
sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
url = "http://kohei.us/files/mdds/src/mdds-${version}.tar.bz2";
sha256 = "0yzwdl8mf8xdj8rif1qq0qnlq7vlk5q86r3hs2x49m5rqzgljbqy";
};
postInstall = ''

4
pkgs/development/libraries/mdds/default.upstream
View File

@@ -1,6 +1,6 @@
url https://gitlab.com/mdds/mdds
version_link '[.]tar[.][a-z0-9]+$'
version '.*_([0-9.]+)[.]tar[.].*' '\1'
version_link 'mdds-.*[.]tar[.][a-z0-9]+$'
version '.*-([0-9.]+)[.]tar[.].*' '\1'
do_overwrite(){
ensure_hash

4
pkgs/development/libraries/mlt/qt-5.nix
View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "mlt-${version}";
version = "0.9.6";
version = "0.9.8";
src = fetchurl {
url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz";
sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh";
sha256 = "0x0hsb05i7g70dh3jll41qlvcylailfgsr0y1dpx7hyigynxc50j";
};
buildInputs = [

25
pkgs/development/libraries/nlohmann_json/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
name = "nlohmann_json-${version}";
version = "2.0.2";
src = fetchFromGitHub {
owner = "nlohmann";
repo = "json";
rev = "v${version}";
sha256 = "10sk8d23vh0c7b3qafjz2n8r5jv8vc275bl069ikhqnx1zxv6hwp";
};
buildInputs = [ cmake ];
doCheck = true;
checkTarget = "test";
meta = with stdenv.lib; {
description = "Header only C++ library for the JSON file format";
homepage = https://github.com/nlohmann/json;
license = licenses.mit;
platforms = platforms.all;
};
}

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

@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
name = "nss-${version}";
version = "3.23";
version = "3.26";
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_3_23_RTM/src/${name}.tar.gz";
sha256 = "1kqidv91icq96m9m8zx50n7px08km2l88458rkgyjwcn3kiq7cwl";
url = "mirror://mozilla/security/nss/releases/NSS_3_26_RTM/src/${name}.tar.gz";
sha256 = "0r65s5q8kk0vr48s0zr8xi610k7h072lgkkpp4z6jlxr19bkly4i";
};
buildInputs = [ nspr perl zlib sqlite ];

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

@@ -1,14 +1,15 @@
{ stdenv, fetchzip, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4
{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4
, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private
}:
stdenv.mkDerivation rec {
name = "pcl-1.7.2";
name = "pcl-1.8.0";
src = fetchzip {
name = name + "-src";
url = "https://github.com/PointCloudLibrary/pcl/archive/${name}.tar.gz";
sha256 = "0sm19p6wcls2d9l0vi5fgwqp7l372nh3g7bdin42w31zr8dmz8h8";
src = fetchFromGitHub {
owner = "PointCloudLibrary";
repo = "pcl";
rev = name;
sha256 = "1pki4y7mc2dryxc8wa7rs4hg74qab80rpy90jnw3j8fzf09kxcll";
};
enableParallelBuilding = true;

43
pkgs/development/libraries/protobuf/3.0.0-beta-2.nix Normal file
View File

@@ -0,0 +1,43 @@
{ stdenv, fetchFromGitHub , autoreconfHook, zlib, gmock }:
stdenv.mkDerivation rec {
name = "protobuf-${version}";
version = "3.0.0-beta-2";
# make sure you test also -A pythonPackages.protobuf
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
rev = "v${version}";
sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1";
};
postPatch = ''
rm -rf gmock
cp -r ${gmock.source} gmock
chmod -R a+w gmock
'' + stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace src/google/protobuf/testing/googletest.cc \
--replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
'';
buildInputs = [ autoreconfHook zlib ];
enableParallelBuilding = true;
doCheck = true;
meta = {
description = "Google's data interchange format";
longDescription =
''Protocol Buffers are a way of encoding structured data in an efficient
yet extensible format. Google uses Protocol Buffers for almost all of
its internal RPC protocols and file formats.
'';
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
homepage = https://developers.google.com/protocol-buffers/;
};
passthru.version = version;
}

3
pkgs/development/libraries/protobuf/generic.nix
View File

@@ -25,15 +25,12 @@ stdenv.mkDerivation rec {
meta = {
description = "Protocol Buffers - Google's data interchange format";
longDescription =
'' Protocol Buffers are a way of encoding structured data in an
efficient yet extensible format. Google uses Protocol Buffers for
almost all of its internal RPC protocols and file formats.
'';
license = "mBSD";
homepage = https://developers.google.com/protocol-buffers/;
platforms = stdenv.lib.platforms.unix;
};

10
pkgs/development/libraries/ptlib/default.nix
View File

@@ -2,20 +2,20 @@
, openssl, openldap, cyrus_sasl, kerberos, expat, SDL, libdv, libv4l, alsaLib }:
stdenv.mkDerivation rec {
name = "ptlib-2.10.10";
name = "ptlib-2.10.11";
src = fetchurl {
url = "mirror://gnome/sources/ptlib/2.10/${name}.tar.xz";
sha256 = "7fcaabe194cbd3bc0b370b951dffd19cfe7ea0298bfff6aecee948e97f3207e4";
sha256 = "1jf27mjz8vqnclhrhrpn7niz4c177kcjbd1hc7vn65ihcqfz05rs";
};
buildInputs = [ pkgconfig bison flex unixODBC openssl openldap
buildInputs = [ pkgconfig bison flex unixODBC openssl openldap
cyrus_sasl kerberos expat SDL libdv libv4l alsaLib ];
enableParallelBuilding = true;
patches = [ ./bison.patch ];
patches = [ ./bison.patch ./sslv3.patch ];
meta = with stdenv.lib; {
description = "Portable Tools from OPAL VoIP";
maintainers = [ maintainers.raskin ];

16
pkgs/development/libraries/ptlib/sslv3.patch Normal file
View File

@@ -0,0 +1,16 @@
--- ptlib-2.10.11/src/ptclib/pssl.cxx 2016-02-07 09:54:36.326325637 +0000
+++ ptlib-2.10.11/src/ptclib/pssl.cxx 2016-02-07 09:55:55.677870908 +0000
@@ -805,11 +805,13 @@
SSL_METHOD * meth;
switch (method) {
+#if !defined(OPENSSL_NO_SSL3)
case SSLv3:
meth = SSLv3_method();
break;
+#endif
case TLSv1:
meth = TLSv1_method();
break;
case SSLv23:
default:

2
pkgs/development/libraries/qt-5/5.5/default.nix
View File

@@ -92,7 +92,7 @@ let
qtsensors = callPackage ./qtsensors.nix {};
qtserialport = callPackage ./qtserialport {};
qtsvg = callPackage ./qtsvg.nix {};
qttools = callPackage ./qttools.nix {};
qttools = callPackage ./qttools {};
qttranslations = callPackage ./qttranslations.nix {};
/* qtwayland = not packaged */
/* qtwebchannel = not packaged */

72
pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch Normal file
View File

@@ -0,0 +1,72 @@
Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
===================================================================
--- qttools-opensource-src-5.5.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in
+++ qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
@@ -2,11 +2,10 @@
if (NOT TARGET Qt5::qcollectiongenerator)
add_executable(Qt5::qcollectiongenerator IMPORTED)
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
+ if(NOT EXISTS \"${imported_location}\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
+ endif()
_qt5_Help_check_file_exists(${imported_location})
set_target_properties(Qt5::qcollectiongenerator PROPERTIES
Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
===================================================================
--- qttools-opensource-src-5.5.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in
+++ qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
@@ -44,11 +44,10 @@ endmacro()
if (NOT TARGET Qt5::lrelease)
add_executable(Qt5::lrelease IMPORTED)
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
+ if(NOT EXISTS \"${imported_location}\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
+ endif()
_qt5_LinguistTools_check_file_exists(${imported_location})
set_target_properties(Qt5::lrelease PROPERTIES
@@ -59,11 +58,10 @@ endif()
if (NOT TARGET Qt5::lupdate)
add_executable(Qt5::lupdate IMPORTED)
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
+ if(NOT EXISTS \"${imported_location}\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
+ endif()
_qt5_LinguistTools_check_file_exists(${imported_location})
set_target_properties(Qt5::lupdate PROPERTIES
@@ -74,11 +72,10 @@ endif()
if (NOT TARGET Qt5::lconvert)
add_executable(Qt5::lconvert IMPORTED)
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
+ if(NOT EXISTS \"${imported_location}\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
+ endif()
_qt5_LinguistTools_check_file_exists(${imported_location})
set_target_properties(Qt5::lconvert PROPERTIES

3
pkgs/development/libraries/qt-5/5.5/qttools.nix → pkgs/development/libraries/qt-5/5.5/qttools/default.nix
View File

@@ -1,8 +1,9 @@
{ qtSubmodule, qtbase }:
{ qtSubmodule, lib, copyPathsToStore, qtbase }:
qtSubmodule {
name = "qttools";
qtInputs = [ qtbase ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
postFixup = ''
moveToOutput "bin/qdbus" "$out"
moveToOutput "bin/qtpaths" "$out"

1
pkgs/development/libraries/qt-5/5.5/qttools/series Normal file
View File

@@ -0,0 +1 @@
cmake-paths.patch

2
pkgs/development/libraries/qt-5/5.6/default.nix
View File

@@ -90,7 +90,7 @@ let
qtsensors = callPackage ./qtsensors.nix {};
qtserialport = callPackage ./qtserialport {};
qtsvg = callPackage ./qtsvg.nix {};
qttools = callPackage ./qttools.nix {};
qttools = callPackage ./qttools {};
qttranslations = callPackage ./qttranslations.nix {};
/* qtwayland = not packaged */
qtwebchannel = callPackage ./qtwebchannel.nix {};

10
pkgs/development/libraries/qt-5/5.6/qttools.nix
View File

@@ -1,10 +0,0 @@
{ qtSubmodule, qtbase, qtdeclarative }:
qtSubmodule {
name = "qttools";
qtInputs = [ qtbase qtdeclarative ];
postFixup = ''
moveToOutput "bin/qdbus" "$out"
moveToOutput "bin/qtpaths" "$out"
'';
}

72
pkgs/development/libraries/qt-5/5.6/qttools/cmake-paths.patch Normal file
View File

@@ -0,0 +1,72 @@
Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
===================================================================
--- qttools-opensource-src-5.5.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in
+++ qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
@@ -2,11 +2,10 @@
if (NOT TARGET Qt5::qcollectiongenerator)
add_executable(Qt5::qcollectiongenerator IMPORTED)
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
+ if(NOT EXISTS \"${imported_location}\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
+ endif()
_qt5_Help_check_file_exists(${imported_location})
set_target_properties(Qt5::qcollectiongenerator PROPERTIES
Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
===================================================================
--- qttools-opensource-src-5.5.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in
+++ qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
@@ -44,11 +44,10 @@ endmacro()
if (NOT TARGET Qt5::lrelease)
add_executable(Qt5::lrelease IMPORTED)
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
+ if(NOT EXISTS \"${imported_location}\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
+ endif()
_qt5_LinguistTools_check_file_exists(${imported_location})
set_target_properties(Qt5::lrelease PROPERTIES
@@ -59,11 +58,10 @@ endif()
if (NOT TARGET Qt5::lupdate)
add_executable(Qt5::lupdate IMPORTED)
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
+ if(NOT EXISTS \"${imported_location}\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
+ endif()
_qt5_LinguistTools_check_file_exists(${imported_location})
set_target_properties(Qt5::lupdate PROPERTIES
@@ -74,11 +72,10 @@ endif()
if (NOT TARGET Qt5::lconvert)
add_executable(Qt5::lconvert IMPORTED)
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
+ if(NOT EXISTS \"${imported_location}\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
+ endif()
_qt5_LinguistTools_check_file_exists(${imported_location})
set_target_properties(Qt5::lconvert PROPERTIES

11
pkgs/development/libraries/qt-5/5.6/qttools/default.nix Normal file
View File

@@ -0,0 +1,11 @@
{ qtSubmodule, lib, copyPathsToStore, qtbase }:
qtSubmodule {
name = "qttools";
qtInputs = [ qtbase ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
postFixup = ''
moveToOutput "bin/qdbus" "$out"
moveToOutput "bin/qtpaths" "$out"
'';
}

1
pkgs/development/libraries/qt-5/5.6/qttools/series Normal file
View File

@@ -0,0 +1 @@
cmake-paths.patch

2
pkgs/development/libraries/qt-5/5.7/default.nix
View File

@@ -86,7 +86,7 @@ let
qtsensors = callPackage ./qtsensors.nix {};
qtserialport = callPackage ./qtserialport {};
qtsvg = callPackage ./qtsvg.nix {};
qttools = callPackage ./qttools.nix {};
qttools = callPackage ./qttools {};
qttranslations = callPackage ./qttranslations.nix {};
qtwebchannel = callPackage ./qtwebchannel.nix {};
qtwebengine = callPackage ./qtwebengine.nix {};

10
pkgs/development/libraries/qt-5/5.7/qttools.nix
View File

@@ -1,10 +0,0 @@
{ qtSubmodule, qtbase, qtdeclarative }:
qtSubmodule {
name = "qttools";
qtInputs = [ qtbase qtdeclarative ];
postFixup = ''
moveToOutput "bin/qdbus" "$out"
moveToOutput "bin/qtpaths" "$out"
'';
}

72
pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch Normal file
View File

@@ -0,0 +1,72 @@
Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
===================================================================
--- qttools-opensource-src-5.5.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in
+++ qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
@@ -2,11 +2,10 @@
if (NOT TARGET Qt5::qcollectiongenerator)
add_executable(Qt5::qcollectiongenerator IMPORTED)
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
+ if(NOT EXISTS \"${imported_location}\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
+ endif()
_qt5_Help_check_file_exists(${imported_location})
set_target_properties(Qt5::qcollectiongenerator PROPERTIES
Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
===================================================================
--- qttools-opensource-src-5.5.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in
+++ qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
@@ -44,11 +44,10 @@ endmacro()
if (NOT TARGET Qt5::lrelease)
add_executable(Qt5::lrelease IMPORTED)
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
+ if(NOT EXISTS \"${imported_location}\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
+ endif()
_qt5_LinguistTools_check_file_exists(${imported_location})
set_target_properties(Qt5::lrelease PROPERTIES
@@ -59,11 +58,10 @@ endif()
if (NOT TARGET Qt5::lupdate)
add_executable(Qt5::lupdate IMPORTED)
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
+ if(NOT EXISTS \"${imported_location}\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
+ endif()
_qt5_LinguistTools_check_file_exists(${imported_location})
set_target_properties(Qt5::lupdate PROPERTIES
@@ -74,11 +72,10 @@ endif()
if (NOT TARGET Qt5::lconvert)
add_executable(Qt5::lconvert IMPORTED)
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
+ if(NOT EXISTS \"${imported_location}\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
+ endif()
_qt5_LinguistTools_check_file_exists(${imported_location})
set_target_properties(Qt5::lconvert PROPERTIES

11
pkgs/development/libraries/qt-5/5.7/qttools/default.nix Normal file
View File

@@ -0,0 +1,11 @@
{ qtSubmodule, lib, copyPathsToStore, qtbase }:
qtSubmodule {
name = "qttools";
qtInputs = [ qtbase ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
postFixup = ''
moveToOutput "bin/qdbus" "$out"
moveToOutput "bin/qtpaths" "$out"
'';
}

1
pkgs/development/libraries/qt-5/5.7/qttools/series Normal file
View File

@@ -0,0 +1 @@
cmake-paths.patch

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

@@ -5,24 +5,25 @@ with stdenv.lib;
let
os = stdenv.lib.optionalString;
majorVersion = "5.10";
minorVersion = "1";
majorVersion = "7.0";
minorVersion = "0";
version = "${majorVersion}.${minorVersion}";
in
stdenv.mkDerivation rec {
name = "vtk-${os (qtLib != null) "qvtk-"}${version}";
src = fetchurl {
url = "${meta.homepage}files/release/${majorVersion}/vtk-${version}.tar.gz";
sha256 = "1fxxgsa7967gdphkl07lbfr6dcbq9a72z5kynlklxn7hyp0l18pi";
url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq";
};
# https://bugzilla.redhat.com/show_bug.cgi?id=1138466
postPatch = "sed '/^#define GL_GLEXT_LEGACY/d' -i ./Rendering/vtkOpenGL.h";
buildInputs = [ cmake mesa libX11 xproto libXt ]
++ optional (qtLib != null) qtLib;
preBuild = ''
export LD_LIBRARY_PATH="$(pwd)/lib";
'';
# Shared libraries don't work, because of rpath troubles with the current
# nixpkgs camke approach. It wants to call a binary at build time, just
# built and requiring one of the shared objects.

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

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "wolfssl-${version}";
version = "3.9.6";
version = "3.9.8";
src = fetchFromGitHub {
owner = "wolfSSL";
repo = "wolfssl";
rev = "v${version}";
sha256 = "19k3pqd567jfxyps4i6mk7sblwzaj1rixmsdwscw63pdgcgf260g";
sha256 = "0b1a9rmzpzjblj0gsrzas2aljivd0gfimcsj8gjl80ng25zgmaxr";
};
outputs = [ "dev" "out" "doc" "lib" ];

4
pkgs/development/python-modules/pyqt/4.x.nix
View File

@@ -28,9 +28,9 @@ stdenv.mkDerivation {
${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}"
'';
buildInputs = [ python pkgconfig makeWrapper qt4 lndir ];
buildInputs = [ pkgconfig makeWrapper qt4 lndir ];
propagatedBuildInputs = [ pythonPackages.sip_4_16 ];
propagatedBuildInputs = [ pythonPackages.sip_4_16 python ];
postInstall = ''
for i in $out/bin/*; do

4
pkgs/development/python-modules/pyqt/5.x.nix
View File

@@ -20,11 +20,11 @@ in stdenv.mkDerivation {
};
buildInputs = [
python pkgconfig makeWrapper lndir
pkgconfig makeWrapper lndir
qtbase qtsvg qtwebkit qmakeHook
];
propagatedBuildInputs = [ sip ];
propagatedBuildInputs = [ sip python ];
configurePhase = ''
runHook preConfigure

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

@@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, git, mercurial }:
{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices }:
with lib;
stdenv.mkDerivation rec {
version = "0.28.0";
version = "0.30.0";
name = "flow-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "1xryv1366zc385r82r6n832xkaqcm63zs1baizl02qchfzfa3am2";
sha256 = "1s6l3570r53qjyqs8ghqqgb51rb0skijwjgm6av43xi7b7knkd35";
};
installPhase = ''
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
cp bin/flow $out/bin/
'';
buildInputs = [ ocaml libelf git mercurial ] # git and mercurial are necessary because of https://github.com/facebook/flow/issues/1981
buildInputs = [ ocaml libelf ]
++ optionals stdenv.isDarwin [ cf-private CoreServices ];
meta = with stdenv.lib; {

8
pkgs/development/tools/continuous-integration/gocd-agent/default.nix
View File

@@ -2,19 +2,19 @@
stdenv.mkDerivation rec {
name = "gocd-agent-${version}-${rev}";
version = "16.5.0";
rev = "3305";
version = "16.7.0";
rev = "3819";
src = fetchurl {
url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip";
sha256 = "2cb988d36ec747b2917f3be040b430f2a8289c07353a6b6bdc95bf741fa1ed97";
sha256 = "24cc47099d2e9cc1d3983e1ab65957316770f791632e572189b1e6c0183403b7";
};
meta = with stdenv.lib; {
description = "A continuous delivery server specializing in advanced workflow modeling and visualization";
homepage = http://www.go.cd;
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ swarren83 ];
maintainers = with maintainers; [ grahamc swarren83 ];
};
buildInputs = [ unzip ];

6
pkgs/development/tools/continuous-integration/gocd-server/default.nix
View File

@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "gocd-server-${version}-${rev}";
version = "16.6.0";
rev = "3590";
version = "16.7.0";
rev = "3819";
src = fetchurl {
url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip";
sha256 = "6e737c8b419544deb5089e9a2540892a6faec73c962ee7c4e526a799056acca1";
sha256 = "3fae89741726eac69adab8dd64cd18918343188eeb43496e88d4f3abbe0998ad";
};
meta = with stdenv.lib; {

31
pkgs/development/tools/deis/deps.json
View File

@@ -1,10 +1,29 @@
[
{
"include": "../../../go-modules/libs.json",
"packages": [
"github.com/docopt/docopt-go",
"golang.org/x/crypto",
"gopkg.in/yaml.v2"
]
"goPackagePath": "gopkg.in/yaml.v2",
"fetch": {
"type": "git",
"url": "https://gopkg.in/yaml.v2",
"rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
"sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
}
},
{
"goPackagePath": "github.com/docopt/docopt-go",
"fetch": {
"type": "git",
"url": "https://github.com/docopt/docopt-go",
"rev": "784ddc588536785e7299f7272f39101f7faccc3f",
"sha256": "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"
}
},
{
"goPackagePath": "golang.org/x/crypto",
"fetch": {
"type": "git",
"url": "https://go.googlesource.com/crypto",
"rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
"sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
}
}
]

25
pkgs/development/tools/go2nix/deps.json
View File

@@ -1,9 +1,20 @@
[
{
"include": "../../libs.json",
"packages": [
"github.com/Masterminds/vcs",
"github.com/jawher/mow.cli"
]
}
{
"goPackagePath": "github.com/Masterminds/vcs",
"fetch": {
"type": "git",
"url": "https://github.com/Masterminds/vcs",
"rev": "7af28b64c5ec41b1558f5514fd938379822c237c",
"sha256": "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6"
}
},
{
"goPackagePath": "github.com/jawher/mow.cli",
"fetch": {
"type": "git",
"url": "https://github.com/jawher/mow.cli",
"rev": "772320464101e904cd51198160eb4d489be9cc49",
"sha256": "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j"
}
}
]

15
pkgs/development/tools/golint/deps.json
View File

@@ -1,8 +1,11 @@
[
{
"include": "../../libs.json",
"packages": [
"golang.org/x/tools"
]
}
{
"goPackagePath": "golang.org/x/tools",
"fetch": {
"type": "git",
"url": "https://go.googlesource.com/tools",
"rev": "9ae4729fba20b3533d829a9c6ba8195b068f2abc",
"sha256": "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"
}
}
]

15
pkgs/development/tools/gotools/deps.json
View File

@@ -1,8 +1,11 @@
[
{
"include": "../../libs.json",
"packages": [
"golang.org/x/net"
]
}
{
"goPackagePath": "golang.org/x/net",
"fetch": {
"type": "git",
"url": "https://go.googlesource.com/net",
"rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4",
"sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"
}
}
]

15
pkgs/development/tools/gox/deps.json
View File

@@ -1,8 +1,11 @@
[
{
"include": "../../libs.json",
"packages": [
"github.com/mitchellh/iochan"
]
}
{
"goPackagePath": "github.com/mitchellh/iochan",
"fetch": {
"type": "git",
"url": "https://github.com/mitchellh/iochan",
"rev": "b584a329b193e206025682ae6c10cdbe03b0cd77",
"sha256": "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"
}
}
]

20
pkgs/development/tools/misc/gpshell/default.nix Normal file
View File

@@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite }:
stdenv.mkDerivation rec {
name = "gpshell-${version}";
version = "1.4.4";
src = fetchurl {
url = "mirror://sourceforge/globalplatform/gpshell-${version}.tar.gz";
sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";
};
buildInputs = [ pkgconfig globalplatform pcsclite ];
meta = with stdenv.lib; {
homepage = https://sourceforge.net/p/globalplatform/wiki/Home/;
description = "Smartcard management application";
license = licenses.gpl3;
platforms = platforms.all;
};
}

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

@@ -118,7 +118,7 @@ in releaseTools.nixBuild rec {
preCheck = ''
patchShebangs .
export LOGNAME=${LOGNAME:-foo}
export LOGNAME=''${LOGNAME:-foo}
'';
postInstall = ''

2
pkgs/development/tools/pypi2nix/default.nix
View File

@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
# mv effect-*/effect $out/pkgs/effect
mv requests-*/requests $out/pkgs/
if [ "$IN_NIX_SHELL" != "1" ]; then
if [ -z "$IN_NIX_SHELL" ]; then
if [ -e git-export ]; then
mv git-export/src/pypi2nix $out/pkgs/pypi2nix
else

25
pkgs/development/tools/remarshal/deps.json
View File

@@ -1,9 +1,20 @@
[
{
"include": "../../libs.json",
"packages": [
"github.com/BurntSushi/toml",
"gopkg.in/yaml.v2"
]
}
{
"goPackagePath": "gopkg.in/yaml.v2",
"fetch": {
"type": "git",
"url": "https://gopkg.in/yaml.v2",
"rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
"sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
}
},
{
"goPackagePath": "github.com/BurntSushi/toml",
"fetch": {
"type": "git",
"url": "https://github.com/BurntSushi/toml",
"rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4",
"sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"
}
}
]

15
pkgs/development/tools/textql/deps.json
View File

@@ -1,8 +1,11 @@
[
{
"include": "../../libs.json",
"packages": [
"github.com/mattn/go-sqlite3"
]
}
{
"goPackagePath": "github.com/mattn/go-sqlite3",
"fetch": {
"type": "git",
"url": "https://github.com/mattn/go-sqlite3",
"rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42",
"sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"
}
}
]

8
pkgs/development/tools/unity3d/default.nix
View File

@@ -4,7 +4,7 @@
, cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
, libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
, libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb
, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp
, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp, chromium
}:
let
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper fakeroot file getopt ];
outputs = [ "out" "monodevelop" "sandbox" ];
outputs = [ "out" "monodevelop" ];
unpackPhase = ''
echo -e 'q\ny' | fakeroot sh $src
@@ -91,12 +91,10 @@ in stdenv.mkDerivation rec {
'';
installPhase = ''
install -Dm755 Editor/chrome-sandbox $sandbox/bin/unity-chrome-sandbox
unitydir="$out/opt/Unity/Editor"
mkdir -p $unitydir
mv Editor/* $unitydir
ln -sf /var/setuid-wrappers/unity-chrome-sandbox $unitydir/chrome-sandbox
ln -sf /var/setuid-wrappers/${chromium.sandboxExecutableName} $unitydir/chrome-sandbox
mkdir -p $out/share/applications
sed "/^Exec=/c\Exec=$out/bin/unity-editor" \

21
pkgs/development/tools/vagrant/default.nix
View File

@@ -15,6 +15,7 @@ let
in
stdenv.mkDerivation rec {
name = "vagrant-${version}";
inherit version;
src =
if stdenv.system == "x86_64-linux" then
@@ -39,10 +40,10 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper ];
unpackPhase = ''
${dpkg}/bin/dpkg-deb -x ${src} .
${dpkg}/bin/dpkg-deb -x "$src" .
'';
buildPhase = false;
buildPhase = "";
installPhase = ''
sed -i "s|/opt|$out/opt|" usr/bin/vagrant
@@ -55,6 +56,8 @@ stdenv.mkDerivation rec {
ln -s ${curl.dev}/bin/curl-config opt/vagrant/embedded/bin
# libarchive: bsdtar, bsdcpio
rm opt/vagrant/embedded/lib/libarchive*
ln -s ${libarchive}/lib/libarchive.so opt/vagrant/embedded/lib/libarchive.so
rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio}
ln -s ${libarchive}/bin/bsdtar opt/vagrant/embedded/bin
ln -s ${libarchive}/bin/bsdcpio opt/vagrant/embedded/bin
@@ -74,6 +77,10 @@ stdenv.mkDerivation rec {
ln -s ${ruby}/bin/ri opt/vagrant/embedded/bin
ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin
# ruby libs
rm -rf opt/vagrant/embedded/lib
ln -s ${ruby}/lib opt/vagrant/embedded/lib
# libiconv: iconv
rm opt/vagrant/embedded/bin/iconv
ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin
@@ -92,17 +99,17 @@ stdenv.mkDerivation rec {
mkdir -p "$out"
cp -r opt "$out"
cp -r usr/bin "$out"
wrapProgram $out/bin/vagrant --prefix LD_LIBRARY_PATH : $out/opt/vagrant/embedded/lib
wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib"
'';
preFixup = ''
# 'hide' the template file from shebang-patching
chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable
chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
chmod -x "$out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable"
chmod -x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh"
'';
postFixup = ''
chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable
chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
chmod +x "$out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable"
chmod +x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh"
'';
}

81
pkgs/development/web/minify/deps.json
View File

@@ -1,15 +1,74 @@
[
{
"include": "../../libs.json",
"packages": [
"github.com/tdewolff/buffer",
"github.com/tdewolff/parse",
"github.com/tdewolff/strconv",
"github.com/dustin/go-humanize",
"github.com/fsnotify/fsnotify",
"github.com/matryer/try",
"github.com/ogier/pflag",
"golang.org/x/sys"
]
"goPackagePath": "golang.org/x/sys",
"fetch": {
"type": "git",
"url": "https://go.googlesource.com/sys",
"rev": "d9157a9621b69ad1d8d77a1933590c416593f24f",
"sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"
}
},
{
"goPackagePath": "github.com/dustin/go-humanize",
"fetch": {
"type": "git",
"url": "https://github.com/dustin/go-humanize",
"rev": "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0",
"sha256": "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0"
}
},
{
"goPackagePath": "github.com/tdewolff/buffer",
"fetch": {
"type": "git",
"url": "https://github.com/tdewolff/buffer",
"rev": "0edfcb7b750146ff879e95831de2ef53605a5cb5",
"sha256": "1mdd4k9byp22mw0a399j3w73zjb5g0vn58g76rjy7ajb0dzm80vl"
}
},
{
"goPackagePath": "github.com/tdewolff/parse",
"fetch": {
"type": "git",
"url": "https://github.com/tdewolff/parse",
"rev": "34d5c1160d4503da4b456e5094609f2331d6dde3",
"sha256": "0hxf65fgkrc1q4p99p33xxxy1s6wxpn1vfsnqf9p846awwbqsy0v"
}
},
{
"goPackagePath": "github.com/tdewolff/strconv",
"fetch": {
"type": "git",
"url": "https://github.com/tdewolff/strconv",
"rev": "3e8091f4417ebaaa3910da63a45ea394ebbfb0e3",
"sha256": "00w2mryfjhz3vaqzxvbwvyhi1vgpc1s4xfv1r9hxn8hwa078q5gp"
}
},
{
"goPackagePath": "github.com/matryer/try",
"fetch": {
"type": "git",
"url": "https://github.com/matryer/try",
"rev": "93d30e50512f879b73829eb79867df38084bcd31",
"sha256": "0dmc8iar9685ks1ba3vnycjsx8qxwyqv51jb7677dvwnzbqhgw6f"
}
},
{
"goPackagePath": "github.com/fsnotify/fsnotify",
"fetch": {
"type": "git",
"url": "https://github.com/fsnotify/fsnotify",
"rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8",
"sha256": "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"
}
},
{
"goPackagePath": "github.com/ogier/pflag",
"fetch": {
"type": "git",
"url": "https://github.com/ogier/pflag",
"rev": "45c278ab3607870051a2ea9040bb85fcb8557481",
"sha256": "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l"
}
}
]

4
pkgs/development/web/nodejs/nodejs.nix
View File

@@ -40,6 +40,10 @@ in stdenv.mkDerivation {
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
'';
postInstall = ''
PATH=$out/bin:$PATH patchShebangs $out
'';
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
buildInputs = extraBuildInputs