Subject: nettle-sys: clear out "vendored" feature cruft from build.rs From: Daniel Kahn Gillmor's avatarDaniel Kahn Gillmor https://salsa.debian.org/rust-team/debcargo-conf/-/commit/0c71150ad26bb66a8396dcdab055181af232ddc5 https://sources.debian.org/src/rust-nettle-sys/2.0.4-3/debian/patches/disable-vendor.diff/ --- a/Cargo.toml 2019-10-23 13:08:07.000000000 -0400 +++ b/Cargo.toml 2019-10-23 14:08:46.644064014 -0400 @@ -29,12 +29,9 @@ version = "0.51.1" default-features = false -[build-dependencies.nettle-src] -version = "3.5.1-0" -optional = true - [build-dependencies.pkg-config] version = "0.3" [features] vendored = ["nettle-src"] +nettle-src = [] diff --git a/build.rs b/build.rs index 44f7af3..ede4b2f 100644 --- a/build.rs +++ b/build.rs @@ -1,7 +1,5 @@ extern crate bindgen; extern crate pkg_config; -#[cfg(feature = "vendored")] -extern crate nettle_src; use std::env; use std::fs; @@ -36,14 +34,6 @@ fn main() { println!("cargo:rerun-if-env-changed=NETTLE_STATIC"); println!("cargo:rerun-if-env-changed={}", NETTLE_PREGENERATED_BINDINGS); - #[cfg(feature = "vendored")] - { - let artifacts = nettle_src::Build::new().build(); - println!("cargo:vendored=1"); - env::set_var("PKG_CONFIG_PATH", - artifacts.lib_dir().join("pkgconfig")); - } - let nettle = pkg_config::probe_library("nettle hogweed").unwrap(); let mode = match env::var_os("NETTLE_STATIC") { 87a5'>diff
path: root/gnu/installer/user.scm
AgeCommit message (Expand)Author
2022-09-22installer: Move <secret> to utils and use it for crypt passwords....* gnu/installer/user.scm (<secret>, secret?, make-secret, secret-content): Move to utils.scm. * gnu/installer/utils.scm (<secret>, secret?, make-secret, secret-content): Moved from user.scm. * gnu/installer/newt/partition.scm (prompt-luks-passwords): Make password a <secret>. * gnu/installer/parted.scm (luks-format-and-open): Unwrap secret. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Josselin Poiret
2022-08-08installer: Add comments and vertical space to the generated config....* gnu/installer/parted.scm (user-partitions->configuration): Introduce vertical space and a comment. * gnu/installer/services.scm (G_): New macro. (%system-services): Add comment for OpenSSH. (system-services->configuration): Add vertical space and comments. * gnu/installer/user.scm (users->configuration): Add comment. * gnu/installer/steps.scm (format-configuration): Add comment. (configuration->file): Expound leading comment. Pass #:format-comment to 'pretty-print-with-comments/splice'. Ludovic Courtès
2022-05-21Revert "installer: user: Remove useless filtering."...This reverts commit c2125e59d0774cda3e559adeb056459a5f23586b. Fixes <https://issues.guix.gnu.org/55361>. Ludovic Courtès
2022-04-06installer: user: Remove useless filtering....* gnu/installer/user.scm (users->configuration): Remove root account filtering that is now performed in the "run-user-add-page" procedure. Mathieu Othacehe
2022-02-02installer: Turn passwords into opaque records....* gnu/installer/user.scm (<secret>, secret?, make-secret, secret-content): Add opaque <secret> record that boxes its contents, with a custom printer that doesn't display anything. * gnu/installer/newt/user.scm (run-user-add-page, run-user-page): Box it. * gnu/installer/final.scm (create-user-database): Unbox it. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Josselin Poiret