Merge branch 'nixpkgs-update' into master

8 files changed, 14 insertions, 38 deletions

diff --git a/pkgs/development/idris-modules/TODO.md b/pkgs/development/idris-modules/TODO.md
index 4dcaa61829a..41b0be2b2ef 100644
--- a/pkgs/development/idris-modules/TODO.md
+++ b/pkgs/development/idris-modules/TODO.md
@@ -1,3 +1,3 @@
 * Build the RTS separately from Idris
 * idris2nix
-* Only require gmp, rts when compiling executables
\ No newline at end of file
+* Only require gmp, rts when compiling executables
diff --git a/pkgs/development/idris-modules/data.nix b/pkgs/development/idris-modules/data.nix
deleted file mode 100644
index 0517edec2d2..00000000000
--- a/pkgs/development/idris-modules/data.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ build-idris-package
-, fetchFromGitHub
-, contrib
-, lib
-}:
-build-idris-package  {
-  name = "data";
-  version = "2018-03-19";
-
-  idrisDeps = [ contrib ];
-
-  src = fetchFromGitHub {
-    owner = "jdevuyst";
-    repo = "idris-data";
-    rev = "105b78ac13235edc596287367a675d7cd04ce5d5";
-    sha256 = "17wz4jddan39984qibx2x7nv2zkqznv0fpab20nrm4zgy17v77ii";
-  };
-
-  meta = {
-    description = "Functional data structures in Idris";
-    homepage = "https://github.com/jdevuyst/idris-data";
-    license = lib.licenses.bsd3;
-    maintainers = [ lib.maintainers.brainrape ];
-  };
-}
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 7011a513c10..d6fb1ac78bd 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -75,8 +75,6 @@
 
     cube = callPackage ./cube.nix {};
 
-    data = callPackage ./data.nix {};
-
     derive = callPackage ./derive.nix {};
 
     descncrunch = callPackage ./descncrunch.nix {};
diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix
index da23ae18331..c63cf8acb0f 100644
--- a/pkgs/development/idris-modules/glfw.nix
+++ b/pkgs/development/idris-modules/glfw.nix
@@ -10,7 +10,7 @@ build-idris-package  {
 
   idrisDeps = [ effects ];
 
-  nativeBuildInputs = [ pkgs.pkgconfig ];
+  nativeBuildInputs = [ pkgs.pkg-config ];
   extraBuildInputs = [ pkgs.glfw ];
 
   postPatch = ''
diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix
index 2e1cdaa9be3..2e06b036825 100644
--- a/pkgs/development/idris-modules/sdl2.nix
+++ b/pkgs/development/idris-modules/sdl2.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , effects
 , lib
-, pkgconfig
+, pkg-config
 , SDL2
 , SDL2_gfx
 }:
@@ -12,8 +12,11 @@ build-idris-package rec {
 
   idrisDeps = [ effects ];
 
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
   extraBuildInputs = [
-    pkgconfig
     SDL2
     SDL2_gfx
   ];
@@ -24,7 +27,7 @@ build-idris-package rec {
     owner = "steshaw";
     repo = "idris-sdl2";
     rev = version;
-    sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv";
+    sha256 = "1jslnlzyw04dcvcd7xsdjqa7waxzkm5znddv76sv291jc94xhl4a";
   };
 
   meta = {
diff --git a/pkgs/development/idris-modules/tfrandom.nix b/pkgs/development/idris-modules/tfrandom.nix
index 5c631950312..8249259075c 100644
--- a/pkgs/development/idris-modules/tfrandom.nix
+++ b/pkgs/development/idris-modules/tfrandom.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib
 , build-idris-package
 , fetchFromGitHub
-, lib
 }:
+
 build-idris-package  {
   name = "tf-random";
   version = "2020-01-15";
diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix
index 84f88e1598b..ce040bebe35 100644
--- a/pkgs/development/idris-modules/tparsec.nix
+++ b/pkgs/development/idris-modules/tparsec.nix
@@ -8,7 +8,7 @@ build-idris-package  {
   version = "2020-02-11";
 
   ipkgName = "TParsec";
-  
+
   idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix
index 47136839d01..080cbe2778a 100644
--- a/pkgs/development/idris-modules/with-packages.nix
+++ b/pkgs/development/idris-modules/with-packages.nix
@@ -1,10 +1,10 @@
 # Build a version of idris with a set of packages visible
 # packages: The packages visible to idris
-{ stdenv, idris, symlinkJoin, makeWrapper }: packages:
+{ lib, idris, symlinkJoin, makeWrapper }: packages:
 
-let paths = stdenv.lib.closePropagation packages;
+let paths = lib.closePropagation packages;
 in
-stdenv.lib.appendToName "with-packages" (symlinkJoin {
+lib.appendToName "with-packages" (symlinkJoin {
 
   inherit (idris) name;