Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
@@ -1,4 +1,4 @@
|
||||
{ pkgs, stdenv }:
|
||||
{ pkgs }:
|
||||
rec {
|
||||
inherit (pkgs) eggDerivation fetchegg;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper
|
||||
{ stdenv, lib, fetchFromGitHub, makeWrapper
|
||||
, coq, ocamlPackages, coq2html
|
||||
, tools ? stdenv.cc
|
||||
}:
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch
|
||||
{ stdenv, lib, fetchFromGitHub
|
||||
, makeWrapper, unzip, which, writeTextFile
|
||||
, curl, tzdata, gdb, darwin, git
|
||||
, callPackage, targetPackages, ldc
|
||||
, targetPackages, ldc
|
||||
, version ? "2.085.1"
|
||||
, dmdSha256 ? "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660"
|
||||
, druntimeSha256 ? "109f2glsqrlshk06761xlw4r5v22mivp873cq9g5gcax3g00k617"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, buildEnv
|
||||
{ lib, stdenv
|
||||
, haskell, nodejs
|
||||
, fetchurl, fetchpatch, makeWrapper, git }:
|
||||
, fetchurl, fetchpatch, makeWrapper }:
|
||||
|
||||
let
|
||||
fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
{ stdenv, fetchurl, glib, glibc, git,
|
||||
{ stdenv, fetchurl, glib, git,
|
||||
rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
|
||||
pango, cairo, gtk2, gdk_pixbuf, gtkglext,
|
||||
mesa, xorg, openssl, unzip }:
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) optional;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "factor-lang-${version}";
|
||||
version = "0.98";
|
||||
rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
# build-tools
|
||||
, bootPkgs
|
||||
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
|
||||
, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
|
||||
, bash
|
||||
|
||||
, libiconv ? null, ncurses
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
# build-tools
|
||||
, bootPkgs
|
||||
, autoconf, automake, coreutils, fetchgit, fetchurl, fetchpatch, perl, python3, m4, sphinx
|
||||
, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3, m4, sphinx
|
||||
, bash
|
||||
|
||||
, libiconv ? null, ncurses
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ haskellLib }:
|
||||
|
||||
let inherit (haskellLib) dontCheck doJailbreak dontHaddock;
|
||||
let inherit (haskellLib) doJailbreak dontHaddock;
|
||||
in self: super: {
|
||||
haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs;
|
||||
haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs);
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
, lens
|
||||
, parallel, safe, shelly, split, stringsearch, syb
|
||||
, tar, terminfo
|
||||
, vector, yaml, fetchgit, fetchFromGitHub
|
||||
, vector, yaml
|
||||
, alex, happy, git, gnumake, autoconf, patch
|
||||
, automake, libtool
|
||||
, cryptohash
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, cmake, bison, jq, python, spirv-tools, spirv-headers }:
|
||||
{ stdenv, fetchFromGitHub, cmake, bison, jq, python, spirv-tools, spirv-headers }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glslang-${version}";
|
||||
version = "7.11.3113";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "go-jsonnet-${version}";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
|
||||
, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
|
||||
, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
|
||||
, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
|
||||
{ stdenv, fetchurl, tzdata, iana-etc, runCommand
|
||||
, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
|
||||
, mailcap, runtimeShell
|
||||
, buildPackages, pkgsTargetTarget
|
||||
}:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
|
||||
, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
|
||||
{ stdenv, fetchurl, tzdata, iana-etc, runCommand
|
||||
, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
|
||||
, mailcap, runtimeShell
|
||||
, buildPackages, pkgsTargetTarget
|
||||
}:
|
||||
|
||||
@@ -6,10 +6,6 @@
|
||||
let
|
||||
version = "1.0.0-rc15";
|
||||
truffleMake = ./truffle.make;
|
||||
R = fetchurl {
|
||||
url = "http://cran.rstudio.com/src/base/R-3/R-3.5.1.tar.gz";
|
||||
sha256 = "1vap2k8kj5icy9naw61f9zyphf4rs0c9rxvil0zxkwx0xvsvyqq4";
|
||||
};
|
||||
makeMxGitCache = list: out: ''
|
||||
mkdir ${out}
|
||||
${lib.concatMapStrings ({ url, name, rev, sha256 }: ''
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchFromGitHub, fetchpatch, which, m4, python, bison, flex, llvmPackages,
|
||||
{stdenv, fetchFromGitHub, which, m4, python, bison, flex, llvmPackages,
|
||||
testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents
|
||||
}:
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
{ stdenv, fetchurl, fetchzip
|
||||
# build tools
|
||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python2
|
||||
, llvm, cmake
|
||||
, cmake
|
||||
# libjulia dependencies
|
||||
, libunwind, readline, utf8proc, zlib
|
||||
# standard library dependencies
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
, version
|
||||
, release_version
|
||||
, zlib
|
||||
, libcxxabi
|
||||
, debugVersion ? false
|
||||
, enableManpages ? false
|
||||
, enableSharedLibraries ? !enableManpages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetch, fetchpatch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
|
||||
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
|
||||
, fixDarwinDylibNames
|
||||
, enableManpages ? false
|
||||
, enablePolly ? false # TODO: get this info from llvm (passthru?)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, version, fetch, cmake, libcxx, fetchpatch }:
|
||||
{ stdenv, version, fetch, cmake, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libunwind-${version}";
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{ stdenv
|
||||
, fetch
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, python
|
||||
, libffi
|
||||
|
||||
@@ -62,7 +62,6 @@ stdenv.mkDerivation rec {
|
||||
patchPhase =
|
||||
let disableTest = ''sed -i '1i discard \"\"\"\n disabled: true\n\"\"\"\n\n' '';
|
||||
disableStdLibTest = ''sed -i -e '/^when isMainModule/,/^END$/{s/^/#/}' '';
|
||||
disableCompile = ''sed -i -e 's/^/#/' '';
|
||||
in ''
|
||||
substituteInPlace ./tests/async/tioselectors.nim --replace "/bin/sleep" "sleep"
|
||||
substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype
|
||||
, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir
|
||||
, alsaLib, bootjdk, perl, fontconfig, zlib, lndir
|
||||
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
|
||||
, libjpeg, giflib
|
||||
, setJavaClassPath
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchFromGitHub }:
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openspin-${version}";
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ stdenv, lib, overrideCC
|
||||
{ stdenv, lib
|
||||
, buildPackages
|
||||
, newScope, callPackage
|
||||
, CoreFoundation, Security
|
||||
, llvmPackages_5
|
||||
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
|
||||
, pkgsBuildTarget, pkgsBuildBuild
|
||||
}: rec {
|
||||
makeRustPlatform = { rustc, cargo, ... }: {
|
||||
rust = {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
|
||||
, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps
|
||||
, llvm_7, ncurses, darwin, git, cmake, curl, rustPlatform
|
||||
, fetchurl, file, python2, tzdata, ps
|
||||
, llvm_7, darwin, git, cmake, rustPlatform
|
||||
, which, libffi, gdb
|
||||
, withBundledLLVM ? false
|
||||
}:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchgit, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib
|
||||
, libXinerama, libarchive, db, pcre, libedit, libossp_uuid, libXft, libXpm
|
||||
{ stdenv, fetchgit, jdk, gmp, readline, openssl, unixODBC, zlib
|
||||
, libarchive, db, pcre, libedit, libossp_uuid, libXpm
|
||||
, libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin
|
||||
, git, cacert, cmake, libyaml
|
||||
, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ stdenv
|
||||
, targetPackages
|
||||
, cmake
|
||||
, coreutils
|
||||
, glibc
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, automake, autoreconfHook
|
||||
, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll, gnome3
|
||||
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, autoreconfHook
|
||||
, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub
|
||||
{ stdenv, fetchFromGitHub
|
||||
, automake, autoconf, readline
|
||||
, libX11, bluez, SDL2
|
||||
}:
|
||||
|
||||
Reference in New Issue
Block a user