diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-07-31 14:08:19 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-07-31 14:08:19 +1000 |
commit | 7d58c271b8ac0070e1a783f31c01682254a4c813 (patch) | |
tree | 3e273c736c9cb315ef8f50cff8b8b0d5b26752b3 | |
parent | afd895debbd40d1d12d2d5de86cc43c1568ec1b4 (diff) | |
download | nixpkgs-7d58c271b8ac0070e1a783f31c01682254a4c813.tar nixpkgs-7d58c271b8ac0070e1a783f31c01682254a4c813.tar.gz nixpkgs-7d58c271b8ac0070e1a783f31c01682254a4c813.tar.bz2 nixpkgs-7d58c271b8ac0070e1a783f31c01682254a4c813.tar.lz nixpkgs-7d58c271b8ac0070e1a783f31c01682254a4c813.tar.xz nixpkgs-7d58c271b8ac0070e1a783f31c01682254a4c813.tar.zst nixpkgs-7d58c271b8ac0070e1a783f31c01682254a4c813.zip |
buildRustPackage packages: editorconfig fixes
-rw-r--r-- | pkgs/applications/misc/rsclock/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/tools/rq/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sozu/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/heatseeker/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/tdns-cli/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/nix/nixpkgs-fmt/default.nix | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index 4f63ed057b7..b508a73de1d 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2"; }; - + cargoSha256 = "01dhkis6zswq1y40n7sdq9xv1sp61f2v7nfqbkicyjngmdrmcgrl"; meta = with stdenv.lib; { @@ -21,4 +21,3 @@ rustPlatform.buildRustPackage rec { platforms = platforms.all; }; } - diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index 89ba58ea5f5..edd24a8aaa2 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67"; - buildInputs = [ llvmPackages.clang-unwrapped v8 ] + buildInputs = [ llvmPackages.clang-unwrapped v8 ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; configurePhase = '' diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index f7feda5e916..1e808358705 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -19,4 +19,4 @@ rustPlatform.buildRustPackage rec { license = licenses.agpl3; maintainers = with maintainers; [ filalex77 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index e0b8c02a08e..207788ed61d 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { # I've suggested using `/usr/bin/env stty`, but doing that isn't quite as simple # as a substitution, and this works since we have the path to coreutils stty. patchPhase = '' - substituteInPlace src/screen/unix.rs --replace "/bin/stty" "${coreutils}/bin/stty" + substituteInPlace src/screen/unix.rs --replace "/bin/stty" "${coreutils}/bin/stty" ''; # some tests require a tty, this variable turns them off for Travis CI, diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 20bc456eea8..681109712ab 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { name = "tdns-cli"; version = "0.0.5"; - + src = fetchFromGitHub { owner = "rotty"; repo = name; diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index 53e70ad7bd7..432f13d86f4 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "1kkw87c63nx5pqsxcwn6iw27k02j9ls21zyhb5dvf0zaqd9sz7ad"; }; - + cargoSha256 = "1wybvm9qckx9cd656gx9zrbszmaj66ihh2kk6qqdb6maixcq5k0x"; meta = with lib; { |