From a0c1511d86ad609f3814f2a4d086fd276e49505d Mon Sep 17 00:00:00 2001 From: linj Date: Tue, 7 Jun 2022 21:42:37 +0800 Subject: [PATCH 01/26] tmuxPlugins.gruvbox: unstable-2019-05-05 -> unstable-2022-04-19 --- pkgs/misc/tmux-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index bffd7edac16e9bc..0146c67f33dd6df 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -249,12 +249,12 @@ in rec { gruvbox = mkTmuxPlugin { pluginName = "gruvbox"; rtpFilePath = "gruvbox-tpm.tmux"; - version = "unstable-2019-05-05"; + version = "unstable-2022-04-19"; src = fetchFromGitHub { owner = "egel"; repo = "tmux-gruvbox"; - rev = "6149fd8b5d6924925b4d5aa6935039780e94f3d6"; - sha256 = "1ykr4yardavd0x7yfrnshd4b0gi8p31pji7i79ib0nss134zncpb"; + rev = "3f9e38d7243179730b419b5bfafb4e22b0a969ad"; + sha256 = "1l0kq77rk3cbv0rvh7bmfn90vvqqmywn9jk6gbl9mg3qbynq5wcf"; }; }; From eeb657a96be67fdaff92d53e9920323659fd7a69 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Wed, 22 Jun 2022 17:39:56 +1000 Subject: [PATCH 02/26] pythonPackages.keyring: depend on dbus-python on Linux Needed to use the KWallet backend. --- pkgs/development/python-modules/keyring/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 23c84b3808bba3e..72ebfec8f758ff8 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.isLinux [ jeepney secretstorage + dbus-python ]; pythonImportsCheck = [ From 93fb6d19ab349f2661e52b7d710f1cbeff9a65d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Jun 2022 00:33:06 +0200 Subject: [PATCH 03/26] schleuder: 4.0.2 -> 4.0.3 https://0xacab.org/schleuder/schleuder/-/blob/schleuder-4.0.3/CHANGELOG.md#403-2022-04-12 --- pkgs/tools/security/schleuder/Gemfile.lock | 44 ++++++++-------- pkgs/tools/security/schleuder/gemset.nix | 60 +++++++++++----------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/pkgs/tools/security/schleuder/Gemfile.lock b/pkgs/tools/security/schleuder/Gemfile.lock index a5b7312901c27df..79c6287580d182a 100644 --- a/pkgs/tools/security/schleuder/Gemfile.lock +++ b/pkgs/tools/security/schleuder/Gemfile.lock @@ -4,25 +4,25 @@ GEM GEM remote: https://rubygems.org/ specs: - activemodel (6.1.4.4) - activesupport (= 6.1.4.4) - activerecord (6.1.4.4) - activemodel (= 6.1.4.4) - activesupport (= 6.1.4.4) - activesupport (6.1.4.4) + activemodel (6.1.6) + activesupport (= 6.1.6) + activerecord (6.1.6) + activemodel (= 6.1.6) + activesupport (= 6.1.6) + activesupport (6.1.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - bcrypt (3.1.16) + bcrypt (3.1.18) charlock_holmes (0.7.7) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) daemons (1.4.1) eventmachine (1.2.7) gpgme (2.0.20) mini_portile2 (~> 2.3) - i18n (1.8.11) + i18n (1.10.0) concurrent-ruby (~> 1.0) mail (2.7.1) mini_mime (>= 0.1.1) @@ -30,17 +30,17 @@ GEM gpgme (~> 2.0, >= 2.0.2) mail (~> 2.5, >= 2.5.3) mini_mime (1.1.2) - mini_portile2 (2.7.1) - minitest (5.15.0) + mini_portile2 (2.8.0) + minitest (5.16.1) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) - rack (2.2.3) - rack-protection (2.1.0) + rack (2.2.3.1) + rack-protection (2.2.0) rack rake (13.0.6) ruby2_keywords (0.0.5) - schleuder (4.0.2) + schleuder (4.0.3) activerecord (~> 6.1.3) bcrypt (~> 3.1.2) charlock_holmes (~> 0.7.6) @@ -53,18 +53,18 @@ GEM sqlite3 (~> 1.4.2) thin (~> 1) thor (~> 0) - sinatra (2.1.0) + sinatra (2.2.0) mustermann (~> 1.0) rack (~> 2.2) - rack-protection (= 2.1.0) + rack-protection (= 2.2.0) tilt (~> 2.0) - sinatra-contrib (2.1.0) + sinatra-contrib (2.2.0) multi_json mustermann (~> 1.0) - rack-protection (= 2.1.0) - sinatra (= 2.1.0) + rack-protection (= 2.2.0) + sinatra (= 2.2.0) tilt (~> 2.0) - sqlite3 (1.4.2) + sqlite3 (1.4.4) thin (1.8.1) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) @@ -73,7 +73,7 @@ GEM tilt (2.0.10) tzinfo (2.0.4) concurrent-ruby (~> 1.0) - zeitwerk (2.5.3) + zeitwerk (2.6.0) PLATFORMS x86_64-linux @@ -82,4 +82,4 @@ DEPENDENCIES schleuder! BUNDLED WITH - 2.2.24 + 2.3.9 diff --git a/pkgs/tools/security/schleuder/gemset.nix b/pkgs/tools/security/schleuder/gemset.nix index 9bd9cadbb883b15..63cd6a5db81f2a4 100644 --- a/pkgs/tools/security/schleuder/gemset.nix +++ b/pkgs/tools/security/schleuder/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g3qdz8dw6zkgz45jd13lwfdnm7rhgczv1pssw63g9k6qj3bkxjm"; + sha256 = "1f0ai51icvvx5q0jd1l89k0dlwzpsrkqlj6x43f8qc4bd1ya9glx"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090d4wl1pq06m9mibpck0m5nm8h45fwhs3fjx27297kjmnv4gzik"; + sha256 = "0khjnkvmiyap1g3rvw9hp16mzai4smqcg5hxhq28pll25ljzxdbp"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -27,20 +27,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98"; + sha256 = "08wzpwgdm03vzb8gqr8bvfdarb89g5ah0skvwqk6qv87p55xqkyw"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.6"; }; bcrypt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb"; + sha256 = "048z3fvcknqx7ikkhrcrykxlqmf9bzc7l0y5h1cnvrc9n2qf0k8m"; type = "gem"; }; - version = "3.1.16"; + version = "3.1.18"; }; charlock_holmes = { groups = ["default"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; daemons = { groups = ["default"]; @@ -99,10 +99,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; type = "gem"; }; - version = "1.8.11"; + version = "1.10.0"; }; mail = { dependencies = ["mini_mime"]; @@ -141,20 +141,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + sha256 = "08z6rgs1jgbc032843mwg3fayvzn4hihz8bl2gp87pf7z02kw5f3"; type = "gem"; }; - version = "5.15.0"; + version = "5.16.1"; }; multi_json = { groups = ["default"]; @@ -182,10 +182,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "1b1qsg0yfargdhmpapp2d3mlxj82wyygs9nj74w0r03diyi8swlc"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.3.1"; }; rack-protection = { dependencies = ["rack"]; @@ -193,10 +193,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz"; + sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; rake = { groups = ["default"]; @@ -224,10 +224,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15j1rfkfvni82msamikynsg48s50hbsx1pxm3y967caq9s80ll6c"; + sha256 = "0lxmi7402v5qkajx3j5bydarxf3lbm1kzpwgy7zsmc7l28mcv8wx"; type = "gem"; }; - version = "4.0.2"; + version = "4.0.3"; }; sinatra = { dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; @@ -235,10 +235,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk"; + sha256 = "1x3rci7k30g96y307hvglpdgm3f7nga3k3n4i8n1v2xxx290800y"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; sinatra-contrib = { dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"]; @@ -246,20 +246,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl1iiafz51yzjd0vchl2lni7lmwppjql6cn1fnfxbma707qlcja"; + sha256 = "0zzckl2n7r18fk3929hgcv8pby6hxwva0rbxw66yq6r96lnwzryb"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; sqlite3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; + sha256 = "1z1wa639c278bsipczn6kv8b13fj85pi8gk7x462chqx6k0wm0ax"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.4"; }; thin = { dependencies = ["daemons" "eventmachine" "rack"]; @@ -308,9 +308,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; + sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; type = "gem"; }; - version = "2.5.3"; + version = "2.6.0"; }; } From a53e0f65ecff638b77174e951eb6ff5324c79986 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Mon, 27 Jun 2022 14:58:08 +0200 Subject: [PATCH 04/26] arrterian.nix-env-selector: 1.0.7 -> 1.0.9 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d4a542bb99e4ead..ac04e85876c0e25 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -235,8 +235,8 @@ let mktplcRef = { name = "nix-env-selector"; publisher = "arrterian"; - version = "1.0.7"; - sha256 = "0e76885c9dbb6dca4eac8a75866ec372b948cc64a3a3845327d7c3ef6ba42a57"; + version = "1.0.9"; + sha256 = "sha256-TkxqWZ8X+PAonzeXQ+sI9WI+XlqUHll7YyM7N9uErk0="; }; meta = { license = lib.licenses.mit; From be2b04c7c282b123f3c04a1cdf747ae6233155b6 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Mon, 27 Jun 2022 14:58:41 +0200 Subject: [PATCH 05/26] eamodio.gitlens: 12.0.7 -> 12.1.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ac04e85876c0e25..c09573937b85120 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -755,8 +755,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "12.0.7"; - sha256 = "sha256-gPhiytthf35eDhtzkSK2JZjtj4877la3hB1Cswbrszw="; + version = "12.1.1"; + sha256 = "0i1wxgc61rrf11zff0481dg9s2lmv1ngpwx8nb2ygf6lh0axr7cj"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; From 84272acac28848498149fd2611c08ed26068feb1 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Mon, 27 Jun 2022 14:59:37 +0200 Subject: [PATCH 06/26] github.vscode-pull-request-github: 0.37.2022030309 -> 0.45.2022062709 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c09573937b85120..9260c22d31a4302 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1126,8 +1126,8 @@ let mktplcRef = { name = "vscode-pull-request-github"; publisher = "github"; - version = "0.37.2022030309"; - sha256 = "1icmg2ssdkxvwp8mn8zzakwn42hrdglsdgfnaf8va4vd9mqixl1v"; + version = "0.45.2022062709"; + sha256 = "119dz79vl2pngf6327zbfw97qnci8xg14d23wdd4n75jmra2wrbz"; }; meta = { license = lib.licenses.mit; }; }; From 81c27ba26056ff61ae2df33530ed576946504f9b Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Mon, 27 Jun 2022 15:00:05 +0200 Subject: [PATCH 07/26] llvm-vs-code-extensions.vscode-clangd -> 0.1.15 -> 0.1.17 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9260c22d31a4302..ee6bf3908325031 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1478,8 +1478,8 @@ let mktplcRef = { name = "vscode-clangd"; publisher = "llvm-vs-code-extensions"; - version = "0.1.15"; - sha256 = "0skasnc490wp0l5xzpdmwdzjr4qiy63kg2qi27060m5yqkq3h8xn"; + version = "0.1.17"; + sha256 = "1vgk4xsdbx0v6sy09wkb63qz6i64n6qcmpiy49qgh2xybskrrzvf"; }; meta = { license = lib.licenses.mit; From 7ce0d6794405b94d11a8620f61ee7995e5543661 Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 27 Jun 2022 15:04:02 +0200 Subject: [PATCH 08/26] vscode-extensions.arcticicestudio.nord-visual-studio-code: 0.18.0 -> 0.19.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d4a542bb99e4ead..36e2e2101d98a06 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -206,8 +206,8 @@ let mktplcRef = { name = "nord-visual-studio-code"; publisher = "arcticicestudio"; - version = "0.18.0"; - sha256 = "sha256-Uo6peR+2ZNX6nwJ0Yar32Pe0rfBZ+f6ef1cYhUvVUbE="; + version = "0.19.0"; + sha256 = "sha256-awbqFv6YuYI0tzM/QbHRTUl4B2vNUdy52F4nPmv+dRU="; }; meta = with lib; { description = "An arctic, north-bluish clean and elegant Visual Studio Code theme."; From 454cb7de87fb5213310be623185c7744c0cacdad Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Mon, 27 Jun 2022 15:00:48 +0200 Subject: [PATCH 09/26] streetsidesoftware.code-spell-checker: 2.1.7 -> 2.2.5 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ee6bf3908325031..276465396affefb 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2148,8 +2148,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.1.7"; - sha256 = "sha256-C0jYDIDBK1JH8eFaFmCUilBXCbU5y2TRF3OZAw9ijoY="; + version = "2.2.5"; + sha256 = "0ayhlzh3b2mcdx6mdj00y4qxvv6mirfpnp8q5zvidm6sv3vwlcj0"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; From 0a6483ce41e2cb8a98e2faba6ff4c90da293c077 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 29 Jun 2022 11:41:10 +0200 Subject: [PATCH 10/26] grafana: 9.0.1 -> 9.0.2 ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.0.2 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 87430bda86d7899..9eb3258d8212211 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.0.1"; + version = "9.0.2"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-+03bfSpUT5sb0oFf9BomglcVb5bRqAwZ1MKCPmRtAss="; + sha256 = "sha256-5N1Buj4bzlkuVXENbZsTajhzjtJUzR1O1JmbOHQU1MQ="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1kw9l3gip4lqfrc0asgsd1lf5sxa7zj67isyvhb14qdsf9rs3b2d"; + sha256 = "1zamibfjfr4kdixajrb8cs2w95sj2hzhw7ak1yilfgiiq4kpkpah"; }; - vendorSha256 = "sha256-eB0SswtqAb0xoLcq021KaH4CdgLbWmhODyifQDVl5XI="; + vendorSha256 = "sha256-ncMIu6J7D3xflZSxf8txpaQd0YW62CtzcO5w/PUE1UU="; nativeBuildInputs = [ wire ]; From f7d9436ead245b0a99c94155c8d20840ecfd9c9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jun 2022 01:40:35 +0000 Subject: [PATCH 11/26] clojure-lsp: 2022.06.22-14.09.50 -> 2022.06.29-19.32.13 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 78bee76efdcf9d9..ff91e227deca061 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.06.22-14.09.50"; + version = "2022.06.29-19.32.13"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-QMzjoxcEbzOZKh3nN+kMwjp5NfARBFiVnZ/1B3yzVK0="; + sha256 = "sha256-skU1p0rEO+9JMxaOepULZhG/xG56KuGNLEUiQ945Pv0="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "ff400595723af878f5d6edfed78d403eb1ce18bd439d4bb0eb8eccf3d20a2b51"; + sha256 = "97446cacf42966e6096570b9f9c48c653a81903a33e98987cba4b855b417c76f"; }; extraNativeImageBuildArgs = [ From 873d7f1f18e4a3e6689a210bc259ad863e387d3b Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Thu, 30 Jun 2022 06:54:55 +0300 Subject: [PATCH 12/26] addlicense: 1.0.0 -> unstable-2021-04-22 Instead of carrying unreleased go1.18 patches, use the latest commit from github. --- pkgs/tools/misc/addlicense/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/addlicense/default.nix b/pkgs/tools/misc/addlicense/default.nix index 2a72f53d671be58..7980185bca426f4 100644 --- a/pkgs/tools/misc/addlicense/default.nix +++ b/pkgs/tools/misc/addlicense/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "addlicense"; - version = "1.0.0"; + version = "unstable-2021-04-22"; src = fetchFromGitHub { owner = "google"; repo = "addlicense"; - rev = "v${version}"; - sha256 = "sha256-Nv7Az3TDtd1P/QWjH92otSV9rIrc2l/mTbGUXhODi7Q="; + rev = "13e73a7f8fcb5696256b6a7b7addabf1070ad4b9"; + sha256 = "sha256-UiJaTWCBup/Ub9NZIvkb67TvcUllV/AmYAKVO4egRqc="; }; vendorSha256 = "sha256-2mncc21ecpv17Xp8PA9GIodoaCxNBacbbya/shU8T9Y="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec10fb1b9abbdf2..d4fb7dcbdcac419 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1011,7 +1011,9 @@ with pkgs; addic7ed-cli = callPackage ../tools/misc/addic7ed-cli { }; - addlicense = callPackage ../tools/misc/addlicense { }; + addlicense = callPackage ../tools/misc/addlicense { + buildGoModule = buildGo118Module; + }; adenum = callPackage ../tools/security/adenum { }; From d12a36559b57c01d73066eb7960498a55e2d08dd Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Thu, 30 Jun 2022 08:43:46 +0300 Subject: [PATCH 13/26] ipget: 0.8.1->0.9.1 Also build with go1.18 now that it works --- pkgs/applications/networking/ipget/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index 7db196de61f692d..8164523244b9ed2 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipget"; - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ipfs"; repo = "ipget"; rev = "v${version}"; - sha256 = "sha256-gtDmBy7IpZCbeDG8JeKvMoaJmXpjnmKGustaNLIlTlY="; + sha256 = "sha256-JGG3DsmFXmWFOFvJ8pKVhQMRgZ0cbkdtmBjMkLYqOwU="; }; - vendorSha256 = "sha256-La9V5B+UDaOswh/R8ad4xsnCF5ewtF7G+uiqnarM4Mg="; + vendorSha256 = "sha256-scrueQoqr9nUONnpitUontcX3Xe0KmmUmvxOcpxK7M8="; postPatch = '' # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec10fb1b9abbdf2..3ff856c8af039a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7376,7 +7376,9 @@ with pkgs; ipfs-migrator-unwrapped = callPackage ../applications/networking/ipfs-migrator/unwrapped.nix { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipget = callPackage ../applications/networking/ipget { }; + ipget = callPackage ../applications/networking/ipget { + buildGoModule = buildGo118Module; + }; i-pi = with python3Packages; toPythonApplication i-pi; From 512670498f288c98279bfae0910a2811b9dd51e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Tue, 28 Jun 2022 15:43:04 +0900 Subject: [PATCH 14/26] phylactery: init at 0.1.1 --- pkgs/servers/web-apps/phylactery/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/servers/web-apps/phylactery/default.nix diff --git a/pkgs/servers/web-apps/phylactery/default.nix b/pkgs/servers/web-apps/phylactery/default.nix new file mode 100644 index 000000000000000..72687e2065dc3b5 --- /dev/null +++ b/pkgs/servers/web-apps/phylactery/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoPackage, fetchFromSourcehut }: + +buildGoPackage rec { + pname = "phylactery"; + version = "0.1.1"; + + goPackagePath = "git.sr.ht/~cnx/phylactery"; + + src = fetchFromSourcehut { + owner = "~cnx"; + repo = pname; + rev = version; + sha256 = "sha256-HcpdPQ1WOMFNdfsZb//GvUVBCbmS3jARbcXjchlv2oE="; + }; + + # Upstream repo doesn't provide any test. + doCheck = false; + + meta = with lib; { + description = "Old school comic web server"; + homepage = "https://git.sr.ht/~cnx/phylactery"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ McSinyx ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45a89043efa638c..cee5e07c1161dc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29169,6 +29169,8 @@ with pkgs; phrase-cli = callPackage ../tools/misc/phrase-cli { }; + phylactery = callPackage ../servers/web-apps/phylactery { }; + pianobar = callPackage ../applications/audio/pianobar { }; pianobooster = qt5.callPackage ../applications/audio/pianobooster { stdenv = gcc10StdenvCompat; }; From 81fe5f1b2f01e12874974b654bf51cdc01d32588 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 30 Jun 2022 10:29:46 +0200 Subject: [PATCH 15/26] schleuder: allow running on aarch64-linux --- pkgs/tools/security/schleuder/Gemfile.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/schleuder/Gemfile.lock b/pkgs/tools/security/schleuder/Gemfile.lock index 79c6287580d182a..7f15bb7bd7176fa 100644 --- a/pkgs/tools/security/schleuder/Gemfile.lock +++ b/pkgs/tools/security/schleuder/Gemfile.lock @@ -76,6 +76,7 @@ GEM zeitwerk (2.6.0) PLATFORMS + aarch64-linux x86_64-linux DEPENDENCIES From b091bae60a0fe244d38bb20f84fc0b86e6a29aa8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 30 Jun 2022 10:30:09 +0200 Subject: [PATCH 16/26] schleuder-cli: allow running on aarch64-linux --- pkgs/tools/security/schleuder/cli/Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/schleuder/cli/Gemfile.lock b/pkgs/tools/security/schleuder/cli/Gemfile.lock index bd47b9df7f9a0bb..3eead9459e054dc 100644 --- a/pkgs/tools/security/schleuder/cli/Gemfile.lock +++ b/pkgs/tools/security/schleuder/cli/Gemfile.lock @@ -12,10 +12,11 @@ GEM thor (0.20.3) PLATFORMS + aarch64-linux x86_64-linux DEPENDENCIES schleuder-cli! BUNDLED WITH - 2.3.6 + 2.3.9 From d6b64a69851d430b128ecbeaea714f5de283dc64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jun 2022 10:09:12 +0000 Subject: [PATCH 17/26] python310Packages.temescal: 0.3 -> 0.5 --- pkgs/development/python-modules/temescal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/temescal/default.nix b/pkgs/development/python-modules/temescal/default.nix index 429b0a23d1877aa..2c19ab2844ad8e3 100644 --- a/pkgs/development/python-modules/temescal/default.nix +++ b/pkgs/development/python-modules/temescal/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "temescal"; - version = "0.3"; + version = "0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-V1wsncIm4f6NPa6lwlO9pkDIFBG1K3VhmOQCwyrPGm4="; + hash = "sha256-MfTftheNj8zI3iXIIJU+jy9xikvX9eO58LA0NCMJBnY="; }; propagatedBuildInputs = [ From 411226059152365c13a94da80e70ef43178b7f5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jun 2022 10:53:15 +0000 Subject: [PATCH 18/26] python310Packages.twilio: 7.9.3 -> 7.10.0 --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 31649923daa62f8..7f4a102d52cc279 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.9.3"; + version = "7.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-tTtfrIapIaC3oidqWRntkZ1T1eKZ9/ggKbZk2cMiPSQ="; + hash = "sha256-UoSZ4g9RVnmnfZ7XxLafsNCSj396rrHz36fMwEoNL84="; }; propagatedBuildInputs = [ From 9e106c15a4be9d1ddd057ddf9c34851ffd76cf52 Mon Sep 17 00:00:00 2001 From: Evgeny Kurnevsky Date: Thu, 30 Jun 2022 01:15:19 +0300 Subject: [PATCH 19/26] wesnoth: 1.16.1 -> 1.16.3 --- pkgs/games/wesnoth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index fa6b8cb631fc958..4e4cee5cb19c83f 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.16.1"; + version = "1.16.3"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "sha256-eRegE+Q5dEtuT2XRKAK0sycRuK6sdSXKS6aLCsBDU8g="; + sha256 = "sha256-om6Tps5ZdAWq1WE9lq9v2oGwfPDPSRJ08pmMlT6DjGk="; }; nativeBuildInputs = [ cmake pkg-config ]; From 1316546506ad0b591a0e782172abdbc12af349a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Thu, 30 Jun 2022 11:20:52 +0200 Subject: [PATCH 20/26] neovim: 0.7.0 -> 0.7.2 --- pkgs/applications/editors/neovim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 022916c388dcaa8..8d8618c881cd706 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-eYYaHpfSaYYrLkcD81Y4rsAMYDP1IJ7fLJJepkACkA8="; + sha256 = "sha256-eKKQNM02Vhy+3yL2QV+0FSEpcniEa5Aq6hkAUIgLo1k="; }; patches = [ From 78f355a11e163912ccab31079514aa3b55946599 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 28 Jun 2022 14:04:30 +0800 Subject: [PATCH 21/26] davmail: 5.5.1 -> 6.0.1 --- .../networking/davmail/default.nix | 47 +++++++++++++++---- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 9b4c56a0561feb7..68a14207e297aee 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,32 +1,61 @@ -{ fetchurl, lib, stdenv, jre, glib, libXtst, gtk2, makeWrapper, unzip }: +{ stdenv +, fetchurl +, lib +, makeWrapper +, unzip +, glib +, gtk2 +, gtk3 +, jre +, libXtst +, zulu +, preferGtk3 ? true +, preferZulu ? true +}: +let + rev = 3390; + jre' = if preferZulu then zulu else jre; + gtk' = if preferGtk3 then gtk3 else gtk2; + + inherit (lib) makeLibraryPath versions; + +in stdenv.mkDerivation rec { pname = "davmail"; - version = "5.5.1"; + version = "6.0.1"; + src = fetchurl { - url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-3299.zip"; - sha256 = "sha256-NN/TUOcUIifNzrJnZmtYhs6UVktjlfoOYJjYaMEQpI4="; + url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip"; + sha256 = "1i1z1kdglccg7pyidlfbagdhgs0wqvybl8dwxcpglh2hkvi0dba0"; }; + postPatch = '' + sed -i -e '/^JAVA_OPTS/d' davmail + ''; + sourceRoot = "."; nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' runHook preInstall + mkdir -p $out/share/davmail cp -vR ./* $out/share/davmail makeWrapper $out/share/davmail/davmail $out/bin/davmail \ - --prefix PATH : ${jre}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 libXtst ]} + --set-default JAVA_OPTS "-Xmx512M -Dsun.net.inetaddr.ttl=60 -Djdk.gtk.version=${lib.versions.major gtk'.version}" \ + --prefix PATH : ${jre'}/bin \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk' libXtst ]} + runHook postInstall ''; meta = with lib; { - homepage = "http://davmail.sourceforge.net/"; description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; - maintainers = [ ]; - platforms = platforms.all; + homepage = "http://davmail.sourceforge.net/"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; }; } From 7727befa4d5968d41cb7778d0abe0f5accdae77d Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Thu, 30 Jun 2022 01:05:57 +0200 Subject: [PATCH 22/26] nrfconnect: init at 3.11.1 --- pkgs/tools/bluetooth/nrfconnect/default.nix | 44 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/bluetooth/nrfconnect/default.nix diff --git a/pkgs/tools/bluetooth/nrfconnect/default.nix b/pkgs/tools/bluetooth/nrfconnect/default.nix new file mode 100644 index 000000000000000..fe76a086284d4fa --- /dev/null +++ b/pkgs/tools/bluetooth/nrfconnect/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchurl +, appimageTools +}: + +let + pname = "nrfconnect"; + version = "3.11.1"; + + src = fetchurl { + url = "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-connect-for-desktop/${lib.versions.major version}-${lib.versions.minor version}-${lib.versions.patch version}/nrfconnect-${version}-x86_64.appimage"; + sha256 = "sha256-Q6QAFqTCFEcZBIlH9KaO4oAYiwCExvJ3h1PBtlGbhhA="; + name = "${pname}-${version}.AppImage"; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; + +in appimageTools.wrapType2 { + inherit pname version src; + + extraPkgs = pkgs: with pkgs; [ + segger-jlink + ]; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + install -m 444 -D ${appimageContents}/nrfconnect.desktop $out/share/applications/nrfconnect.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/nrfconnect.png \ + $out/share/icons/hicolor/512x512/apps/nrfconnect.png + substituteInPlace $out/share/applications/nrfconnect.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "Nordic Semiconductor nRF Connect for Desktop"; + homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Connect-for-desktop"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ stargate01 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92c47cbd5be216f..826d9c32baee603 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16175,6 +16175,8 @@ with pkgs; nrf5-sdk = callPackage ../development/libraries/nrf5-sdk { }; + nrfconnect = callPackage ../tools/bluetooth/nrfconnect { }; + nrfutil = callPackage ../development/tools/misc/nrfutil { }; obelisk = callPackage ../development/tools/ocaml/obelisk { menhir = ocamlPackages.menhir; }; From f5f338c8468a84b624980c2fd2cf2fa32d14741b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Tue, 28 Jun 2022 16:41:44 +0900 Subject: [PATCH 23/26] nixos/phylactery: init --- nixos/modules/module-list.nix | 1 + .../modules/services/web-apps/phylactery.nix | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 nixos/modules/services/web-apps/phylactery.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c1e41c8951ca478..7258df33cfc5613 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1078,6 +1078,7 @@ ./services/web-apps/nexus.nix ./services/web-apps/nifi.nix ./services/web-apps/node-red.nix + ./services/web-apps/phylactery.nix ./services/web-apps/pict-rs.nix ./services/web-apps/peertube.nix ./services/web-apps/plantuml-server.nix diff --git a/nixos/modules/services/web-apps/phylactery.nix b/nixos/modules/services/web-apps/phylactery.nix new file mode 100644 index 000000000000000..f0e97da1f20233e --- /dev/null +++ b/nixos/modules/services/web-apps/phylactery.nix @@ -0,0 +1,51 @@ +{ config, lib, pkgs, ... }: + +with lib; +let cfg = config.services.phylactery; +in { + options.services.phylactery = { + enable = mkEnableOption "Whether to enable Phylactery server"; + + host = mkOption { + type = types.str; + default = "localhost"; + description = "Listen host for Phylactery"; + }; + + port = mkOption { + type = types.port; + description = "Listen port for Phylactery"; + }; + + library = mkOption { + type = types.path; + description = "Path to CBZ library"; + }; + + package = mkOption { + type = types.package; + default = pkgs.phylactery; + defaultText = literalExpression "pkgs.phylactery"; + description = "The Phylactery package to use"; + }; + }; + + config = mkIf cfg.enable { + systemd.services.phylactery = { + environment = { + PHYLACTERY_ADDRESS = "${cfg.host}:${toString cfg.port}"; + PHYLACTERY_LIBRARY = "${cfg.library}"; + }; + + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ConditionPathExists = cfg.library; + DynamicUser = true; + ExecStart = "${cfg.package}/bin/phylactery"; + }; + }; + }; + + meta.maintainers = with maintainers; [ McSinyx ]; +} From ce910fca8841061e86bfbfd15f8976132c2bfd78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Wed, 29 Jun 2022 04:17:38 +0900 Subject: [PATCH 24/26] nixos/tests: add phlactery --- nixos/tests/all-tests.nix | 1 + nixos/tests/web-apps/phylactery.nix | 20 ++++++++++++++++++++ pkgs/servers/web-apps/phylactery/default.nix | 3 ++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/web-apps/phylactery.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 87bed40eac9e8e8..70904d61077be3a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -424,6 +424,7 @@ in { php = handleTest ./php {}; php80 = handleTest ./php { php = pkgs.php80; }; php81 = handleTest ./php { php = pkgs.php81; }; + phylactery = handleTest ./web-apps/phylactery.nix {}; pict-rs = handleTest ./pict-rs.nix {}; pinnwand = handleTest ./pinnwand.nix {}; plasma5 = handleTest ./plasma5.nix {}; diff --git a/nixos/tests/web-apps/phylactery.nix b/nixos/tests/web-apps/phylactery.nix new file mode 100644 index 000000000000000..cf2689d2300d30f --- /dev/null +++ b/nixos/tests/web-apps/phylactery.nix @@ -0,0 +1,20 @@ +import ../make-test-python.nix ({ pkgs, lib, ... }: { + name = "phylactery"; + + nodes.machine = { ... }: { + services.phylactery = rec { + enable = true; + port = 8080; + library = "/tmp"; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit('phylactery') + machine.wait_for_open_port(8080) + machine.wait_until_succeeds('curl localhost:8080') + ''; + + meta.maintainers = with lib.maintainers; [ McSinyx ]; +}) diff --git a/pkgs/servers/web-apps/phylactery/default.nix b/pkgs/servers/web-apps/phylactery/default.nix index 72687e2065dc3b5..a3cddf2fc8d5599 100644 --- a/pkgs/servers/web-apps/phylactery/default.nix +++ b/pkgs/servers/web-apps/phylactery/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromSourcehut }: +{ lib, buildGoPackage, fetchFromSourcehut, nixosTests }: buildGoPackage rec { pname = "phylactery"; @@ -15,6 +15,7 @@ buildGoPackage rec { # Upstream repo doesn't provide any test. doCheck = false; + passthru.tests.phylactery = nixosTests.phylactery; meta = with lib; { description = "Old school comic web server"; From 989565d67661918799c6190a43db60590600dd01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 30 Jun 2022 09:56:28 -0500 Subject: [PATCH 25/26] cachix-agent: expose verbose option --- nixos/modules/services/system/cachix-agent/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix index 30c0b18096798a4..3d2e9bc374ba06b 100644 --- a/nixos/modules/services/system/cachix-agent/default.nix +++ b/nixos/modules/services/system/cachix-agent/default.nix @@ -17,6 +17,12 @@ in { defaultText = "config.networking.hostName"; }; + verbose = mkOption { + type = types.bool; + description = "Enable verbose output"; + default = false; + }; + profile = mkOption { type = types.nullOr types.str; default = null; @@ -54,7 +60,7 @@ in { serviceConfig = { Restart = "on-failure"; EnvironmentFile = cfg.credentialsFile; - ExecStart = "${cfg.package}/bin/cachix deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}"; + ExecStart = "${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}"; }; }; }; From 6724234f2821eafed028c98501edb5a4bfdb9aa3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 23 Jun 2022 21:47:46 +0200 Subject: [PATCH 26/26] =?UTF-8?q?ocamlPackages.mirage-vnetif:=200.5.0=20?= =?UTF-8?q?=E2=86=92=200.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/mirage-vnetif/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix index 876bc1a98177aac..22955018bdef572 100644 --- a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix +++ b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix @@ -1,28 +1,23 @@ { lib, buildDunePackage, fetchurl -, lwt, mirage-time, mirage-clock, mirage-net +, lwt, mirage-net , cstruct, ipaddr, macaddr, mirage-profile , duration, logs }: buildDunePackage rec { pname = "mirage-vnetif"; - version = "0.5.0"; + version = "0.6.0"; - minimumOCamlVersion = "4.06"; - - # due to cstruct - useDune2 = true; + minimalOCamlVersion = "4.06"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "0cpqwf51v2cpz41dfqxabf3bsabwyl6a0h0v2ncrn33q58i60m5q"; + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "sha256-fzRoNFqdnj4Ke+eNdo5crvbnKDx6/+dQyu+K3rD5dYw="; }; propagatedBuildInputs = [ lwt mirage-net - mirage-time - mirage-clock cstruct ipaddr macaddr