summaryrefslogtreecommitdiffstats
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/libasr/default.nix4
-rw-r--r--pkgs/development/libraries/liblaxjson/default.nix23
-rw-r--r--pkgs/development/libraries/ncurses/default.nix5
-rw-r--r--pkgs/development/libraries/openssl/1.0.2.x.nix4
-rw-r--r--pkgs/development/libraries/tk/8.5.nix11
-rw-r--r--pkgs/development/libraries/tk/8.6.nix13
-rw-r--r--pkgs/development/libraries/tk/generic.nix (renamed from pkgs/development/libraries/tk/default.nix)9
7 files changed, 57 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix
index b919aef5658c..2f4a122d61e8 100644
--- a/pkgs/development/libraries/libasr/default.nix
+++ b/pkgs/development/libraries/libasr/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libasr-${version}";
- version= "1.0.1";
+ version= "1.0.2";
src = fetchurl {
url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
- sha256 = "10h1c9b58msbggns8k2m0857zmbldb0x8ghk3aay88yn2bip2916";
+ sha256 = "0d4blm0kzdhb75fq8sbcpvkc25lv5dbjaxa2ldniaf39633d3xd6";
};
buildInputs = [ libevent openssl ];
diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix
new file mode 100644
index 000000000000..cafd6a66aa00
--- /dev/null
+++ b/pkgs/development/libraries/liblaxjson/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ version = "1.0.5";
+ name = "liblaxjson-${version}";
+
+ src = fetchFromGitHub {
+ owner = "andrewrk";
+ repo = "liblaxjson";
+ rev = "${version}";
+ sha256 = "01iqbpbhnqfifhv82m6hi8190w5sdim4qyrkss7z1zyv3gpchc5s";
+ };
+
+ buildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ description = "Library for parsing JSON config files";
+ homepage = https://github.com/andrewrk/liblaxjson;
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.andrewrk ];
+ };
+}
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 15e711b096bb..36cc4d55933d 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -107,5 +107,8 @@ stdenv.mkDerivation rec {
maintainers = [ lib.maintainers.wkennington ];
};
- passthru.ldflags = "-lncurses";
+ passthru = {
+ ldflags = "-lncurses";
+ inherit unicode abiVersion;
+ };
}
diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix
index a1645189161a..944a531ae9c3 100644
--- a/pkgs/development/libraries/openssl/1.0.2.x.nix
+++ b/pkgs/development/libraries/openssl/1.0.2.x.nix
@@ -2,7 +2,7 @@
, withCryptodev ? false, cryptodevHeaders }:
let
- name = "openssl-1.0.2a";
+ name = "openssl-1.0.2c";
opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
(throw "openssl needs its platform name cross building" null)
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
"http://www.openssl.org/source/${name}.tar.gz"
"http://openssl.linux-mirror.org/source/${name}.tar.gz"
];
- sha256 = "0jijgzf72659pikms2bc5w31h78xrd1h5zp2r01an2h340y3kdhm";
+ sha256 = "10vasdg52qiyqvgbp14n9z7ghglmhzvag9qpiz2nfqssycvvlf00";
};
patches = (patchesCross false) ++ extraPatches;
diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix
new file mode 100644
index 000000000000..c3396dcdad22
--- /dev/null
+++ b/pkgs/development/libraries/tk/8.5.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchurl, tcl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+
+ src = fetchurl {
+ url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
+ sha256 = "0an3wqkjzlyyq6l9l3nawz76axsrsppbyylx0zk9lkv7llrala03";
+ };
+
+})
+
diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix
new file mode 100644
index 000000000000..110151227bdd
--- /dev/null
+++ b/pkgs/development/libraries/tk/8.6.nix
@@ -0,0 +1,13 @@
+{ callPackage, fetchurl, tcl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+
+ src = fetchurl {
+ url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
+ sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
+ };
+
+ patches = [ ./different-prefix-with-tcl.patch ];
+
+})
+
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/generic.nix
index a847f848a02a..c3bab0b2f868 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -1,14 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }:
+{ stdenv, src, pkgconfig, tcl, libXft, fontconfig, patches ? [], ... }:
stdenv.mkDerivation {
name = "tk-${tcl.version}";
- src = fetchurl {
- url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
- sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
- };
-
- patches = [ ./different-prefix-with-tcl.patch ];
+ inherit src patches;
postInstall = ''
ln -s $out/bin/wish* $out/bin/wish