colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs: 0-unstable-2025-02-17 -> 0-unstable-2025-02-22

Browse Source
This commit is contained in:
Colin
2025-02-24 05:55:15 +00:00
parent ec77f8f6b9
commit d399a824e4
8 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hosts/common/programs/assorted.nix
View File

@@ -457,12 +457,6 @@ in
"cacert.unbundled".sandbox.enable = false; #< data only "cacert.unbundled".sandbox.enable = false; #< data only
cargo.persist.byStore.plaintext = [ ".cargo" ];
# probably this sandboxing is too restrictive; i'm sandboxing it for rust-analyzer / neovim LSP
cargo.sandbox.whitelistPwd = true;
cargo.sandbox.net = "all";
cargo.sandbox.extraHomePaths = [ "dev" "ref" ];
clang = {}; clang = {};
clang-tools.sandbox.whitelistPwd = true; clang-tools.sandbox.whitelistPwd = true;

13
hosts/common/programs/cargo.nix Normal file
View File

@@ -0,0 +1,13 @@
{ pkgs, ... }:
{
sane.programs.cargo = {
#v XXX(2025-02-23): normal `cargo` fails to build for cross (temporarily?). use prebuilt instead.
# NOT easy to debug/fix. git bisect pins this between ceba2c6c3b (good) and 62a28e5a3d (bad)
packageUnwrapped = pkgs.rust.packages.prebuilt.cargo;
persist.byStore.plaintext = [ ".cargo" ];
# probably this sandboxing is too restrictive; i'm sandboxing it for rust-analyzer / neovim LSP
sandbox.whitelistPwd = true;
sandbox.net = "all";
sandbox.extraHomePaths = [ "dev" "ref" ];
};
}

1
hosts/common/programs/default.nix
View File

@@ -27,6 +27,7 @@
./cantata.nix ./cantata.nix
./capsh.nix ./capsh.nix
./captree.nix ./captree.nix
./cargo.nix
./catt.nix ./catt.nix
./celeste64.nix ./celeste64.nix
./chatty.nix ./chatty.nix

2
hosts/common/programs/kdenlive.nix
View File

@@ -3,7 +3,7 @@
sane.programs.kdenlive = { sane.programs.kdenlive = {
buildCost = 1; buildCost = 1;
packageUnwrapped = pkgs.kdenlive.overrideAttrs (base: { packageUnwrapped = pkgs.kdePackages.kdenlive.overrideAttrs (base: {
qtWrapperArgs = base.qtWrapperArgs ++ [ qtWrapperArgs = base.qtWrapperArgs ++ [
"--set QP_QPA_PLATFORM wayland" "--set QP_QPA_PLATFORM wayland"
]; ];

12
overlays/cross.nix
View File

@@ -470,6 +470,14 @@ in with final; {
lemoa = prev.lemoa.override { cargo = crossCargo; }; lemoa = prev.lemoa.override { cargo = crossCargo; };
libqmi = prev.libqmi.overrideAttrs (upstream: {
# gtk-doc fails (even with mesonEmulatorHook present)
outputs = lib.remove "devdoc" upstream.outputs;
mesonFlags = (lib.remove "-Dgtk_doc=true" upstream.mesonFlags) ++ [
"-Dgtk_doc=false"
];
});
# libsForQt5 = prev.libsForQt5.overrideScope (self: super: { # libsForQt5 = prev.libsForQt5.overrideScope (self: super: {
# phonon = super.phonon.overrideAttrs (orig: { # phonon = super.phonon.overrideAttrs (orig: {
# # fixes "ECM (required version >= 5.60), Extra CMake Modules" # # fixes "ECM (required version >= 5.60), Extra CMake Modules"
@@ -490,9 +498,9 @@ in with final; {
# 2024/11/19: upstreaming is unblocked # 2024/11/19: upstreaming is unblocked
mepo = (prev.mepo.override { mepo = (prev.mepo.override {
# nixpkgs mepo correctly puts `zig_0_12.hook` in nativeBuildInputs, # nixpkgs mepo correctly puts `zig_0_13.hook` in nativeBuildInputs,
# but for some reason that tries to use the host zig instead of the build zig. # but for some reason that tries to use the host zig instead of the build zig.
zig_0_12 = buildPackages.zig_0_12; zig_0_13 = buildPackages.zig_0_13;
}).overrideAttrs (upstream: { }).overrideAttrs (upstream: {
dontUseZigCheck = true; dontUseZigCheck = true;
nativeBuildInputs = upstream.nativeBuildInputs ++ [ nativeBuildInputs = upstream.nativeBuildInputs ++ [

6
pkgs/by-name/megapixels-next/package.nix
View File

@@ -25,13 +25,13 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "megapixels-next"; pname = "megapixels-next";
version = "2.0.0-alpha1-unstable-2025-02-11"; version = "2.0.0-alpha1-unstable-2025-02-17";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "megapixels-org"; owner = "megapixels-org";
repo = "Megapixels"; repo = "Megapixels";
rev = "2f2929800b005820a21da8f3e7cc4ba0fe51fe1d"; rev = "9acea2849d3a3539edccb24fc837a3b966f911f1";
hash = "sha256-ehPq1UwhYv4ncAhnVjDMgGT255ZdliMw6nMzYE5qWnM="; hash = "sha256-W64iZLcTW7M4YQpnHWbzMYky7ZqNuprvVnHiFsnF92I=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -8,8 +8,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {} mkNixpkgs ? import ./mkNixpkgs.nix {}
}: }:
mkNixpkgs { mkNixpkgs {
rev = "49bae9aaddd584d28321f729e166903fb81ad23c"; rev = "81aebb632a8eca2ee473f0b8b5bdb325a19827ec";
sha256 = "sha256-mIY+RwUDvtVN1/6g0CbJKqlG3jhwR9ttX1Q3h9C0cw8="; sha256 = "sha256-E7H7k02MO8RDnIT+gWndWgNDm9opUK0aFXvjpfCaq3w=";
version = "0-unstable-2025-02-17"; version = "0-unstable-2025-02-22";
branch = "master"; branch = "master";
} }

14
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -46,13 +46,13 @@ in
# hash = "sha256-jW66W1V3upZMfbjuoruY3OGNJfEewx7DW/Z4vAhMEXw="; # hash = "sha256-jW66W1V3upZMfbjuoruY3OGNJfEewx7DW/Z4vAhMEXw=";
# }) # })
(fetchpatch' { # (fetchpatch' {
# patch should be safe to remove; keeping it here to track the upstreaming status # # patch should be safe to remove; keeping it here to track the upstreaming status
name = "nixos/gitea: don't configure the database if `createDatabase == false`"; # name = "nixos/gitea: don't configure the database if `createDatabase == false`";
prUrl = "https://github.com/NixOS/nixpkgs/pull/268849"; # prUrl = "https://github.com/NixOS/nixpkgs/pull/268849";
# saneCommit = "92662a9920cf8b70ad8a061591dc37146123bde3"; # # saneCommit = "92662a9920cf8b70ad8a061591dc37146123bde3";
hash = "sha256-Bmy1xqqmHqJVpleKWOssF+6SUpKOIm6hIGQsW6+hUTg="; # hash = "sha256-Bmy1xqqmHqJVpleKWOssF+6SUpKOIm6hIGQsW6+hUTg=";
}) # })
# (fetchpatch' { # (fetchpatch' {
# # TODO: send to upstream nixpkgs once tested (branch: lappy: pr-stepmania-wrapper) # # TODO: send to upstream nixpkgs once tested (branch: lappy: pr-stepmania-wrapper)