diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 16:55:11 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 16:55:11 +0200 |
commit | f9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (patch) | |
tree | 4c7212dd0f5244a3f09b8dcd5abca15737cffedf /pkgs/development | |
parent | cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f (diff) | |
parent | 4a1189e0abdbe26e34fc05555cf49c25583dfe3d (diff) | |
download | nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.gz nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.bz2 nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.lz nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.xz nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.zst nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/coq-modules/iris/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/coq-modules/stdpp/default.nix | 20 | ||||
-rw-r--r-- | pkgs/development/libraries/clipp/clipp.pc | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/clipp/default.nix | 30 | ||||
-rw-r--r-- | pkgs/development/python-modules/loguru/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/purl/default.nix | 27 | ||||
-rw-r--r-- | pkgs/development/python-modules/requests-mock/default.nix | 26 | ||||
-rw-r--r-- | pkgs/development/tools/misc/kibana/5.x.nix | 45 |
8 files changed, 109 insertions, 69 deletions
diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index ea26f3e1ca9..0718e518b35 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchzip, coq, ssreflect, stdpp }: +{ stdenv, fetchFromGitLab, coq, stdpp }: stdenv.mkDerivation rec { - version = "3.1.0"; + version = "3.2.0"; name = "coq${coq.coq-version}-iris-${version}"; - src = fetchzip { - url = "https://gitlab.mpi-sws.org/FP/iris-coq/-/archive/iris-${version}/iris-coq-iris-${version}.tar.gz"; - sha256 = "0ipdb061jj205avxifshxkpyxxqykigmlxk2n5nvxj62gs3rl5j1"; + src = fetchFromGitLab { + domain = "gitlab.mpi-sws.org"; + owner = "iris"; + repo = "iris"; + rev = "iris-${version}"; + sha256 = "10dfi7qx6j5w6kbmbrf05xh18jwxr9iz5g7y0f6157msgvl081xs"; }; buildInputs = [ coq ]; - propagatedBuildInputs = [ ssreflect stdpp ]; + propagatedBuildInputs = [ stdpp ]; enableParallelBuilding = true; @@ -24,7 +27,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ]; }; } diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 883ed971b08..3ba99e87ffb 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchzip, coq }: +{ stdenv, fetchFromGitLab, coq }: -stdenv.mkDerivation { - name = "coq${coq.coq-version}-stdpp-1.1"; - src = fetchzip { - url = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp/-/archive/coq-stdpp-1.1.0/coq-stdpp-coq-stdpp-1.1.0.tar.gz"; - sha256 = "0z8zl288x9w32w06sjax01jcpy12wd5i3ygps58dl2hfy7r3lwg0"; +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-stdpp-${version}"; + version = "1.2.1"; + src = fetchFromGitLab { + domain = "gitlab.mpi-sws.org"; + owner = "iris"; + repo = "stdpp"; + rev = "coq-stdpp-${version}"; + sha256 = "1lczybg1jq9drbi8nzrlb0k199x4n07aawjwfzrl3qqc0w8kmvdz"; }; buildInputs = [ coq ]; @@ -14,7 +18,7 @@ stdenv.mkDerivation { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = { - homepage = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp"; + inherit (src.meta) homepage; description = "An extended “Standard Library” for Coq"; inherit (coq.meta) platforms; license = stdenv.lib.licenses.bsd3; @@ -22,7 +26,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ]; }; } diff --git a/pkgs/development/libraries/clipp/clipp.pc b/pkgs/development/libraries/clipp/clipp.pc new file mode 100644 index 00000000000..38c07e5ba16 --- /dev/null +++ b/pkgs/development/libraries/clipp/clipp.pc @@ -0,0 +1,9 @@ +prefix=@out@ +includedir=${prefix}/include + +Name: @pname@ +Description: Easy to use, powerful and expressive command line argument \ +handling for C++11/14/17 +URL: https://github.com/muellan/clipp +Version: @version@ +Cflags: -I${includedir} diff --git a/pkgs/development/libraries/clipp/default.nix b/pkgs/development/libraries/clipp/default.nix new file mode 100644 index 00000000000..f7c8f90e868 --- /dev/null +++ b/pkgs/development/libraries/clipp/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "clipp"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "muellan"; + repo = pname; + rev = "v${version}"; + sha256 = "0rq80ba2krwzvcg4r2g1al88453c7lz6ziri2s1ygv8inp9r775s"; + }; + + installPhase = '' + mkdir -p $out/share/pkgconfig + cp -r include $out/ + substitute ${./clipp.pc} $out/share/pkgconfig/clipp.pc \ + --subst-var out \ + --subst-var pname \ + --subst-var version + ''; + + meta = with stdenv.lib; { + description = "Easy to use, powerful and expressive command line argument handling for C++11/14/17"; + homepage = "https://github.com/muellan/clipp"; + license = licenses.mit; + maintainers = with maintainers; [ xbreak ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index c06f5d6cd08..67134fdfd95 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.3.1"; + version = "0.3.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "14pmxyx4kwyafdifqzal121mpdd89lxbjgn0zzi9z6fmzk6pr5h2"; + sha256 = "0apd3wcjbyhwzgw0fgzzn4dcgy10pqa8f1vf58d4hmszxvyqn4z3"; }; checkInputs = [ pytest colorama ]; diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix new file mode 100644 index 00000000000..43fd5b71ca6 --- /dev/null +++ b/pkgs/development/python-modules/purl/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, nose +, six +}: + +buildPythonPackage rec { + pname = "purl"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "codeinthehole"; + repo = "purl"; + rev = version; + sha256 = "0vi7xdm2xc1rbqrz5jwpr7x7dnkcrbjf1mb4w1q2c2f8jca0kk0g"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ nose ]; + + meta = with lib; { + description = "Immutable URL class for easy URL-building and manipulation"; + homepage = "https://github.com/codeinthehole/purl"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 3ea1bf58d8a..9728639e0ef 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -1,21 +1,33 @@ -{ buildPythonPackage, fetchPypi, python -, mock, testrepository, testtools -, requests, six }: +{ lib, buildPythonPackage, fetchPypi, python +, mock +, purl +, requests +, six +, testrepository +, testtools +}: buildPythonPackage rec { pname = "requests-mock"; - version = "1.5.2"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "7a5fa99db5e3a2a961b6f20ed40ee6baeff73503cf0a553cc4d679409e6170fb"; + sha256 = "0ij6ir5cy0gpy5xw4sykxz320ndi26np6flx9yg9mimkv0nl1lw8"; }; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf ''; - checkInputs = [ mock testrepository testtools ]; - propagatedBuildInputs = [ requests six ]; + + checkInputs = [ mock purl testrepository testtools ]; + + meta = with lib; { + description = "Mock out responses from the requests package"; + homepage = "https://requests-mock.readthedocs.io"; + license = licenses.asl20; + maintainers = [ ]; + }; } diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix deleted file mode 100644 index 992d12ae08e..00000000000 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, makeWrapper, fetchurl, elk5Version, nodejs, coreutils, which }: - -with stdenv.lib; -let - inherit (builtins) elemAt; - archOverrides = { - i686 = "x86"; - }; - info = splitString "-" stdenv.hostPlatform.system; - arch = (elemAt info 0); - elasticArch = archOverrides.${arch} or arch; - plat = elemAt info 1; - shas = { - x86_64-linux = "0hzr47hyw54b9j4c33n6f6n3pala6kjhyvinfszgikbghyhb7fsa"; - i686-linux = "0bka4h31cw10ii4pfygc81pwc3wr32pzw3v4k4bi8rnqbk280fmn"; - x86_64-darwin = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll"; - }; -in stdenv.mkDerivation rec { - pname = "kibana"; - version = elk5Version; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${elasticArch}.tar.gz"; - sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); - }; - - buildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/libexec/kibana $out/bin - mv * $out/libexec/kibana/ - rm -r $out/libexec/kibana/node - makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ - --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" - sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana - ''; - - meta = { - description = "Visualize logs and time-stamped data"; - homepage = http://www.elasticsearch.org/overview/kibana; - license = licenses.asl20; - maintainers = with maintainers; [ offline ]; - platforms = with platforms; unix; - }; -} |