diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
commit | d4e9fd2a906b5227ae51a522a0708a0b6884ed1c (patch) | |
tree | ca6bb53bb064b71b5ad9bf94dbcc27c47c2d652c /pkgs/development/tools | |
parent | 5c53f22492511d1d8de46ecd8f11fca20f1287fd (diff) | |
parent | 2d03fbf75202272f37bf648d06922c2c624f126a (diff) | |
download | nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.gz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.bz2 nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.lz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.xz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.zst nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.zip |
Merge recent master into staging
Hydra: ?compare=1148749 Conflicts (easy): nixos/modules/virtualisation/containers.nix
Diffstat (limited to 'pkgs/development/tools')
9 files changed, 46 insertions, 28 deletions
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 75c2da8a28de..d62e000fc2a5 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ninja-${version}"; - version = "1.4.0"; + version = "1.5.1"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/martine/ninja/archive/v${version}.tar.gz"; - sha256 = "05y3whnp0fvfv1wsp862x0w1vrn3yjzzg8ypvbpcv6y6qlrsn73h"; + sha256 = "0z9rzay6ipy6q025n1f2im8d8jy6in9pcdsiqj30xpdlsjg7p9zv"; }; buildInputs = [ python asciidoc re2c ]; @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = http://martine.github.io/ninja/; license = licenses.asl20; platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; + maintainers = [ maintainers.thoughtpolice maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix index c8dc299e7d90..213ba6f9d132 100644 --- a/pkgs/development/tools/haskell/cabal-bounds/default.nix +++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix @@ -1,20 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, Cabal, cabalLenses, cmdargs, either, filepath, lens -, strict, tasty, tastyGolden, transformers, unorderedContainers +{ cabal, Cabal, cabalInstall, cabalLenses, cmdargs, either +, filepath, Glob, lens, strict, tasty, tastyGolden, transformers +, unorderedContainers }: cabal.mkDerivation (self: { pname = "cabal-bounds"; - version = "0.8"; - sha256 = "0db5vy4qfjc2d27d4vk37gz9sdjgjlargndligmljf52s2g568r0"; + version = "0.8.4"; + sha256 = "00vj6ca9liqlqg69d4ziacsxz6x9365sbyc1ag6g18bhibyinsh2"; isLibrary = true; isExecutable = true; buildDepends = [ Cabal cabalLenses cmdargs either lens strict transformers unorderedContainers ]; - testDepends = [ filepath tasty tastyGolden ]; + testDepends = [ filepath Glob tasty tastyGolden ]; + buildTools = [ cabalInstall ]; + jailbreak = true; doCheck = false; meta = { description = "A command line program for managing the bounds/versions of the dependencies in a cabal file"; diff --git a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix index af708e40afe4..b58d8d1429bc 100644 --- a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix +++ b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix @@ -18,5 +18,7 @@ cabal.mkDerivation (self: { description = "Analyze and visualize event logs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix index dc5c1f203ba4..8241bf121033 100644 --- a/pkgs/development/tools/haskell/happy-meta/default.nix +++ b/pkgs/development/tools/haskell/happy-meta/default.nix @@ -1,17 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, haskellSrcMeta, mtl }: +{ cabal, happy, haskellSrcMeta, mtl }: cabal.mkDerivation (self: { pname = "happy-meta"; - version = "0.2.0.5"; - sha256 = "103hi87azqv11l8lq1rv0v9v88sl227g31snvkn8db6b4cfrwrxk"; + version = "0.2.0.7"; + sha256 = "12599233lh0ffmvlim0gs5jzg8lly1g11i1cg44lb37bz3l7psh9"; buildDepends = [ haskellSrcMeta mtl ]; + buildTools = [ happy ]; meta = { description = "Quasi-quoter for Happy parsers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/tools/haskell/hdevtools/default.nix b/pkgs/development/tools/haskell/hdevtools/default.nix index 9565478d11b6..350ad216bcab 100644 --- a/pkgs/development/tools/haskell/hdevtools/default.nix +++ b/pkgs/development/tools/haskell/hdevtools/default.nix @@ -1,12 +1,12 @@ -{ cabal, cmdargs, ghcPaths, network, syb, time, fetchpatch }: +{ cabal, cmdargs, ghcPaths, network, syb, time, fetchurl }: cabal.mkDerivation (self: { pname = "hdevtools"; - version = "0.1.0.5"; + version = "0.1.0.6-pre-github-schell-9e34f7dd"; sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7"; isLibrary = false; isExecutable = true; - patches = [ (fetchpatch { url = "https://github.com/bitc/hdevtools/pull/28.patch"; sha256 = "1rlv5zskg4ns9ba791x72gycxrr52lhy8x164q38gpq600gh5n40"; }) ]; + patches = [ (fetchurl { url = "https://github.com/ts468/hdevtools/pull/2.patch"; md5 = "256609d2d3f5b719caa0002ee579d169"; }) ]; buildDepends = [ cmdargs ghcPaths network syb time ]; meta = { homepage = "https://github.com/bitc/hdevtools/"; diff --git a/pkgs/development/tools/haskell/profiteur/default.nix b/pkgs/development/tools/haskell/profiteur/default.nix index 2cc73ca66726..b637e563ffb2 100644 --- a/pkgs/development/tools/haskell/profiteur/default.nix +++ b/pkgs/development/tools/haskell/profiteur/default.nix @@ -18,5 +18,7 @@ cabal.mkDerivation (self: { description = "Treemap visualiser for GHC prof files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 514aa8746c66..8194ffc22a81 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + + # jq is linked to libjq: + configureFlags = [ + "LDFLAGS=-Wl,-rpath,\\\${libdir}" + ]; meta = { inherit (s) version; description = ''A lightweight and flexible command-line JSON processor''; diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index 086f4b5fed33..3402c2060e7f 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "inotify-tools-3.13"; +stdenv.mkDerivation rec { + name = "inotify-tools-${version}"; + version = "3.14"; src = fetchurl { - url = mirror://sourceforge/inotify-tools/inotify-tools/3.13/inotify-tools-3.13.tar.gz; + url = "http://github.com/downloads/rvoicilas/inotify-tools/inotify-tools-${version}.tar.gz"; sha256 = "0icl4bx041axd5dvhg89kilfkysjj86hjakc7bk8n49cxjn4cha6"; }; - meta = { - homepage = http://sourceforge.net/projects/inotify-tools/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + homepage = https://github.com/rvoicilas/inotify-tools/wiki; + license = licenses.gpl2; + maintainers = with maintainers; [ marcweber pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 00b32bed44e5..5ff4f8ec9db7 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -1,13 +1,19 @@ {stdenv, fetchurl }: -stdenv.mkDerivation { - name = "re2c-0.13.6"; +stdenv.mkDerivation rec { + name = "re2c-${version}"; + version = "0.13.7.4"; + src = fetchurl { - url = mirror://sourceforge/re2c/re2c/0.13.6/re2c-0.13.6.tar.gz; - sha256 = "1h3na1zacw3166k6wkdjzjs67frjca9wj07wgfas56c7m8wk0ilf"; + url = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz"; + sha256 = "0j42s2gpz0rgiadwyb7ksqgc7i02l0q2qnmiyaj5f1w5rfa2c7yy"; }; meta = { description = "Tool for writing very fast and very flexible scanners"; + homepage = "http://re2c.org"; + license = stdenv.lib.licenses.publicDomain; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } |