From 76a8089d96670fbb5dd35edaea7e83877c35a7ad Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Mon, 27 Apr 2015 22:55:54 -0400 Subject: Added standalone diagram-builder haskell package. Simple wrapper over `haskellng`'s `diagram-builder` package that allows for simpler install. --- pkgs/tools/graphics/diagrams-builder/default.nix | 43 ++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/tools/graphics/diagrams-builder/default.nix (limited to 'pkgs/tools') diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix new file mode 100644 index 00000000000..fc7766b403c --- /dev/null +++ b/pkgs/tools/graphics/diagrams-builder/default.nix @@ -0,0 +1,43 @@ +/* + If user need access to more haskell package for building his + diagrams, he simply has to pass these package through the + extra packages function as follow in `config.nix`: + + ~~~ + diagrams-builder.override { + extraPackages = self : [myHaskellPackage]; + } + ­~~~ +*/ + +{ stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }: +let + # Used same technique as for the yiCustom package. + w = ghcWithPackages + (self: [ diagrams-builder ] ++ extraPackages self); + wrappedGhc = w.override { ignoreCollisions = true; }; + ghcVersion = w.version; +in +stdenv.mkDerivation { + name = "diagrams-builder"; + buildInputs = [ makeWrapper ]; + buildCommand = '' + makeWrapper \ + "${diagrams-builder}/bin/diagrams-builder-svg" "$out/bin/diagrams-builder-svg" \ + --set NIX_GHC ${wrappedGhc}/bin/ghc \ + --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion} + + makeWrapper \ + "${diagrams-builder}/bin/diagrams-builder-cairo" "$out/bin/diagrams-builder-cairo" \ + --set NIX_GHC ${wrappedGhc}/bin/ghc \ + --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion} + + makeWrapper \ + "${diagrams-builder}/bin/diagrams-builder-ps" "$out/bin/diagrams-builder-ps" \ + --set NIX_GHC ${wrappedGhc}/bin/ghc \ + --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion} + ''; + # Will be faster to build the wrapper locally then to fetch it from a binary cache. + preferLocalBuild = true; + meta = diagrams-builder.meta; +} \ No newline at end of file -- cgit 1.4.1 From 6119355c9cecbdc8f49abf0b7b4502c78a931d83 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Wed, 29 Apr 2015 21:45:57 -0400 Subject: Simplify standalone `diagrams-builder` expression. --- pkgs/tools/graphics/diagrams-builder/default.nix | 35 ++++++++++++------------ 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix index fc7766b403c..a12e5dbb8bb 100644 --- a/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/pkgs/tools/graphics/diagrams-builder/default.nix @@ -11,32 +11,33 @@ */ { stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }: + let + # Used same technique as for the yiCustom package. - w = ghcWithPackages + wrappedGhc = ghcWithPackages (self: [ diagrams-builder ] ++ extraPackages self); - wrappedGhc = w.override { ignoreCollisions = true; }; - ghcVersion = w.version; + ghcVersion = wrappedGhc.version; + + exeWrapper = backend : '' + makeWrapper \ + "${diagrams-builder}/bin/diagrams-builder-${backend}" "$out/bin/diagrams-builder-${backend}" \ + --set NIX_GHC ${wrappedGhc}/bin/ghc \ + --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion} + ''; + + backends = ["svg" "cairo" "ps"]; + in + stdenv.mkDerivation { name = "diagrams-builder"; + buildInputs = [ makeWrapper ]; - buildCommand = '' - makeWrapper \ - "${diagrams-builder}/bin/diagrams-builder-svg" "$out/bin/diagrams-builder-svg" \ - --set NIX_GHC ${wrappedGhc}/bin/ghc \ - --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion} - makeWrapper \ - "${diagrams-builder}/bin/diagrams-builder-cairo" "$out/bin/diagrams-builder-cairo" \ - --set NIX_GHC ${wrappedGhc}/bin/ghc \ - --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion} + buildCommand = with stdenv.lib; + concatStrings (intersperse "\n" (map exeWrapper backends)); - makeWrapper \ - "${diagrams-builder}/bin/diagrams-builder-ps" "$out/bin/diagrams-builder-ps" \ - --set NIX_GHC ${wrappedGhc}/bin/ghc \ - --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion} - ''; # Will be faster to build the wrapper locally then to fetch it from a binary cache. preferLocalBuild = true; meta = diagrams-builder.meta; -- cgit 1.4.1 From 0db1bb5bda4ae9c5b900402ca6a47eadb5cc3fb2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 May 2015 17:30:20 +0200 Subject: wget: verify cookie domains with libpsl Reduces vulnerability to "supercookie" attacks: --- pkgs/tools/networking/wget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 5a597afd9d3..7c6f815f909 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, libidn , perl, perlPackages, LWP, python3 -, libiconv, gnutls ? null }: +, libiconv, libpsl, gnutls ? null }: stdenv.mkDerivation rec { name = "wget-1.16"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ gettext ]; - buildInputs = [ libidn libiconv ] + buildInputs = [ libidn libiconv libpsl ] ++ stdenv.lib.optionals doCheck [ perl perlPackages.IOSocketSSL LWP python3 ] ++ stdenv.lib.optional (gnutls != null) gnutls ++ stdenv.lib.optional stdenv.isDarwin perl; -- cgit 1.4.1 From d62204a1d2c30a7f963d95da0a152c7b26e23daa Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 7 May 2015 22:47:58 +0200 Subject: s3fs: fix typo in name --- pkgs/tools/filesystems/s3fs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 4c509444b74..c39f5cba775 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}: stdenv.mkDerivation { - name = "sshfs-fuse-1.78"; + name = "s3fs-fuse-1.78"; src = fetchurl { url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.78.tar.gz; sha256 = "1xcp0bqa4a2ynjn5phb1pj70wm322czhqp4qcb27d5jd545b1h1n"; -- cgit 1.4.1 From eb98989cf0e8dc86445408bf07abb2dc7552344d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 8 May 2015 13:19:31 +0200 Subject: Add libcrafter and tracebox --- pkgs/development/libraries/libcrafter/default.nix | 26 +++++++++++++++++++ pkgs/tools/networking/tracebox/default.nix | 31 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 61 insertions(+) create mode 100644 pkgs/development/libraries/libcrafter/default.nix create mode 100644 pkgs/tools/networking/tracebox/default.nix (limited to 'pkgs/tools') diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix new file mode 100644 index 00000000000..e775e9ef63f --- /dev/null +++ b/pkgs/development/libraries/libcrafter/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchzip, autoconf, automake, libtool, libpcap }: + +stdenv.mkDerivation rec { + name = "libcrafter-${version}"; + version = "0.3"; + + src = fetchzip { + url = "https://github.com/pellegre/libcrafter/archive/version-${version}.zip"; + sha256 = "04lpmshh4wb1dav03p6rnskpd1zmmvhv80xwn8v7l8faps5gvjp4"; + }; + + preConfigure = "cd libcrafter"; + + configureScript = "./autogen.sh"; + + configureFlags = [ "--with-libpcap=yes" ]; + + buildInputs = [ autoconf automake libtool ]; + + propagatedBuildInputs = [ libpcap ]; + + meta = { + homepage = https://github.com/pellegre/libcrafter; + description = "High level C++ network packet sniffing and crafting library"; + }; +} diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix new file mode 100644 index 00000000000..8c443282e5c --- /dev/null +++ b/pkgs/tools/networking/tracebox/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }: + +stdenv.mkDerivation rec { + name = "tracebox-${version}"; + version = "0.2"; + + src = fetchzip { + url = "https://github.com/tracebox/tracebox/archive/v${version}.zip"; + sha256 = "0gxdapm6b5a41gymi1f0nr2kyz70vllnk10085yz3pq527gp9gns"; + }; + + buildInputs = [ autoreconfHook libcrafter lua ]; + + configureFlags = [ "--with-lua=yes" ]; + + NIX_LDFLAGS = [ "${libpcap}/lib/libpcap.so" "${libcrafter}/lib/libcrafter.so" ]; + + preAutoreconf = '' + substituteInPlace Makefile.am --replace "noinst" "" + sed '/noinst/d' -i configure.ac + sed '/libcrafter/d' -i src/tracebox/Makefile.am + ''; + + meta = with stdenv.lib; { + homepage = http://www.tracebox.org/; + description = "A middlebox detection tool"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ maintainers.lethalman ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c38feccb510..79b50719bf6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2970,6 +2970,8 @@ let traceroute = callPackage ../tools/networking/traceroute { }; + tracebox = callPackage ../tools/networking/tracebox { }; + trash-cli = callPackage ../tools/misc/trash-cli { }; trickle = callPackage ../tools/networking/trickle {}; @@ -6376,6 +6378,8 @@ let libchardet = callPackage ../development/libraries/libchardet { }; + libcrafter = callPackage ../development/libraries/libcrafter { }; + libuchardet = callPackage ../development/libraries/libuchardet { }; libchop = callPackage ../development/libraries/libchop { }; -- cgit 1.4.1 From c17b2144b42a373366b3d82438b64447bb519fdd Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 8 May 2015 05:50:21 -0700 Subject: tmux: 1.9a -> 2.0 --- pkgs/tools/misc/tmux/default.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 7180665bd3d..f559c77712a 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,24 +1,26 @@ -{stdenv, fetchurl, ncurses, libevent, pkgconfig}: +{ stdenv, fetchurl, ncurses, libevent, pkgconfig }: stdenv.mkDerivation rec { - pname = "tmux"; - version = "1.9a"; - name = "${pname}-${version}"; + name = "tmux-2.0"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "1x9k4wfd4l5jg6fh7xkr3yyilizha6ka8m5b1nr0kw8wj0mv5qy5"; + url = "mirror://sourceforge/tmux/${name}.tar.gz"; + sha256 = "0qnkda8kb747vmbldjpb23ksv9pq3s65xhh1ja5rdsmh8r24npvr"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses libevent ]; - postInstall = - '' - mkdir -p $out/etc/bash_completion.d - cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux - ''; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + postInstall = '' + mkdir -p $out/etc/bash_completion.d + cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux + ''; meta = { homepage = http://tmux.sourceforge.net/; -- cgit 1.4.1