From dfed0ea5609409f21fa4eca361505b51ddb4e8f5 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Tue, 13 Apr 2021 14:08:42 +0200 Subject: [PATCH] butane: 0.10.0 -> 0.11.0 This package was formerly known as the "Fedora CoreOS Config Transpiler" (fcct). Release 0.11.0 renames it to "Butane", but aside from this it's just the next release of the same project. --- .../default.nix | 16 ++++++++-------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) rename pkgs/development/tools/{fedora-coreos-config-transpiler => butane}/default.nix (52%) diff --git a/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix b/pkgs/development/tools/butane/default.nix similarity index 52% rename from pkgs/development/tools/fedora-coreos-config-transpiler/default.nix rename to pkgs/development/tools/butane/default.nix index acbdf431fe2..fc42f311af8 100644 --- a/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -3,14 +3,14 @@ with lib; buildGoModule rec { - pname = "fcct"; - version = "0.10.0"; + pname = "butane"; + version = "0.11.0"; src = fetchFromGitHub { owner = "coreos"; - repo = "fcct"; + repo = "butane"; rev = "v${version}"; - sha256 = "0gxaj2fy889fl5vhb4s89rhih9a65aqjsz2yffhi5z4fa2im8szv"; + sha256 = "1s4rkq7mj1lyi8h47jyfy3qygfxhrmpihdy8rcnn55gcy04lm0qc"; }; vendorSha256 = null; @@ -20,17 +20,17 @@ buildGoModule rec { subPackages = [ "internal" ]; buildFlagsArray = '' - -ldflags=-X github.com/coreos/fcct/internal/version.Raw=v${version} + -ldflags=-X github.com/coreos/butane/internal/version.Raw=v${version} ''; postInstall = '' - mv $out/bin/{internal,fcct} + mv $out/bin/{internal,butane} ''; meta = { - description = "Translates Fedora CoreOS configs into Ignition configs"; + description = "Translates human-readable Butane configs into machine-readable Ignition configs"; license = licenses.asl20; - homepage = "https://github.com/coreos/fcct"; + homepage = "https://github.com/coreos/butane"; maintainers = with maintainers; [ elijahcaine ruuda ]; platforms = platforms.unix; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 12704a3c0fc..62e5104c4cf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -185,6 +185,7 @@ mapAliases ({ exfat-utils = exfat; # 2015-09-11 facette = throw "facette has been removed."; # added 2020-01-06 fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28 + fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; ffadoFull = ffado; # added 2018-05-01 firefox-esr-68 = throw "Firefox 68 ESR reached end of life with its final release 68.12esr on 2020-08-25 and was therefore removed from nixpkgs"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5efe5b519eb..11802a6b0eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1240,8 +1240,6 @@ in fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; - fedora-coreos-config-transpiler = callPackage ../development/tools/fedora-coreos-config-transpiler { }; - ccextractor = callPackage ../applications/video/ccextractor { }; cconv = callPackage ../tools/text/cconv { }; @@ -1748,6 +1746,8 @@ in blur-effect = callPackage ../tools/graphics/blur-effect { }; + butane = callPackage ../development/tools/butane { }; + charles = charles4; inherit (callPackage ../applications/networking/charles {}) charles3