Merge pull request #503 from serokell/krendelhoff/chore-macos-shell-h…

…otfix

v14.0~rc1 release hotfixes

.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
 

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

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
@@ -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
@@ -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

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

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

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
@@ -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
@@ -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

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

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

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

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

docker/package/package_generator.py

@@ -62,6 +62,7 @@ def get_build_deps(args):
         "opam",
         "git",
         "autoconf",
+        "coreutils",
     ]
 
 

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 {};
-    });
+    }));
 }

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