summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/compilers/go/1.8.nix4
-rw-r--r--pkgs/development/compilers/go/1.9.nix4
-rw-r--r--pkgs/development/ocaml-modules/eliom/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/lambda-term/1.6.nix4
-rw-r--r--pkgs/development/ocaml-modules/lwt/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/lwt_react/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/ocsigen-server/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/ojquery/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/react/default.nix22
-rw-r--r--pkgs/development/ocaml-modules/reactivedata/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/zed/default.nix4
-rw-r--r--pkgs/development/python-modules/devpi-common/default.nix26
-rw-r--r--pkgs/development/tools/analysis/snowman/default.nix6
-rw-r--r--pkgs/development/tools/devpi-client/default.nix24
-rw-r--r--pkgs/development/tools/ocaml/utop/default.nix2
15 files changed, 69 insertions, 51 deletions
diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix
index 8a675b1b7761..838032c96984 100644
--- a/pkgs/development/compilers/go/1.8.nix
+++ b/pkgs/development/compilers/go/1.8.nix
@@ -25,13 +25,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "go";
     rev = "go${version}";
-    sha256 = "0g83xm9gb872rsqzwqr1zw5szq69xhynljj2nglg4yyfi7dm2r1c";
+    sha256 = "0p0m63y39pja3fkj43sdq0qv8kqljkz7d58bf9jbw0rjw2c9ml4a";
   };
 
   # perl is used for testing go vet
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index 49ac9feff806..a90985c2525a 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -25,13 +25,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.9";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "go";
     rev = "go${version}";
-    sha256 = "06k66x387r93m7d3bd5yzwdm8f8xc43cdjfamqldfc1v8ngak0y9";
+    sha256 = "1p226lgsmiwgcvmiakac9i08304cq5ick23vmsk1vjcsh6dvz9i3";
   };
 
   # perl is used for testing go vet
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 63e256b60958..b981aa548e0b 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
-  js_of_ocaml, ocaml_react, lwt, calendar, cryptokit, tyxml,
+  js_of_ocaml, react, lwt, calendar, cryptokit, tyxml,
   ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
   reactivedata, opam, ppx_tools, ppx_deriving, findlib
 , ocamlbuild
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec
 
   propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
                             ocsigen_deriving js_of_ocaml
-                            calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ];
+                            calendar cryptokit ocamlnet react ocaml_ssl ocaml_pcre ];
 
   installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
 
diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix
index f8e79d566d44..c0532ff03259 100644
--- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix
+++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, ocaml_react, zed, camlp4 }:
+{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, react, zed, camlp4 }:
 
 stdenv.mkDerivation rec {
   version = "1.6";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09";
   };
 
-  buildInputs = [ libev ocaml findlib ocamlbuild lwt ocaml_react ];
+  buildInputs = [ libev ocaml findlib ocamlbuild lwt react ];
 
   propagatedBuildInputs = [ camlp4 zed ];
 
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 99438cfc20c5..262fef763d89 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
-, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
+, react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
 , ppx_tools, result, cppo
 , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
 , version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0"
@@ -31,7 +31,7 @@ buildOcaml rec {
   ++ stdenv.lib.optional ppxSupport ppx_tools;
 
   propagatedBuildInputs = [ result ]
-  ++ optionals [ ocaml_react ocaml_ssl ]
+  ++ optionals [ react ocaml_ssl ]
   ++ [ libev ];
 
   configureScript = "ocaml setup.ml -configure";
diff --git a/pkgs/development/ocaml-modules/lwt_react/default.nix b/pkgs/development/ocaml-modules/lwt_react/default.nix
index 022a60dcc66f..4d505b23ae0e 100644
--- a/pkgs/development/ocaml-modules/lwt_react/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_react/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, ocaml_react }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, react }:
 
 stdenv.mkDerivation rec {
 	version = "1.0.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
 	buildInputs = [ ocaml findlib ocamlbuild ];
 
-	propagatedBuildInputs = [ lwt ocaml_react ];
+	propagatedBuildInputs = [ lwt react ];
 
 	createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index c8e60015d013..39375bc8ea1c 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl,
+{stdenv, fetchurl, ocaml, findlib, which, react, ocaml_ssl,
 lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
 libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
 , camlzip, pgocaml
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
   };
 
-  buildInputs = [ocaml which findlib ocaml_react ocaml_ssl lwt
+  buildInputs = [ocaml which findlib react ocaml_ssl lwt
   ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
   ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ];
 
diff --git a/pkgs/development/ocaml-modules/ojquery/default.nix b/pkgs/development/ocaml-modules/ojquery/default.nix
index 6e9ca15fb382..2d697a285fd3 100644
--- a/pkgs/development/ocaml-modules/ojquery/default.nix
+++ b/pkgs/development/ocaml-modules/ojquery/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, ocaml_react }:
+{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, react }:
 
 stdenv.mkDerivation rec {
   version = "0.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ ocaml findlib ocamlbuild js_of_ocaml-camlp4 camlp4 ];
-  propagatedBuildInputs = [ js_of_ocaml lwt3 ocaml_react ];
+  propagatedBuildInputs = [ js_of_ocaml lwt3 react ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix
index 2dffbcf440f9..5a720aead806 100644
--- a/pkgs/development/ocaml-modules/react/default.nix
+++ b/pkgs/development/ocaml-modules/react/default.nix
@@ -1,29 +1,19 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }:
+{ stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild, opam }:
 
 stdenv.mkDerivation {
-  name = "ocaml-react-1.2.0";
+  name = "ocaml-react-1.2.1";
 
   src = fetchurl {
-    url = http://erratique.ch/software/react/releases/react-1.2.0.tbz;
-    sha256 = "0knhgbngphv5sp1yskfd97crf169qhpc0igr6w7vqw0q36lswyl8";
+    url = http://erratique.ch/software/react/releases/react-1.2.1.tbz;
+    sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v";
   };
 
   unpackCmd = "tar xjf $src";
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
+  buildInputs = [ ocaml findlib topkg ocamlbuild opam ];
 
   createFindlibDestdir = true;
 
-  configurePhase = "ocaml pkg/git.ml";
-  buildPhase     = "ocaml pkg/build.ml native=true native-dynlink=true";
-
-  installPhase   =
-  let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
-  in
-   ''
-    opam-installer --script --prefix=$out react.install > install.sh
-    sed -i s!lib/react!lib/ocaml/${ocamlVersion}/site-lib/react! install.sh
-    sh install.sh
-  '';
+  inherit (topkg) buildPhase installPhase;
 
   meta = with stdenv.lib; {
     homepage = http://erratique.ch/software/react;
diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix
index 828a3fb60683..1f1781f5a65b 100644
--- a/pkgs/development/ocaml-modules/reactivedata/default.nix
+++ b/pkgs/development/ocaml-modules/reactivedata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opam }:
 
 assert stdenv.lib.versionAtLeast ocaml.version "3.11";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ocaml_react];
+  propagatedBuildInputs = [ react ];
 
   buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
 
diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix
index 410d5c0c612b..72ff8e4c0497 100644
--- a/pkgs/development/ocaml-modules/zed/default.nix
+++ b/pkgs/development/ocaml-modules/zed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, ocaml_react }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react }:
 
 stdenv.mkDerivation rec {
   version = "1.4";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ocaml_react ];
