From d9c1adde3e13f140bf242da98663bd688cd871d6 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Wed, 7 Jun 2023 13:11:34 +0200 Subject: [PATCH 1/2] Nix flake update --- flake.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index da0269f..61d77ce 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1681403268, - "narHash": "sha256-ek423DGBkCzGMxN/DjYZ5fCDOL/C0B2nMioUVFZo0Uk=", + "lastModified": 1686137513, + "narHash": "sha256-u30JB/KsBjF4xWAz4iswdKIAmVGtkahD+VV7sywYCBA=", "ref": "main", - "rev": "9ec64d6189890d01b70dbc4b275433ed67df56c9", - "revCount": 17, + "rev": "61db764a7ed44159c1ade3cd9bf9c068de0bdeb8", + "revCount": 20, "type": "git", "url": "https://cyberchaos.dev/e1mo/freescout-nix-flake" }, @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684385584, - "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=", + "lastModified": 1689940971, + "narHash": "sha256-397xShPnFqPC59Bmpo3lS+/Aw0yoDRMACGo1+h2VJMo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a", + "rev": "9ca785644d067445a4aa749902b29ccef61f7476", "type": "github" }, "original": { @@ -59,16 +59,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1684025543, - "narHash": "sha256-hGe7S+i5je+8E/b2mOXVI9nmr038Dw+bV8e1P8xHSe0=", + "lastModified": 1689473667, + "narHash": "sha256-41ePf1ylHMTogSPAiufqvBbBos+gtB6zjQlYFSEKFMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6d2f3dc0d3efd4285eebe4f8a36a47ba438138e", + "rev": "13231eccfa1da771afa5c0807fdd73e05a1ec4e6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } @@ -89,11 +89,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1684032930, - "narHash": "sha256-ueeSYDii2e5bkKrsSdP12JhkW9sqgYrUghLC8aDfYGQ=", + "lastModified": 1689534977, + "narHash": "sha256-EB4hasmjKgetTR0My2bS5AwELZFIQ4zANLqHKi7aVXg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a376127bb5277cd2c337a9458744f370aaf2e08d", + "rev": "bd695cc4d0a5e1bead703cc1bec5fa3094820a81", "type": "github" }, "original": { From cb56ab1f45e25352c1780e6a46066a076cb67782 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Wed, 7 Jun 2023 13:27:14 +0200 Subject: [PATCH 2/2] Update dokuwiki plugins --- packages/default.nix | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/default.nix b/packages/default.nix index 655e309..2e475b0 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -28,12 +28,12 @@ final: prev: tag = final.stdenv.mkDerivation rec { name = "tag"; pname = "dokuwiki-plugin-tag"; - version = "2022-10-02"; + version = "2023-05-25"; src = final.fetchFromGitHub { owner = "dokufreaks"; repo = "plugin-tag"; rev = version; - hash = "sha256-DVO3ZtXTtF8pBroF5VQiR2Vqa/FPxVzq81Jv9e9Z2EU="; + hash = "sha256-HipMbLK6LSdBfHGW03ekLp3Rvh2JQbAPyVIRRHug4GU="; }; installPhase = "mkdir -p $out; cp -R * $out/"; }; @@ -49,27 +49,27 @@ final: prev: }; installPhase = "mkdir -p $out; cp -R * $out/"; }; - smtp = final.stdenv.mkDerivation { + smtp = final.stdenv.mkDerivation rec { name = "smtp"; pname = "dokuwiki-plugin-smtp"; - version = "2022-09-11"; + version = "2023-04-03"; src = final.fetchFromGitHub { owner = "splitbrain"; repo = "dokuwiki-plugin-smtp"; - rev = "31226785e712be0c042f824019c08b7824db90ea"; - hash = "sha256-fwhOePzWGORmjS47/p+MZGhu1YstamlhdTjCxftu9eE="; + rev = version; + hash = "sha256-nvVsL94jJNu7wvyTL5hwMaSBTKHA3Z3YWg7+QtSZ8ss="; }; installPhase = "mkdir -p $out; cp -R * $out/"; }; nspages = final.stdenv.mkDerivation { name = "nspages"; pname = "dokuwiki-plugin-nspages"; - version = "2022-11-27"; + version = "2023-05-29"; src = final.fetchFromGitHub { owner = "gturri"; repo = "nspages"; - rev = "2aeaf7dff24d8ce62a93477357e34834436634ff"; - hash = "sha256-U/mP8wtT6qE/MqMxePUt8XPD9kkGLErdWW0RCIQZZMI="; + rev = "8763b40b3e9c79042055135e7c157aeaed5c078b"; + hash = "sha256-Fa8gtImR8tP8Vnhys9rZdtxl8Ii8cfrXZsTFNC0sD3w="; }; installPhase = "mkdir -p $out; cp -R * $out/"; }; @@ -96,19 +96,19 @@ final: prev: }; installPhase = "mkdir -p $out; cp -R * $out/"; }; - oauth = final.stdenv.mkDerivation { + oauth = final.stdenv.mkDerivation rec { name = "oauth"; pname = "dokuwiki-plugin-oauth"; - version = "2022-10-25"; + version = "2023-03-27"; src = final.fetchFromGitHub { owner = "cosmocode"; repo = "dokuwiki-plugin-oauth"; - rev = "da4733221ed7b4fb3ac0e2429499b14ece3d5f2d"; # 2022-10-25 - hash = "sha256-CNRlaieYm/KCjZ9+OP9pMo5SGjJ4CUrNNdL4iVktCcU="; + rev = version; + hash = "sha256-jyyKEhKp6LyHIq8vmaS1WOc+uyNxwHMt0kmSTSuOGKo="; }; installPhase = "mkdir -p $out; cp -R * $out/"; }; - oauthkeycloak = final.stdenv.mkDerivation { + oauthkeycloak = final.stdenv.mkDerivation rec { name = "oauthkeycloak"; pname = "dokuwiki-plugin-oauthkeycloak"; version = "2022-03-17"; @@ -123,12 +123,12 @@ final: prev: edittable = final.stdenv.mkDerivation rec { name = "edittable"; pname = "dokuwiki-plugin-edittable"; - version = "2022-01-22"; + version = "2023-01-14"; src = final.fetchFromGitHub { owner = "cosmocode"; repo = "edittable"; rev = version; - hash = "sha256-KzNUcZcK/y4SNdzuQACS+GqrrnaZIJlXFWUcYtfSxWY="; + hash = "sha256-Mns8zgucpJrg1xdEopAhd4q1KH7j83Mz3wxuu4Thgsg="; }; installPhase = "mkdir -p $out; cp -R * $out/"; };