From 76b536fc4580fb59f5ca6ac7f75978d0433ca719 Mon Sep 17 00:00:00 2001 From: LeUlukai Date: Sat, 29 May 2021 11:15:41 +0200 Subject: [PATCH 01/13] texstudio: 3.1.1 -> 3.1.2 --- pkgs/applications/editors/texstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 12b9c638c4c1..a51056130806 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "sha256-MFCQwhdF+WCTqDt4q5qw431y/zqEy9vHudcUYb4BYNQ="; + sha256 = "0h5g1sirsy1f2xlq85c1ik1s52gycfipy9yx0flgaw8m4wmhz26v"; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; From 3f8d0419448614fcf375382e7375b382d22a4e98 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Mon, 31 May 2021 02:12:09 -0400 Subject: [PATCH 02/13] rox-filer: Use wrapGAppsHook Also use `pname` + `version` --- pkgs/desktops/rox/rox-filer/default.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index ed00f37c6878..032209c2f182 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk, libSM, shared-mime-info }: +{ lib +, stdenv +, fetchurl +, pkg-config +, wrapGAppsHook +, libxml2 +, gtk +, libSM +, shared-mime-info +}: -let +stdenv.mkDerivation rec { + pname = "rox-filer"; version = "2.11"; - name = "rox-filer-${version}"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { url = "mirror://sourceforge/rox/rox-filer-${version}.tar.bz2"; sha256 = "a929bd32ee18ef7a2ed48b971574574592c42e34ae09f36604bf663d7c101ba8"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + ]; buildInputs = [ libxml2 gtk shared-mime-info libSM ]; NIX_LDFLAGS = "-ldl -lm"; From c6a546e996d7dce5a688a6718ee7baeca694ddde Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 25 May 2021 12:08:42 -0600 Subject: [PATCH 03/13] synapse: 1.34.0 -> 1.35.0 --- pkgs/servers/matrix-synapse/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c1444ecb6b3f..0141d6eb7a27 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.34.0"; + version = "1.35.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lXVJfhcH9lKOCHn5f4Lc/OjgEYa5IpauKRhBsFXNWLw="; + sha256 = "sha256-McgLJoOS8h8C7mcbLaF0hiMkfthpDRUKyB5Effzk2ds="; }; patches = [ @@ -27,12 +27,13 @@ buildPythonApplication rec { buildInputs = [ openssl ]; propagatedBuildInputs = [ - setuptools + authlib bcrypt bleach canonicaljson daemonize frozendict + ijson jinja2 jsonschema lxml @@ -44,20 +45,20 @@ buildPythonApplication rec { psutil psycopg2 pyasn1 + pyjwt pymacaroons pynacl pyopenssl pysaml2 pyyaml requests + setuptools signedjson sortedcontainers treq twisted - unpaddedbase64 typing-extensions - authlib - pyjwt + unpaddedbase64 ] ++ lib.optional enableSystemd systemd ++ lib.optional enableRedis hiredis; @@ -66,7 +67,6 @@ buildPythonApplication rec { doCheck = !stdenv.isDarwin; checkPhase = '' - ${lib.optionalString (!enableRedis) "rm -r tests/replication # these tests need the optional dependency 'hiredis'"} PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests ''; From f22183002c78847180a5953b59849e712a74f6b7 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Wed, 2 Jun 2021 11:59:04 +0200 Subject: [PATCH 04/13] yafetch: unstable-2021-05-13 -> unstable-2021-06-01 --- pkgs/tools/misc/yafetch/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/tools/misc/yafetch/default.nix index cfdc0219eef2..c3bea1d9e8c5 100644 --- a/pkgs/tools/misc/yafetch/default.nix +++ b/pkgs/tools/misc/yafetch/default.nix @@ -2,22 +2,23 @@ stdenv.mkDerivation rec { pname = "yafetch"; - version = "unstable-2021-05-13"; + version = "unstable-2021-06-01"; src = fetchFromGitLab { owner = "cyberkitty"; repo = pname; - rev = "627465e6bf0192a9bc10f9c9385cde544766486f"; - sha256 = "1r8jnzfyjs5ardq697crwysclfm3k8aiqvfbsyhsl251a08yls5c"; + rev = "d9bbc1e4abca87028f898473c9a265161af3c287"; + sha256 = "0hyb5k7drnm9li720z1fdvz7b15xgf7n6yajnz1j98day3k88bqk"; }; # Use the provided NixOS logo automatically prePatch = '' - echo "#include \"ascii/nixos.h\"" > config.h + substituteInPlace ./config.h --replace \ + "#include \"ascii/tux.h\"" "#include \"ascii/nixos.h\"" ''; # Fixes installation path - DESTDIR = placeholder "out"; + PREFIX = placeholder "out"; meta = with lib; { homepage = "https://gitlab.com/cyberkitty/yafetch"; From 3b4d312b9fe86b7972481c049fc62aac67aee257 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 2 Jun 2021 15:33:28 +0100 Subject: [PATCH 05/13] nerdctl: 0.8.2 -> 0.8.3 --- pkgs/applications/networking/cluster/nerdctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 5dd183a7fa5a..7be59ee1661c 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GPOrC9gL9lPv5SUldFxTS8ZT9YboPoDdqOAfwD0qGBQ="; + sha256 = "sha256-mBoqyDfGho2e4RuFwkiU2R+zb38LzByWtH4pOhguueY="; }; vendorSha256 = "sha256-S3Gp7HkBIZNZ8rkp64XaUQUj1TggGwI9FMrVkyLCQWA="; From a425b4fbe446e53f7adce108e780522f3cc4d916 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Jun 2021 15:49:54 +0000 Subject: [PATCH 06/13] jackett: 0.18.100 -> 0.18.225 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index d48043964978..600a5f67eb80 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.100"; + version = "0.18.225"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-qgIC1PCCEMmt83xqedwmiUttA85zE/frn/Qxo5Y1yoM="; + sha256 = "sha256-EvFu+v1Ltot5zuDWcuG8Z00NHjWjZTrI0JKv+rgVB7U="; }; nativeBuildInputs = [ makeWrapper ]; From 90218e5e03a16a9b7c323e494bc27c384c82f84b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Jun 2021 17:47:00 +0000 Subject: [PATCH 07/13] bdf2psf: 1.202 -> 1.203 --- pkgs/tools/misc/bdf2psf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 1297b61e7f8c..5e91756413eb 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.202"; + version = "1.203"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-QXjORfwPxNF9iWF29YcVyT2EAwcR4UQjF4Zv7dPMC9c="; + sha256 = "sha256-jQJC3b+HsEeKYRKQUfI2w3xYDJHs9ajfN8lb6Upzgd8="; }; nativeBuildInputs = [ dpkg ]; From e5173c84812621ced04b8ccc59962d93fdd1e087 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 2 Jun 2021 18:30:25 +0000 Subject: [PATCH 08/13] factorio: 1.1.32 -> 1.1.34 --- pkgs/games/factorio/versions.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 3496fd324c04..dd96172572a9 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -10,12 +10,12 @@ "version": "1.1.33" }, "stable": { - "name": "factorio_alpha_x64-1.1.32.tar.xz", + "name": "factorio_alpha_x64-1.1.34.tar.xz", "needsAuth": true, - "sha256": "0ciz7y8xqlk9vg3akvflq1aabzgbqpazfnihyk4gsadk12b6a490", + "sha256": "1gba6ivxdhj8khk6kfja2nzvqbbjlq1gzk8vlb23mkzqcmf4gnqc", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.32/alpha/linux64", - "version": "1.1.32" + "url": "https://factorio.com/get-download/1.1.34/alpha/linux64", + "version": "1.1.34" } }, "demo": { @@ -46,12 +46,12 @@ "version": "1.1.33" }, "stable": { - "name": "factorio_headless_x64-1.1.32.tar.xz", + "name": "factorio_headless_x64-1.1.34.tar.xz", "needsAuth": false, - "sha256": "0dg98ycs7m8rm996pk0p1iajalpmiy30p0pwr9dw2chf1d887kvz", + "sha256": "0sfafdvfhhvxnhf7q23xnvckx8nihg5xzzc6dw39a3iprwhr75i1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.32/headless/linux64", - "version": "1.1.32" + "url": "https://factorio.com/get-download/1.1.34/headless/linux64", + "version": "1.1.34" } } } From 266fa7f015da93d062b4b78cd2e3659bc61e6d25 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 2 Jun 2021 18:31:23 +0000 Subject: [PATCH 09/13] factorio-experimental: 1.1.33 -> 1.1.34 --- pkgs/games/factorio/versions.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index dd96172572a9..fa459c6f5eb9 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.33.tar.xz", + "name": "factorio_alpha_x64-1.1.34.tar.xz", "needsAuth": true, - "sha256": "0qgr609w8pgjpmh8ycf0b846v0i019b393x71i790lb7vcygl2aa", + "sha256": "1gba6ivxdhj8khk6kfja2nzvqbbjlq1gzk8vlb23mkzqcmf4gnqc", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.33/alpha/linux64", - "version": "1.1.33" + "url": "https://factorio.com/get-download/1.1.34/alpha/linux64", + "version": "1.1.34" }, "stable": { "name": "factorio_alpha_x64-1.1.34.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.33.tar.xz", + "name": "factorio_headless_x64-1.1.34.tar.xz", "needsAuth": false, - "sha256": "0iv667l25aaij3g9v3mqxhkpphfbc6dhdghsg5qdw4l59vh6fpd4", + "sha256": "0sfafdvfhhvxnhf7q23xnvckx8nihg5xzzc6dw39a3iprwhr75i1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.33/headless/linux64", - "version": "1.1.33" + "url": "https://factorio.com/get-download/1.1.34/headless/linux64", + "version": "1.1.34" }, "stable": { "name": "factorio_headless_x64-1.1.34.tar.xz", From 7876162722f37150f654680548b45ae4719151dc Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 2 Jun 2021 18:32:28 +0000 Subject: [PATCH 10/13] factorio-demo: 1.1.32 -> 1.1.34 --- pkgs/games/factorio/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index fa459c6f5eb9..29c2d6a7bb3f 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -28,12 +28,12 @@ "version": "1.1.30" }, "stable": { - "name": "factorio_demo_x64-1.1.32.tar.xz", + "name": "factorio_demo_x64-1.1.34.tar.xz", "needsAuth": false, - "sha256": "19zwl20hn8hh942avqri1kslf7dcqi9nim50vh4w5d0493srybfw", + "sha256": "1ld373lxfx1xbaqq394az8sxfxpjwkyqwwr77wbmg4sm2g9dinxm", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.32/demo/linux64", - "version": "1.1.32" + "url": "https://factorio.com/get-download/1.1.34/demo/linux64", + "version": "1.1.34" } }, "headless": { From 2a1c29ef4bacac06f9b677931027bf053952618c Mon Sep 17 00:00:00 2001 From: Milan Date: Thu, 3 Jun 2021 00:53:34 +0200 Subject: [PATCH 11/13] gitlab: 13.12.0 -> 13.12.2 (#125271) https://about.gitlab.com/releases/2021/06/01/security-release-gitlab-13-12-2-released/ --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile.lock | 2 +- .../version-management/gitlab/rubyEnv/gemset.nix | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 05d18631e5cd..40af0656fe6b 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.12.0", - "repo_hash": "060bmfvpqh6zdrwdh4lx4xr1nbg0f7hcp8zh6k9qplv48szhj8m9", + "version": "13.12.2", + "repo_hash": "1wzbjw21pan5cfiz1jd03c3w9sgyvmn35f6dm2sr2k54acsw034p", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.12.0-ee", + "rev": "v13.12.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.12.0", + "GITALY_SERVER_VERSION": "13.12.2", "GITLAB_PAGES_VERSION": "1.39.0", "GITLAB_SHELL_VERSION": "13.18.0", - "GITLAB_WORKHORSE_VERSION": "13.12.0" + "GITLAB_WORKHORSE_VERSION": "13.12.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 20695409f47f..994683c2e2b1 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,14 +21,14 @@ let }; }; in buildGoModule rec { - version = "13.12.0"; + version = "13.12.2"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-MGK0WjAeqApf2xUsbF1mtyzYMhJHC5LFtj8LSb0NQKI="; + sha256 = "sha256-jZg/OlecYlGjDxlxsayAuqzptil1OPtyPjOe1WYT0HY="; }; vendorSha256 = "sha256-drS0L0olEFHYJVC0VYwEZeNYa8fjwrfxlhrEQa4pqzY="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 747cb79e59b1..c6302be8d184 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "13.12.0"; + version = "13.12.2"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 3e97365f5889..6f40a15a64bc 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -139,7 +139,7 @@ GEM coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - bindata (2.4.8) + bindata (2.4.10) binding_ninja (0.2.3) bootsnap (1.4.6) msgpack (~> 1.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index f2e5c9adea44..9500febc8563 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -557,10 +557,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic"; + sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr"; type = "gem"; }; - version = "2.4.8"; + version = "2.4.10"; }; binding_ninja = { groups = ["default" "development" "test"]; From b1926fc77e096d9d1d3939ca5c4392082155854f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Jun 2021 22:09:46 +0000 Subject: [PATCH 12/13] erlangR23: 23.3.4.1 -> 23.3.4.2 --- pkgs/development/interpreters/erlang/R23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index cfd508b851f6..ee788560dcf4 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.3.4.1"; - sha256 = "vBGPCAq7410ykiWsxDo6PpgnInPMY35+RPx4gl/BW7k="; + version = "23.3.4.2"; + sha256 = "QAIkiYBhYnUzyRg70SQ4BwjjYqclDA4uruqRNTgB2Sk="; } From 928ed6f2c76fdb6552864f31d22b11d871f9a245 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 3 Jun 2021 09:27:02 +0900 Subject: [PATCH 13/13] mdbook: 0.4.8 -> 0.4.9 --- pkgs/tools/text/mdbook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index e841d0c5fb5e..a8c5efb0a493 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "sha256-MdkKDjyePlu6nDyHM9qdhn+kFeXZnyfin+cIZkE+PRE="; + sha256 = "sha256-wc3poiLnIHbbl0j2sWQkEbxccpohPnvjLPdNuKfsDSY="; }; - cargoSha256 = "sha256-MaN0Zz1cQQvwA6rPJRqzI4Q8gniHKAsROLsc0tBpYYU="; + cargoSha256 = "sha256-2DNfacPp9IMke2j8WYxpGmMxityaFGyXrc0jOyqPl3c="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];