From 6551af69eb9b1865d2797712aeea25b174a738fd Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 19 Jun 2015 15:54:35 +0200 Subject: add tk-8_5 and fix xconq (XHF) --- pkgs/development/libraries/tk/8.5.nix | 11 ++++++++ pkgs/development/libraries/tk/8.6.nix | 13 +++++++++ pkgs/development/libraries/tk/default.nix | 45 ------------------------------- pkgs/development/libraries/tk/generic.nix | 40 +++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 45 deletions(-) create mode 100644 pkgs/development/libraries/tk/8.5.nix create mode 100644 pkgs/development/libraries/tk/8.6.nix delete mode 100644 pkgs/development/libraries/tk/default.nix create mode 100644 pkgs/development/libraries/tk/generic.nix (limited to 'pkgs/development/libraries') 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/default.nix deleted file mode 100644 index a847f848a02a..000000000000 --- a/pkgs/development/libraries/tk/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }: - -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 ]; - - postInstall = '' - ln -s $out/bin/wish* $out/bin/wish - ''; - - preConfigure = '' - cd unix - ''; - - configureFlags = [ - "--with-tcl=${tcl}/lib" - ]; - - buildInputs = [ pkgconfig tcl libXft ] - ++ stdenv.lib.optional stdenv.isDarwin fontconfig; - - NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null; - - inherit tcl; - - passthru = rec { - inherit (tcl) release version; - libPrefix = "tk${tcl.release}"; - libdir = "lib/${libPrefix}"; - }; - - meta = with stdenv.lib; { - description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages"; - homepage = http://www.tcl.tk/; - license = licenses.tcltk; - platforms = platforms.all; - maintainers = with maintainers; [ lovek323 wkennington ]; - }; -} diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix new file mode 100644 index 000000000000..c3bab0b2f868 --- /dev/null +++ b/pkgs/development/libraries/tk/generic.nix @@ -0,0 +1,40 @@ +{ stdenv, src, pkgconfig, tcl, libXft, fontconfig, patches ? [], ... }: + +stdenv.mkDerivation { + name = "tk-${tcl.version}"; + + inherit src patches; + + postInstall = '' + ln -s $out/bin/wish* $out/bin/wish + ''; + + preConfigure = '' + cd unix + ''; + + configureFlags = [ + "--with-tcl=${tcl}/lib" + ]; + + buildInputs = [ pkgconfig tcl libXft ] + ++ stdenv.lib.optional stdenv.isDarwin fontconfig; + + NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null; + + inherit tcl; + + passthru = rec { + inherit (tcl) release version; + libPrefix = "tk${tcl.release}"; + libdir = "lib/${libPrefix}"; + }; + + meta = with stdenv.lib; { + description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages"; + homepage = http://www.tcl.tk/; + license = licenses.tcltk; + platforms = platforms.all; + maintainers = with maintainers; [ lovek323 wkennington ]; + }; +} -- cgit 1.4.1 From 42f88b5ba744ada078f95998c499cc6a3092d0ee Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 16 Jun 2015 02:04:55 -0700 Subject: liblaxjson: init at 1.0.5 --- pkgs/development/libraries/liblaxjson/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/liblaxjson/default.nix (limited to 'pkgs/development/libraries') 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5eb6ce270e0..552694be44ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6794,6 +6794,8 @@ let libLAS = callPackage ../development/libraries/libLAS { }; + liblaxjson = callPackage ../development/libraries/liblaxjson { }; + liblo = callPackage ../development/libraries/liblo { }; liblrdf = librdf; -- cgit 1.4.1 From f5cae290056d15d2580360687060a2ff25692524 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 20 Jun 2015 09:10:19 +0200 Subject: openssl-1.0.2: bug+security upate (Fixes #8415) --- pkgs/development/libraries/openssl/1.0.2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix index 18c533ea1886..528674401919 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) @@ -46,7 +46,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; -- cgit 1.4.1 From db2b0ce90db4343cca9c1755fb85a514be12da05 Mon Sep 17 00:00:00 2001 From: koral Date: Sat, 20 Jun 2015 12:45:26 +0000 Subject: libasr: 1.0.1 -> 1.0.2 --- pkgs/development/libraries/libasr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') 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 ]; -- cgit 1.4.1 From 7907a8bcba6fe50e1f7fa8f8ee6a98df884031ad Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Mon, 22 Jun 2015 14:40:55 +0200 Subject: dialog: init at 1.2-20150225, closes #8457 Generate ncurses dialogs from shell scripts. --- pkgs/development/libraries/ncurses/default.nix | 5 +++- pkgs/development/tools/misc/dialog/default.nix | 41 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/misc/dialog/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index bea4754a1f53..9df56212ad2c 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -160,5 +160,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ wkennington ]; }; - passthru.ldflags = if unicode then "-lncursesw" else "-lncurses"; + passthru = { + ldflags = if unicode then "-lncursesw" else "-lncurses"; + inherit unicode abiVersion; + }; } diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix new file mode 100644 index 000000000000..d70f409f3430 --- /dev/null +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, ncurses, gettext +, withLibrary ? false, libtool +, unicodeSupport ? true +}: + +let optional = stdenv.lib.optional; + optStr = stdenv.lib.optionalString; + buildShared = !stdenv.isDarwin; +in + +assert withLibrary -> libtool != null; +assert unicodeSupport -> ncurses.unicode && ncurses != null; + +stdenv.mkDerivation rec { + name = "dialog-${version}"; + version = "1.2-20150225"; + + src = fetchurl { + url = "ftp://invisible-island.net/dialog/${name}.tgz"; + sha256 = "6844b13a7a1fea568a8d5bb3004e1af90888cd4a5e8c2ded2c38f34fcc7397ff"; + }; + + buildInputs = [ ncurses ]; + + configureFlags = '' + --disable-rpath-hacks + ${optStr withLibrary "--with-libtool"} + --with-libtool-opts=${optStr buildShared "-shared"} + --with-ncurses${optStr unicodeSupport "w"} + ''; + + installTargets = "install${optStr withLibrary "-full"}"; + + meta = { + homepage = http://invisible-island.net/dialog/dialog.html; + description = "Display dialog boxes from shell"; + license = stdenv.lib.licenses.lgpl21Plus; + maintainers = [ stdenv.lib.maintainers.spacefrogg ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 480864fb9e2d..a014ee2b6339 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -827,6 +827,8 @@ let inherit (haskellngPackages) ghcWithPackages diagrams-builder; }; + dialog = callPackage ../development/tools/misc/dialog { }; + direnv = callPackage ../tools/misc/direnv { }; discount = callPackage ../tools/text/discount { }; -- cgit 1.4.1