updates and fixes

This commit is contained in:
Rouven Seifert 2024-02-17 19:14:03 +01:00
parent d7475bf560
commit 3dc025762f
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
4 changed files with 14 additions and 30 deletions

View file

@ -12,11 +12,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1703433843, "lastModified": 1707830867,
"narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "417caa847f9383e111d1397039c9d4337d024bf0", "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,11 +180,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707683400, "lastModified": 1708031129,
"narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=", "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "21b078306a2ab68748abf72650db313d646cf2ca", "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -261,11 +261,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1706637303, "lastModified": 1707825078,
"narHash": "sha256-K6SqE9diWDCoEQ+MzuVlTfNrAKcdIa/dLHBtKfz445U=", "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=",
"owner": "Misterio77", "owner": "Misterio77",
"repo": "nix-colors", "repo": "nix-colors",
"rev": "fc080c51d2a219b40d886870e364243783ed5ca1", "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -296,11 +296,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1707546158, "lastModified": 1707956935,
"narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -34,6 +34,7 @@ in
enable = true; enable = true;
enableSubmission = true; enableSubmission = true;
enableSubmissions = true; enableSubmissions = true;
recipientDelimiter = "+";
hostname = "${hostname}"; hostname = "${hostname}";
domain = "${domain}"; domain = "${domain}";
origin = "${domain}"; origin = "${domain}";

View file

@ -5,6 +5,7 @@ let
inherit (prev) fetchPypi; inherit (prev) fetchPypi;
inherit (prev) fetchpatch; inherit (prev) fetchpatch;
inherit (prev) makeWrapper; inherit (prev) makeWrapper;
inherit (prev) python3Packages;
in in
rec { rec {
pcmanfm = prev.pcmanfm.overrideAttrs (_: { pcmanfm = prev.pcmanfm.overrideAttrs (_: {
@ -17,23 +18,6 @@ rec {
pww = callPackage ../pkgs/pww { }; pww = callPackage ../pkgs/pww { };
ianny = callPackage ../pkgs/ianny { }; ianny = callPackage ../pkgs/ianny { };
python3 = prev.python3.override {
packageOverrides = _finel: prev: {
tpm2-pytss = prev.tpm2-pytss.overrideAttrs (old: {
# https://github.com/NixOS/nixpkgs/pull/287804/
patches = old.patches ++ [
(fetchpatch {
name = "fix-newer-cryptography-42-0-1-support.patch";
url = "https://github.com/tpm2-software/tpm2-pytss/commit/0fbb9d099370c0a7031dd13990986538f586836a.patch";
sha256 = "sha256-xnQIr4/iJra0+rn5estVqSvG8pXcuwWykmmayBpCzgw=";
})
];
});
};
};
python3Packages = python3.pkgs;
tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; }; tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
gnome-break-timer = callPackage ../pkgs/gnome-break-timer { }; gnome-break-timer = callPackage ../pkgs/gnome-break-timer { };

View file

@ -9,7 +9,6 @@
./mpv ./mpv
# broken # broken
# ./qutebrowser # ./qutebrowser
./spotify
./ssh ./ssh
./theme ./theme
./tex ./tex