summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/analysis/cppcheck/default.nix20
-rw-r--r--pkgs/development/tools/build-managers/buildbot/default.nix2
-rw-r--r--pkgs/development/tools/database/sqlitebrowser/default.nix13
-rw-r--r--pkgs/development/tools/galen/default.nix6
-rw-r--r--pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix4
-rw-r--r--pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix4
-rw-r--r--pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix4
7 files changed, 27 insertions, 26 deletions
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 53397786dc49..5955f34b58e9 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45 }:
 
 let
-  name = "cppcheck";
-  version = "1.69";
+  pname = "cppcheck";
+  version = "1.72";
 in
-stdenv.mkDerivation {
-  name = "${name}-${version}";
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
-    sha256 = "0bjkqy4c6ph6nzparcnbxrdn52i3hiind4jc99v2kvsq281wimab";
+    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+    sha256 = "085lm8v7biixy6rykq836gfy91jcccpz9qpk8i9x339dzy2b2q4l";
   };
 
   buildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ];
@@ -22,15 +22,15 @@ stdenv.mkDerivation {
     cp cppcheck.1 $out/share/man/man1/cppcheck.1
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A static analysis tool for C/C++ code";
     longDescription = ''
       Check C/C++ code for memory leaks, mismatching
       allocation-deallocation, buffer overruns and more.
     '';
     homepage = http://cppcheck.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons joachifm ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 99c1352b4fb6..a246044d6f1e 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonApplication, fetchurl, twisted, dateutil, jinja2
-, sqlalchemy , sqlalchemy_migrate_0_7
+, sqlalchemy_migrate_0_7
 , enableDebugClient ? false, pygobject ? null, pyGtkGlade ? null
 }:
 
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index e5c2060b5e9b..338f3323d947 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchzip, qt4, sqlite, cmake }:
+{ stdenv, fetchFromGitHub, qt4, sqlite, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "3.7.0";
+  version = "3.8.0";
   name = "sqlitebrowser-${version}";
 
-  src = fetchzip {
-    name = "${name}-src";
-    url = "https://github.com/sqlitebrowser/sqlitebrowser/archive/v${version}.tar.gz";
-    sha256 = "1zsgylnxk4lyg7p6k6pv8d3mh1k0wkfcplh5c5da3x3i9a3qs78j";
+  src = fetchFromGitHub {
+    repo   = "sqlitebrowser";
+    owner  = "sqlitebrowser";
+    rev    = "v${version}";
+    sha256 = "009yaamf6f654dl796f1gmj3rb34d55w87snsfgk33gpy6x19ccp";
   };
 
   buildInputs = [ qt4 sqlite cmake ];
diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix
index 169c8fdd68a0..7ff283176e1d 100644
--- a/pkgs/development/tools/galen/default.nix
+++ b/pkgs/development/tools/galen/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "galen";
-  version = "2.2.1";
+  version = "2.2.3";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
-    url = "https://github.com/galenframework/galen/releases/download/galen-2.2.1/galen-bin-${version}.zip";
-    sha256 = "0zwrh3bxcgkwip6z9lvy3hn53kfr99cdij64c57ff8d95xilclhb";
+    url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip";
+    sha256 = "13kvxbw68g82rv8bp9g4fkrrsd7nag1a4bspilqi2wnxc51c8mqq";
   };
 
   buildInputs = [ unzip ];
diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
index 68c85fb29515..87dc173dd878 100644
--- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
@@ -6,12 +6,12 @@
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20151217";
+  version = "20160308";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5";
+    sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;
diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
index 7aac407e3ceb..5aa4370b26f9 100644
--- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
@@ -11,8 +11,8 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
-    rev = "v20151217";
-    sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5";
+    rev = "v20160308";
+    sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52";
   };
   postUnpack = "sourceRoot+=/${pname}";
   libraryHaskellDepends = [
diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
index b2b3b46581aa..ce1d9303cdcd 100644
--- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
@@ -7,12 +7,12 @@
 
 mkDerivation rec {
   pname = "hackage2nix";
-  version = "20151217";
+  version = "20160308";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5";
+    sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;