MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

elmPackages.elm-json: 0.2.10 -> 0.2.12

Browse source
This commit is contained in:
Marek Fajkus 2022-07-18 22:26:48 +02:00
parent 02da3a1229
commit d5765d5150
No known key found for this signature in database
GPG key ID: 95585219BA6FE2CC
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/compilers/elm/packages/elm-json.nix
View file

@ -10,11 +10,11 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "elm-json"; pname = "elm-json";
version = "0.2.10"; version = "0.2.12";
src = fetchurl { src = fetchurl {
url = "https://github.com/zwilias/elm-json/archive/v${version}.tar.gz"; url = "https://github.com/zwilias/elm-json/archive/v${version}.tar.gz";
sha256 = "sha256:03azh7wvl60h6w7ffpvl49s7jr7bxpladcm4fzcasakg26i5a71x"; sha256 = "sha256:nlpxlPzWk3wwDgczuMI9T6DFY1YtQpQ1R4BhdPbzZBs=";
}; };
cargoPatches = [ ./elm-json.patch ]; cargoPatches = [ ./elm-json.patch ];
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
curl openssl curl openssl
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
cargoSha256 = "sha256:01zasrqf1va58i52s3kwdkj1rnwy80gv00xi6npfshjirj3ix07f"; cargoSha256 = "sha256:8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc=";
# Tests perform networking and therefore can't work in sandbox # Tests perform networking and therefore can't work in sandbox
doCheck = false; doCheck = false;

28
pkgs/development/compilers/elm/packages/elm-json.patch
View file

@ -1,24 +1,24 @@
diff --git a/Cargo.lock b/Cargo.lock diff --git a/Cargo.lock b/Cargo.lock
index 5440d72..6e173fa 100644 index b9bf434..58cfe81 100644
--- a/Cargo.lock --- a/Cargo.lock
+++ b/Cargo.lock +++ b/Cargo.lock
@@ -774,15 +774,6 @@ version = "0.1.2" @@ -685,15 +685,6 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
-[[package]] -[[package]]
-name = "openssl-src" -name = "openssl-src"
-version = "111.11.0+1.1.1h" -version = "111.17.0+1.1.1m"
-source = "registry+https://github.com/rust-lang/crates.io-index" -source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380fe324132bea01f45239fadfec9343adb044615f29930d039bec1ae7b9fa5b" -checksum = "05d6a336abd10814198f66e2a91ccd7336611f30334119ca8ce300536666fcf4"
-dependencies = [ -dependencies = [
- "cc", - "cc",
-] -]
- -
[[package]] [[package]]
name = "openssl-sys" name = "openssl-sys"
version = "0.9.58" version = "0.9.72"
@@ -792,7 +783,6 @@ dependencies = [ @@ -703,7 +694,6 @@ dependencies = [
"autocfg", "autocfg",
"cc", "cc",
"libc", "libc",
@ -27,17 +27,17 @@ index 5440d72..6e173fa 100644
"vcpkg", "vcpkg",
] ]
diff --git a/Cargo.toml b/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml
index 4d319f2..6f4d0e5 100644 index bc97f20..54d3b14 100644
--- a/Cargo.toml --- a/Cargo.toml
+++ b/Cargo.toml +++ b/Cargo.toml
@@ -21,8 +21,8 @@ colored = "2.0" @@ -17,8 +17,8 @@ colored = "2.0"
dialoguer = "0.6" dialoguer = "0.6"
dirs = "3.0" dirs = "3.0"
fs2 = "0.4" fs2 = "0.4"
-isahc = { version = "0.9", features = ["static-ssl"] } -isahc = { version = "1.6.0", default-features = false, features = ["static-ssl", "static-curl"] }
-curl = {version = "0.4", features = ["static-curl", "static-ssl", "force-system-lib-on-osx", "http2"]} -curl = {version = "0.4.42", default-features = false, features = ["ssl", "static-curl", "static-ssl", "force-system-lib-on-osx"]}
+isahc = "0.9" +isahc = { version = "1.6.0", default-features = false }
+curl = {version = "0.4", features = ["force-system-lib-on-osx", "http2"]} +curl = {version = "0.4.42", default-features = false, features = ["ssl", "force-system-lib-on-osx"]}
ctrlc = "3.1" ctrlc = "3.1"
console = "0.12" console = "0.12"
anyhow = "1.0"