commit 3a7f7c1153ba73f21abf761f054aecd8f093f517 · pyrox.dev/nixpkgs

+1 -1

maintainers/scripts/haskell/hydra-report.hs

···

       1
       1
        
       #! /usr/bin/env nix-shell

     

       2
       2
        
       #! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])"

     

       3
       3
       -
       #! nix-shell -p hydra-unstable

     

       3
       3
       +
       #! nix-shell -p hydra_unstable

     

       4
       4
        
       #! nix-shell -i runhaskell

     

       5
       5
        
       

     

       6
       6
        
       {-

+2 -2

nixos/modules/services/continuous-integration/hydra/default.nix

···

       99
       99
        
       

     

       100
       100
        
             package = mkOption {

     

       101
       101
        
               type = types.package;

     

       102
       102
       -
               default = pkgs.hydra-unstable;

     

       103
       103
       -
               defaultText = literalExpression "pkgs.hydra-unstable";

     

       102
       102
       +
               default = pkgs.hydra_unstable;

     

       103
       103
       +
               defaultText = literalExpression "pkgs.hydra_unstable";

     

       104
       104
        
               description = "The Hydra package.";

     

       105
       105
        
             };

     

       106
       106

+1 -1

nixos/tests/hydra/default.nix

···

       11
       11
        
         inherit (import ./common.nix { inherit system; }) baseConfig;

     

       12
       12
        
       

     

       13
       13
        
         hydraPkgs = {

     

       14
       14
       -
           inherit (pkgs) hydra-unstable;

     

       14
       14
       +
           inherit (pkgs) hydra_unstable;

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         makeHydraTest = with pkgs.lib; name: package: makeTest {

+1 -1

pkgs/development/tools/misc/hydra/unstable.nix

···

       173
       173
        
       

     

       174
       174
        
         passthru = {

     

       175
       175
        
           inherit perlDeps;

     

       176
       176
       -
           tests.basic = nixosTests.hydra.hydra-unstable;

     

       176
       176
       +
           tests.basic = nixosTests.hydra.hydra_unstable;

     

       177
       177
        
         };

     

       178
       178
        
       

     

       179
       179
        
         meta = with lib; {

+2 -1

pkgs/top-level/aliases.nix

···

       549
       549
        
         holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01

     

       550
       550
        
         htmlTidy = throw "'htmlTidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22

     

       551
       551
        
         ht-rust = xh; # Added 2021-02-13

     

       552
       552
       -
         hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now"; # Added 2020-04-06

     

       552
       552
       +
         hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra_unstable` now"; # Added 2020-04-06

     

       553
       553
       +
         hydra-unstable = hydra_unstable; # added 2022-05-10

     

       553
       554
        
       

     

       554
       555
        
         ### I ###

     

       555
       556

+1 -1

pkgs/top-level/all-packages.nix

···

       17830
       17830
        
       

     

       17831
       17831
        
         hwloc = callPackage ../development/libraries/hwloc {};

     

       17832
       17832
        
       

     

       17833
       17833
       -
         hydra-unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_6; };

     

       17833
       17833
       +
         hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_6; };

     

       17834
       17834
        
       

     

       17835
       17835
        
         hydra-cli = callPackage ../development/tools/misc/hydra-cli { };

     

       17836
       17836

+1 -1

pkgs/top-level/release-haskell.nix

···

       4
       4
        
         https://hydra.nixos.org/jobset/nixpkgs/haskell-updates.

     

       5
       5
        
       

     

       6
       6
        
         To debug this expression you can use `hydra-eval-jobs` from

     

       7
       7
       -
         `pkgs.hydra-unstable` which prints the jobset description

     

       7
       7
       +
         `pkgs.hydra_unstable` which prints the jobset description

     

       8
       8
        
         to `stdout`:

     

       9
       9
        
       

     

       10
       10
        
         $ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix