8000 feat: add `passthru.updateScript` where nurl fetchers are known by KiaraGrouwstra · Pull Request #768 · nix-community/nix-init · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions < 8000 /span> src/inputs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ pub struct Inputs {
pub x86_64_linux: BTreeSet<String>,
}

// "all" here refers to all systems
// does not write out python inputs or nix-update-script
pub fn write_all_lambda_inputs(
out: &mut impl Write,
inputs: &AllInputs,
Expand Down
38 changes: 38 additions & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,7 @@ async fn run() -> Result<()> {
}
}

let nix_update_script = matches!(fetcher, MaybeFetcher::Known(_));
match fetcher {
MaybeFetcher::Known(fetcher) => {
writeln!(out, " {fetcher},")?;
Expand Down Expand Up @@ -588,6 +589,10 @@ async fn run() -> Result<()> {
};

let res = write_all_lambda_inputs(&mut out, &inputs, &mut BTreeSet::new())?;
if nix_update_script {
writeln!(out, " nix-update-script,")?;
}

writedoc! {out, r#"
}}:

Expand Down Expand Up @@ -674,6 +679,9 @@ async fn run() -> Result<()> {
write_lambda_input(&mut out, &mut written, &name.to_kebab_case())?;
}
}
if nix_update_script {
writeln!(out, " nix-update-script,")?;
}

writedoc! {out, r#"
}}:
Expand Down Expand Up @@ -727,8 +735,13 @@ async fn run() -> Result<()> {
&nixpkgs,
)
.await;

let res =
write_all_lambda_inputs(&mut out, &inputs, &mut ["rustPlatform".into()].into())?;
if nix_update_script {
8000 writeln!(out, " nix-update-script,")?;
}

writedoc! {out, r#"
}}:

Expand Down Expand Up @@ -762,6 +775,10 @@ async fn run() -> Result<()> {

let res =
write_all_lambda_inputs(&mut out, &inputs, &mut ["rustPlatform".into()].into())?;
if nix_update_script {
writeln!(out, " nix-update-script,")?;
}

writedoc! {out, r#"
}}:

Expand All @@ -779,6 +796,10 @@ async fn run() -> Result<()> {

Builder::MkDerivation { rust: None } => {
let res = write_all_lambda_inputs(&mut out, &inputs, &mut ["stdenv".into()].into())?;
if nix_update_script {
writeln!(out, " nix-update-script,")?;
}

writedoc! { out, r#"
}}:

Expand All @@ -805,7 +826,12 @@ async fn run() -> Result<()> {
&nixpkgs,
)
.await;

let res = write_all_lambda_inputs(&mut out, &inputs, &mut ["stdenv".into()].into())?;
if nix_update_script {
writeln!(out, " nix-update-script,")?;
}

writedoc! {out, r#"
}}:

Expand Down Expand Up @@ -841,6 +867,10 @@ async fn run() -> Result<()> {
};

let res = write_all_lambda_inputs(&mut out, &inputs, &mut ["stdenv".into()].into())?;
if nix_update_script {
writeln!(out, " nix-update-script,")?;
}

writedoc! {out, r#"
}}:

Expand All @@ -859,6 +889,10 @@ async fn run() -> Result<()> {
Builder::MkDerivationNoCC => {
let res =
write_all_lambda_inputs(&mut out, &inputs, &mut ["stdenvNoCC".into()].into())?;
if nix_update_script {
writeln!(out, " nix-update-script,")?;
}

writedoc! { out, r#"
}}:

Expand Down Expand Up @@ -951,6 +985,10 @@ async fn run() -> Result<()> {
writeln!(out, " }};\n")?;
}

if nix_update_script {
writeln!(out, " passthru.updateScript = nix-update-script {{ }};\n")?;
}

let mut desc = desc.trim_matches(|c: char| !c.is_alphanumeric()).to_owned();
desc.get_mut(0 .. 1).map(str::make_ascii_uppercase);
write!(out, " ")?;
Expand Down
3 changes: 3 additions & 0 deletions tests/cmd/drv-no-cc.out/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchFromGitHub,
nix-update-script,
}:

stdenvNoCC.mkDerivation (finalAttrs: {
Expand All @@ -15,6 +16,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
hash = "sha256-nuw/riQaAdk0fYUpm3z978YGPDJnzc66DnOj774tPu0=";
};

passthru.updateScript = nix-update-script { };

meta = {
description = "[..]";
homepage = "https://github.com/z-shell/zi";
Expand Down
3 changes: 3 additions & 0 deletions tests/cmd/drv-rust.out/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
libpulseaudio,
pango,
udev,
nix-update-script,
}:

stdenv.mkDerivation (finalAttrs: {
Expand Down Expand Up @@ -62,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
udev
];

passthru.updateScript = nix-update-script { };

meta = {
description = "[..]";
homepage = "https://github.com/ErikReider/SwayOSD";
Expand Down
26 changes: 26 additions & 0 deletions tests/cmd/drv-sourcehut.out/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
lib,
stdenv,
fetchFromSourcehut,
}:

stdenv.mkDerivation (finalAttrs: {
pname = "scdoc";
version = "1.11.3";

src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "scdoc";
tag = finalAttrs.version;
hash = "sha256-MbLDhLn/JY6OcdOz9/mIPAQRp5TZ6IKuQ/FQ/R3wjGc=";
};

meta = {
description = "[..]";
homepage = "https://git.sr.ht/~sircmpwn/scdoc";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ alice ];
mainProgram = "scdoc";
platforms = lib.platforms.all;
};
})
1 change: 1 addition & 0 deletions tests/cmd/drv-sourcehut.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
args = ["--headless", "--url=https://git.sr.ht/~sircmpwn/scdoc", "--rev=1.11.3"]
3 changes: 3 additions & 0 deletions tests/cmd/drv.out/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
fetchFromGitHub,
meson,
ninja,
nix-update-script,
}:

stdenv.mkDerivation (finalAttrs: {
Expand All @@ -22,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
ninja
];

passthru.updateScript = nix-update-script { };

meta = {
description = "[..]";
homepage = "https://github.com/containers/bubblewrap";
Expand Down
3 changes: 3 additions & 0 deletions tests/cmd/go.out/default.nix