From 3b648a5e52a17a819d5ea37f10f37c7f54cd1115 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jun 2021 17:07:36 +0000 Subject: [PATCH 1/7] imgproxy: 2.16.3 -> 2.16.4 --- pkgs/servers/imgproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 780b3c5eb20c..b0d013602417 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.16.3"; + version = "2.16.4"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-WK5TAI+dYmBLNp1A0p9DbWF7ZEw3dqr+Cuwy7LzrdBM="; + sha256 = "sha256-25oOGkTc19PHlU0Va7IPKrvGK9pDrGqKZa6qNFMVphQ="; rev = "v${version}"; }; - vendorSha256 = "sha256-7IpMgsATQ1SMuBOF9agHIN2Lx6OKxRr0Zk5SRFxHiQ4="; + vendorSha256 = "sha256-y8cXe4+jTLnM7K+na2VHGXkPgZjFYdgtDd14D8KiCas="; doCheck = false; From 8af39ed0ac4120b100c8e8e85be65df097a7183c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Jun 2021 04:20:00 +0000 Subject: [PATCH 2/7] postgresqlPackages.pgvector: 0.1.6 -> 0.1.7 --- pkgs/servers/sql/postgresql/ext/pgvector.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index a3be7d50a01e..53dfee7d0326 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "ankane"; repo = pname; rev = "v${version}"; - sha256 = "108qf5pvqhz4vh31sijikajf4hrrk7rknrqzwj999psr33acag4z"; + sha256 = "07m1nn640by5q22q2s1nlmjp14q5ffbyib28kjzlss0mq8acb439"; }; buildInputs = [ postgresql ]; From a4826b88d75b7a34f51e5911dc30b241ff4b98c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 18 Jun 2021 04:53:39 +0000 Subject: [PATCH 3/7] flyctl: 0.0.223 -> 0.0.227 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 262ddc5d7218..130ff9c9bcbf 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.223"; + version = "0.0.227"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-HDxFjEXQ33U2SiRz/e6vurZo710ibArdGLZcLoou17I="; + sha256 = "sha256-nql0zK2H0FDQMsnSJSNzC7YmvUZfITHH5p1efFHsj58="; }; preBuild = '' From d9428fe9b5ad09c3113e31b77a0b3890b8adfb85 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 18 Jun 2021 07:45:10 +0000 Subject: [PATCH 4/7] jackett: 0.18.234 -> 0.18.345 --- 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 d78524039858..0bd0227ece6f 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.234"; + version = "0.18.345"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-F01iR1BdSWCBqBI+Mh8uyzWKIbiMR2tOW6sJgFU3hG8="; + sha256 = "sha256-cCUlKyndKAU57hSRZYWqwOthfjIirE5c95HRETnFEiA="; }; nativeBuildInputs = [ makeWrapper ]; From b1d42dbe6d5e079be7453241c7a4b539366feff4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 18 Jun 2021 17:55:04 +0000 Subject: [PATCH 5/7] graylog: 3.3.9 -> 4.0.7 --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index b41cc9cb0699..8d18d654c72f 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.3.9"; + version = "4.0.7"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1wl9j2jgjg5gwcsh92qr5f68wx12nvwadc9xkaa9wwd7x3z825jq"; + sha256 = "sha256-sZn/ug4oh/SHbICbiQeAmtEIwT3++DBWbT2XBkYGYUc="; }; dontBuild = true; From 5e06828dff0fe6b97cc215826872788b55c77397 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 19 Jun 2021 21:11:28 +0200 Subject: [PATCH 6/7] factorio: Fix bug in update.py Prior to this change, `update.py` fails with `KeyError: 'alpha'` when upstream does not have a version in the `experimental` channel: ./update.py --username XXXXXXXX --token "$(wl-paste)" Traceback (most recent call last): File "./update.py", line 180, in app.run(main) File "/nix/store/854z51wg8fj1s6ghxasp1xxx8khb3r8v-python3-3.8.9-env/lib/python3.8/site-packages/absl/app.py", line 303, in run _run_main(main, args) File "/nix/store/854z51wg8fj1s6ghxasp1xxx8khb3r8v-python3-3.8.9-env/lib/python3.8/site-packages/absl/app.py", line 251, in _run_main sys.exit(main(argv)) File "./update.py", line 162, in main new_our_versions = generate_our_versions(factorio_versions) File "./update.py", line 92, in generate_our_versions version = factorio_versions[release_channel.name][release_type.name] KeyError: 'alpha' I chose to make it so that the versions in nixpkgs' `factorio-*` packages are either experimental (when available) or stable, as this seems like the most coherent approach --- pkgs/games/factorio/update.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/games/factorio/update.py b/pkgs/games/factorio/update.py index b1cdce6b4aa1..3806ba3614f1 100755 --- a/pkgs/games/factorio/update.py +++ b/pkgs/games/factorio/update.py @@ -80,6 +80,12 @@ def fetch_versions() -> FactorioVersionsJSON: def generate_our_versions(factorio_versions: FactorioVersionsJSON) -> OurVersionJSON: rec_dd = lambda: defaultdict(rec_dd) output = rec_dd() + + # Deal with times where there's no experimental version + for rc in RELEASE_CHANNELS: + if not factorio_versions[rc.name]: + factorio_versions[rc.name] = factorio_versions['stable'] + for system in SYSTEMS: for release_type in RELEASE_TYPES: for release_channel in RELEASE_CHANNELS: From e5baf82e87ac9f2d5bd8c60f20f3021f0d7df79e Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 19 Jun 2021 21:16:15 +0200 Subject: [PATCH 7/7] =?UTF-8?q?factorio:=201.1.34=20=E2=86=92=201.1.35?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/games/factorio/versions.json | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 29c2d6a7bb3f..b230d94cfa53 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.34.tar.xz", + "name": "factorio_alpha_x64-1.1.35.tar.xz", "needsAuth": true, - "sha256": "1gba6ivxdhj8khk6kfja2nzvqbbjlq1gzk8vlb23mkzqcmf4gnqc", + "sha256": "1svjjpyffdrmll1b3icsrikfi4v2r1z6j7iqq0v36iq0zw7vw3bk", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.34/alpha/linux64", - "version": "1.1.34" + "url": "https://factorio.com/get-download/1.1.35/alpha/linux64", + "version": "1.1.35" }, "stable": { - "name": "factorio_alpha_x64-1.1.34.tar.xz", + "name": "factorio_alpha_x64-1.1.35.tar.xz", "needsAuth": true, - "sha256": "1gba6ivxdhj8khk6kfja2nzvqbbjlq1gzk8vlb23mkzqcmf4gnqc", + "sha256": "1svjjpyffdrmll1b3icsrikfi4v2r1z6j7iqq0v36iq0zw7vw3bk", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.34/alpha/linux64", - "version": "1.1.34" + "url": "https://factorio.com/get-download/1.1.35/alpha/linux64", + "version": "1.1.35" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.30.tar.xz", + "name": "factorio_demo_x64-1.1.35.tar.xz", "needsAuth": false, - "sha256": "1b3na8xn9lhlvrsd6hxr130nf9p81s26n25a4qdgkczz6waysgjv", + "sha256": "0yqb4gf2avpxr4vwafws9pv74xyd9g84zggfikfc801ldc7sp29f", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.30/demo/linux64", - "version": "1.1.30" + "url": "https://factorio.com/get-download/1.1.35/demo/linux64", + "version": "1.1.35" }, "stable": { - "name": "factorio_demo_x64-1.1.34.tar.xz", + "name": "factorio_demo_x64-1.1.35.tar.xz", "needsAuth": false, - "sha256": "1ld373lxfx1xbaqq394az8sxfxpjwkyqwwr77wbmg4sm2g9dinxm", + "sha256": "0yqb4gf2avpxr4vwafws9pv74xyd9g84zggfikfc801ldc7sp29f", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.34/demo/linux64", - "version": "1.1.34" + "url": "https://factorio.com/get-download/1.1.35/demo/linux64", + "version": "1.1.35" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.34.tar.xz", + "name": "factorio_headless_x64-1.1.35.tar.xz", "needsAuth": false, - "sha256": "0sfafdvfhhvxnhf7q23xnvckx8nihg5xzzc6dw39a3iprwhr75i1", + "sha256": "0xpiw89ad6cfpc576g5jpsyzwjncs3jrx01056p52wj01747fm94", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.34/headless/linux64", - "version": "1.1.34" + "url": "https://factorio.com/get-download/1.1.35/headless/linux64", + "version": "1.1.35" }, "stable": { - "name": "factorio_headless_x64-1.1.34.tar.xz", + "name": "factorio_headless_x64-1.1.35.tar.xz", "needsAuth": false, - "sha256": "0sfafdvfhhvxnhf7q23xnvckx8nihg5xzzc6dw39a3iprwhr75i1", + "sha256": "0xpiw89ad6cfpc576g5jpsyzwjncs3jrx01056p52wj01747fm94", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.34/headless/linux64", - "version": "1.1.34" + "url": "https://factorio.com/get-download/1.1.35/headless/linux64", + "version": "1.1.35" } } }