summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--krebs/5pkgs/haskell/X11-aeson.nix4
-rw-r--r--krebs/5pkgs/haskell/blessings.nix4
-rw-r--r--krebs/5pkgs/haskell/brockman/default.nix4
-rw-r--r--krebs/5pkgs/haskell/email-header.nix4
-rw-r--r--krebs/5pkgs/haskell/hack.nix5
-rw-r--r--krebs/5pkgs/haskell/kirk.nix7
-rw-r--r--krebs/5pkgs/haskell/much.nix8
-rw-r--r--krebs/5pkgs/haskell/news.nix4
-rw-r--r--krebs/5pkgs/haskell/reaktor2/default.nix4
-rw-r--r--krebs/5pkgs/haskell/recht.nix4
-rw-r--r--krebs/5pkgs/haskell/scanner.nix4
-rw-r--r--krebs/5pkgs/haskell/xmonad-aeson.nix4
-rw-r--r--krebs/5pkgs/haskell/xmonad-stockholm.nix4
-rw-r--r--krebs/5pkgs/simple/buildbot-classic/sqlparse.nix4
-rw-r--r--tv/5pkgs/haskell/mailaids.nix4
-rw-r--r--tv/5pkgs/haskell/th-env/default.nix4
16 files changed, 36 insertions, 36 deletions
diff --git a/krebs/5pkgs/haskell/X11-aeson.nix b/krebs/5pkgs/haskell/X11-aeson.nix
index 7db6c28a8..103d87faa 100644
--- a/krebs/5pkgs/haskell/X11-aeson.nix
+++ b/krebs/5pkgs/haskell/X11-aeson.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, aeson, base, fetchgit, stdenv, X11 }:
+{ mkDerivation, aeson, base, fetchgit, lib, X11 }:
mkDerivation {
pname = "X11-aeson";
version = "1.0.0";
@@ -9,5 +9,5 @@ mkDerivation {
fetchSubmodules = true;
};
libraryHaskellDepends = [ aeson base X11 ];
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
}
diff --git a/krebs/5pkgs/haskell/blessings.nix b/krebs/5pkgs/haskell/blessings.nix
index 00299ca68..2176db2ff 100644
--- a/krebs/5pkgs/haskell/blessings.nix
+++ b/krebs/5pkgs/haskell/blessings.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, fetchgit, hspec, QuickCheck, stdenv, stockholm, text }:
+{ mkDerivation, base, fetchgit, hspec, QuickCheck, lib, stockholm, text }:
with stockholm.lib;
let
@@ -24,5 +24,5 @@ in mkDerivation {
testHaskellDepends = [ base hspec QuickCheck ];
doHaddock = false;
# WTFPL is the true license, which is unknown to cabal.
- license = stdenv.lib.licenses.wtfpl;
+ license = lib.licenses.wtfpl;
}
diff --git a/krebs/5pkgs/haskell/brockman/default.nix b/krebs/5pkgs/haskell/brockman/default.nix
index d3dbcd89c..de41d1886 100644
--- a/krebs/5pkgs/haskell/brockman/default.nix
+++ b/krebs/5pkgs/haskell/brockman/default.nix
@@ -2,7 +2,7 @@
, case-insensitive, conduit, containers, directory, feed, filepath
, hashable, hslogger, html-entity, http-client, irc-conduit, lens
, lrucache, lrucaching, network, optparse-applicative, random, safe
-, stdenv, text, time, timerep, wreq
+, lib, text, time, timerep, wreq
, fetchFromGitHub
}:
mkDerivation rec {
@@ -22,5 +22,5 @@ mkDerivation rec {
http-client irc-conduit lens lrucache lrucaching network
optparse-applicative random safe text time timerep wreq
];
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
}
diff --git a/krebs/5pkgs/haskell/email-header.nix b/krebs/5pkgs/haskell/email-header.nix
index ccc32c09b..e1e9d423f 100644
--- a/krebs/5pkgs/haskell/email-header.nix
+++ b/krebs/5pkgs/haskell/email-header.nix
@@ -1,6 +1,6 @@
{ mkDerivation, attoparsec, base, base64-bytestring, bytestring
, case-insensitive, containers, exceptions, fetchgit, QuickCheck
-, stdenv, stockholm, tasty, tasty-quickcheck, text, text-icu, time
+, lib, stockholm, tasty, tasty-quickcheck, text, text-icu, time
}:
with stockholm.lib;
@@ -42,5 +42,5 @@ in mkDerivation {
jailbreak = true;
homepage = "http://github.com/knrafto/email-header";
description = "Parsing and rendering of email and MIME headers";
- license = stdenv.lib.licenses.bsd3;
+ license = lib.licenses.bsd3;
}
diff --git a/krebs/5pkgs/haskell/hack.nix b/krebs/5pkgs/haskell/hack.nix
index 4e157107e..37ef94e46 100644
--- a/krebs/5pkgs/haskell/hack.nix
+++ b/krebs/5pkgs/haskell/hack.nix
@@ -1,6 +1,5 @@
{ mkDerivation, base, blessings, containers, data-default, fetchgit
-, lens, mtl, old-locale, process, scanner, stdenv, time, unix
-, zippers
+, lens, lib, mtl, old-locale, process, scanner, time, unix, zippers
}:
mkDerivation {
pname = "hack";
@@ -18,5 +17,5 @@ mkDerivation {
base blessings containers data-default lens mtl old-locale process
scanner time unix zippers
];
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
}
diff --git a/krebs/5pkgs/haskell/kirk.nix b/krebs/5pkgs/haskell/kirk.nix
index 073e5d505..d6fdec4c9 100644
--- a/krebs/5pkgs/haskell/kirk.nix
+++ b/krebs/5pkgs/haskell/kirk.nix
@@ -1,5 +1,5 @@
-{ mkDerivation, async, base, bytestring, fetchgit, network
-, optparse-applicative, stdenv, text
+{ mkDerivation, async, base, bytestring, fetchgit, lib, network
+, optparse-applicative, text
}:
mkDerivation {
pname = "kirk";
@@ -8,6 +8,7 @@ mkDerivation {
url = "http://cgit.krebsco.de/kirk";
sha256 = "1acsmmc485c54axpy9bd0320j18hs261vl1vdxns4n04sxzqd7k0";
rev = "cdf3cb373af8f9b03a9487a63eb32e0226913589";
+ fetchSubmodules = true;
};
isLibrary = true;
isExecutable = true;
@@ -17,5 +18,5 @@ mkDerivation {
executableHaskellDepends = [
async base network optparse-applicative text
];
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
}
diff --git a/krebs/5pkgs/haskell/much.nix b/krebs/5pkgs/haskell/much.nix
index 0a5453c0c..f3aad2ee6 100644
--- a/krebs/5pkgs/haskell/much.nix
+++ b/krebs/5pkgs/haskell/much.nix
@@ -2,9 +2,9 @@
, blaze-builder, blessings, bytestring, case-insensitive
, containers, data-default, deepseq, directory, either
, email-header, fetchgit, filepath, friendly-time, http-types
-, hyphenation, linebreak, network, old-locale, optparse-applicative
-, process, random, rosezipper, safe, scanner, servant-server, split
-, stdenv, terminal-size, text, time, transformers
+, hyphenation, lib, linebreak, network, old-locale
+, optparse-applicative, process, random, rosezipper, safe, scanner
+, servant-server, split, terminal-size, text, time, transformers
, transformers-compat, unix, vector, wai, warp
}:
mkDerivation {
@@ -32,5 +32,5 @@ mkDerivation {
data-default deepseq directory filepath hyphenation linebreak
process rosezipper safe scanner text time transformers unix
];
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
}
diff --git a/krebs/5pkgs/haskell/news.nix b/krebs/5pkgs/haskell/news.nix
index ba5e7a5e1..0274ac8d5 100644
--- a/krebs/5pkgs/haskell/news.nix
+++ b/krebs/5pkgs/haskell/news.nix
@@ -1,5 +1,5 @@
{ mkDerivation, base, bloomfilter, bytestring, feed, fetchgit, lens
-, stdenv, wreq
+, lib, wreq
}:
mkDerivation {
pname = "news";
@@ -14,5 +14,5 @@ mkDerivation {
executableHaskellDepends = [
base bloomfilter bytestring feed lens wreq
];
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
}
diff --git a/krebs/5pkgs/haskell/reaktor2/default.nix b/krebs/5pkgs/haskell/reaktor2/default.nix
index 6a48f865c..d41d8d818 100644
--- a/krebs/5pkgs/haskell/reaktor2/default.nix
+++ b/krebs/5pkgs/haskell/reaktor2/default.nix
@@ -2,7 +2,7 @@
, bytestring, containers, data-default, fetchgit, filepath
, hashable, lens, lens-aeson, network, network-simple
, network-simple-tls, network-uri, pcre-light, process, random
-, servant-server, stdenv, string-conversions, stringsearch, text
+, servant-server, lib, string-conversions, stringsearch, text
, time, transformers, unagi-chan, unix, unordered-containers
, vector, wai, warp
}:
@@ -24,5 +24,5 @@ mkDerivation rec {
random servant-server string-conversions stringsearch text time
transformers unagi-chan unix unordered-containers vector wai warp
];
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
}
diff --git a/krebs/5pkgs/haskell/recht.nix b/krebs/5pkgs/haskell/recht.nix
index 7d884a9fa..bf62d3697 100644
--- a/krebs/5pkgs/haskell/recht.nix
+++ b/krebs/5pkgs/haskell/recht.nix
@@ -1,6 +1,6 @@
{ mkDerivation, ansi-terminal, async, base, binary, bytestring
, data-default, directory, filepath, megaparsec
-, optparse-applicative, pandoc, random, safe, scalpel, stdenv, text
+, optparse-applicative, pandoc, random, safe, scalpel, lib, text
, time
, fetchFromGitHub
}:
@@ -21,5 +21,5 @@ mkDerivation rec {
filepath megaparsec optparse-applicative pandoc random safe scalpel
text time
];
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
}
diff --git a/krebs/5pkgs/haskell/scanner.nix b/krebs/5pkgs/haskell/scanner.nix
index 28f89b069..a317e575e 100644
--- a/krebs/5pkgs/haskell/scanner.nix
+++ b/krebs/5pkgs/haskell/scanner.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, fetchgit, stdenv }:
+{ mkDerivation, base, fetchgit, lib }:
mkDerivation {
pname = "scanner";
version = "1.0.1";
@@ -9,5 +9,5 @@ mkDerivation {
fetchSubmodules = true;
};
libraryHaskellDepends = [ base ];
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
}
diff --git a/krebs/5pkgs/haskell/xmonad-aeson.nix b/krebs/5pkgs/haskell/xmonad-aeson.nix
index 3fccab469..d27f9c783 100644
--- a/krebs/5pkgs/haskell/xmonad-aeson.nix
+++ b/krebs/5pkgs/haskell/xmonad-aeson.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, aeson, base, fetchgit, stdenv, X11-aeson, xmonad }:
+{ mkDerivation, aeson, base, fetchgit, lib, X11-aeson, xmonad }:
mkDerivation {
pname = "xmonad-aeson";
version = "1.0.0";
@@ -9,5 +9,5 @@ mkDerivation {
fetchSubmodules = true;
};
libraryHaskellDepends = [ aeson base X11-aeson xmonad ];
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
}
diff --git a/krebs/5pkgs/haskell/xmonad-stockholm.nix b/krebs/5pkgs/haskell/xmonad-stockholm.nix
index 1b197b914..751f26749 100644
--- a/krebs/5pkgs/haskell/xmonad-stockholm.nix
+++ b/krebs/5pkgs/haskell/xmonad-stockholm.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, containers, fetchgit, filepath, stdenv, unix, X11, X11-xft , X11-xshape, xmonad, xmonad-contrib
+{ mkDerivation, base, containers, fetchgit, filepath, lib, unix, X11, X11-xft , X11-xshape, xmonad, xmonad-contrib
}:
mkDerivation rec {
pname = "xmonad-stockholm";
@@ -11,5 +11,5 @@ mkDerivation rec {
libraryHaskellDepends = [
base containers filepath unix X11 X11-xft X11-xshape xmonad xmonad-contrib
];
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
}
diff --git a/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix b/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix
index b6aee633e..2cbb51845 100644
--- a/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix
+++ b/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
, buildPythonPackage
, fetchPypi
, pytest
@@ -22,7 +22,7 @@ buildPythonPackage rec {
# Package supports 3.x, but tests are clearly 2.x only.
doCheck = !isPy3k;
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Non-validating SQL parser for Python";
longDescription = ''
Provides support for parsing, splitting and formatting SQL statements.
diff --git a/tv/5pkgs/haskell/mailaids.nix b/tv/5pkgs/haskell/mailaids.nix
index b705c7c69..f152a76f4 100644
--- a/tv/5pkgs/haskell/mailaids.nix
+++ b/tv/5pkgs/haskell/mailaids.nix
@@ -1,6 +1,6 @@
{ mkDerivation, aeson, aeson-pretty, base, bytestring
, case-insensitive, fetchgit, lens, optparse-applicative
-, purebred-email, stdenv, text, vector, word8
+, purebred-email, lib, text, vector, word8
}:
mkDerivation {
pname = "mailaids";
@@ -17,5 +17,5 @@ mkDerivation {
aeson aeson-pretty base bytestring case-insensitive lens
optparse-applicative purebred-email text vector word8
];
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
}
diff --git a/tv/5pkgs/haskell/th-env/default.nix b/tv/5pkgs/haskell/th-env/default.nix
index 474a63b85..158fb165a 100644
--- a/tv/5pkgs/haskell/th-env/default.nix
+++ b/tv/5pkgs/haskell/th-env/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, stdenv, template-haskell, text }:
+{ mkDerivation, base, lib, template-haskell, text }:
mkDerivation {
pname = "th-env";
version = "1.0.0";
@@ -6,5 +6,5 @@ mkDerivation {
libraryHaskellDepends = [ base template-haskell text ];
homepage = "https://stackoverflow.com/q/57635686";
license = "unknown";
- hydraPlatforms = stdenv.lib.platforms.none;
+ hydraPlatforms = lib.platforms.none;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 01:47:55 +0000