wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-03 06:11:46 +02:00
Code Activity

Merge pull request #66 from DeterminateSystems/detsys-version-2

Browse source 
Bump version to 3.0.0, rename nix to determinate-nix
This commit is contained in:
Eelco Dolstra 2025-02-25 17:46:34 +00:00 • committed by GitHub
commit 3a0458a6ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.version-determinate
View file

@ -1 +1 @@
0.37.2 3.0.0

2
doc/manual/package.nix
View file

@ -22,7 +22,7 @@ let
in in
mkMesonDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-manual"; pname = "determinate-nix-manual";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

4
packaging/components.nix
View file

@ -26,7 +26,7 @@ let
pkg-config pkg-config
; ;
baseVersion = lib.fileContents ../.version; baseVersion = lib.fileContents ../.version-determinate;
versionSuffix = lib.optionalString (!officialRelease) "pre"; versionSuffix = lib.optionalString (!officialRelease) "pre";
@ -50,6 +50,7 @@ let
exts: userFn: stdenv.mkDerivation (lib.extends (lib.composeManyExtensions exts) userFn); exts: userFn: stdenv.mkDerivation (lib.extends (lib.composeManyExtensions exts) userFn);
setVersionLayer = finalAttrs: prevAttrs: { setVersionLayer = finalAttrs: prevAttrs: {
/*
preConfigure = preConfigure =
prevAttrs.prevAttrs or "" prevAttrs.prevAttrs or ""
+ +
@ -59,6 +60,7 @@ let
chmod u+w ./.version chmod u+w ./.version
echo ${finalAttrs.version} > ./.version echo ${finalAttrs.version} > ./.version
''; '';
*/
}; };
localSourceLayer = localSourceLayer =

2
packaging/dev-shell.nix
View file

@ -23,7 +23,7 @@ pkgs.nixComponents.nix-util.overrideAttrs (
pname = "shell-for-" + attrs.pname; pname = "shell-for-" + attrs.pname;
# Remove the version suffix to avoid unnecessary attempts to substitute in nix develop # Remove the version suffix to avoid unnecessary attempts to substitute in nix develop
version = lib.fileContents ../.version; version = lib.fileContents ../.version-determinate;
name = attrs.pname; name = attrs.pname;
installFlags = "sysconfdir=$(out)/etc"; installFlags = "sysconfdir=$(out)/etc";

4
packaging/everything.nix
View file

@ -69,7 +69,7 @@ let
}; };
dev = stdenv.mkDerivation (finalAttrs: { dev = stdenv.mkDerivation (finalAttrs: {
name = "nix-${nix-cli.version}-dev"; name = "determinate-nix-${nix-cli.version}-dev";
pname = "nix"; pname = "nix";
version = nix-cli.version; version = nix-cli.version;
dontUnpack = true; dontUnpack = true;
@ -120,7 +120,7 @@ let
in in
(buildEnv { (buildEnv {
name = "nix-${nix-cli.version}"; name = "determinate-nix-${nix-cli.version}";
paths = [ paths = [
nix-cli nix-cli
nix-manual.man nix-manual.man

2
src/external-api-docs/package.nix
View file

@ -14,7 +14,7 @@ let
in in
mkMesonDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-external-api-docs"; pname = "determinate-nix-external-api-docs";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/internal-api-docs/package.nix
View file

@ -14,7 +14,7 @@ let
in in
mkMesonDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-internal-api-docs"; pname = "determinate-nix-internal-api-docs";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libcmd/package.nix
View file

@ -35,7 +35,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-cmd"; pname = "determinate-nix-cmd";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libexpr-c/package.nix
View file

@ -15,7 +15,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-expr-c"; pname = "determinate-nix-expr-c";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libexpr-test-support/package.nix
View file

@ -18,7 +18,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-util-test-support"; pname = "determinate-nix-util-test-support";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libexpr/package.nix
View file

@ -36,7 +36,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-expr"; pname = "determinate-nix-expr";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libfetchers/package.nix
View file

@ -17,7 +17,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-fetchers"; pname = "determinate-nix-fetchers";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libflake-c/package.nix
View file

@ -16,7 +16,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-flake-c"; pname = "determinate-nix-flake-c";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libflake/package.nix
View file

@ -18,7 +18,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-flake"; pname = "determinate-nix-flake";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libmain-c/package.nix
View file

@ -17,7 +17,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-main-c"; pname = "determinate-nix-main-c";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libmain/package.nix
View file

@ -17,7 +17,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-main"; pname = "determinate-nix-main";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libstore-c/package.nix
View file

@ -15,7 +15,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-store-c"; pname = "determinate-nix-store-c";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libstore-test-support/package.nix
View file

@ -18,7 +18,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-store-test-support"; pname = "determinate-nix-store-test-support";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libstore/package.nix
View file

@ -28,7 +28,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-store"; pname = "determinate-nix-store";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libutil-c/package.nix
View file

@ -14,7 +14,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-util-c"; pname = "determinate-nix-util-c";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libutil-test-support/package.nix
View file

@ -17,7 +17,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-util-test-support"; pname = "determinate-nix-util-test-support";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/libutil/package.nix
View file

@ -21,7 +21,7 @@ let
in in
mkMesonLibrary (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-util"; pname = "determinate-nix-util";
inherit version; inherit version;
workDir = ./.; workDir = ./.;

2
src/perl/package.nix
View file

@ -18,7 +18,7 @@ in
perl.pkgs.toPerlModule ( perl.pkgs.toPerlModule (
mkMesonDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-perl"; pname = "determinate-nix-perl";
inherit version; inherit version;
workDir = ./.; workDir = ./.;