diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-05 00:56:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-05 00:56:58 +0000 |
commit | 0e4e47512d709e93c35fa575dd82e3e6ce4f884d (patch) | |
tree | 937091db4b8e386f917648baf773d2dd51ab2973 /pkgs/development | |
parent | e1ed9b3b0851b95d3e82fb1085a121531c32a42a (diff) | |
parent | a43963db12774a01af9159981d877bb8326463ca (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/evcxr/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/ppx_import/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/python-modules/flufl/i18n.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/rust/racer/default.nix | 29 |
4 files changed, 28 insertions, 26 deletions
diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index a97f132b3b2f..59abf36f7ac0 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-QpUhUE65/IuT/VenziPX6z+CbJswbPPIv/ZnTthZpEU="; + sha256 = "sha256-33XeepqwYmTMcObroPTuxykYuM9qYI1+LV5lZIFSomg="; }; - cargoSha256 = "sha256-iUzVd4XtD+41yTV/BmqWLenzAUNPfS7vIHm1KfuPe9A="; + cargoSha256 = "sha256-tjCID3YeGkxcq/LqJDMHGNpv1MCXKtcLlDnNkFwx1zU="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index f4977992759d..b5651a8cec2a 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -1,24 +1,27 @@ { lib, fetchurl, buildDunePackage, ocaml , ounit, ppx_deriving, ppx_tools_versioned +, ppxlib, ocaml-migrate-parsetree }: -if !lib.versionAtLeast ocaml.version "4.04" -then throw "ppx_import is not available for OCaml ${ocaml.version}" -else - buildDunePackage rec { pname = "ppx_import"; version = "1.7.1"; + useDune2 = true; + + minimumOCamlVersion = "4.04"; + src = fetchurl { url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-v${version}.tbz"; sha256 = "16dyxfb7syz659rqa7yq36ny5vzl7gkqd7f4m6qm2zkjc1gc8j4v"; }; - buildInputs = [ ounit ppx_deriving ]; - propagatedBuildInputs = [ ppx_tools_versioned ]; + propagatedBuildInputs = [ + ppxlib ppx_tools_versioned ocaml-migrate-parsetree + ]; doCheck = true; + checkInputs = [ ounit ppx_deriving ]; meta = { description = "A syntax extension that allows to pull in types or signatures from other compiled interface files"; diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix index b980449661ee..8b0c98635507 100644 --- a/pkgs/development/python-modules/flufl/i18n.nix +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "flufl.i18n"; - version = "3.1.3"; + version = "3.1.4"; propagatedBuildInputs = [ atpublic ]; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "dcca738be27f2c43ddf6f9307667a17478353190071f38a9f92c9af8d2252ba4"; + sha256 = "e19036292a825a69f0e0a87566d1628830c69eecd3b0295d22f582039477a6bb"; }; } diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 86f1989729eb..7de30855dd37 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "racer"; - version = "2.1.35"; + version = "2.1.40"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; rev = "v${version}"; - sha256 = "0c00b81s7abnadjbf4i39lhdkipx7z44sr8p78jd1fl61yyrspli"; + sha256 = "sha256-8Is+RBfcXKbGSFzYoolLHs30rxlNI//xVGEOhxP2TV8="; }; - cargoSha256 = "1nbp2jp65fqwsq9i04iyi4pbszs035w6id50p5ypw234cqxznikm"; + cargoSha256 = "sha256-iUomr9viCdZk4nV75/OP8vHtJpMbmy+pq1IbaA2lLmE="; nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -19,21 +19,20 @@ rustPlatform.buildRustPackage rec { # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP = 1; - RUST_SRC_PATH = rustPlatform.rustcSrc; + RUST_SRC_PATH = rustPlatform.rustLibSrc; postInstall = '' - wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustcSrc} + wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc} ''; - checkPhase = '' - cargo test -- \ - --skip nameres::test_do_file_search_std \ - --skip util::test_get_rust_src_path_rustup_ok \ - --skip util::test_get_rust_src_path_not_rust_source_tree \ - --skip extern --skip completes_pub_fn --skip find_crate_doc \ - --skip follows_use_local_package --skip follows_use_for_reexport \ - --skip follows_rand_crate --skip get_completion_in_example_dir \ - --skip test_resolve_global_path_in_modules - ''; + checkFlags = [ + "--skip nameres::test_do_file_search_std" + "--skip util::test_get_rust_src_path_rustup_ok" + "--skip util::test_get_rust_src_path_not_rust_source_tree" + "--skip extern --skip completes_pub_fn --skip find_crate_doc" + "--skip follows_use_local_package --skip follows_use_for_reexport" + "--skip follows_rand_crate --skip get_completion_in_example_dir" + "--skip test_resolve_global_path_in_modules" + ]; doInstallCheck = true; installCheckPhase = '' |