diff options
| author | jade <lix@jade.fyi> | 2024-06-07 03:53:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@lix-systems> | 2024-06-07 03:53:31 +0000 |
| commit | 4f94531209510c7d580e525a017ea01f18894ded (patch) | |
| tree | c5b8e06f73a5fd27ed6afa53a22b9fca145c4638 /package.nix | |
| parent | ec768df0046659e75974919f5923661a29ff52c9 (diff) | |
| parent | 611b1de441a54d3ed7781ca0a26b51b6cb9c45cc (diff) | |
Merge changes from topic "releng" into main
* changes:
Add meson release note
Move version to a JSON file so we can have release names
Remove rl-next-dev
Diffstat (limited to 'package.nix')
| -rw-r--r-- | package.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package.nix b/package.nix index d38563eec..3d41ea703 100644 --- a/package.nix +++ b/package.nix @@ -88,7 +88,8 @@ let inherit (lib) fileset; 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 { apis = [ @@ -138,7 +139,7 @@ let # that would interfere with repo semantics. baseFiles = fileset.fileFilter (f: f.name != ".gitignore") ./.; - configureFiles = fileset.unions [ ./.version ]; + configureFiles = fileset.unions [ ./version.json ]; topLevelBuildFiles = fileset.unions ([ ./meson.build |