diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-10-27 19:58:03 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-10-27 19:58:03 +0300 |
| commit | 067d1cf33067a514489ed6d3953dd348dbdc2233 (patch) | |
| tree | 74dc49535964849be2168f56056439a121f55e85 /pkgs/development/tools | |
| parent | 4b45aa784e2933ac89334622c969870bd0f87650 (diff) | |
| parent | f2b8262e053f6d2ab91cb9e5ead0496e3e4d3eab (diff) | |
| download | nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.tar nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.tar.gz nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.tar.bz2 nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.tar.lz nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.tar.xz nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.tar.zst nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/applications/science/math/sage/sage-src.nix
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/go-junit-report/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/development/tools/minizinc/default.nix | 4 |
2 files changed, 26 insertions, 2 deletions
diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix new file mode 100644 index 000000000000..5e1a69a16929 --- /dev/null +++ b/pkgs/development/tools/go-junit-report/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-junit-report-unstable-${version}"; + version = "2018-06-14"; + rev = "385fac0ced9acaae6dc5b39144194008ded00697"; + + goPackagePath = "github.com/jstemmer/go-junit-report"; + + src = fetchFromGitHub { + inherit rev; + owner = "jstemmer"; + repo = "go-junit-report"; + sha256 = "109zs8wpdmc2ijc2khyqija8imay88ka6v50xvrpnnwnd3ywckxi"; + }; + + meta = with stdenv.lib; { + description = "Converts go test output to an xml report, suitable for applications that expect junit xml reports (e.g. Jenkins)"; + homepage = "https://${goPackagePath}"; + maintainers = with maintainers; [ cryptix ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 8c210cb93601..59f60d4046ad 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, flex, bison }: let - version = "2.2.0"; + version = "2.2.1"; in stdenv.mkDerivation { name = "minizinc-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "${version}"; owner = "MiniZinc"; repo = "libminizinc"; - sha256 = "05is1r5y06jfqwvka90dn2ffxnvbgyswaxl00aqz6455hnggnxvm"; + sha256 = "1i11lan7fqs3lg0s6jfr8sflzwn5nk1ln5j6afjrkrdb08291dr7"; }; # meta is all the information about the package.. |