commit b98abd8c0080f27a432cb0c37da2ac820b31513c · pyrox.dev/nixpkgs

+10 -5

pkgs/servers/etcd/3.5.nix pkgs/servers/etcd/3.5/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         version = "3.5.12";

     

       5
       5
       +
         etcdSrcHash = "sha256-Z2WXNzFJYfRQCldUspQjUR5NyUzCCINycuEXWaTn4vU=";

     

       6
       6
       +
         etcdServerVendorHash = "sha256-S5cEIV4hKRjn9JFEKWBiSEPytHtVacsSnG6T8dofgyk=";

     

       7
       7
       +
         etcdUtlVendorHash = "sha256-Vgp44Kg6zUDYVJU6SiYd8ZEcAWqKPPTsqYafcfk89Cc=";

     

       8
       8
       +
         etcdCtlVendorHash = "sha256-PZLsekZzwlGzccCirNk9uUj70Ue5LMDs6LMWBI9yivs=";

     

       5
       9
        
       

     

       6
       10
        
         src = fetchFromGitHub {

     

       7
       11
        
           owner = "etcd-io";

     

       8
       12
        
           repo = "etcd";

     

       9
       13
        
           rev = "v${version}";

     

       10
       10
       -
           hash = "sha256-Z2WXNzFJYfRQCldUspQjUR5NyUzCCINycuEXWaTn4vU=";

     

       14
       14
       +
           hash = etcdSrcHash;

     

       11
       15
        
         };

     

       12
       16
        
       

     

       13
       17
        
         CGO_ENABLED = 0;

     
···

       16
       20
        
           description = "Distributed reliable key-value store for the most critical data of a distributed system";

     

       17
       21
        
           license = licenses.asl20;

     

       18
       22
        
           homepage = "https://etcd.io/";

     

       19
       19
       -
           maintainers = with maintainers; [ offline endocrimes ];

     

       23
       23
       +
           maintainers = with maintainers; [ endocrimes offline superherointj ];

     

       20
       24
        
           platforms = platforms.darwin ++ platforms.linux;

     

       21
       25
        
         };

     

       22
       26
        
       

     
···

       25
       29
        
       

     

       26
       30
        
           inherit CGO_ENABLED meta src version;

     

       27
       31
        
       

     

       28
       28
       -
           vendorHash = "sha256-S5cEIV4hKRjn9JFEKWBiSEPytHtVacsSnG6T8dofgyk=";

     

       32
       32
       +
           vendorHash = etcdServerVendorHash;

     

       29
       33
        
       

     

       30
       34
        
           modRoot = "./server";

     

       31
       35
        
       

     
···

       45
       49
        
       

     

       46
       50
        
           inherit CGO_ENABLED meta src version;

     

       47
       51
        
       

     

       48
       48
       -
           vendorHash = "sha256-Vgp44Kg6zUDYVJU6SiYd8ZEcAWqKPPTsqYafcfk89Cc=";

     

       52
       52
       +
           vendorHash = etcdUtlVendorHash;

     

       49
       53
        
       

     

       50
       54
        
           modRoot = "./etcdutl";

     

       51
       55
        
         };

     
···

       55
       59
        
       

     

       56
       60
        
           inherit CGO_ENABLED meta src version;

     

       57
       61
        
       

     

       58
       58
       -
           vendorHash = "sha256-PZLsekZzwlGzccCirNk9uUj70Ue5LMDs6LMWBI9yivs=";

     

       62
       62
       +
           vendorHash = etcdCtlVendorHash;

     

       59
       63
        
       

     

       60
       64
        
           modRoot = "./etcdctl";

     

       61
       65
        
         };

     
···

       71
       75
        
             inherit (nixosTests) etcd etcd-cluster;

     

       72
       76
        
             k3s = k3s.passthru.tests.etcd;

     

       73
       77
        
           };

     

       78
       78
       +
           updateScript = ./update.sh;

     

       74
       79
        
         };

     

       75
       80
        
       

     

       76
       81
        
         paths = [

+68

pkgs/servers/etcd/3.5/update.sh

···

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

     

       2
       2
       +
       #!nix-shell -i bash -p curl gnugrep gnused jq nix-prefetch

     

       3
       3
       +
       

     

       4
       4
       +
       set -x -eu -o pipefail

     

       5
       5
       +
       

     

       6
       6
       +
       ETCD_VERSION_MAJOR_MINOR=`basename "$PWD"`

     

       7
       7
       +
       

     

       8
       8
       +
       ETCD_PKG_NAME=etcd_$(echo $ETCD_VERSION_MAJOR_MINOR | sed 's/[.]/_/g')

     

       9
       9
       +
       NIXPKGS_PATH="$(git rev-parse --show-toplevel)"

     

       10
       10
       +
       ETCD_PATH="$(dirname "$0")"

     

       11
       11
       +
       

     

       12
       12
       +
       OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; \

     

       13
       13
       +
           $ETCD_PKG_NAME.version or (builtins.parseDrvName $ETCD_PKG_NAME.name).version" | tr -d '"')"

     

       14
       14
       +
       

     

       15
       15
       +
       LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/etcd-io/etcd/releases \

     

       16
       16
       +
           | jq -r 'map(.tag_name)' | grep $ETCD_VERSION_MAJOR_MINOR | sed 's|[", ]||g' | sort -rV | head -n1)

     

       17
       17
       +
       

     

       18
       18
       +
       LATEST_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//')

     

       19
       19
       +
       

     

       20
       20
       +
       if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then

     

       21
       21
       +
           echo "Attempting to update etcd from $OLD_VERSION to $LATEST_VERSION"

     

       22
       22
       +
           ETCD_SRC_HASH=$(nix-prefetch-url --quiet --unpack https://github.com/etcd-io/etcd/archive/refs/tags/${LATEST_TAG}.tar.gz)

     

       23
       23
       +
           ETCD_SRC_HASH=$(nix hash to-sri --type sha256 $ETCD_SRC_HASH)

     

       24
       24
       +
       

     

       25
       25
       +
           setKV () {

     

       26
       26
       +
               sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/default.nix"

     

       27
       27
       +
           }

     

       28
       28
       +
       

     

       29
       29
       +
           setKV version $LATEST_VERSION

     

       30
       30
       +
           setKV etcdSrcHash $ETCD_SRC_HASH

     

       31
       31
       +
       

     

       32
       32
       +
           getAndSetVendorHash () {

     

       33
       33
       +
               local EMPTY_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" # Hash from lib.fakeHash

     

       34
       34
       +
               local VENDOR_HASH=$EMPTY_HASH

     

       35
       35
       +
               local PKG_KEY=$1

     

       36
       36
       +
               local INNER_PKG=$2

     

       37
       37
       +
       

     

       38
       38
       +
               setKV $PKG_KEY $EMPTY_HASH

     

       39
       39
       +
       

     

       40
       40
       +
               set +e

     

       41
       41
       +
               VENDOR_HASH=$(nix-prefetch -I nixpkgs=$NIXPKGS_PATH "{ sha256 }: \

     

       42
       42
       +
                   (import $NIXPKGS_PATH/. {}).$ETCD_PKG_NAME.passthru.$INNER_PKG.goModules.overrideAttrs (_: { vendorHash = sha256; })")

     

       43
       43
       +
               set -e

     

       44
       44
       +
       

     

       45
       45
       +
               if [ -n "${VENDOR_HASH:-}" ]; then

     

       46
       46
       +
                   setKV $PKG_KEY $VENDOR_HASH

     

       47
       47
       +
               else

     

       48
       48
       +
                   echo "Update failed. $PKG_KEY is empty."

     

       49
       49
       +
                   exit 1

     

       50
       50
       +
               fi

     

       51
       51
       +
           }

     

       52
       52
       +
       

     

       53
       53
       +
           getAndSetVendorHash etcdServerVendorHash etcdserver

     

       54
       54
       +
           getAndSetVendorHash etcdUtlVendorHash etcdutl

     

       55
       55
       +
           getAndSetVendorHash etcdCtlVendorHash etcdctl

     

       56
       56
       +
       

     

       57
       57
       +
           # `git` flag here is to be used by local maintainers to speed up the bump process

     

       58
       58
       +
           if [ $# -eq 1 ] && [ "$1" = "git" ]; then

     

       59
       59
       +
               git switch -c "package-$ETCD_PKG_NAME-$LATEST_VERSION"

     

       60
       60
       +
               git add "$ETCD_PATH"/default.nix

     

       61
       61
       +
               git commit -m "$ETCD_PKG_NAME: $OLD_VERSION -> $LATEST_VERSION

     

       62
       62
       +
       

     

       63
       63
       +
       Release: https://github.com/etcd-io/etcd/releases/tag/v$LATEST_VERSION"

     

       64
       64
       +
           fi

     

       65
       65
       +
       

     

       66
       66
       +
       else

     

       67
       67
       +
           echo "etcd is already up-to-date at $OLD_VERSION"

     

       68
       68
       +
       fi

+1 -1

pkgs/top-level/all-packages.nix

···

       25886
       25886
        
       

     

       25887
       25887
        
         etcd = etcd_3_5;

     

       25888
       25888
        
         etcd_3_4 = callPackage ../servers/etcd/3.4.nix { };

     

       25889
       25889
       -
         etcd_3_5 = callPackage ../servers/etcd/3.5.nix { };

     

       25889
       25889
       +
         etcd_3_5 = callPackage ../servers/etcd/3.5 { };

     

       25890
       25890
        
       

     

       25891
       25891
        
         ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlang_24; };

     

       25892
       25892