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

nixpkgs: 0-unstable-2024-08-13 -> 0-unstable-2024-08-18

Browse Source
This commit is contained in:
Colin
2024-08-19 13:48:19 +00:00
parent c15cea08f6
commit ddffda1594
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/common/programs/visidata.nix
View File

@@ -1,7 +1,9 @@
{ pkgs, ... }:
{
sane.programs.visidata = {
packageUnwrapped = pkgs.visidata.overridePythonAttrs (upstream: {
packageUnwrapped = (pkgs.visidata.override {
zulip = null; #< XXX(2024-08-17): security vulnerability, but completely useless anyway so disable. see: <https://github.com/NixOS/nixpkgs/pull/334638>
}).overridePythonAttrs (upstream: {
# XXX(2024/07/07): tests fail due to python 3.12 string formatting differences (inconsequential)
doCheck = false;
});

17
pkgs/additional/nixpkgs/default.nix
View File

@@ -27,12 +27,12 @@
}:
let
lock = {
master.rev = "02a8f81ccbc8fee8f0be9daf1b1e56830e78382c";
master.sha256 = "sha256:0mcjiyp818vldkdg223bln7mwzsgdffnpgl6sg3cf5mfvh8hk0v3";
staging.rev = "558b07002999a26ed9bc67f372dd19f6a37b892e";
staging.sha256 = "sha256-xP/h4X4ms/gxugNFRxl4q0D1+RwrZA4RsI7okgVVS7E=";
staging-next.rev = "d353e29271bcbaab945b7c1c13208950590da9d3";
staging-next.sha256 = "sha256-0DdUd/mIqEe5JSWhLYQ1PHMvvrdmnYuVe7l4hWbGTm8=";
master.rev = "82821e1670b61b43c89b1cf27654321c7623ec2e";
master.sha256 = "sha256-+MP4Lw0b2NWMnpt0JNczKje38K0AEdGyTTcIhe0/Pr4=";
staging.rev = "82821e1670b61b43c89b1cf27654321c7623ec2e";
staging.sha256 = "sha256-+MP4Lw0b2NWMnpt0JNczKje38K0AEdGyTTcIhe0/Pr4=";
staging-next.rev = "82821e1670b61b43c89b1cf27654321c7623ec2e";
staging-next.sha256 = "sha256-+MP4Lw0b2NWMnpt0JNczKje38K0AEdGyTTcIhe0/Pr4=";
};
lock' = lock."${variant}";
unpatchedSrc = fetchzip {
@@ -66,6 +66,9 @@ let
config = {
allowUnfree = true; # NIXPKGS_ALLOW_UNFREE=1
allowBroken = true; # NIXPKGS_ALLOW_BROKEN=1
permittedInsecurePackages = [
"jitsi-meet-1.0.8043" #< XXX(2024-08-17): used by element-web, and probably in a safe way. see: <https://github.com/NixOS/nixpkgs/pull/334638>
];
};
} // (if (system != localSystem) then {
# XXX(2023/12/11): cache.nixos.org uses `system = ...` instead of `hostPlatform.system`, and that choice impacts the closure of every package.
@@ -81,7 +84,7 @@ in
src.overrideAttrs (base: {
# attributes needed for update scripts
pname = "nixpkgs";
version = "0-unstable-2024-08-13";
version = "0-unstable-2024-08-18";
passthru = (base.passthru or {}) // nixpkgs // {
src = unpatchedSrc // {
inherit (lock') rev;