commit 12a63c13099845c0f65ce58a20de022e179b8cc0 · pyrox.dev/nixpkgs

-15

pkgs/by-name/hy/hydra-check/fix-cargo-1_88-reqwest.patch

···

       1
       1
       -
       diff --git a/Cargo.toml b/Cargo.toml

     

       2
       2
       -
       index bb8d370..7c5b7ac 100644

     

       3
       3
       -
       --- a/Cargo.toml

     

       4
       4
       -
       +++ b/Cargo.toml

     

       5
       5
       -
       @@ -35,6 +35,10 @@ anyhow = "1.0.89"

     

       6
       6
       -
        insta.opt-level = 3

     

       7
       7
       -
        similar.opt-level = 3

     

       8
       8
       -
        

     

       9
       9
       -
       +# work around https://github.com/NixOS/nixpkgs/issues/427072

     

       10
       10
       -
       +[profile.release.package.hyper]

     

       11
       11
       -
       +opt-level = 0

     

       12
       12
       -
       +

     

       13
       13
       -
        [lints.clippy]

     

       14
       14
       -
        pedantic = { level = "warn", priority = -1 }

     

       15
       15
       -
        cargo = { level = "warn", priority = -1 }

+28 -11

pkgs/by-name/hy/hydra-check/package.nix

···

       7
       7
        
         stdenv,

     

       8
       8
        
         installShellFiles,

     

       9
       9
        
         versionCheckHook,

     

       10
       10
       +
         testers,

     

       11
       11
       +
         curl,

     

       12
       12
       +
         cacert,

     

       10
       13
        
       }:

     

       11
       14
        
       

     

       12
       12
       -
       rustPlatform.buildRustPackage rec {

     

       15
       15
       +
       rustPlatform.buildRustPackage (finalAttrs: rec {

     

       13
       16
        
         pname = "hydra-check";

     

       14
       17
        
         version = "2.0.4";

     

       15
       18
        
       

     
···

       21
       24
        
         };

     

       22
       25
        
       

     

       23
       26
        
         cargoHash = "sha256-G9M+1OWp2jlDeSDFagH/YOCdxGQbcru1KFyKEUcMe7g=";

     

       24
       24
       -
       

     

       25
       25
       -
         patches =

     

       26
       26
       -
           lib.optional (stdenv.hostPlatform.system == "x86_64-darwin")

     

       27
       27
       -
             # work around rust 1.88 compiler / linker bug for x86_64-darwin. This is

     

       28
       28
       -
             # applied conditionally because it will introduce a performance penalty on

     

       29
       29
       -
             # other host platforms. NOTE: Please check the patch applies if you update

     

       30
       30
       -
             # the package on a different platform (e.g x86_64-linux).

     

       31
       31
       -
             # see: https://github.com/NixOS/nixpkgs/issues/427072

     

       32
       32
       -
             ./fix-cargo-1_88-reqwest.patch;

     

       33
       27
        
       

     

       34
       28
        
         nativeBuildInputs = [

     

       35
       29
        
           pkg-config

     
···

       53
       47
        
       

     

       54
       48
        
         doInstallCheck = true;

     

       55
       49
        
       

     

       50
       50
       +
         passthru.tests.mainCommand =

     

       51
       51
       +
           testers.runCommand # allows internet access

     

       52
       52
       +
             {

     

       53
       53
       +
               name = "hydra-check-test";

     

       54
       54
       +
       

     

       55
       55
       +
               # only runs the test when internet access is confirmed:

     

       56
       56
       +
               script = ''

     

       57
       57
       +
                 set -e

     

       58
       58
       +
                 if curl hydra.nixos.org > /dev/null; then

     

       59
       59
       +
                   hydra-check

     

       60
       60
       +
                 else

     

       61
       61
       +
                   echo "no internet access, skipping test"

     

       62
       62
       +
                 fi

     

       63
       63
       +
                 touch $out

     

       64
       64
       +
               '';

     

       65
       65
       +
       

     

       66
       66
       +
               nativeBuildInputs = [

     

       67
       67
       +
                 finalAttrs.finalPackage

     

       68
       68
       +
                 curl

     

       69
       69
       +
                 cacert # for https connectivity

     

       70
       70
       +
               ];

     

       71
       71
       +
             };

     

       72
       72
       +
       

     

       56
       73
        
         meta = {

     

       57
       74
        
           description = "Check hydra for the build status of a package";

     

       58
       75
        
           homepage = "https://github.com/nix-community/hydra-check";

     
···

       65
       82
        
           ];

     

       66
       83
        
           mainProgram = "hydra-check";

     

       67
       84
        
         };

     

       68
       68
       -
       }

     

       85
       85
       +
       })