diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
| commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
| tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/libraries/db | |
| parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
| parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
| download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip | |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/db')
5 files changed, 11 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/db/db-4.8.nix b/nixpkgs/pkgs/development/libraries/db/db-4.8.nix index dc668a233b06..5cf9200a9ab9 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-4.8.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-4.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, ... } @ args: import ./generic.nix (args // { version = "4.8.30"; diff --git a/nixpkgs/pkgs/development/libraries/db/db-5.3.nix b/nixpkgs/pkgs/development/libraries/db/db-5.3.nix index 1223cb897e86..0bb5c4cd6a4a 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-5.3.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-5.3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, ... } @ args: import ./generic.nix (args // { version = "5.3.28"; diff --git a/nixpkgs/pkgs/development/libraries/db/db-6.0.nix b/nixpkgs/pkgs/development/libraries/db/db-6.0.nix index 642054b5a018..49935dd2399b 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-6.0.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-6.0.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, ... } @ args: import ./generic.nix (args // { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/nixpkgs/pkgs/development/libraries/db/db-6.2.nix b/nixpkgs/pkgs/development/libraries/db/db-6.2.nix index dee07a9637e6..b2c0fd7ac8fc 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-6.2.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-6.2.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, ... } @ args: import ./generic.nix (args // { version = "6.2.23"; sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/nixpkgs/pkgs/development/libraries/db/generic.nix b/nixpkgs/pkgs/development/libraries/db/generic.nix index f439113efb3a..a564db369fba 100644 --- a/nixpkgs/pkgs/development/libraries/db/generic.nix +++ b/nixpkgs/pkgs/development/libraries/db/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , cxxSupport ? true , compat185 ? true , dbmSupport ? false @@ -6,7 +6,7 @@ # Options from inherited versions , version, sha256 , extraPatches ? [ ] -, license ? stdenv.lib.licenses.sleepycat +, license ? lib.licenses.sleepycat , drvArgs ? {} }: @@ -27,8 +27,8 @@ stdenv.mkDerivation (rec { (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") ] - ++ stdenv.lib.optional dbmSupport "--enable-dbm" - ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + ++ lib.optional dbmSupport "--enable-dbm" + ++ lib.optional stdenv.isFreeBSD "--with-pic"; preConfigure = '' cd build_unix @@ -47,7 +47,7 @@ stdenv.mkDerivation (rec { make examples_c examples_cxx ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html"; description = "Berkeley DB"; license = license; |