Merge master into staging-next

2021-01-25 18:52:08 +00:00
parent 351b28d469 9ce1caa63c
commit a127deeb88
2813 changed files with 3233 additions and 2989 deletions
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
+{ lib, fetchFromGitHub, makeWrapper, clang, haskellPackages }:

 haskellPackages.mkDerivation rec {

@@ -1,4 +1,4 @@
-{ stdenv, eggDerivation, fetchurl, chickenEggs }:
+{ eggDerivation, fetchurl, chickenEggs }:

 # Note: This mostly reimplements the default.nix already contained in
 # the tarball. Is there a nicer way than duplicating code?
@@ -1,4 +1,4 @@
-{ pkgs, stdenv }:
+{ pkgs }:
 rec {
  inherit (pkgs) eggDerivation fetchegg;

@@ -1,4 +1,4 @@
-{ lib, stdenv, eggDerivation, fetchFromGitHub, chickenEggs }:
+{ lib, eggDerivation, fetchFromGitHub, chickenEggs }:

 # Note: This mostly reimplements the default.nix already contained in
 # the tarball. Is there a nicer way than duplicating code?
@@ -1,4 +1,4 @@
-{ pkgs, stdenv }:
+{ pkgs }:
 rec {
  inherit (pkgs) eggDerivation fetchegg;

@@ -1,7 +1,7 @@
 { mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, array, base, binary
 , bytestring, cmark, containers, directory, filepath, free, HUnit
 , indents, json, mtl, optparse-applicative, parsec, process
-, QuickCheck, quickcheck-io, split, lib, stdenv, tasty, tasty-golden
+, QuickCheck, quickcheck-io, split, lib, tasty, tasty-golden
 , tasty-hunit, tasty-quickcheck, text
 }:
 mkDerivation {
@@ -2,7 +2,7 @@
 , bytestring, Cabal, cmark, containers, directory, elm-format
 , fetchgit, filepath, free, HUnit, indents, json, mtl
 , optparse-applicative, parsec, process, QuickCheck, quickcheck-io
-, split, lib, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+, split, lib, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
 , text
 }:
 mkDerivation {
@@ -3,7 +3,7 @@
 , file-embed, filelock, filepath, ghc-prim, haskeline, HTTP
 , http-client, http-client-tls, http-types, language-glsl, mtl
 , network, parsec, process, raw-strings-qq, scientific, SHA
-, snap-core, snap-server, lib, stdenv, template-haskell, time
+, snap-core, snap-server, lib, template-haskell, time
 , unordered-containers, utf8-string, vector, zip-archive
 }:
 mkDerivation {
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, base, binary, bytestring, containers
 , directory, fetchgit, filepath, ghc-prim, hpack
-, optparse-applicative, lib, stdenv, text, unliftio
+, optparse-applicative, lib, text, unliftio
 , unordered-containers
 }:
 mkDerivation {
@@ -1,4 +1,4 @@
-{ mkDerivation, base, concatenative, mtl, parsec, lib, stdenv }:
+{ mkDerivation, base, concatenative, mtl, parsec, lib }:
 mkDerivation {
  pname = "indents";
  version = "0.3.3";
@@ -1,7 +1,7 @@
 { mkDerivation, aeson, array, attoparsec, base, binary, bytestring
 , containers, deepseq, directory, dlist, fetchgit, ghc-prim
 , ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck
-, quickcheck-unicode, random, scientific, stdenv, test-framework
+, quickcheck-unicode, random, scientific, test-framework
 , test-framework-hunit, test-framework-quickcheck2, text, time
 , transformers, unordered-containers, vector
 }:
@@ -49,7 +49,7 @@ llvmPackages.stdenv.mkDerivation rec {
    description = "C++ based language for image processing and computational photography";
    homepage = "https://halide-lang.org";
    license = licenses.mit;
-    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
+    platforms = platforms.all;
    maintainers = [ maintainers.ck3d ];
  };
 }
@@ -1,4 +1,4 @@
-{ lib, stdenv, git, clang,
+{ lib, git, clang,
  fetchFromGitHub, requireFile,
  openssl, xz, gnutar,
  automake, autoconf, libtool, clangStdenv } :
@@ -1,4 +1,4 @@
-{ lib, stdenv, openjdk11, fetchFromGitHub, jetbrains }:
+{ lib, openjdk11, fetchFromGitHub, jetbrains }:

 openjdk11.overrideAttrs (oldAttrs: rec {
  pname = "jetbrains-jdk";
@@ -1,4 +1,6 @@
-{lib, stdenv, fetchurl}: stdenv.mkDerivation {
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation {
  name = "meta-build-env-0.1";
  src = fetchurl {
    url = "http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz";
@@ -1,4 +1,4 @@
-{ clangStdenv, lib, stdenv, fetchFromGitHub, cmake, zlib, openexr,
+{ clangStdenv, lib, fetchFromGitHub, cmake, zlib, openexr,
 openimageio, llvm, boost165, flex, bison, partio, pugixml,
 util-linux, python
 }:
@@ -1,5 +1,5 @@
 { mkDerivation, base, Cabal, containers, directory, extra, filepath
-, mtl, parsec, pretty, lib, stdenv, time, transformers
+, mtl, parsec, pretty, lib, time, transformers
 }:
 mkDerivation {
  pname = "curry-base";
@@ -1,6 +1,6 @@
 { mkDerivation, base, bytestring, Cabal, containers, curry-base
 , directory, extra, file-embed, filepath, mtl, network-uri, pretty
-, process, set-extra, lib, stdenv, template-haskell, transformers
+, process, set-extra, lib, template-haskell, transformers
 }:
 mkDerivation {
  pname = "curry-frontend";
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, writeText, asttokens
+{ lib, buildPythonPackage, fetchPypi, writeText, asttokens
 , pycryptodome, pytest_xdist, pytestcov, recommonmark, semantic-version, sphinx
 , sphinx_rtd_theme, pytestrunner }: