Unverified Commit eeecc350 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents cf9a69ee bd193ba6

ci/eval/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ let 
        system=$3

        outputDir=$4



        # Default is 5, higher values effectively disable the warning.

        # This randomly breaks Eval.

        export GC_LARGE_ALLOC_WARN_INTERVAL=1000



        export NIX_SHOW_STATS=1

        export NIX_SHOW_STATS_PATH="$outputDir/stats/$myChunk"

        echo "Chunk $myChunk on $system start"

ci/nixpkgs-vet.nix

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ runCommand "nixpkgs-vet" 
  }

  ''

    export NIX_STATE_DIR=$(mktemp -d)

    $NIXPKGS_VET_NIX_PACKAGE/bin/nix-store --init



    nixpkgs-vet --base ${filteredBase} ${filteredHead}

pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix

0 → 100644
+10 −0
Original line number Diff line number Diff line 
{

  traefik-crd = {

    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-34.2.1+up34.2.0.tgz";

    sha256 = "0bnvkp1bxfsccgdnvpq3ni3p2h8jyvj0iclbqj0rsls8vv1jnp9z";

  };

  traefik = {

    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-34.2.1+up34.2.0.tgz";

    sha256 = "16ljy2ncn2kc4kr3m93w2kfw4vjk8is3cp3i2lx4b7afbmi75zyw";

  };

}

pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
diff --git a/scripts/package-cli b/scripts/package-cli

index a15d754926..bc450dbe4e 100755

--- a/scripts/package-cli

+++ b/scripts/package-cli

@@ -3,7 +3,10 @@ set -e -x

 

 cd $(dirname $0)/..

 

+runc_require=$(grep "github.com/opencontainers/runc" go.mod | awk -F '=> ' '{print $2}' | xargs -0 printf 'require %s')

+echo "$runc_require" >> go.mod

 . ./scripts/version.sh

+sed -i '$d' go.mod

 

 GO=${GO-go}

pkgs/applications/networking/cluster/k3s/1_34/images-versions.json

0 → 100644
+26 −0
Original line number Diff line number Diff line 
{

  "airgap-images-amd64-tar-gz": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-amd64.tar.gz",

    "sha256": "076c53d96bbca9ed7aee5a4e398933787c55c59fd58e617581ce885e22759793"

  },

  "airgap-images-amd64-tar-zst": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst",

    "sha256": "27355d2838c727180f0a8ded8aec0ac14e2186bd50487a3c3f29500884121aa7"

  },

  "airgap-images-arm-tar-gz": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm.tar.gz",

    "sha256": "7292bafb04a8800b7efdc096a4e4f00d972dcf9a009f7ccca311a0bc9b23eda1"

  },

  "airgap-images-arm-tar-zst": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm.tar.zst",

    "sha256": "64e166d1b037ed87566c444261365bdd54745de6cf8acf1ae4698ddf34ca69a7"

  },

  "airgap-images-arm64-tar-gz": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm64.tar.gz",

    "sha256": "b1f649125466251088aec6fcd56b86df29d7674eb3ae6ab596448ddfd60cc9e0"

  },

  "airgap-images-arm64-tar-zst": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst",

    "sha256": "78380791cb61262b78d61c2b52fd77e0eedde6c0351e53d11e2cfb9034ec5937"

  }

}