diff --git a/configuration/default.nix b/configuration/default.nix index 9c0ce68..f5d68fb 100644 --- a/configuration/default.nix +++ b/configuration/default.nix @@ -25,10 +25,6 @@ pkgs = prev; lib = prev.lib; }; - - # Mitigate - # https://mta.openssl.org/pipermail/openssl-announce/2022-October/000238.html - nginxStable = prev.nginxStable.override {openssl = prev.openssl_1_1;}; }) ]; diff --git a/flake.lock b/flake.lock index fd1773d..8507c27 100644 --- a/flake.lock +++ b/flake.lock @@ -182,11 +182,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1667055375, - "narHash": "sha256-xfSTHYxuKRiqF4dcuAFdti1OUvrC2lHpQqCHWUK5/JA=", + "lastModified": 1667610399, + "narHash": "sha256-XZd0f4ZWAY0QOoUSdiNWj/eFiKb4B9CJPtl9uO9SYY4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7f9be6a505a31f88499c5d20d11f98accf5ae6ba", + "rev": "1dd8696f96db47156e1424a49578fe7dd4ce99a4", "type": "github" }, "original": { @@ -307,11 +307,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1666961615, - "narHash": "sha256-+Sqz6zQA85Q14U/KwsJO386oxd47zDte8dqBGOtRJGg=", + "lastModified": 1667564121, + "narHash": "sha256-DlR65WyEW78cBmnOhxDzfvNQ9euJEGctSl77olqEaLg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "040c6d8374d090f46ab0e99f1f7c27a4529ecffd", + "rev": "1404483f4531560aad73bdebae4096881c910ac0", "type": "github" }, "original": { @@ -345,11 +345,11 @@ ] }, "locked": { - "lastModified": 1664550666, - "narHash": "sha256-eXfMRd9uItEp3PsYI31FSVGPG9dVC6yF++65ZrGwW8A=", + "lastModified": 1667620329, + "narHash": "sha256-v1Zk7rtEbAGpevBGPZvZBKpwbmw4I+uVwxvd+pBlp3o=", "owner": "berberman", "repo": "nvfetcher", - "rev": "9763ad40d59a044e90726653d9253efaeeb053b2", + "rev": "294826951113dcd3aa9abbcacfb1aa5b95a19116", "type": "github" }, "original": { @@ -454,11 +454,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1667102919, - "narHash": "sha256-DP5j4TwXe96eZf0PLgYSj1Hdyt7SPUoQ003iNBQSKpQ=", + "lastModified": 1667427533, + "narHash": "sha256-MsgTnQEi1g7f8anlW5klHW2pJgam4CLbJaYyBw2ed58=", "owner": "Mic92", "repo": "sops-nix", - "rev": "448ec3e7eb7c7e4563cc2471db748a71baaf9698", + "rev": "486b4455da16272c1ed31bc82adcdbe7af829465", "type": "github" }, "original": { diff --git a/pkgs/_sources_nextcloud/generated.json b/pkgs/_sources_nextcloud/generated.json index 23dc755..c4a4b55 100644 --- a/pkgs/_sources_nextcloud/generated.json +++ b/pkgs/_sources_nextcloud/generated.json @@ -68,11 +68,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-P3jgNAFcABwTBzOnW9/R6hp8Ak6XoXvz+B9GVS9/BeM=", + "sha256": "sha256-3lCqvmaMsgrFD5PzyHIcwxxGeC+qOMTGxbOi7nPFL6I=", "type": "url", - "url": "https://github.com/nextcloud/cookbook/releases/download/v0.9.16/Cookbook-0.9.16.tar.gz" + "url": "https://github.com/nextcloud/cookbook/releases/download/v0.9.17/Cookbook-0.9.17.tar.gz" }, - "version": "0.9.16" + "version": "0.9.17" }, "news": { "cargoLocks": null, diff --git a/pkgs/_sources_nextcloud/generated.nix b/pkgs/_sources_nextcloud/generated.nix index c1e35e7..324306d 100644 --- a/pkgs/_sources_nextcloud/generated.nix +++ b/pkgs/_sources_nextcloud/generated.nix @@ -1,5 +1,5 @@ # This file was generated by nvfetcher, please do not modify it manually. -{ fetchgit, fetchurl, fetchFromGitHub }: +{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { apporder = { pname = "apporder"; @@ -35,10 +35,10 @@ }; cookbook = { pname = "cookbook"; - version = "0.9.16"; + version = "0.9.17"; src = fetchurl { - url = "https://github.com/nextcloud/cookbook/releases/download/v0.9.16/Cookbook-0.9.16.tar.gz"; - sha256 = "sha256-P3jgNAFcABwTBzOnW9/R6hp8Ak6XoXvz+B9GVS9/BeM="; + url = "https://github.com/nextcloud/cookbook/releases/download/v0.9.17/Cookbook-0.9.17.tar.gz"; + sha256 = "sha256-3lCqvmaMsgrFD5PzyHIcwxxGeC+qOMTGxbOi7nPFL6I="; }; }; news = { diff --git a/pkgs/nextcloud-apps.toml b/pkgs/nextcloud-apps.toml index 0620299..6e06432 100644 --- a/pkgs/nextcloud-apps.toml +++ b/pkgs/nextcloud-apps.toml @@ -18,8 +18,9 @@ src.manual = "v4.2.2" # Pinned until we update to nextcloud 25 fetch.url = "https://github.com/nextcloud-releases/contacts/releases/download/$ver/contacts-$ver.tar.gz" [cookbook] -src.github = "nextcloud/cookbook" +src.github_tag = "nextcloud/cookbook" src.prefix = "v" +src.exclude_regex = 'v\d+\.\d+\.\d+-rc\d+' fetch.url = "https://github.com/nextcloud/cookbook/releases/download/v$ver/Cookbook-$ver.tar.gz" [news]