From 80a8484c5429ce6a9cb806bf5f11ee4f7e3e30eb Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 22 Apr 2025 06:25:25 +0800 Subject: [PATCH] elmPackages.elm-json: 0.2.12 -> 0.2.13 --- .../elm/packages/elm-json/default.nix | 32 +++++++++---------- .../packages/elm-json/use-system-ssl.patch | 22 ++++++------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/elm-json/default.nix b/pkgs/development/compilers/elm/packages/elm-json/default.nix index b3c529c7d5c7..dc1208b4239d 100644 --- a/pkgs/development/compilers/elm/packages/elm-json/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-json/default.nix @@ -1,21 +1,21 @@ { lib, - curl, rustPlatform, - fetchurl, - openssl, - stdenv, + fetchFromGitHub, pkg-config, - darwin, + curl, + openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "elm-json"; - version = "0.2.12"; + version = "0.2.13"; - src = fetchurl { - url = "https://github.com/zwilias/elm-json/archive/v${version}.tar.gz"; - sha256 = "sha256:nlpxlPzWk3wwDgczuMI9T6DFY1YtQpQ1R4BhdPbzZBs="; + src = fetchFromGitHub { + owner = "zwilias"; + repo = "elm-json"; + tag = "v${finalAttrs.version}"; + hash = "sha256-pSt4ugP8r7s0ABT3Y9ZbWAG/ShsARtame2lTxXiCuws="; }; cargoPatches = [ ./use-system-ssl.patch ]; @@ -25,19 +25,19 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; useFetchCargoVendor = true; - cargoHash = "sha256-iDyGPE1BEh1uIf4K6ijtlqugWFtfM/2GGda0u/lCLJ0="; + cargoHash = "sha256-BnL//AHaSnsugtMEnSTynpMyeNt5N7L6PG2wdWDw1y4="; # Tests perform networking and therefore can't work in sandbox doCheck = false; - meta = with lib; { + meta = { description = "Install, upgrade and uninstall Elm dependencies"; mainProgram = "elm-json"; homepage = "https://github.com/zwilias/elm-json"; - license = licenses.mit; - maintainers = [ maintainers.turbomack ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.turbomack ]; }; -} +}) diff --git a/pkgs/development/compilers/elm/packages/elm-json/use-system-ssl.patch b/pkgs/development/compilers/elm/packages/elm-json/use-system-ssl.patch index 54df03019231..feb9d9f927de 100644 --- a/pkgs/development/compilers/elm/packages/elm-json/use-system-ssl.patch +++ b/pkgs/development/compilers/elm/packages/elm-json/use-system-ssl.patch @@ -2,23 +2,23 @@ diff --git a/Cargo.lock b/Cargo.lock index b9bf434..58cfe81 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -685,15 +685,6 @@ version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" - --[[package]] +@@ -677,15 +677,6 @@ + checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + + [[package]] -name = "openssl-src" --version = "111.17.0+1.1.1m" +-version = "111.22.0+1.1.1q" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "05d6a336abd10814198f66e2a91ccd7336611f30334119ca8ce300536666fcf4" +-checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" -dependencies = [ - "cc", -] - - [[package]] +-[[package]] name = "openssl-sys" - version = "0.9.72" -@@ -703,7 +694,6 @@ dependencies = [ + version = "0.9.76" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -694,7 +685,6 @@ "autocfg", "cc", "libc", @@ -30,7 +30,7 @@ diff --git a/Cargo.toml b/Cargo.toml index bc97f20..54d3b14 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -17,8 +17,8 @@ colored = "2.0" +@@ -17,8 +17,8 @@ dialoguer = "0.6" dirs = "3.0" fs2 = "0.4"