public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-03-30 12:06:24 +00:00
committed by GitHub
parent ce7cdafed9 f15cbfdfcd
commit c9e9ff786b
39 changed files with 930 additions and 883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/build-managers/sbt-extras/default.nix
View File

@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
rev = "483533f7fad8e5de57a5c37bc387f5e7a94b4493";
version = "2021-03-13";
rev = "b430596eb8566a59793ea0b8ddd2c693505e801f";
version = "2021-03-29";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "1z6ass2w1hrp5yxki0d4zrsrrnqbl6k0bvxia090mqrcm9mig2y3";
sha256 = "0r0ysv7dzrlmj3c82fv60i2490ky7q70jlv40q7zdmm5q2wp7y63";
};
dontBuild = true;

88
pkgs/development/tools/diesel-cli/allow-warnings.patch
View File

@@ -1,88 +0,0 @@
diff --git a/diesel/src/lib.rs b/diesel/src/lib.rs
index 4e743eb4..97c53ed8 100644
--- a/diesel/src/lib.rs
+++ b/diesel/src/lib.rs
@@ -131,7 +131,6 @@
#![cfg_attr(feature = "unstable", feature(specialization, try_from))]
// Built-in Lints
#![deny(
- warnings,
missing_debug_implementations,
missing_copy_implementations,
missing_docs
diff --git a/diesel_cli/src/main.rs b/diesel_cli/src/main.rs
index 741ca003..cf93bb8f 100644
--- a/diesel_cli/src/main.rs
+++ b/diesel_cli/src/main.rs
@@ -1,5 +1,5 @@
// Built-in Lints
-#![deny(warnings, missing_copy_implementations)]
+#![deny(missing_copy_implementations)]
// Clippy lints
#![allow(clippy::option_map_unwrap_or_else, clippy::option_map_unwrap_or)]
#![warn(
diff --git a/diesel_cli/tests/tests.rs b/diesel_cli/tests/tests.rs
index 2edee846..c96917c4 100644
--- a/diesel_cli/tests/tests.rs
+++ b/diesel_cli/tests/tests.rs
@@ -1,5 +1,3 @@
-#![deny(warnings)]
-
extern crate chrono;
extern crate diesel;
#[macro_use]
diff --git a/diesel_derives/src/lib.rs b/diesel_derives/src/lib.rs
index 2c43b2a3..44dcf3f9 100644
--- a/diesel_derives/src/lib.rs
+++ b/diesel_derives/src/lib.rs
@@ -1,6 +1,6 @@
#![recursion_limit = "1024"]
// Built-in Lints
-#![deny(warnings, missing_copy_implementations)]
+#![deny(missing_copy_implementations)]
// Clippy lints
#![allow(
clippy::needless_pass_by_value,
diff --git a/diesel_derives/tests/tests.rs b/diesel_derives/tests/tests.rs
index 636fea66..f86f3dcc 100644
--- a/diesel_derives/tests/tests.rs
+++ b/diesel_derives/tests/tests.rs
@@ -1,5 +1,3 @@
-#![deny(warnings)]
-
#[macro_use]
extern crate cfg_if;
#[macro_use]
diff --git a/diesel_migrations/migrations_internals/src/lib.rs b/diesel_migrations/migrations_internals/src/lib.rs
index 933e21a8..7c4d0222 100644
--- a/diesel_migrations/migrations_internals/src/lib.rs
+++ b/diesel_migrations/migrations_internals/src/lib.rs
@@ -1,5 +1,5 @@
// Built-in Lints
-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)]
+#![deny(missing_debug_implementations, missing_copy_implementations)]
// Clippy lints
#![allow(
clippy::option_map_unwrap_or_else,
diff --git a/diesel_migrations/migrations_macros/src/lib.rs b/diesel_migrations/migrations_macros/src/lib.rs
index 0a83234e..2f509c04 100644
--- a/diesel_migrations/migrations_macros/src/lib.rs
+++ b/diesel_migrations/migrations_macros/src/lib.rs
@@ -1,5 +1,5 @@
// Built-in Lints
-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)]
+#![deny(missing_debug_implementations, missing_copy_implementations)]
// Clippy lints
#![allow(
clippy::option_map_unwrap_or_else,
diff --git a/diesel_migrations/src/lib.rs b/diesel_migrations/src/lib.rs
index c85414e5..f025f237 100644
--- a/diesel_migrations/src/lib.rs
+++ b/diesel_migrations/src/lib.rs
@@ -1,5 +1,5 @@
// Built-in Lints
-#![deny(warnings, missing_copy_implementations)]
+#![deny(missing_copy_implementations)]
// Clippy lints
#![allow(
clippy::needless_pass_by_value,

