From af426c01fafe544c0e6d0712978fe4f3c616782e Mon Sep 17 00:00:00 2001 From: Dmitry Laptov Date: Fri, 22 Jul 2022 16:04:17 +0300 Subject: [PATCH 1/5] [Chore] Hotfix macos devShell --- flake.nix | 17 ++++++++++------- scripts/build-all-bottles.sh | 3 +-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 08f014d9a..1d87ae042 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,9 @@ }; outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, flake-utils, serokell-nix, nix, ... }: + let + pkgs-darwin = nixpkgs-unstable.legacyPackages."aarch64-darwin"; + in pkgs-darwin.lib.recursiveUpdate { nixosModules = { tezos-node = import ./nix/modules/tezos-node.nix; @@ -33,7 +36,10 @@ tezos-signer = import ./nix/modules/tezos-signer.nix; }; - } // flake-utils.lib.eachSystem [ + devShells."aarch64-darwin".autorelease-macos = + import ./scripts/macos-shell.nix { pkgs = pkgs-darwin; }; + + } (flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: let @@ -60,8 +66,6 @@ overlays = [(_: _: { nix = nix.packages.${system}.default; })]; }; - pkgs-darwin = nixpkgs-unstable.legacyPackages."aarch64-darwin"; - callPackage = pkg: input: import pkg (inputs // { inherit sources protocols meta pkgs; } // input); @@ -73,20 +77,19 @@ binaries = callPackage ./nix {}; - tezos-release = callPackage ./release.nix {}; + release = callPackage ./release.nix {}; in { legacyPackages = unstable; - release = tezos-release; + inherit release; packages = binaries // { default = self.packages.${system}.binaries; }; devShells = { buildkite = callPackage ./.buildkite/shell.nix {}; autorelease = callPackage ./scripts/shell.nix {}; - autorelease-macos = callPackage ./scripts/macos-shell.nix { pkgs = pkgs-darwin; }; dev = callPackage ./shell.nix { pkgs = unstable; }; }; @@ -96,5 +99,5 @@ }; binaries-test = callPackage ./tests/tezos-binaries.nix {}; - }); + })); } diff --git a/scripts/build-all-bottles.sh b/scripts/build-all-bottles.sh index 603c38486..731145bf3 100755 --- a/scripts/build-all-bottles.sh +++ b/scripts/build-all-bottles.sh @@ -1,5 +1,4 @@ -#! /usr/bin/env nix-shell -#! nix-shell .. -A autorelease-macos -i bash +#! /usr/bin/env bash # shellcheck shell=bash # SPDX-FileCopyrightText: 2022 Oxhead Alpha From 98eb64cd5dbd0bd49be05269ea76e4c089f45ff9 Mon Sep 17 00:00:00 2001 From: Dmitry Laptov Date: Fri, 22 Jul 2022 16:10:41 +0300 Subject: [PATCH 2/5] [Chore] Hotfix pipeline-for-tags --- .buildkite/pipeline-for-tags.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline-for-tags.yml b/.buildkite/pipeline-for-tags.yml index 112d14df6..a06cc56b1 100644 --- a/.buildkite/pipeline-for-tags.yml +++ b/.buildkite/pipeline-for-tags.yml @@ -3,6 +3,8 @@ env: USE_NEWER_NIX: 1 + SET_VERSION: "export TEZOS_VERSION=\"$(cat meta.json | jq -r '.tezos_ref' | cut -d'/' -f3)\"" + steps: - label: Check for new Tezos release @@ -16,7 +18,7 @@ steps: agents: queue: "docker" commands: - - export TEZOS_VERSION="$(cat nix/nix/sources.json | jq -r '.tezos.ref' | cut -d'/' -f3)" + - eval "$SET_VERSION" - ./docker/docker-tezos-packages.sh --os ubuntu --type source - ./docker/docker-tezos-packages.sh --os fedora --type source artifact_paths: @@ -27,7 +29,7 @@ steps: depends_on: - "build-source-packages" commands: - - export TEZOS_VERSION="$(cat nix/nix/sources.json | jq -r '.tezos.ref' | cut -d'/' -f3)" + - eval "$SET_VERSION" - buildkite-agent artifact download "out/*" . --step build-source-packages - ./scripts/publish-native-packages.sh out From bc3a21978b8b1d3a80162dddd0ec5e3e006a66f9 Mon Sep 17 00:00:00 2001 From: Dmitry Laptov Date: Fri, 22 Jul 2022 16:14:32 +0300 Subject: [PATCH 3/5] [Chore] Hotfix formulae deps --- Formula/tezos-accuser-013-PtJakart.rb | 2 +- Formula/tezos-accuser-014-PtKathma.rb | 2 +- Formula/tezos-admin-client.rb | 2 +- Formula/tezos-baker-013-PtJakart.rb | 2 +- Formula/tezos-baker-014-PtKathma.rb | 2 +- Formula/tezos-client.rb | 2 +- Formula/tezos-codec.rb | 2 +- Formula/tezos-node.rb | 2 +- Formula/tezos-signer.rb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Formula/tezos-accuser-013-PtJakart.rb b/Formula/tezos-accuser-013-PtJakart.rb index c39ebd6f2..dbb1e95aa 100644 --- a/Formula/tezos-accuser-013-PtJakart.rb +++ b/Formula/tezos-accuser-013-PtJakart.rb @@ -13,7 +13,7 @@ class << self version "v14.0-rc1-1" - build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init] build_dependencies.each do |dependency| depends_on dependency => :build end diff --git a/Formula/tezos-accuser-014-PtKathma.rb b/Formula/tezos-accuser-014-PtKathma.rb index b1623615e..137c65dce 100644 --- a/Formula/tezos-accuser-014-PtKathma.rb +++ b/Formula/tezos-accuser-014-PtKathma.rb @@ -13,7 +13,7 @@ class << self version "v14.0-rc1-1" - build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init] build_dependencies.each do |dependency| depends_on dependency => :build end diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb index 78e3e66cd..45c1dc10c 100644 --- a/Formula/tezos-admin-client.rb +++ b/Formula/tezos-admin-client.rb @@ -13,7 +13,7 @@ class << self version "v14.0-rc1-1" - build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init] build_dependencies.each do |dependency| depends_on dependency => :build end diff --git a/Formula/tezos-baker-013-PtJakart.rb b/Formula/tezos-baker-013-PtJakart.rb index 1129afdb6..594b83366 100644 --- a/Formula/tezos-baker-013-PtJakart.rb +++ b/Formula/tezos-baker-013-PtJakart.rb @@ -13,7 +13,7 @@ class << self version "v14.0-rc1-1" - build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init] build_dependencies.each do |dependency| depends_on dependency => :build end diff --git a/Formula/tezos-baker-014-PtKathma.rb b/Formula/tezos-baker-014-PtKathma.rb index 1c323d4a2..1fa5002e4 100644 --- a/Formula/tezos-baker-014-PtKathma.rb +++ b/Formula/tezos-baker-014-PtKathma.rb @@ -13,7 +13,7 @@ class << self version "v14.0-rc1-1" - build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init] build_dependencies.each do |dependency| depends_on dependency => :build end diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb index f53ceec9d..570c0af0c 100644 --- a/Formula/tezos-client.rb +++ b/Formula/tezos-client.rb @@ -13,7 +13,7 @@ class << self version "v14.0-rc1-1" - build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init] build_dependencies.each do |dependency| depends_on dependency => :build end diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb index 446cbab23..f9ff87736 100644 --- a/Formula/tezos-codec.rb +++ b/Formula/tezos-codec.rb @@ -13,7 +13,7 @@ class << self version "v14.0-rc1-1" - build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init] build_dependencies.each do |dependency| depends_on dependency => :build end diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index 0abe5f6ac..388adc6de 100644 --- a/Formula/tezos-node.rb +++ b/Formula/tezos-node.rb @@ -13,7 +13,7 @@ class << self version "v14.0-rc1-1" - build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init] build_dependencies.each do |dependency| depends_on dependency => :build end diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb index 14d41afb2..1658d1793 100644 --- a/Formula/tezos-signer.rb +++ b/Formula/tezos-signer.rb @@ -13,7 +13,7 @@ class << self version "v14.0-rc1-1" - build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init] build_dependencies.each do |dependency| depends_on dependency => :build end From 91ea10ffa2a51475e77e2210b4437c5385600f16 Mon Sep 17 00:00:00 2001 From: Dmitry Laptov Date: Fri, 22 Jul 2022 16:16:33 +0300 Subject: [PATCH 4/5] [Chore] Hotfix formulae titles --- Formula/tezos-accuser-014-PtKathma.rb | 4 ++-- Formula/tezos-baker-014-PtKathma.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Formula/tezos-accuser-014-PtKathma.rb b/Formula/tezos-accuser-014-PtKathma.rb index 137c65dce..295aa6dda 100644 --- a/Formula/tezos-accuser-014-PtKathma.rb +++ b/Formula/tezos-accuser-014-PtKathma.rb @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2022 Oxhead Alpha # SPDX-License-Identifier: LicenseRef-MIT-OA -class TezosAccuser014PtKathma < Formula +class TezosAccuser014Ptkathma < Formula @all_bins = [] class << self @@ -25,7 +25,7 @@ class << self desc "Daemon for accusing" bottle do - root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser014PtKathma.version}/" + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser014Ptkathma.version}/" end def make_deps diff --git a/Formula/tezos-baker-014-PtKathma.rb b/Formula/tezos-baker-014-PtKathma.rb index 1fa5002e4..e842729ab 100644 --- a/Formula/tezos-baker-014-PtKathma.rb +++ b/Formula/tezos-baker-014-PtKathma.rb @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2022 Oxhead Alpha # SPDX-License-Identifier: LicenseRef-MIT-OA -class TezosBaker014PtKathma < Formula +class TezosBaker014Ptkathma < Formula @all_bins = [] class << self @@ -25,7 +25,7 @@ class << self desc "Daemon for baking" bottle do - root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker014PtKathma.version}/" + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker014Ptkathma.version}/" end def make_deps From 5b787327243375e7c3f9737fa2b6ead5d65e6767 Mon Sep 17 00:00:00 2001 From: Dmitry Laptov Date: Fri, 22 Jul 2022 16:19:02 +0300 Subject: [PATCH 5/5] [Chore] Fix ubuntu/fedora packages deps --- docker/package/package_generator.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/package/package_generator.py b/docker/package/package_generator.py index 63fb658f1..72b7a178f 100755 --- a/docker/package/package_generator.py +++ b/docker/package/package_generator.py @@ -62,6 +62,7 @@ def get_build_deps(args): "opam", "git", "autoconf", + "coreutils", ]