From d9b59f63c82f362ab747649a5e0ee4490561bc9c Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Sun, 11 Feb 2024 20:01:24 +0100 Subject: [PATCH] nix flake update --- flake.lock | 60 ++++++++++++++++++++++---------------------- overlays/default.nix | 19 +++++++++++++- 2 files changed, 48 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 991ccaa..bd8dea0 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "base16-schemes": { "flake": false, "locked": { - "lastModified": 1689473676, - "narHash": "sha256-L0RhUr9+W5EPWBpLcmkKpUeCEWRs/kLzVMF3Vao2ZU0=", + "lastModified": 1696158499, + "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", "owner": "tinted-theming", "repo": "base16-schemes", - "rev": "d95123ca6377cd849cfdce92c0a24406b0c6a789", + "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1706306660, - "narHash": "sha256-lZvgkHtVeduGByPb0Tz9LpAi4olfkEm8XPgv0o7GRsk=", + "lastModified": 1707672157, + "narHash": "sha256-dzfGf+R+ECFKe4rw42vUn5mV0hMSGQRVJlhjRHs3cvM=", "owner": "nix-community", "repo": "home-manager", - "rev": "b2f56952074cb46e93902ecaabfb04dd93733434", + "rev": "a09cfdbaf11c821340cff24d9ad1c264708ee12e", "type": "github" }, "original": { @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1703800710, - "narHash": "sha256-BlTnkNW50xEMojxDd+M4W1WUX4t33vkxJhsW/eeSCco=", + "lastModified": 1706522977, + "narHash": "sha256-Tq69CQ+uutfY477w8uCRyF/2V0Wh/+zHzM3qwcVmqsk=", "owner": "therealr5", "repo": "TruckSimulatorBot-images", - "rev": "ead83b4ce653e293b9459b0495f0a3f1baac0aa3", + "rev": "d54a772d48a329a402433cc90502700a6699008e", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "impermanence": { "locked": { - "lastModified": 1703656108, - "narHash": "sha256-hCSUqdFJKHHbER8Cenf5JRzjMlBjIdwdftGQsO0xoJs=", + "lastModified": 1706639736, + "narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=", "owner": "nix-community", "repo": "impermanence", - "rev": "033643a45a4a920660ef91caa391fbffb14da466", + "rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045", "type": "github" }, "original": { @@ -261,11 +261,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1695388192, - "narHash": "sha256-2jelpE7xK+4M7jZNyWL7QYOYegQLYBDQS5bvdo8XRUQ=", + "lastModified": 1706637303, + "narHash": "sha256-K6SqE9diWDCoEQ+MzuVlTfNrAKcdIa/dLHBtKfz445U=", "owner": "Misterio77", "repo": "nix-colors", - "rev": "37227f274b34a3b51649166deb94ce7fec2c6a4c", + "rev": "fc080c51d2a219b40d886870e364243783ed5ca1", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1705806513, - "narHash": "sha256-FcOmNjhHFfPz2udZbRpZ1sfyhVMr+C2O8kOxPj+HDDk=", + "lastModified": 1707620986, + "narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f8e04fbcebcc24cebc91989981bd45f69b963ed7", + "rev": "0cb4345704123492e6d1f1068629069413c80de0", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1707546158, + "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1694911725, - "narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=", + "lastModified": 1697935651, + "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "819180647f428a3826bfc917a54449da1e532ce0", + "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1705881825, - "narHash": "sha256-tFmDS9lSuDKx6voMK4HlLAI0/IR5x319Ng8LvhsfL1U=", + "lastModified": 1706780558, + "narHash": "sha256-tZRNaZKENRzd83oLgqgG/G2A+7FgsISFhgblGjFM244=", "owner": "therealr5", "repo": "purge", - "rev": "364bc2c5522dda77947f003d3ab03d023a7318e1", + "rev": "3875053bd588aeee14849c50c60f6a33ac784da3", "type": "github" }, "original": { @@ -488,11 +488,11 @@ ] }, "locked": { - "lastModified": 1705882231, - "narHash": "sha256-OyWYOsl876tAJ443p9lKSDIrBtq80JZ/OlmrVVdIHF4=", + "lastModified": 1706780552, + "narHash": "sha256-qXEAZNReY2jeoxLO/uZmZMOEOQq6BRq/Mh20BQGF2Bs=", "owner": "therealr5", "repo": "TruckSimulatorBot", - "rev": "9ae3c21b72b1f49f0b15808eb61b10600e00a845", + "rev": "88194a54c984fb91090c00d116c821627af9ed2f", "type": "github" }, "original": { diff --git a/overlays/default.nix b/overlays/default.nix index d97f598..4f2d9ba 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -7,7 +7,7 @@ let inherit (prev) fetchpatch; inherit (prev) makeWrapper; in -{ +rec { pcmanfm = prev.pcmanfm.overrideAttrs (_: { # remove deskop preferences shortcut postInstall = '' @@ -18,6 +18,23 @@ in pww = callPackage ../pkgs/pww { }; 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; }; gnome-break-timer = callPackage ../pkgs/gnome-break-timer { };