1354
pkgs/development/tools/diesel-cli/cargo-lock.patch
View File

File diff suppressed because it is too large Load Diff

29
pkgs/development/tools/diesel-cli/default.nix
View File

@@ -16,26 +16,37 @@ in
rustPlatform.buildRustPackage rec {
pname = "diesel-cli";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "diesel-rs";
repo = "diesel";
rev = "v${version}";
sha256 = "0wp4hvpl9cf8hw1jyz3z476k5blrh6srfpv36dw10bj126rz9pvb";
# diesel and diesel_cli are independently versioned. diesel_cli
# 1.4.1 first became available in diesel 1.4.5, but we can use
# a newer diesel tag.
rev = "v1.4.6";
sha256 = "0c8a2f250mllzpr20j7j0msbf2csjf9dj8g7j6cl04ifdg7gwb9z";
};
patches = [
# Allow warnings to fix many instances of `error: trait objects without an explicit `dyn` are deprecated`
#
# Remove this after https://github.com/diesel-rs/diesel/commit/9004d1c3fa12aaee84986bd3d893002491373f8c
# is in a release.
./allow-warnings.patch
# Fixes:
# Compiling diesel v1.4.6 (/build/source/diesel)
# error: this `#[deprecated]` annotation has no effect
# --> diesel/src/query_builder/insert_statement/mod.rs:205:1
# |
# 205 | / #[deprecated(
# 206 | | since = "1.2.0",
# 207 | | note = "Use `<&'a [U] as Insertable<T>>::Values` instead"
# 208 | | )]
# | |__^ help: remove the unnecessary deprecation attribute
# |
# = note: `#[deny(useless_deprecated)]` on by default
./fix-deprecated.patch
];
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g";
cargoSha256 = "1vkwp861vm20agj0lkhnnxgg4vwg4d5clvvyzxrmm4y4yw46cdl2";
nativeBuildInputs = [ pkg-config ];

10
pkgs/development/tools/diesel-cli/fix-deprecated.patch Normal file
View File

@@ -0,0 +1,10 @@
diff --git a/diesel/src/query_builder/insert_statement/mod.rs b/diesel/src/query_builder/insert_statement/mod.rs
index b6bb34df9d..7486eb7a59 100644
--- a/diesel/src/query_builder/insert_statement/mod.rs
+++ b/diesel/src/query_builder/insert_statement/mod.rs
@@ -1,3 +1,5 @@
+#![allow(useless_deprecated)]
+
mod column_list;
mod insert_from_select;

2
pkgs/development/tools/jpexs/default.nix
View File

@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/jindrapetrik/jpexs-decompiler";
license = licenses.gpl3;
platforms = jdk8.meta.platforms;
maintainers = with maintainers; [ samuelgrf ];
maintainers = [ ];
};
}

6
pkgs/development/tools/misc/hydra/default.nix
View File

@@ -2,12 +2,12 @@
{
hydra-unstable = callPackage ./common.nix {
version = "2021-03-10";
version = "2021-03-29";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "930f05c38eeac63ad6c3e3250de2667e2df2e96e";
sha256 = "06s2lg119p96i1j4rdbg3z097n25bgvq8ljdn4vcwcw3yz0lnswm";
rev = "9bb04ed97af047968196bad1728f927f7a6d905f";
sha256 = "sha256-gN/zNI2hGDMnYUjeGnU7SAuXP4KCmNqG+AYOVfINaQE=";
};
nix = nixFlakes;

6
pkgs/development/tools/rust/cargo-make/default.nix
View File

@@ -4,11 +4,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.32.14";
version = "0.32.15";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-Q7gEjtStb4WUSyJv9KSu7Q61tH0O2qnNn3eyH77pI9g=";
sha256 = "sha256-BvZe2+PwradByyDeqhs3u42tbLrR5UMyUhJVSlX/U+w=";
};
nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
cargoSha256 = "sha256-DB4ywbbHE9wfvywvYnjD9OzDikmUR34RVdPOQYrst74=";
cargoSha256 = "sha256-eA1cyffQAmSN3jQo5k8H6eYrS23qUxsiAqWzwrYmh3o=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.