lix-project/lix
20
57
Fork 31
Code Issues 342 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Move version to a JSON file so we can have release names

Browse source 
Change-Id: I5ff3396a302565ee5ee6c2db97e048e403779076
This commit is contained in:
jade 2024-06-06 11:35:03 -07:00
parent 24057dcb6a
commit 9c77c62e73
9 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.version
View file

@ -1 +0,0 @@
2.90.0

2
docker.nix
View file

@ -1,7 +1,7 @@
{ {
pkgs ? import <nixpkgs> { }, pkgs ? import <nixpkgs> { },
lib ? pkgs.lib, lib ? pkgs.lib,
name ? "nix", name ? "lix",
tag ? "latest", tag ? "latest",
bundleNixpkgs ? true, bundleNixpkgs ? true,
channelName ? "nixpkgs", channelName ? "nixpkgs",

8
flake.nix
View file

@ -59,7 +59,6 @@
# Set to true to build the release notes for the next release. # Set to true to build the release notes for the next release.
buildUnreleasedNotes = true; buildUnreleasedNotes = true;
version = lib.fileContents ./.version + versionSuffix;
versionSuffix = versionSuffix =
if officialRelease then if officialRelease then
"" ""
@ -149,8 +148,7 @@
} }
); );
binaryTarball = binaryTarball = nix: pkgs: pkgs.callPackage ./nix-support/binary-tarball.nix { inherit nix; };
nix: pkgs: pkgs.callPackage ./nix-support/binary-tarball.nix { inherit nix version; };
overlayFor = overlayFor =
getStdenv: final: prev: getStdenv: final: prev:
@ -330,10 +328,10 @@
pkgs = nixpkgsFor.${system}.native; pkgs = nixpkgsFor.${system}.native;
image = import ./docker.nix { image = import ./docker.nix {
inherit pkgs; inherit pkgs;
tag = version; tag = pkgs.nix.version;
}; };
in in
pkgs.runCommand "docker-image-tarball-${version}" pkgs.runCommand "docker-image-tarball-${pkgs.nix.version}"
{ meta.description = "Docker image with Lix for ${system}"; } { meta.description = "Docker image with Lix for ${system}"; }
'' ''
mkdir -p $out/nix-support mkdir -p $out/nix-support

2
meson.build
View file

@ -39,7 +39,7 @@
# in the build directory. # in the build directory.
project('lix', 'cpp', project('lix', 'cpp',
version : run_command('bash', '-c', 'echo -n $(cat ./.version)$VERSION_SUFFIX', check : true).stdout().strip(), version : run_command('bash', '-c', 'echo -n $(jq -r .version < ./version.json)$VERSION_SUFFIX', check : true).stdout().strip(),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level

5
nix-support/binary-tarball.nix
View file

@ -3,7 +3,6 @@
cacert, cacert,
nix, nix,
system, system,
version,
}: }:
let let
installerClosureInfo = buildPackages.closureInfo { installerClosureInfo = buildPackages.closureInfo {
@ -15,10 +14,10 @@ let
meta.description = "Distribution-independent Lix bootstrap binaries for ${system}"; meta.description = "Distribution-independent Lix bootstrap binaries for ${system}";
in in
buildPackages.runCommand "lix-binary-tarball-${version}" { inherit meta; } '' buildPackages.runCommand "lix-binary-tarball-${nix.version}" { inherit meta; } ''
cp ${installerClosureInfo}/registration $TMPDIR/reginfo cp ${installerClosureInfo}/registration $TMPDIR/reginfo
dir=lix-${version}-${system} dir=lix-${nix.version}-${system}
fn=$out/$dir.tar.xz fn=$out/$dir.tar.xz
mkdir -p $out/nix-support mkdir -p $out/nix-support
echo "file binary-dist $fn" >> $out/nix-support/hydra-build-products echo "file binary-dist $fn" >> $out/nix-support/hydra-build-products

5
package.nix
View file

@ -88,7 +88,8 @@ let
inherit (lib) fileset; inherit (lib) fileset;
inherit (stdenv) hostPlatform buildPlatform; inherit (stdenv) hostPlatform buildPlatform;
version = lib.fileContents ./.version + versionSuffix; versionJson = builtins.fromJSON (builtins.readFile ./version.json);
version = versionJson.version + versionSuffix;
aws-sdk-cpp-nix = aws-sdk-cpp.override { aws-sdk-cpp-nix = aws-sdk-cpp.override {
apis = [ apis = [
@ -138,7 +139,7 @@ let
# that would interfere with repo semantics. # that would interfere with repo semantics.
baseFiles = fileset.fileFilter (f: f.name != ".gitignore") ./.; baseFiles = fileset.fileFilter (f: f.name != ".gitignore") ./.;
configureFiles = fileset.unions [ ./.version ]; configureFiles = fileset.unions [ ./version.json ];
topLevelBuildFiles = fileset.unions ([ topLevelBuildFiles = fileset.unions ([
./meson.build ./meson.build

2
perl/default.nix
View file

@ -23,7 +23,7 @@ perl.pkgs.toPerlModule (
src = fileset.toSource { src = fileset.toSource {
root = ../.; root = ../.;
fileset = fileset.unions ([ fileset = fileset.unions ([
../.version ../version.json
./lib ./lib
./meson.build ./meson.build
]); ]);

2
perl/meson.build
View file

@ -1,5 +1,5 @@
project('lix-perl', 'cpp', project('lix-perl', 'cpp',
version : run_command('bash', '-c', 'echo -n $(cat ../.version)$VERSION_SUFFIX', check : true).stdout().strip(), version : run_command('bash', '-c', 'echo -n $(jq -r .version < ../version.json)$VERSION_SUFFIX', check : true).stdout().strip(),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level

4
version.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": "2.90.0",
"release_name": "Vanilla Ice Cream"
}