public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #119327 from ruuda/butane-0.11.0

Browse Source 
butane: 0.10.0 -> 0.11.0
This commit is contained in:
Sandro 2021-04-14 19:19:01 +02:00 committed by GitHub
commit 7b037c94cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/tools/fedora-coreos-config-transpiler/default.nix → pkgs/development/tools/butane/default.nix
View File

@ -3,14 +3,14 @@
with lib; with lib;
buildGoModule rec { buildGoModule rec {
pname = "fcct"; pname = "butane";
version = "0.10.0"; version = "0.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coreos"; owner = "coreos";
repo = "fcct"; repo = "butane";
rev = "v${version}"; rev = "v${version}";
sha256 = "0gxaj2fy889fl5vhb4s89rhih9a65aqjsz2yffhi5z4fa2im8szv"; sha256 = "1s4rkq7mj1lyi8h47jyfy3qygfxhrmpihdy8rcnn55gcy04lm0qc";
}; };
vendorSha256 = null; vendorSha256 = null;
@ -20,17 +20,17 @@ buildGoModule rec {
subPackages = [ "internal" ]; subPackages = [ "internal" ];
buildFlagsArray = '' buildFlagsArray = ''
-ldflags=-X github.com/coreos/fcct/internal/version.Raw=v${version} -ldflags=-X github.com/coreos/butane/internal/version.Raw=v${version}
''; '';
postInstall = '' postInstall = ''
mv $out/bin/{internal,fcct} mv $out/bin/{internal,butane}
''; '';
meta = { meta = {
description = "Translates Fedora CoreOS configs into Ignition configs"; description = "Translates human-readable Butane configs into machine-readable Ignition configs";
license = licenses.asl20; license = licenses.asl20;
homepage = "https://github.com/coreos/fcct"; homepage = "https://github.com/coreos/butane";
maintainers = with maintainers; [ elijahcaine ruuda ]; maintainers = with maintainers; [ elijahcaine ruuda ];
platforms = platforms.unix; platforms = platforms.unix;
}; };

1
pkgs/top-level/aliases.nix
View File

@ -185,6 +185,7 @@ mapAliases ({
exfat-utils = exfat; # 2015-09-11 exfat-utils = exfat; # 2015-09-11
facette = throw "facette has been removed."; # added 2020-01-06 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 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."; fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H.";
ffadoFull = ffado; # added 2018-05-01 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"; 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";

4
pkgs/top-level/all-packages.nix
View File

@ -1240,8 +1240,6 @@ in
fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { };
fedora-coreos-config-transpiler = callPackage ../development/tools/fedora-coreos-config-transpiler { };
ccextractor = callPackage ../applications/video/ccextractor { }; ccextractor = callPackage ../applications/video/ccextractor { };
cconv = callPackage ../tools/text/cconv { }; cconv = callPackage ../tools/text/cconv { };
@ -1748,6 +1746,8 @@ in
blur-effect = callPackage ../tools/graphics/blur-effect { }; blur-effect = callPackage ../tools/graphics/blur-effect { };
butane = callPackage ../development/tools/butane { };
charles = charles4; charles = charles4;
inherit (callPackage ../applications/networking/charles {}) inherit (callPackage ../applications/networking/charles {})
charles3 charles3