diff --git a/flake.lock b/flake.lock index aa06fc6..a632973 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -28,11 +28,11 @@ }, "locked": { "host": "cyberchaos.dev", - "lastModified": 1715425724, - "narHash": "sha256-SJdDA540r/UheHFHe13GrUrV0HVCMeLZVTIKy9DT3i4=", + "lastModified": 1743845578, + "narHash": "sha256-tS1fQfOasIbzOnCCBZHAjdOCsKD/Zt5btciC/cgcwWc=", "owner": "e1mo", "repo": "freescout-nix-flake", - "rev": "7e35a8d1f507ea3d6b6be54edc3a83f48f3dd140", + "rev": "2b5bcee06a673c13c5b5a62b4f4dd1300ce85903", "type": "gitlab" }, "original": { @@ -45,11 +45,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728356841, - "narHash": "sha256-sSGavgctEuqq07OZ1XiA/V7/RXLdUAUVpqgUhfmGAdQ=", + "lastModified": 1743814133, + "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6f24b0bbb0461887719d10c77c9fe81e7bea37d", + "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b", "type": "github" }, "original": { @@ -59,22 +59,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", @@ -87,15 +71,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1743756170, + "narHash": "sha256-2b11EYa08oqDmF3zEBLkG1AoNn9rB1k39ew/T/mSvbU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "cff8437c5fe8c68fc3a840a21bf1f4dc801da40d", "type": "github" }, "original": { diff --git a/packages/default.nix b/packages/default.nix index f3c7199..70a53eb 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -182,6 +182,36 @@ final: prev: final.matrix-synapse-unwrapped ]; }; + + pysaml2 = pprev.pysaml2.overrideAttrs (oa: rec { + version = "7.5.2"; + + src = final.fetchFromGitHub { + owner = "IdentityPython"; + repo = "pysaml2"; + tag = "v${version}"; + hash = "sha256-2mvAXTruZqoSBUgfT2VEAnWQXVdviG0e49y7LPK5x00="; + }; + + patches = (oa.patches or []) ++ [ + (final.fetchpatch { + url = "https://github.com/IdentityPython/pysaml2/pull/977.patch"; + hash = "sha256-kBNvGk5pwVmpW1wsIWVH9wapu6kjFavaTt4e3Llaw2c="; + }) + ]; + + dependencies = (oa.dependencies or []) ++ [ + pfinal.cryptography + ]; + + disabledTests = (oa.disabledTests or []) ++ [ + "test_namespace_processing" + ]; + + meta = (oa.meta or {}) // { + broken = false; + }; + }); })]; matrixjoinlink = final.callPackage ./matrixjoinlink {}; diff --git a/services/dokuwiki.nix b/services/dokuwiki.nix index b28397d..d083bc6 100644 --- a/services/dokuwiki.nix +++ b/services/dokuwiki.nix @@ -60,8 +60,6 @@ in { ''; }); - enable = true; - pluginsConfig = { "tag" = true; "pagelist" = true;