+  buildInputs = [ ocaml findlib ocamlbuild react ];
 
   propagatedBuildInputs = [ camomile ];
 
diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix
new file mode 100644
index 000000000000..971d53e3dddd
--- /dev/null
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, pythonPackages }:
+
+with pythonPackages;buildPythonPackage rec {
+  pname = "devpi-common";
+  version = "3.2.0rc1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ws35g1r0j2xccsna4r6fc9a08przfi28kf9hciq3rmd6ndbr9c9";
+  };
+
+  propagatedBuildInputs = [ requests py ];
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/devpi/devpi;
+    description = "Utilities jointly used by devpi-server and devpi-client";
+    license = licenses.mit;
+    maintainers = with maintainers; [ lewo makefu ];
+  };
+}
diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix
index f21e9bba3f7f..2caadfc62667 100644
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -6,13 +6,13 @@ assert qtbase != null -> qt4 == null;
 
 stdenv.mkDerivation rec {
   name = "snowman-${version}";
-  version = "2017-07-22";
+  version = "2017-08-13";
 
   src = fetchFromGitHub {
     owner = "yegord";
     repo = "snowman";
-    rev = "6c4d9cceb56bf2fd0f650313131a2240579d1bea";
-    sha256 = "1d0abh0fg637jksk7nl4yl54b4cadinj93qqvsm138zyx7h57xqf";
+    rev = "cd9edcddf873fc40d7bcb1bb1eae815faedd3a03";
+    sha256 = "10f3kd5m5xw7hqh92ba7dcczwbznxvk1qxg0yycqz7y9mfr2282n";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index f724b65dd823..9da88f6c63d8 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, fetchurl, pythonPackages, glibcLocales} :
+{ stdenv, pythonPackages, glibcLocales} :
 
 pythonPackages.buildPythonApplication rec {
-  name = "devpi-client-${version}";
-  version = "2.7.0";
+  name = "${pname}-${version}";
+  pname = "devpi-client";
+  version = "3.1.0rc1";
 
-  src = fetchurl {
-    url = "mirror://pypi/d/devpi-client/${name}.tar.gz";
-    sha256 = "0z7vaf0a66n82mz0vx122pbynjvkhp2mjf9lskgyv09y3bxzzpj3";
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
+    sha256 = "0kfyva886k9zxmilqb2yviwqzyvs3n36if3s56y4clbvw9hr2lc3";
   };
-
-  doCheck = false;
+  # requires devpi-server which is currently not packaged
+  doCheck = true;
+  checkInputs = with pythonPackages; [ pytest webtest mock ];
+  checkPhase = "py.test";
 
   LC_ALL = "en_US.UTF-8";
-  buildInputs = with pythonPackages; [ glibcLocales tox check-manifest pkginfo ];
-
-  propagatedBuildInputs = with pythonPackages; [ py devpi-common ];
+  buildInputs = with pythonPackages; [ glibcLocales pkginfo tox check-manifest ];
+  propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy ];
 
   meta = {
     homepage = http://doc.devpi.net;
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 0f73f4c54afc..404bf08e74ee 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4, ocaml_react
+{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4
 , lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper
 }:
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-18 15:20:15 +0000