mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-25 17:55:21 +00:00
warpgate: 0.23.4 -> 0.26.1
Major changes: https://github.com/warp-tech/warpgate/releases/tag/v0.24.0 https://github.com/warp-tech/warpgate/releases/tag/v0.25.0 https://github.com/warp-tech/warpgate/releases/tag/v0.26.0 Security releases: https://github.com/warp-tech/warpgate/releases/tag/v0.25.5 https://github.com/warp-tech/warpgate/releases/tag/v0.25.6
This commit is contained in:
@@ -2,12 +2,18 @@ diff --git a/warpgate-common/src/version.rs b/warpgate-common/src/version.rs
|
||||
index 0e7985a..62c2b67 100644
|
||||
--- a/warpgate-common/src/version.rs
|
||||
+++ b/warpgate-common/src/version.rs
|
||||
@@ -1,8 +1,3 @@
|
||||
@@ -1,14 +1,3 @@
|
||||
-use git_version::git_version;
|
||||
-
|
||||
pub const fn warpgate_version() -> &'static str {
|
||||
- git_version!(
|
||||
- args = ["--tags", "--always", "--dirty=-modified"],
|
||||
- args = [
|
||||
- "--tags",
|
||||
- "--always",
|
||||
- "--dirty=-modified",
|
||||
- "--match",
|
||||
- "v[0-9]*"
|
||||
- ],
|
||||
- fallback = "unknown"
|
||||
- )
|
||||
+ "v@version@"
|
||||
|
||||
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (
|
||||
|
||||
patches = [ ./web-ui-package-json.patch ];
|
||||
|
||||
npmDepsHash = "sha256-JW3nibMIETj5PQcaNRS5UVZgguSvGd9Bw8uGD3kb5uM=";
|
||||
npmDepsHash = "sha256-McQI5EmTfrbdcWnYRsoRHjhZphrZVaV/fN9i9MX8XF0=";
|
||||
|
||||
nativeBuildInputs = [ openapi-generator-cli ];
|
||||
|
||||
@@ -36,16 +36,16 @@ rustPlatform.buildRustPackage (
|
||||
in
|
||||
{
|
||||
pname = "warpgate";
|
||||
version = "0.23.4";
|
||||
version = "0.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "warp-tech";
|
||||
repo = "warpgate";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/IhnDBQq7Ed5vaGiCHNTcE7Uu9b9VrBN1ipCd2Tai1o=";
|
||||
hash = "sha256-1Dg7bzhBQNe+u90Tw+kcmVaxV5IK0/t505HZr18qP5I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PRR+bzvmWcWUVdV1HqDqD08SwvDCvGXMvkIVoFEnaQI=";
|
||||
cargoHash = "sha256-A5rRLrqlAZV/3ID8F+wUO8OP3Ocivg7vYrNDiMqRKik=";
|
||||
|
||||
patches = [
|
||||
(replaceVars ./hardcode-version.patch { inherit (finalAttrs) version; })
|
||||
|
||||
@@ -2,25 +2,30 @@ diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 0e92acb..d187ebc 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -100,21 +100,3 @@ strip = "debuginfo"
|
||||
@@ -1,5 +1,3 @@
|
||||
-cargo-features = ["profile-rustflags"]
|
||||
-
|
||||
[workspace]
|
||||
members = [
|
||||
"warpgate",
|
||||
@@ -160,20 +158,2 @@
|
||||
[profile.coverage]
|
||||
inherits = "dev"
|
||||
# rustflags = ["-Cinstrument-coverage"]
|
||||
-
|
||||
-[profile.dev.package.aws-sdk-ec2]
|
||||
-rustflags = ["-Zhint-mostly-unused"]
|
||||
-hint-mostly-unused = true
|
||||
-
|
||||
-[profile.release.package.aws-sdk-ec2]
|
||||
-rustflags = ["-Zhint-mostly-unused"]
|
||||
-hint-mostly-unused = true
|
||||
-
|
||||
-[profile.dev.package.aws-sdk-rds]
|
||||
-rustflags = ["-Zhint-mostly-unused"]
|
||||
-hint-mostly-unused = true
|
||||
-
|
||||
-[profile.release.package.aws-sdk-rds]
|
||||
-rustflags = ["-Zhint-mostly-unused"]
|
||||
-hint-mostly-unused = true
|
||||
-
|
||||
-[profile.dev.package.aws-sdk-eks]
|
||||
-rustflags = ["-Zhint-mostly-unused"]
|
||||
-hint-mostly-unused = true
|
||||
-
|
||||
-[profile.release.package.aws-sdk-eks]
|
||||
-rustflags = ["-Zhint-mostly-unused"]
|
||||
-hint-mostly-unused = true
|
||||
|
||||
Reference in New Issue
Block a user