diff options
14 files changed, 94 insertions, 31 deletions
diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index ad0d5c636f36..efeb23b3e83d 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -3,7 +3,7 @@ bundlerApp { pname = "timetrap"; gemdir = ./.; - exes = [ "timetrap" ]; + exes = [ "t" "timetrap" ]; meta = with lib; { description = "A simple command line time tracker written in ruby"; diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 8f017e0e2ced..d25cd9fee770 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, gmp, ncurses5, lib }: +{ stdenv, pkgs, fetchurl, zlib, gmp, ncurses5, lib }: # from justinwoo/easy-purescript-nix # https://github.com/justinwoo/easy-purescript-nix/blob/d383972c82620a712ead4033db14110497bc2c9c/purs.nix @@ -50,6 +50,11 @@ in stdenv.mkDerivation rec { mkdir -p $out/etc/bash_completion.d/ $PURS --bash-completion-script $PURS > $out/etc/bash_completion.d/purs-completion.bash ''; + + passthru.tests = { + minimal-module = pkgs.callPackage ./test-minimal-module {}; + }; + meta = with stdenv.lib; { description = "A strongly-typed functional programming language that compiles to JavaScript"; homepage = http://www.purescript.org/; diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js new file mode 100644 index 000000000000..a3547e206b7c --- /dev/null +++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js @@ -0,0 +1,8 @@ +"use strict" + +exports.log = function (s) { + return function () { + console.log(s); + return {}; + }; +}; diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs new file mode 100644 index 000000000000..8bf5a23f3469 --- /dev/null +++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs @@ -0,0 +1,9 @@ +module Main where + +foreign import data Effect :: Type -> Type +data Unit = Unit + +foreign import log :: String -> Effect Unit + +main :: Effect Unit +main = log "hello world" diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix b/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix new file mode 100644 index 000000000000..5f01298960cd --- /dev/null +++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix @@ -0,0 +1,11 @@ +{ runCommand, purescript, nodejs }: + +runCommand "purescript-test-minimal-module" {} '' + ${purescript}/bin/purs compile -o ./output ${./.}/Main.purs + + echo 'require("./output/Main/index.js").main()' > node.js + + ${nodejs}/bin/node node.js | grep "hello world" || echo "did not output hello world" + + touch $out +'' diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 045790b9bc2d..97ecb5a1127f 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "avro"; - version = "1.8.2"; + version = "1.9.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8f9ee40830b70b5fb52a419711c9c4ad0336443a6fba7335060805f961b04b59"; + sha256 = "0af72fcql34v30cvjqm9nmz68rl35znn5qbd4k3b9ks02xzy3b2y"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 393285636b60..2d1ca0d5f787 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "3.53.0"; + version = "3.54.0"; src = fetchPypi { inherit pname version; - sha256 = "026apwkjn83la7jm0azz3qajg26nza3gh49zd37j0rsp6cgmfa24"; + sha256 = "09dbj04r55hnm8zvfz8wbnxkxb1pfy7g43pzcgs4hhh5xh45ppfd"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 77a6f9b04088..50a6dbf40df6 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -4,30 +4,30 @@ , six , monotonic , testtools -, python , isPy3k +, nose +, futures }: buildPythonPackage rec { pname = "fasteners"; - version = "0.14.1"; + version = "0.15"; src = fetchPypi { inherit pname version; - sha256 = "063y20kx01ihbz2mziapmjxi2cd0dq48jzg587xdsdp07xvpcz22"; + sha256 = "3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef"; }; - propagatedBuildInputs = [ six monotonic testtools ]; + propagatedBuildInputs = [ six monotonic ]; + + checkInputs = [ testtools nose ] ++ stdenv.lib.optionals (!isPy3k) [ futures ]; checkPhase = '' - ${python.interpreter} -m unittest discover + nosetests ''; - # Tests are written for Python 3.x only (concurrent.futures) - doCheck = isPy3k; - meta = with stdenv.lib; { - description = "Fasteners"; + description = "A python package that provides useful locks"; homepage = https://github.com/harlowja/fasteners; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index c03590f8de88..a5c351502683 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-tornado"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0jv7jhq6ddhsmnz67vc76r4kwac9k5a142968zppyw9av6qalbl4"; + sha256 = "0ncaq7icijls6qh66kv19w3i9av2wnmaycfr4yadyybajr8yvffz"; }; # package has no tests diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index f170780b6e3f..262a3d31742a 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -1,29 +1,32 @@ { stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform -, CoreServices, Security +, CoreServices, Security, cf-private }: rustPlatform.buildRustPackage rec { - name = "cargo-web-${version}"; - version = "0.6.23"; + pname = "cargo-web"; + version = "0.6.25"; src = fetchFromGitHub { owner = "koute"; - repo = "cargo-web"; + repo = pname; rev = version; - sha256 = "1qbi3z4x39il07xlhfvq5ckzjqrf0yf6p8qidf24fp92gb940zxr"; + sha256 = "0q77bryc7ap8gb4rzp9xk8ngqwxh106qn7899g30lwxycnyii0mf"; }; - cargoSha256 = "1ysp8y0s0ha5gffwkra2vd1qh5wmfy1678k9hsfals0ww2f79wii"; + cargoSha256 = "1f4sj260q4rlzbajwimya1yhh90hmmbhr47yfg9i8xcv5cg0cqjn"; nativeBuildInputs = [ openssl perl pkgconfig ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + CoreServices Security + # Needed for CFURLResourceIsReachable symbols. + cf-private + ]; meta = with stdenv.lib; { description = "A Cargo subcommand for the client-side Web"; homepage = https://github.com/koute/cargo-web; - license = with licenses; [asl20 /* or */ mit]; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.kevincox ]; - broken = stdenv.isDarwin; # test with CoreFoundation 10.11 platforms = platforms.all; }; } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index a8f4336cf71e..42e8f26970f5 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.10.1"; + version = "11.11.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "120gpyim54mc8z84gzpbms5hkg2xg4sgzdvkrn1fis9myvd55bav"; + sha256 = "0h35y3ifqqsirkbgg75jj30n1ggyyncbwjnnxwdhc3r9hbbc545y"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "0qfqsi1fm94sxv7g975fw0av871f677rp48yv8q5669ipm16n9qk"; + sha256 = "1lphzy5xxyc4qgmnf7rrplida2zdn2mfl9p9fr3gyjs7gbcr92d7"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1nxv783rdzdwm0qq3li893p7q3n8gg7abla2961f3n735gjlnibx"; + sha256 = "0i45p4z8f7ggdh7624473d8qhz7d75hlhz98p3z69dggx38vv49y"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 66941ca281ef..6dfda2bbfe6c 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -44,7 +44,7 @@ buildGoPackage rec { postBuild = '' # depends on buildGoPackage not changing … pushd ./go/src/${goPackagePath} - make install-docs MANINSTALLDIR="$man" + make install-docs MANINSTALLDIR="$man/share/man" popd ''; diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix new file mode 100644 index 000000000000..63bded64a36e --- /dev/null +++ b/pkgs/servers/monitoring/loki/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + version = "0.1.0"; + name = "grafana-loki-${version}"; + goPackagePath = "github.com/grafana/loki"; + + doCheck = true; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "grafana"; + repo = "loki"; + sha256 = "18iysr8p84vd1sdjdnpc9cydd5rpw0azdjzpz8yjqhscqw9gk4w2"; + }; + + meta = with stdenv.lib; { + description = "Like Prometheus, but for logs."; + license = licenses.asl20; + homepage = https://grafana.com/loki; + maintainers = with maintainers; [ willibutz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43bda3342a36..5c494496641c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7966,6 +7966,7 @@ in cargo-web = callPackage ../development/tools/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; + inherit (darwin) cf-private; }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; @@ -14196,6 +14197,8 @@ in grafana = callPackage ../servers/monitoring/grafana { }; + grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; h2o = callPackage ../servers/http/h2o { }; |