8000 build(deps): bump the nix group with 3 updates by dependabot[bot] · Pull Request #808 · 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
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/fetcher/gitlab.rs
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ impl FetchFromGitLab {
if let Some(group) = &self.group {
let _ = write!(root, "{}%2F", group.replace("/", "%2F"));
}
let _ = write!(root, "{}%2F{}", &self.owner, &self.repo);
let _ = write!(root, "{}%2F{}", self.owner, self.repo);
root
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/lang/go/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pub(super) fn load_go_dependency(inputs: &mut AllInputs, pkg: GoPackage<'_>) {
input_macros!(inputs);

match pkg.name {
// keep-sorted start block=yes
// keep-sorted start group_start_regex=^\s*"
"github.com/diamondburned/gotk4-adwaita/pkg" => build!("libadwaita"),
"github.com/diamondburned/gotk4/pkg" => {
native_build!("pkg-config", "wrapGAppsHook4");
Expand All @@ -25,13 +25,13 @@ pub(super) fn load_go_dependency(inputs: &mut AllInputs, pkg: GoPackage<'_>) {
native_build!("pkg-config", "wrapGAppsHook3");
build!("gtk3");
}
"github.com/shirou/gopsutil" => {
"github.com/shirou/gopsutil"
if pkg.version.get().is_some_and(|version| {
version < Version::new(3, 21, 3)
&& (version.major != 2 || version < Version::new(2, 21, 11))
}) {
environ!("CGO_CFLAGS", r#""-Wno-undef-prefix""#);
}
}) =>
{
environ!("CGO_CFLAGS", r#""-Wno-undef-prefix""#);
}
"golang.design/x/clipboard" => {
build!("xorg.libX11"; linux);
Expand Down
8 changes: 3 additions & 5 deletions src/lang/rust/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pub(super) fn load_rust_dependency(inputs: &mut AllInputs, resolve: &Resolve, pk
input_macros!(inputs);

match &*pkg.name() {
// keep-sorted start block=yes
// keep-sorted start group_start_regex=^\s*"
"alsa-sys" => build!("alsa-lib"; linux),
"ash" => build!("vulkan-loader"),
"atk-sys" => build!("atk"),
Expand Down Expand Up @@ -127,10 +127,8 @@ pub(super) fn load_rust_dependency(inputs: &mut AllInputs, resolve: &Resolve, pk
}
"libudev-sys" => build!("udev"),
"libusb1-sys" => build!("libusb"),
"libwebp-sys2" => {
if resolve.features(pkg).iter().all(|feat| feat != "static") {
build!("libwebp");
}
"libwebp-sys2" if resolve.features(pkg).iter().all(|feat| feat != "static") => {
build!("libwebp");
}
"libxml" => build!("libxml2"),
"libz-sys" => {
Expand Down
0