nipkgs-bootstrap.master: 0-unstable-2025-02-28 -> 0-unstable-2025-03-04
This commit is contained in:
@@ -1,16 +1,6 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
sane.services.kiwix-serve = {
|
||||
# XXX(2025-02-24): libzim build failure after nixpkgs changed icu default from icu74 -> icu76.
|
||||
# see: <https://github.com/NixOS/nixpkgs/issues/384684>
|
||||
package = pkgs.kiwix-tools.override {
|
||||
libkiwix = pkgs.libkiwix.override {
|
||||
icu = pkgs.icu75;
|
||||
libzim = pkgs.libzim.override {
|
||||
icu = pkgs.icu75;
|
||||
};
|
||||
};
|
||||
};
|
||||
enable = true;
|
||||
port = 8013;
|
||||
zimPaths = with pkgs.zimPackages; [
|
||||
|
@@ -1,8 +1,11 @@
|
||||
# Terminal UI mail client
|
||||
{ ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
sane.programs.aerc = {
|
||||
packageUnwrapped = pkgs.aerc.override {
|
||||
withNotmuch = false; #< not used; regularly fails to build
|
||||
};
|
||||
sandbox.wrapperType = "inplace"; #< /share/aerc/aerc.conf mentions (in comments) other (non-sandboxed) /share files by absolute path
|
||||
sandbox.net = "clearnet";
|
||||
secrets.".config/aerc/accounts.conf" = ../../../secrets/common/aerc_accounts.conf.bin;
|
||||
|
@@ -8,8 +8,8 @@
|
||||
mkNixpkgs ? import ./mkNixpkgs.nix {},
|
||||
}:
|
||||
mkNixpkgs {
|
||||
rev = "5db39d669a21ca7f0e76c295e7664b9d938b7042";
|
||||
sha256 = "sha256-SUZZMAn19X3Ym6lVb18LoXhCS2yicrRr83si5VyJDS0=";
|
||||
version = "0-unstable-2025-02-28";
|
||||
rev = "72bccb2960235fd31de456566789c324a251f297";
|
||||
sha256 = "sha256-8qmLpDUmaiBGLZkFfVyK5/T5fyTXXGdzCRdqAtO0gf4=";
|
||||
version = "0-unstable-2025-03-04";
|
||||
branch = "master";
|
||||
}
|
||||
|
@@ -39,6 +39,19 @@ in
|
||||
# hash = "sha256-PvewYks5P6QX59SG9sEcV89ddJdcNcEO9bB9x05Xgf0=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
name = "aerc: make notmuch optional";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/386733";
|
||||
hash = "sha256-gLxRQ+mF7RTciV7dfVA8ADOyl6u1sv4MW6GzCZDjAdw=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
name = "kiwix-tools: 3.7.0 -> 3.7.0-unstable-2024-12-21 to fix build against kiwix-14.0";
|
||||
saneGhCommit = "4ccec684a6f5096e56918758a85a794ad0564157";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/387044";
|
||||
hash = "sha256-s6llAcopDvx7I8ZwzJ4mL+mSo6BWIKDM7gjpzZiMxok=";
|
||||
})
|
||||
|
||||
# (fetchpatch' {
|
||||
# # 2024-12-26: required to build ollama (with AMD acceleration)
|
||||
# name = "rocm-6: bump packages to 6.3.1 and add missing packages";
|
||||
|
@@ -2,8 +2,8 @@
|
||||
mkNixpkgs ? import ./mkNixpkgs.nix {},
|
||||
}:
|
||||
mkNixpkgs {
|
||||
rev = "29dcbf482396b9e5bdf1ec92973a8451e0aaa1d5";
|
||||
sha256 = "sha256-ps1xz98RAUqrT+V7GFpzf/uHaoh9o5ZoOpE7SnSB6sY=";
|
||||
version = "0-unstable-2025-02-28";
|
||||
rev = "476a8a9af32b94b6b43e7e17231ef566ae61ae0f";
|
||||
sha256 = "sha256-q8aNISLX+sotNnVgacRAtQ/zJYKYsouV0efJbo2w/qg=";
|
||||
version = "0-unstable-2025-03-04";
|
||||
branch = "staging";
|
||||
}
|
||||
|
Reference in New Issue
Block a user