tlaternet/tlaternet-server
1
0
Fork 0
Code Issues 9 Pull requests Releases Activity

Update inputs and remove openssl CVE mitigations #75

Manually merged
tlaternet merged 3 commits from tlater/update into master 2022-11-05 17:42:43 +00:00
Conversation 0 Commits 3 Files changed 5 +24 -27
5 changed files with 24 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configuration/default.nix
View file

@ -25,10 +25,6 @@
pkgs = prev; pkgs = prev;
lib = prev.lib; lib = prev.lib;
}; };
# Mitigate
# https://mta.openssl.org/pipermail/openssl-announce/2022-October/000238.html
nginxStable = prev.nginxStable.override {openssl = prev.openssl_1_1;};
}) })
]; ];

30
flake.lock
View file

@ -182,11 +182,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1667077288,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,11 +291,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1667055375, "lastModified": 1667610399,
"narHash": "sha256-xfSTHYxuKRiqF4dcuAFdti1OUvrC2lHpQqCHWUK5/JA=", "narHash": "sha256-XZd0f4ZWAY0QOoUSdiNWj/eFiKb4B9CJPtl9uO9SYY4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7f9be6a505a31f88499c5d20d11f98accf5ae6ba", "rev": "1dd8696f96db47156e1424a49578fe7dd4ce99a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -307,11 +307,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1666961615, "lastModified": 1667564121,
"narHash": "sha256-+Sqz6zQA85Q14U/KwsJO386oxd47zDte8dqBGOtRJGg=", "narHash": "sha256-DlR65WyEW78cBmnOhxDzfvNQ9euJEGctSl77olqEaLg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "040c6d8374d090f46ab0e99f1f7c27a4529ecffd", "rev": "1404483f4531560aad73bdebae4096881c910ac0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -345,11 +345,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1664550666, "lastModified": 1667620329,
"narHash": "sha256-eXfMRd9uItEp3PsYI31FSVGPG9dVC6yF++65ZrGwW8A=", "narHash": "sha256-v1Zk7rtEbAGpevBGPZvZBKpwbmw4I+uVwxvd+pBlp3o=",
"owner": "berberman", "owner": "berberman",
"repo": "nvfetcher", "repo": "nvfetcher",
"rev": "9763ad40d59a044e90726653d9253efaeeb053b2", "rev": "294826951113dcd3aa9abbcacfb1aa5b95a19116",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -454,11 +454,11 @@
"nixpkgs-22_05": "nixpkgs-22_05" "nixpkgs-22_05": "nixpkgs-22_05"
}, },
"locked": { "locked": {
"lastModified": 1667102919, "lastModified": 1667427533,
"narHash": "sha256-DP5j4TwXe96eZf0PLgYSj1Hdyt7SPUoQ003iNBQSKpQ=", "narHash": "sha256-MsgTnQEi1g7f8anlW5klHW2pJgam4CLbJaYyBw2ed58=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "448ec3e7eb7c7e4563cc2471db748a71baaf9698", "rev": "486b4455da16272c1ed31bc82adcdbe7af829465",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
pkgs/_sources_nextcloud/generated.json
View file

@ -68,11 +68,11 @@
"pinned": false, "pinned": false,
"src": { "src": {
"name": null, "name": null,
"sha256": "sha256-P3jgNAFcABwTBzOnW9/R6hp8Ak6XoXvz+B9GVS9/BeM=", "sha256": "sha256-3lCqvmaMsgrFD5PzyHIcwxxGeC+qOMTGxbOi7nPFL6I=",
"type": "url", "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": { "news": {
"cargoLocks": null, "cargoLocks": null,

8
pkgs/_sources_nextcloud/generated.nix
View file

@ -1,5 +1,5 @@
# This file was generated by nvfetcher, please do not modify it manually. # This file was generated by nvfetcher, please do not modify it manually.
{ fetchgit, fetchurl, fetchFromGitHub }: { fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
{ {
apporder = { apporder = {
pname = "apporder"; pname = "apporder";
@ -35,10 +35,10 @@
}; };
cookbook = { cookbook = {
pname = "cookbook"; pname = "cookbook";
version = "0.9.16"; version = "0.9.17";
src = fetchurl { src = fetchurl {
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";
sha256 = "sha256-P3jgNAFcABwTBzOnW9/R6hp8Ak6XoXvz+B9GVS9/BeM="; sha256 = "sha256-3lCqvmaMsgrFD5PzyHIcwxxGeC+qOMTGxbOi7nPFL6I=";
}; };
}; };
news = { news = {

3
pkgs/nextcloud-apps.toml
View file

@ -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" fetch.url = "https://github.com/nextcloud-releases/contacts/releases/download/$ver/contacts-$ver.tar.gz"
[cookbook] [cookbook]
src.github = "nextcloud/cookbook" src.github_tag = "nextcloud/cookbook"
src.prefix = "v" 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" fetch.url = "https://github.com/nextcloud/cookbook/releases/download/v$ver/Cookbook-$ver.tar.gz"
[news] [news]