commit 80a8484c5429ce6a9cb806bf5f11ee4f7e3e30eb · pyrox.dev/nixpkgs

+16 -16

pkgs/development/compilers/elm/packages/elm-json/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         curl,

     

       4
       3
        
         rustPlatform,

     

       5
       5
       -
         fetchurl,

     

       6
       6
       -
         openssl,

     

       7
       7
       -
         stdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       8
       5
        
         pkg-config,

     

       9
       9
       -
         darwin,

     

       6
       6
       +
         curl,

     

       7
       7
       +
         openssl,

     

       10
       8
        
       }:

     

       11
       9
        
       

     

       12
       12
       -
       rustPlatform.buildRustPackage rec {

     

       10
       10
       +
       rustPlatform.buildRustPackage (finalAttrs: {

     

       13
       11
        
         pname = "elm-json";

     

       14
       14
       -
         version = "0.2.12";

     

       12
       12
       +
         version = "0.2.13";

     

       15
       13
        
       

     

       16
       16
       -
         src = fetchurl {

     

       17
       17
       -
           url = "https://github.com/zwilias/elm-json/archive/v${version}.tar.gz";

     

       18
       18
       -
           sha256 = "sha256:nlpxlPzWk3wwDgczuMI9T6DFY1YtQpQ1R4BhdPbzZBs=";

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "zwilias";

     

       16
       16
       +
           repo = "elm-json";

     

       17
       17
       +
           tag = "v${finalAttrs.version}";

     

       18
       18
       +
           hash = "sha256-pSt4ugP8r7s0ABT3Y9ZbWAG/ShsARtame2lTxXiCuws=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         cargoPatches = [ ./use-system-ssl.patch ];

     
···

       25
       25
        
         buildInputs = [

     

       26
       26
        
           curl

     

       27
       27
        
           openssl

     

       28
       28
       -
         ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];

     

       28
       28
       +
         ];

     

       29
       29
        
       

     

       30
       30
        
         useFetchCargoVendor = true;

     

       31
       31
       -
         cargoHash = "sha256-iDyGPE1BEh1uIf4K6ijtlqugWFtfM/2GGda0u/lCLJ0=";

     

       31
       31
       +
         cargoHash = "sha256-BnL//AHaSnsugtMEnSTynpMyeNt5N7L6PG2wdWDw1y4=";

     

       32
       32
        
       

     

       33
       33
        
         # Tests perform networking and therefore can't work in sandbox

     

       34
       34
        
         doCheck = false;

     

       35
       35
        
       

     

       36
       36
       -
         meta = with lib; {

     

       36
       36
       +
         meta = {

     

       37
       37
        
           description = "Install, upgrade and uninstall Elm dependencies";

     

       38
       38
        
           mainProgram = "elm-json";

     

       39
       39
        
           homepage = "https://github.com/zwilias/elm-json";

     

       40
       40
       -
           license = licenses.mit;

     

       41
       41
       -
           maintainers = [ maintainers.turbomack ];

     

       40
       40
       +
           license = lib.licenses.mit;

     

       41
       41
       +
           maintainers = [ lib.maintainers.turbomack ];

     

       42
       42
        
         };

     

       43
       43
       -
       }

     

       43
       43
       +
       })

+11 -11

pkgs/development/compilers/elm/packages/elm-json/use-system-ssl.patch

···

       2
       2
        
       index b9bf434..58cfe81 100644

     

       3
       3
        
       --- a/Cargo.lock

     

       4
       4
        
       +++ b/Cargo.lock

     

       5
       5
       -
       @@ -685,15 +685,6 @@ version = "0.1.4"

     

       6
       6
       -
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       7
       7
       -
        checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"

     

       8
       8
       -
        

     

       9
       9
       -
       -[[package]]

     

       5
       5
       +
       @@ -677,15 +677,6 @@

     

       6
       6
       +
        checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

     

       7
       7
       +
       

     

       8
       8
       +
        [[package]]

     

       10
       9
        
       -name = "openssl-src"

     

       11
       11
       -
       -version = "111.17.0+1.1.1m"

     

       10
       10
       +
       -version = "111.22.0+1.1.1q"

     

       12
       11
        
       -source = "registry+https://github.com/rust-lang/crates.io-index"

     

       13
       13
       -
       -checksum = "05d6a336abd10814198f66e2a91ccd7336611f30334119ca8ce300536666fcf4"

     

       12
       12
       +
       -checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"

     

       14
       13
        
       -dependencies = [

     

       15
       14
        
       - "cc",

     

       16
       15
        
       -]

     

       17
       16
        
       -

     

       18
       18
       -
        [[package]]

     

       17
       17
       +
       -[[package]]

     

       19
       18
        
        name = "openssl-sys"

     

       20
       20
       -
        version = "0.9.72"

     

       21
       21
       -
       @@ -703,7 +694,6 @@ dependencies = [

     

       19
       19
       +
        version = "0.9.76"

     

       20
       20
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       21
       21
       +
       @@ -694,7 +685,6 @@

     

       22
       22
        
         "autocfg",

     

       23
       23
        
         "cc",

     

       24
       24
        
         "libc",

     
···

       30
       30
        
       index bc97f20..54d3b14 100644

     

       31
       31
        
       --- a/Cargo.toml

     

       32
       32
        
       +++ b/Cargo.toml

     

       33
       33
       -
       @@ -17,8 +17,8 @@ colored = "2.0"

     

       33
       33
       +
       @@ -17,8 +17,8 @@

     

       34
       34
        
        dialoguer = "0.6"

     

       35
       35
        
        dirs = "3.0"

     

       36
       36
        
        fs2 = "0.4"