commit 34c51b70fbe2fa69e368268d04413feb6d9cc996 · pyrox.dev/nixpkgs

+1 -7

maintainers/scripts/haskell/merge-and-open-pr.sh

···

       80
        
       gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num"

     

       81
        
       

     

       82
        
       # Update stackage, Hackage hashes, and regenerate Haskell package set

     

       83
       -
       echo "Updating Stackage..."

     

       84
       -
       ./maintainers/scripts/haskell/update-stackage.sh --do-commit

     

       85
       -
       echo "Updating Hackage hashes..."

     

       86
       -
       ./maintainers/scripts/haskell/update-hackage.sh --do-commit

     

       87
       -
       echo "Regenerating Hackage packages..."

     

       88
       -
       # Using fast here because after the hackage-update eval errors will likely break the transitive dependencies check.

     

       89
       -
       ./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast --do-commit

     

       90
        
       

     

       91
        
       # Push these new commits to the haskell-updates branch

     

       92
        
       echo "Pushing commits just created to the remote $push_remote/haskell-updates branch..."

···

       80
        
       gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num"

     

       81
        
       

     

       82
        
       # Update stackage, Hackage hashes, and regenerate Haskell package set

     

       83
       +
       ./maintainers/scripts/haskell/update-package-set.sh

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       84
        
       

     

       85
        
       # Push these new commits to the haskell-updates branch

     

       86
        
       echo "Pushing commits just created to the remote $push_remote/haskell-updates branch..."

+53

maintainers/scripts/haskell/update-package-set.sh

···

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

     

       2
       +
       #! nix-shell -i bash

     

       3
       +
       #! nix-shell -p git -I nixpkgs=.

     

       4
       +
       set -euo pipefail

     

       5
       +
       

     

       6
       +
       filesToStage=(

     

       7
       +
         'pkgs/data/misc/hackage/pin.json'

     

       8
       +
         'pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml'

     

       9
       +
         'pkgs/development/haskell-modules/hackage-packages.nix'

     

       10
       +
       )

     

       11
       +
       

     

       12
       +
       if ! git diff --quiet --cached; then

     

       13
       +
         echo "Please commit staged changes before running $0" >&2

     

       14
       +
         exit 100

     

       15
       +
       fi

     

       16
       +
       

     

       17
       +
       if ! git diff --quiet -- "${filesToStage[@]}"; then

     

       18
       +
         echo -n "Please commit your changes to the following files before running $0: " >&2

     

       19
       +
         echo    "${filesToStage[@]}" >&2

     

       20
       +
         exit 100

     

       21
       +
       fi

     

       22
       +
       

     

       23
       +
       stackage_diff="$(./maintainers/scripts/haskell/update-stackage.sh)"

     

       24
       +
       hackage_diff="$(./maintainers/scripts/haskell/update-hackage.sh)"

     

       25
       +
       readonly stackage_diff hackage_diff

     

       26
       +
       

     

       27
       +
       # Prefer Stackage version diff in the commit header, fall back to Hackage

     

       28
       +
       if [[ -n "$stackage_diff" ]]; then

     

       29
       +
         commit_message="haskellPackages: stackage $stackage_diff"

     

       30
       +
         if [[ -n "$hackage_diff" ]]; then

     

       31
       +
           commit_message="$commit_message

     

       32
       +
       

     

       33
       +
       all-cabal-hashes: $hackage_diff"

     

       34
       +
         fi

     

       35
       +
       elif [[ -n "$hackage_diff" ]]; then

     

       36
       +
         commit_message="haskellPackages: hackage $hackage_diff

     

       37
       +
       

     

       38
       +
       all-cabal-hashes: $hackage_diff"

     

       39
       +
       else

     

       40
       +
         echo "Neither Hackage nor Stackage changed. Nothing to do." >&2

     

       41
       +
         exit 0

     

       42
       +
       fi

     

       43
       +
       

     

       44
       +
       commit_message="$commit_message

     

       45
       +
       

     

       46
       +
       (generated by maintainers/scripts/haskell/update-package-set.sh)"

     

       47
       +
       

     

       48
       +
       # Using fast here because after the hackage-update eval errors will likely break the transitive dependencies check.

     

       49
       +
       ./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast

     

       50
       +
       

     

       51
       +
       # A --do-commit flag probably doesn't make much sense

     

       52
       +
       git add -- "${filesToStage[@]}"

     

       53
       +
       git commit -m "$commit_message"