diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2020-03-29 14:08:10 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2020-03-29 14:08:10 +0100 |
commit | 10059e4b71ff132a42c0a793f36e5d07a7e11311 (patch) | |
tree | fefd66fa4622a255fbe2ff5ec14f69a3d9645d88 /pkgs/tools/misc | |
parent | e54a9c85df278e5e0840d3606af49cc6c75b3975 (diff) | |
parent | d04396da8bf320f41a2bd939f2f4eb83a586b3b2 (diff) | |
download | nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.tar nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.tar.gz nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.tar.bz2 nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.tar.lz nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.tar.xz nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.tar.zst nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/parallel-rust/default.nix | 25 | ||||
-rw-r--r-- | pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch | 12 | ||||
-rw-r--r-- | pkgs/tools/misc/tensorman/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/misc/uutils-coreutils/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/vdirsyncer/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/misc/vector/default.nix | 3 |
6 files changed, 8 insertions, 42 deletions
diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix deleted file mode 100644 index 213e8c8e378a..000000000000 --- a/pkgs/tools/misc/parallel-rust/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "parallel-rust"; - version = "0.11.3"; - - src = fetchFromGitHub { - owner = "mmstick"; - repo = "parallel"; - rev = version; - sha256 = "1bb1m3ckkrxlnw9w24ig70bd1zwyrbaw914q3xz5yv43c0l6pn9c"; - }; - - cargoSha256 = "1r5chjhmy6ivhsvgqf75ph1qxa4x7n20f7rb3b6maqpbsc64km9n"; - - patches = [ ./fix_cargo_lock_version.patch ]; - - meta = with stdenv.lib; { - description = "A command-line CPU load balancer written in Rust"; - homepage = https://github.com/mmstick/parallel; - license = licenses.mit; - maintainers = []; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch b/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch deleted file mode 100644 index 75a1ba35e129..000000000000 --- a/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index c01308d..dba3927 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,6 +1,6 @@ - [root] - name = "parallel" --version = "0.11.2" -+version = "0.11.3" - dependencies = [ - "arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", - "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index eca80cbcadf3..85091a41b126 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0ywb53snvymmwh10hm6whckz7dwmpqa4rxiggd24y178jdfrm2ns"; }; - buildInputs = [ pkgconfig openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ]; cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 9c58785e84ea..09c29a0af1fb 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -20,8 +20,8 @@ rustPlatform.buildRustPackage { [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] ++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ cargo sphinx ] ++ lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ cmake cargo sphinx ]; + buildInputs = lib.optional stdenv.isDarwin Security; # empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults buildPhase = ""; diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 52eec555b165..3ee7787a8a45 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -20,7 +20,8 @@ python3Packages.buildPythonApplication rec { inherit src; sourceRoot = "source/rust"; cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d"; - buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 17e764698d52..c441242885e6 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "1al8jzjxjhxwb5n1d52pvl59d11g0bdg2dcw8ir2nclya1w68f2w"; - buildInputs = [ openssl pkg-config protobuf rdkafka ] + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl protobuf rdkafka ] ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ]; # needed for internal protobuf c wrapper library |