From a57c2d2092ad9484ee14ecfebe6141cb74216c79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Jan 2022 03:55:12 +0000 Subject: [PATCH 01/72] pt2-clone: 1.37 -> 1.38 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index e5a97aee86cd..cebf20ae78b8 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.37"; + version = "1.38"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-r9H+qF542j2qjmOEjJLAtnMU7SkJBJB8nH39zhkZu9M="; + sha256 = "sha256-fnPYlZvCZYiKkQmp5bNtrqgZAkVtKLmLMcfkbbysMyU="; }; nativeBuildInputs = [ cmake ]; From cdc50f2c04bd9e6cc5848daf9c3ff552d6807db9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Jan 2022 06:19:35 +0000 Subject: [PATCH 02/72] pcm: 202110 -> 202112 --- pkgs/os-specific/linux/pcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index a7b26fb6d711..a5d9771a2f9c 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pcm"; - version = "202110"; + version = "202112"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - sha256 = "sha256-YcTsC1ceCXKALroyZtgRYpqK3ysJhgzRJ8fBiCx7CCM="; + sha256 = "sha256-uuQvj8BcUmuYDwV4r3oqkT+QTcSFcGjBeGUM2NZRFcA="; }; enableParallelBuilding = true; From 843bac6005e26b1823dfc2ebb1c1f697c48549d3 Mon Sep 17 00:00:00 2001 From: Steamwalker Date: Sun, 2 Jan 2022 13:01:02 +0100 Subject: [PATCH 03/72] abiword: 3.0.4 -> 3.0.5 --- pkgs/applications/office/abiword/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 0554713feb89..c064ea94d04e 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -5,29 +5,15 @@ stdenv.mkDerivation rec { pname = "abiword"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz"; - sha256 = "1mx5l716n0z5788i19qmad30cck4v9ggr071cafw2nrf375rcc79"; + hash = "sha256-ElckfplwUI1tFFbT4zDNGQnEtCsl4PChvDJSbW86IbQ="; }; enableParallelBuilding = true; - patches = [ - # Switch to using enchant2; note by the next update enchant2 should be - # default and this patch can be removed. - # https://github.com/NixOS/nixpkgs/issues/38506 - (fetchurl { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/d3ff951d3c7249927e7113b3de1653031db24596/abiword/trunk/enchant-2.1.patch"; - sha256 = "444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2"; - }) - ]; - - postPatch = '' - substituteInPlace configure --replace 'enchant >=' 'enchant-2 >=' - ''; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ From 2d5b086b36cfb998eccee300291bb5e3bbf403b2 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Mon, 3 Jan 2022 16:31:51 +0100 Subject: [PATCH 04/72] antimicrox: 3.2.0 -> 3.2.1 --- pkgs/tools/misc/antimicrox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index e248ac4a0c78..6d1ae6cfe3b7 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-brG3DTpWRYmDemTeteuuNbF0JoDAXdcFwO12JC6/0/Q="; + sha256 = "sha256-dj/6bIJfNt/ZBVucjLRu2FYLoyuWZ72MB20eVCRvo0Y="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; From ea368b3c62230e9fdad5e9dbf2d1e04e15b5f15d Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 4 Jan 2022 10:04:06 +0100 Subject: [PATCH 05/72] gnomeExtensions.taskwhisperer: 16 -> 20 --- .../extensions/taskwhisperer/default.nix | 4 +- .../extensions/taskwhisperer/fix-paths.patch | 174 +++++++++--------- 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix index 19936f6be61d..5f7dc7b06a36 100644 --- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-taskwhisperer"; - version = "16"; + version = "20"; src = fetchFromGitHub { owner = "cinatic"; repo = "taskwhisperer"; rev = "v${version}"; - sha256 = "05w2dfpr5vrydb7ij4nd2gb7c31nxix3j48rb798r4jzl1rakyah"; + sha256 = "sha256-UVBLFXsbOPRXC4P5laZ82Rs08yXnNnzJ+pp5fbx6Zqc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch b/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch index 2ea54f4b0897..0e3ea668a8a1 100644 --- a/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch @@ -1,99 +1,99 @@ -diff --git a/taskwhisperer-extension@infinicode.de/extra/create.sh b/taskwhisperer-extension@infinicode.de/extra/create.sh -index a69e369..35d5ea1 100755 ---- a/taskwhisperer-extension@infinicode.de/extra/create.sh -+++ b/taskwhisperer-extension@infinicode.de/extra/create.sh -@@ -1 +1 @@ --bash -c "task add $1" -+bash -c "@task@ add $1" -diff --git a/taskwhisperer-extension@infinicode.de/extra/modify.sh b/taskwhisperer-extension@infinicode.de/extra/modify.sh -index 7964a26..8edd21b 100755 ---- a/taskwhisperer-extension@infinicode.de/extra/modify.sh -+++ b/taskwhisperer-extension@infinicode.de/extra/modify.sh -@@ -1 +1 @@ --bash -c "task $1 modify $2" -+bash -c "@task@ $1 modify $2" -diff --git a/taskwhisperer-extension@infinicode.de/taskService.js b/taskwhisperer-extension@infinicode.de/taskService.js -index ead7a12..aa36db4 100644 ---- a/taskwhisperer-extension@infinicode.de/taskService.js -+++ b/taskwhisperer-extension@infinicode.de/taskService.js -@@ -182,7 +182,7 @@ const TaskService = class TaskService { +diff --git a/taskwhisperer-extension@infinicode.de/metadata.json b/taskwhisperer-extension@infinicode.de/metadata.json +index 2f1471c..a84bdf4 100644 +--- a/taskwhisperer-extension@infinicode.de/metadata.json ++++ b/taskwhisperer-extension@infinicode.de/metadata.json +@@ -6,7 +6,8 @@ + "3.32", + "3.36", + "3.38", +- "40" ++ "40", ++ "41" + ], + "url": "https://github.com/cinatic/taskwhisperer", + "uuid": "taskwhisperer-extension@infinicode.de", +diff --git a/taskwhisperer-extension@infinicode.de/services/taskService.js b/taskwhisperer-extension@infinicode.de/services/taskService.js +index df09cdf..df68c60 100644 +--- a/taskwhisperer-extension@infinicode.de/services/taskService.js ++++ b/taskwhisperer-extension@infinicode.de/services/taskService.js +@@ -63,7 +63,7 @@ var loadTaskData = async ({ taskStatus, project, taskOrder }) => { - let project = projectName ? "project:" + projectName : ""; + await syncTasks() -- let command = ['task', 'rc.json.array=on', status, project, 'export']; -+ let command = ['@task@', 'rc.json.array=on', status, project, 'export']; - let reader = new SpawnReader.SpawnReader(); +- const command = ['task', 'rc.json.array=on', statusFilter, projectFilter, 'export'].join(' ') ++ const command = ['@task@', 'rc.json.array=on', statusFilter, projectFilter, 'export'].join(' ') - let buffer = ""; -@@ -220,7 +220,7 @@ const TaskService = class TaskService { - break; - } + let { output, error } = await run({ command }) -- let shellProc = Gio.Subprocess.new(['task', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE); -+ let shellProc = Gio.Subprocess.new(['@task@', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE); +@@ -110,7 +110,7 @@ var loadProjectsData = async taskStatus => { - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; -@@ -261,7 +261,7 @@ const TaskService = class TaskService { - return; - } + await syncTasks() -- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE); -+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE); +- const command = ['task', 'rc.json.array=on', statusFilter, 'export'].join(' ') ++ const command = ['@task@', 'rc.json.array=on', statusFilter, 'export'].join(' ') + const { output: allTheTasks } = await run({ command }) - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; -@@ -290,7 +290,7 @@ const TaskService = class TaskService { - return; - } + let sortedUniqueProjects = [] +@@ -129,7 +129,7 @@ var setTaskDone = async taskID => { + return + } -- let shellProc = Gio.Subprocess.new(['task', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE); -+ let shellProc = Gio.Subprocess.new(['@task@', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE); +- const command = ['task', taskID.toString(), 'done'].join(' ') ++ const command = ['@task@', taskID.toString(), 'done'].join(' ') + const result = await run({ command, asJson: false }) - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; -@@ -318,7 +318,7 @@ const TaskService = class TaskService { - if (!taskID) { - return; - } -- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE); -+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; - shellProc.wait_finish(result); -@@ -344,7 +344,7 @@ const TaskService = class TaskService { - if (!taskID) { - return; - } -- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE); -+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; - shellProc.wait_finish(result); -@@ -374,7 +374,7 @@ const TaskService = class TaskService { - // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the - // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de) - // bypassing problem with own shell script -- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); -+ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); + if (!result.error) { +@@ -146,7 +146,7 @@ var setTaskUndone = async taskUUID => { + return + } - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; -@@ -403,7 +403,7 @@ const TaskService = class TaskService { - // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the - // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de) - // bypassing problem with own shell script -- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); -+ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); +- const command = ['task', `uuid:${taskUUID}`, 'modify', 'status:pending'].join(' ') ++ const command = ['@task@', `uuid:${taskUUID}`, 'modify', 'status:pending'].join(' ') + const result = await run({ command, asJson: false }) - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; -@@ -432,7 +432,7 @@ const TaskService = class TaskService { - let shellProc; + if (!result.error) { +@@ -163,7 +163,7 @@ var startTask = async taskID => { + return + } - try { -- shellProc = Gio.Subprocess.new(['task', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE); -+ shellProc = Gio.Subprocess.new(['@task@', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE); - } catch (err) { - onError(err); - return; +- const command = ['task', taskID.toString(), 'start'].join(' ') ++ const command = ['@task@', taskID.toString(), 'start'].join(' ') + const result = await run({ command, asJson: false }) + + if (!result.error) { +@@ -180,7 +180,7 @@ var stopTask = async taskID => { + return + } + +- const command = ['task', taskID.toString(), 'stop'].join(' ') ++ const command = ['@task@', taskID.toString(), 'stop'].join(' ') + const result = await run({ command, asJson: false }) + + if (!result.error) { +@@ -195,7 +195,7 @@ var stopTask = async taskID => { + var createTask = async task => { + const params = _convertTaskToParams(task) + +- const command = ['task', 'add', ...params].join(' ') ++ const command = ['@task@', 'add', ...params].join(' ') + const result = await run({ command, asJson: false }) + + if (!result.error) { +@@ -212,7 +212,7 @@ var modifyTask = async (taskUUID, task) => { + + const params = _convertTaskToParams(task) + +- const command = ['task', `uuid:${taskUUID}`, 'modify', ...params].join(' ') ++ const command = ['@task@', `uuid:${taskUUID}`, 'modify', ...params].join(' ') + const result = await run({ command, asJson: false }) + + if (!result.error) { +@@ -227,7 +227,7 @@ var syncTasks = async () => { + return + } + +- const command = ['task', 'sync'].join(' ') ++ const command = ['@task@', 'sync'].join(' ') + const result = await run({ command, asJson: false }) + + _showProcessErrorNotificationIfError(result, 'Sync Tasks') From d4dc638d77fc31aaa3000090e50a69fa6096fb86 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Sun, 2 Jan 2022 23:48:56 +0100 Subject: [PATCH 06/72] nixos/test-driver: also passthru driverInteractive --- .../running-nixos-tests-interactively.section.md | 14 +++++++------- .../running-nixos-tests-interactively.section.xml | 14 +++++++------- nixos/lib/testing-python.nix | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md index f87298201791..4c399586eb52 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md @@ -4,19 +4,19 @@ The test itself can be run interactively. This is particularly useful when developing or debugging a test: ```ShellSession -$ nix-build nixos/tests/login.nix -A driverInteractive +$ nix-build . -A nixosTests.login.driverInteractive $ ./result/bin/nixos-test-driver --interactive -starting VDE switch for network 1 -> +[...] +>>> ``` You can then take any Python statement, e.g. ```py -> start_all() -> test_script() -> machine.succeed("touch /tmp/foo") -> print(machine.succeed("pwd")) # Show stdout of command +>>> start_all() +>>> test_script() +>>> machine.succeed("touch /tmp/foo") +>>> print(machine.succeed("pwd")) # Show stdout of command ``` The function `test_script` executes the entire test script and drops you diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml index 17003cbcbfdc..8348ab56deb3 100644 --- a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml +++ b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml @@ -5,19 +5,19 @@ useful when developing or debugging a test: -$ nix-build nixos/tests/login.nix -A driverInteractive +$ nix-build . -A nixosTests.login.driverInteractive $ ./result/bin/nixos-test-driver --interactive -starting VDE switch for network 1 -> +[...] +>>> You can then take any Python statement, e.g. -> start_all() -> test_script() -> machine.succeed("touch /tmp/foo") -> print(machine.succeed("pwd")) # Show stdout of command +>>> start_all() +>>> test_script() +>>> machine.succeed("touch /tmp/foo") +>>> print(machine.succeed("pwd")) # Show stdout of command The function test_script executes the entire test diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 365e22714573..a67040468136 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -17,7 +17,7 @@ rec { inherit pkgs; # Run an automated test suite in the given virtual network. - runTests = { driver, pos }: + runTests = { driver, driverInteractive, pos }: stdenv.mkDerivation { name = "vm-test-run-${driver.testName}"; @@ -34,7 +34,7 @@ rec { ''; passthru = driver.passthru // { - inherit driver; + inherit driver driverInteractive; }; inherit pos; # for better debugging @@ -224,7 +224,7 @@ rec { passMeta = drv: drv // lib.optionalAttrs (t ? meta) { meta = (drv.meta or { }) // t.meta; }; - in passMeta (runTests { inherit driver pos; }); + in passMeta (runTests { inherit driver pos driverInteractive; }); in test // { From b1a8923231a273a8787dcfbc1444e6246ab7ac88 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 4 Jan 2022 17:47:54 +0100 Subject: [PATCH 07/72] golden-cheetah: inline patch This won't get merged into GoldenCheetah any time soon, at least not before their 3.6 release. The PR is periodically rebased, so better ship this in nixpkgs for the time being. --- .../0001-Fix-building-with-bison-3.7.patch | 63 +++++++++++++++++++ .../misc/golden-cheetah/default.nix | 22 ++++--- 2 files changed, 78 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch diff --git a/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch b/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch new file mode 100644 index 000000000000..f8f725f7f680 --- /dev/null +++ b/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch @@ -0,0 +1,63 @@ +From 8befa137776786829508f23dd33ab37e2b95a895 Mon Sep 17 00:00:00 2001 +From: Poncho +Date: Mon, 7 Sep 2020 09:39:49 +0200 +Subject: [PATCH] Fix building with bison 3.7 + +Bison 3.7 changes how header files are included [1][2], in that instead of +copying and inserting the contents of a file, the file itself is included +(by default as '"basename.h"'). + +[1] https://lists.gnu.org/archive/html/info-gnu/2020-07/msg00006.html +[2] https://www.gnu.org/software/bison/manual/html_node/_0025define-Summary.html + +Close: https://github.com/GoldenCheetah/GoldenCheetah/issues/3586 +--- + src/Core/DataFilter.y | 3 +++ + src/Core/RideDB.y | 2 ++ + src/FileIO/JsonRideFile.y | 3 +++ + 3 files changed, 8 insertions(+) + +diff --git a/src/Core/DataFilter.y b/src/Core/DataFilter.y +index 7c5e481b0..142e80a5c 100644 +--- a/src/Core/DataFilter.y ++++ b/src/Core/DataFilter.y +@@ -49,6 +49,9 @@ extern Leaf *DataFilterroot; // root node for parsed statement + + %} + ++// generated by the scanner ++%define api.header.include {"DataFilter_yacc.h"} ++ + // Symbol can be meta or metric name + %token SYMBOL PYTHON + +diff --git a/src/Core/RideDB.y b/src/Core/RideDB.y +index d6da086bd..f2001e23c 100644 +--- a/src/Core/RideDB.y ++++ b/src/Core/RideDB.y +@@ -40,6 +40,8 @@ void RideDBerror(void*jc, const char *error) // used by parser aka yyerror() + #define scanner jc->scanner + + %} ++// generated by the scanner ++%define api.header.include {"RideDB_yacc.h"} + + %pure-parser + %lex-param { void *scanner } +diff --git a/src/FileIO/JsonRideFile.y b/src/FileIO/JsonRideFile.y +index 2cbbef9fc..d5c77a779 100644 +--- a/src/FileIO/JsonRideFile.y ++++ b/src/FileIO/JsonRideFile.y +@@ -106,6 +106,9 @@ static QString protect(const QString string) + + %} + ++// generated by the scanner ++%define api.header.include {"JsonRideFile_yacc.h"} ++ + %pure-parser + %lex-param { void *scanner } + %parse-param { struct JsonContext *jc } +-- +2.34.1 + diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 4f411f105ce9..b2a858d8d3e9 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -26,18 +26,26 @@ in mkDerivation rec { }; buildInputs = [ - qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib - qtconnectivity qtcharts libusb-compat-0_1 gsl blas + qtbase + qtsvg + qtserialport + qtwebengine + qtmultimedia + qttools + zlib + qtconnectivity + qtcharts + libusb-compat-0_1 + gsl + blas ]; nativeBuildInputs = [ flex makeWrapper qmake bison ]; patches = [ # allow building with bison 3.7 - # PR at https://github.com/GoldenCheetah/GoldenCheetah/pull/3590 - (fetchpatch { - url = "https://github.com/GoldenCheetah/GoldenCheetah/commit/e1f42f8b3340eb4695ad73be764332e75b7bce90.patch"; - sha256 = "1h0y9vfji5jngqcpzxna5nnawxs77i1lrj44w8a72j0ah0sznivb"; - }) + # Included in https://github.com/GoldenCheetah/GoldenCheetah/pull/3590, + # which is periodically rebased but pre 3.6 release, as it'll break other CI systems + ./0001-Fix-building-with-bison-3.7.patch ]; NIX_LDFLAGS = "-lz -lgsl -lblas"; From 5cfcc8ea540d8ed86d91a360f1c9a830345d3bc4 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 21 Dec 2021 20:59:30 +0300 Subject: [PATCH 08/72] quictls: 3.0.0+quic_unstable-2021-11-02 -> 3.0.1+quick_unstable-2021-12.14 --- pkgs/development/libraries/quictls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index a91015e1b8a7..3d5741ccba55 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -16,13 +16,13 @@ assert ( stdenv.mkDerivation rec { pname = "quictls"; - version = "3.0.0+quick_unstable-2021-11.02"; + version = "3.0.1+quick_unstable-2021-12.14"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; - rev = "62d4de00abfa82fc01efa2eba1982a86c4864f39"; - sha256 = "11mi4bkkyy4qd2wml6p7xcsbps0mabk3bp537rp7n43qnhwyg1g3"; + rev = "ab8b87bdb436b11bf2a10a2a57a897722224f828"; + sha256 = "sha256-835oZgoM1CTS+JLxPO3oGSTnhLmJXGT1cFaJhCJK++8="; }; patches = [ From 8538701a989d96c9f0a05cbd75936ca8e9b7c44d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 21 Dec 2021 23:04:12 +0300 Subject: [PATCH 09/72] ngtcp2: unstable-2021.11.10 -> unstable-2021-12-19 --- pkgs/development/libraries/ngtcp2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 0d4002ca10d7..dfe07c39e326 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "unstable-2021-11-10"; + version = "unstable-2021-12-19"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; - rev = "7039808c044152c14b44046468bd16249b4d7048"; - sha256 = "1cjsky24f6fazw9b1r6w9cgp09vi8wp99sv76gg2b1r8ic3hgq23"; + rev = "20c710a8789ec910455ae4e588c72e9e39f8cec9"; + sha256 = "sha256-uBmD26EYT8zxmHD5FuHCbEuTdWxer/3uhRp8PhUT87M="; }; nativeBuildInputs = [ autoreconfHook pkg-config cunit file ]; From 3c846ac1c5d9be73f08616d87fad091854e97a45 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 21 Dec 2021 23:07:45 +0300 Subject: [PATCH 10/72] nghttp3: unstable-2021.11.10 -> unstable-2021-12-22 --- pkgs/development/libraries/nghttp3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 85a66f940658..21b9fdf419c8 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "unstable-2021-11-10"; + version = "unstable-2021-12-22"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; - rev = "270e75447ed9e2a05b78ba89d0699d076230ea60"; - sha256 = "01cla03cv8nd2rf5p77h0xzvn9f8sfwn8pp3r2jshvqp9ipa8065"; + rev = "8d8184acf850b06b53157bba39022bc7b7b5f1cd"; + sha256 = "sha256-pV1xdQa5RBz17jDINC2uN1Q+jpa2edDwqTqf8D5VU3E="; }; nativeBuildInputs = [ autoreconfHook pkg-config cunit file ]; From 7d23c7437b52c2247edc1004ffb5012f2b112fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 6 Jan 2022 08:28:28 -0300 Subject: [PATCH 11/72] mc: fix path of cat --- pkgs/tools/misc/mc/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index be24d3e2c0b7..511314324fc2 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -58,6 +58,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/filemanager/ext.c \ --replace /bin/rm ${coreutils}/bin/rm + + substituteInPlace misc/ext.d/misc.sh.in \ + --replace /bin/cat ${coreutils}/bin/cat ''; preFixup = '' From 958754bfd5fa702e3c561301ca442e9fc0e80d4f Mon Sep 17 00:00:00 2001 From: Clemens Lutz Date: Thu, 6 Jan 2022 13:48:22 +0100 Subject: [PATCH 12/72] zoom-us: 5.8.6.739 -> 5.9.1.1380 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 9451dcd2d236..752fa7ba191f 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -28,11 +28,11 @@ }: let - version = "5.8.6.739"; + version = "5.9.1.1380"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "12gzdfxf6xy558smsfazvjj4g1rnaiw7l2lznzlh2qazyaq6f3mq"; + sha256 = "0r1w13y3ks377hdyil9s68vn09vh22zl6ni4693fm7cf6q49ayyw"; }; }; From 45477f7ce5597ab3cc71fe4214d6b38119476426 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 6 Jan 2022 09:21:33 -0500 Subject: [PATCH 13/72] nixos/caddy: add globalConfig option --- .../services/web-servers/caddy/default.nix | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index d51effa31c97..a4ada662cfbd 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -28,11 +28,7 @@ let let Caddyfile = pkgs.writeText "Caddyfile" '' { - ${optionalString (cfg.email != null) "email ${cfg.email}"} - ${optionalString (cfg.acmeCA != null) "acme_ca ${cfg.acmeCA}"} - log { - ${cfg.logFormat} - } + ${cfg.globalConfig} } ${cfg.extraConfig} ''; @@ -183,6 +179,26 @@ in ''; }; + globalConfig = mkOption { + type = types.lines; + default = ""; + example = '' + debug + servers { + protocol { + experimental_http3 + } + } + ''; + description = '' + Additional lines of configuration appended to the global config section + of the Caddyfile. + + Refer to + for details on supported values. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -253,6 +269,13 @@ in ]; services.caddy.extraConfig = concatMapStringsSep "\n" mkVHostConf virtualHosts; + services.caddy.globalConfig = '' + ${optionalString (cfg.email != null) "email ${cfg.email}"} + ${optionalString (cfg.acmeCA != null) "acme_ca ${cfg.acmeCA}"} + log { + ${cfg.logFormat} + } + ''; systemd.packages = [ cfg.package ]; systemd.services.caddy = { From bfbd34eb3574f0d049e7cfa4bb37eb833b5e8882 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 09:16:37 +0100 Subject: [PATCH 14/72] checkov: 2.0.707 -> 2.0.708 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index ee3009a633c9..92a6f9acfc67 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -46,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.707"; + version = "2.0.708"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-AsKsv3fKubFZZMZHBRuVmgeGJB1zTe00J2kmqikBiD8="; + sha256 = "sha256-qnRYxbw42vN0w+x1ARRz60e8q9LCPWglprOBm7rkxsE="; }; nativeBuildInputs = with py.pkgs; [ From ac6f54c1f78ba5d7dc8836dadb09d68e0155aed8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 09:40:24 +0100 Subject: [PATCH 15/72] python3Packages.hahomematic: 0.13.3 -> 0.14.0 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index bf8bed9dd262..d5c5a41abc04 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.13.3"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-9dR0qYoHVovD4fwJz6v+/RItMuqr2vA9YHn0nMGHUX0="; + sha256 = "sha256-Olwol/DhsVJznxpiMB57zkPuco0RBxMy8cfzSQMZZrU="; }; propagatedBuildInputs = [ From f8f6be817f3b902ca1a2cc514999a5444c4f3d6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 09:44:10 +0100 Subject: [PATCH 16/72] python3Packages.meross-iot: 0.4.3.0 -> 0.4.4.1 --- pkgs/development/python-modules/meross-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 5c2bbe9222b7..a0aacb63a1cf 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.3.0"; + version = "0.4.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = version; - sha256 = "sha256-PZ1+Bjw7k6EFZEuPhbkGrdQzdLGiM4U0ecAAN8SxWU4="; + sha256 = "sha256-NkLMQ1sgoZit2BQechgGq8XhBuzw2P7jKHsAjGq3l08="; }; propagatedBuildInputs = [ From abed3ce21137e29ba11a6a553ea26f152a8584f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 09:45:43 +0100 Subject: [PATCH 17/72] python3Packages.identify: 2.4.1 -> 2.4.2 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 194dce3f88df..4497683932ce 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.4.1"; + version = "2.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+kfIpmJ6Gnb33MZ7NZrE8oVSBbZLuRfIvfCbstxJFX0="; + sha256 = "sha256-6YduKmXqgqXAqlK2cd1CkdI7nzK0Dg65E+nl6vhMAow="; }; checkInputs = [ From c7218b3f7e72f39df3477e38cfc4362fdaec9a66 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Fri, 7 Jan 2022 09:48:08 +0100 Subject: [PATCH 18/72] vscode-extensions.bungcip.better-toml: init at 0.3.2 --- pkgs/misc/vscode-extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 98257d87a92a..20b1c0c632c4 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -333,6 +333,23 @@ let }; }; + bungcip.better-toml = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "better-toml"; + publisher = "bungcip"; + version = "0.3.2"; + sha256 = "sha256-g+LfgjAnSuSj/nSmlPdB0t29kqTmegZB5B1cYzP8kCI="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/bungcip.better-toml/changelog"; + description = "Better TOML Language support"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bungcip.better-toml"; + homepage = "https://github.com/bungcip/better-toml/blob/master/README.md"; + license = licenses.mit; + maintainers = with maintainers; [ datafoo ]; + }; + }; + chenglou92.rescript-vscode = callPackage ./rescript { }; cmschuetz12.wal = buildVscodeMarketplaceExtension { From 4e2ca8b0a99eed958d32974a074cb11cedce3cc9 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Fri, 7 Jan 2022 10:06:40 +0100 Subject: [PATCH 19/72] vscode-extensions.jakebecker.elixir-ls: init at 0.9.0 --- pkgs/misc/vscode-extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 98257d87a92a..350def5b6d0b 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -984,6 +984,23 @@ let }; }; + jakebecker.elixir-ls = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "elixir-ls"; + publisher = "JakeBecker"; + version = "0.9.0"; + sha256 = "sha256-KNfZOrVxK3/rClHPcIyPgE9CRtjkI7NLY0xZ9W+X6OM="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; + description = "Elixir support with debugger, autocomplete, and more. Powered by ElixirLS."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=JakeBecker.elixir-ls"; + homepage = "https://github.com/elixir-lsp/elixir-ls"; + license = licenses.mit; + maintainers = with maintainers; [ datafoo ]; + }; + }; + james-yu.latex-workshop = buildVscodeMarketplaceExtension { mktplcRef = { name = "latex-workshop"; From 12fb16f8ad2b0971d1d73b45dd0a636cd1d33336 Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Fri, 7 Jan 2022 14:40:19 +0530 Subject: [PATCH 20/72] broot: 1.7.4 -> 1.9.1 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index d1cc0503efc2..9961416e0d3d 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.7.4"; + version = "1.9.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-laFLm6A0EeprSHuqBi3p4ykgBbCinYU1sf0iRV0PY/M="; + sha256 = "sha256-oIStnwbfp48QHkSlXgveH9AM2fmmrrSmwdvXxvbV/tg="; }; - cargoHash = "sha256-0ybig1S56cJjf6QGWuDasfsIiwRhK+bpWNKOjs4D7P8="; + cargoHash = "sha256-DOPFVa2w+ldG7fnundBGb+jM0t2E2jS0nJIIzekD2QE="; nativeBuildInputs = [ installShellFiles From ea634d99e81f08f92a802e5526102bd0bd3cc6d3 Mon Sep 17 00:00:00 2001 From: Petros Angelatos Date: Fri, 7 Jan 2022 10:35:20 +0100 Subject: [PATCH 21/72] materialize: 0.10.0 -> 0.15.0 Signed-off-by: Petros Angelatos --- pkgs/servers/sql/materialize/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/materialize/default.nix b/pkgs/servers/sql/materialize/default.nix index 5667de22bc33..ce91c322af1d 100644 --- a/pkgs/servers/sql/materialize/default.nix +++ b/pkgs/servers/sql/materialize/default.nix @@ -40,17 +40,17 @@ let in rustPlatform.buildRustPackage rec { pname = "materialize"; - version = "0.10.0"; - MZ_DEV_BUILD_SHA = "c14633f59e842fbdd62c7239ffd8c2a16704386e"; + version = "0.15.0"; + MZ_DEV_BUILD_SHA = "f79f63205649d6011822893c5b55396b2bef7b0b"; src = fetchFromGitHub { owner = "MaterializeInc"; repo = pname; rev = "v${version}"; - sha256 = "06290l2xrryx7bc9g1ffyfjm18a34pa2k410qk9w2p0psqiw2v8d"; + hash = "sha256-/A6+0fehBa8XEB8P8QUV5Lsl9Lwfz4FhQLgotvBG1Gw="; }; - cargoSha256 = "1bxfp6pidiziiq938ah49pa3qr1dhnfnbihp7jxind9qsb3q9gp0"; + cargoHash = "sha256-NJvAIy9b39HWJaG860Mlf3WasanUnz+Nq39k4WpddB0="; nativeBuildInputs = [ cmake perl pkg-config ] # Provides the mig command used by the krb5-src build script @@ -68,8 +68,12 @@ rustPlatform.buildRustPackage rec { "--skip test_client" "--skip test_client_errors" "--skip test_client_all_subjects" + "--skip test_client_subject_and_references" "--skip test_no_block" "--skip test_safe_mode" + # this test is broken on 0.15.0 + # TODO: re-add it in a subsequent release + "--skip test_threads" "--skip test_tls" ]; From 2c5e45c35c42ff06a30addc44f2e260b1651b02d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:23:53 +0700 Subject: [PATCH 22/72] bypass403: remove --- pkgs/tools/security/bypass403/default.nix | 28 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/tools/security/bypass403/default.nix diff --git a/pkgs/tools/security/bypass403/default.nix b/pkgs/tools/security/bypass403/default.nix deleted file mode 100644 index 3d1569cf5577..000000000000 --- a/pkgs/tools/security/bypass403/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -}: - -buildGoModule rec { - pname = "bypass403"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "drsigned"; - repo = pname; - rev = "v${version}"; - sha256 = "1x3a4lnxjxbv80kaydy57809n9r7vzci9ki4f98smf3w04s86rcl"; - }; - - vendorSha256 = "1bp6bf99rxlyg91pn1y228q18lawpykmvkl22cydmclms0q0n238"; - - meta = with lib; { - description = "Tool to bypass 403 Forbidden responses"; - homepage = "https://github.com/drsigned/bypass403"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - - # https://github.com/drsigned/bypass403 no longer exists - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3517f43fbeee..16c461dec84a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -104,6 +104,7 @@ mapAliases ({ buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 buildkite-agent3 = buildkite-agent; # added 2018-09-26 bundler_HEAD = bundler; # added 2015-11-15 + bypass403 = throw "bypass403 has been removed: deleted by upstream"; # added 2022-01-07 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13 caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # added 2020-10-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82bd5f88666f..61fbc3b0c3b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2372,8 +2372,6 @@ with pkgs; textual-window-manager = tmux; }; - bypass403 = callPackage ../tools/security/bypass403 { }; - bsh = fetchurl { url = "http://www.beanshell.org/bsh-2.0b5.jar"; sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; From f9bbc840e3fd93cd0a66de54ef81cb3fe70e3193 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:24:44 +0700 Subject: [PATCH 23/72] aqbanking: update homepage --- pkgs/development/libraries/aqbanking/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 1e11661b0098..2db69f8028c4 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "An interface to banking tasks, file formats and country information"; - homepage = "https://www.aquamaniac.de/"; + homepage = "https://www.aquamaniac.de/rdm/"; hydraPlatforms = []; license = licenses.gpl2Plus; maintainers = with maintainers; [ goibhniu ]; From f2a8126dcc0b4024804eac136c23fe72450598e0 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:25:43 +0700 Subject: [PATCH 24/72] argtable: update homepage --- pkgs/development/libraries/argtable/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/development/libraries/argtable/default.nix index f22f81c87709..9752b9600397 100644 --- a/pkgs/development/libraries/argtable/default.nix +++ b/pkgs/development/libraries/argtable/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://argtable.org"; + homepage = "https://github.com/argtable/argtable3"; description = "A single-file, ANSI C command-line parsing library"; longDescription = '' Argtable is an open source ANSI C library that parses GNU-style From 801c41bd296e224042b0d967144fe45633031916 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:33:07 +0700 Subject: [PATCH 25/72] asn1c: remove --- pkgs/development/compilers/asn1c/default.nix | 33 -------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/development/compilers/asn1c/default.nix diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix deleted file mode 100644 index a4e822eec6da..000000000000 --- a/pkgs/development/compilers/asn1c/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, perl }: - -stdenv.mkDerivation rec { - pname = "asn1c"; - version = "0.9.28"; - - src = fetchurl { - url = "https://lionet.info/soft/asn1c-${version}.tar.gz"; - sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0"; - }; - - outputs = [ "out" "doc" "man" ]; - - buildInputs = [ perl ]; - - preConfigure = '' - patchShebangs examples/crfc2asn1.pl - ''; - - postInstall = '' - cp -r skeletons/standard-modules $out/share/asn1c - ''; - - doCheck = true; - - meta = with lib; { - homepage = "http://lionet.info/asn1c/compiler.html"; - description = "Open Source ASN.1 Compiler"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = [ maintainers.montag451 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 16c461dec84a..92a6f6a283f1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -61,6 +61,7 @@ mapAliases ({ ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28 arora = throw "arora has been removed."; # added 2020-09-09 asciidocFull = asciidoc-full; # added 2014-06-22 + asn1c = throw "asn1c has been removed: deleted by upstream"; # added 2022-01-07 asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # added 2020-10-07 at_spi2_atk = at-spi2-atk; # added 2018-02-25 at_spi2_core = at-spi2-core; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61fbc3b0c3b8..ad2863bda3eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11596,8 +11596,6 @@ with pkgs; tex = texlive.combined.scheme-medium; }; - asn1c = callPackage ../development/compilers/asn1c { }; - aspectj = callPackage ../development/compilers/aspectj { }; atasm = callPackage ../development/compilers/atasm { }; From 0bc6122a2ac6e8ea045076b386422baeac66c750 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:33:50 +0700 Subject: [PATCH 26/72] astyle: update homepage --- pkgs/development/tools/misc/astyle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 66e972826cb9..4ce8c1edffd4 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; - homepage = "https://astyle.sourceforge.net/"; + homepage = "http://astyle.sourceforge.net/"; license = licenses.lgpl3; platforms = platforms.unix; }; From ce4535e01eef55cb5e653b20144b617d5011a319 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:35:04 +0700 Subject: [PATCH 27/72] banking: update homepage --- pkgs/applications/office/banking/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/applications/office/banking/default.nix index c71c1eafa66c..e6c5192b0f94 100644 --- a/pkgs/applications/office/banking/default.nix +++ b/pkgs/applications/office/banking/default.nix @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Banking application for small screens"; - homepage = "https://tabos.gitlab.io/project/banking/"; + homepage = "https://tabos.gitlab.io/projects/banking/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; }; From c9339da1d11f784b198d80d59177fbdc6b5a977e Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:35:51 +0700 Subject: [PATCH 28/72] banner: update homepage --- pkgs/games/banner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index 613947c677a5..befb29f6ffc9 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://software.cedar-solutions.com/utilities.html"; + homepage = "https://github.com/pronovic/banner"; description = "Print large banners to ASCII terminals"; license = licenses.gpl2Only; From 16091bda7974cd56ae07511860aabd77ce4ce12e Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:40:04 +0700 Subject: [PATCH 29/72] bashburn: remove --- pkgs/tools/cd-dvd/bashburn/default.nix | 63 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 pkgs/tools/cd-dvd/bashburn/default.nix diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix deleted file mode 100644 index d9664f1072fb..000000000000 --- a/pkgs/tools/cd-dvd/bashburn/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchurl, util-linux -, cdparanoia, cdrdao, dvdplusrwtools, flac, lame, mpg123, normalize -, vorbis-tools, xorriso }: - -stdenv.mkDerivation rec { - pname = "bashburn"; - version = "3.1.0"; - - src = fetchurl { - sha256 = "0g5va5rjdrvacanmqr6pbxk2rl565ahkfbsvxsp1jvhvxvhmv3dp"; - url = "http://bashburn.dose.se/index.php?s=file_download&id=25"; - name = "${pname}-${version}.tar.gz"; - }; - - nativeBuildInputs = [ util-linux ]; - - postPatch = '' - for path in \ - BB_CDBURNCMD=${xorriso}/bin/"xorriso -as cdrecord" \ - BB_DVDBURNCMD=${dvdplusrwtools}/bin/growisofs \ - BB_ISOCMD=${xorriso}/bin/"xorriso -as mkisofs" \ - BB_DVDBLANK=${dvdplusrwtools}/bin/dvd+rw-format \ - BB_CDIMAGECMD=${cdrdao}/bin/cdrdao \ - BB_CDAUDIORIP=${cdparanoia}/bin/cdparanoia \ - BB_READCD=${xorriso}/bin/"xorriso -as mkisofs" \ - BB_MP3ENC=${lame}/bin/lame \ - BB_MP3DEC=${mpg123}/bin/mpg123 \ - BB_OGGENC=${vorbis-tools}/bin/oggenc \ - BB_OGGDEC=${vorbis-tools}/bin/oggdec \ - BB_FLACCMD=${flac.bin}/bin/flac \ - BB_EJECT=${util-linux}/bin/eject \ - BB_NORMCMD=${normalize}/bin/normalize \ - ; do - echo $path - sed -i BashBurn.sh \ - -e "s,\(''${path%%=*}:\).*,\1 ''${path#*=}," - sed -i menus/advanced.sh \ - -e "s,\(''${path%%=*}|\).*\('.*\),\1''${path#*=}\2," - done - ''; - - installPhase = '' - sh Install.sh --prefix $out - ''; - - meta = with lib; { - description = "Bash script CD Burner Writer"; - longDescription = '' - It might not be the best looking application out there, but it works. - It’s simple, fast and small, and can handle most things you throw at it. - Currently (and with the right dependencies installed), BashBurn can: - - burn data CDs/DVDs (Including CDRWs) - - burn music CDs - - burn CD/DVD-images - - rip data/music CDs - - manipulate ISO-files - - and probably more... - ''; - homepage = "http://bashburn.dose.se/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 92a6f6a283f1..c58e2bdae774 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -71,6 +71,7 @@ mapAliases ({ azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # added 2021-08-02 badtouch = authoscope; # Project was renamed, added 20210626 bar-xft = lemonbar-xft; # added 2015-01-16 + bashburn = throw "bashburn has been removed: deleted by upstream"; # added 2022-01-07 bashCompletion = bash-completion; # Added 2016-09-28 bash_5 = bash; # added 2021-08-20 bashInteractive_5 = bashInteractive; # added 2021-08-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad2863bda3eb..5fbbefba0bf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2135,8 +2135,6 @@ with pkgs; barcode = callPackage ../tools/graphics/barcode {}; - bashburn = callPackage ../tools/cd-dvd/bashburn { }; - bashmount = callPackage ../tools/filesystems/bashmount {}; bat = callPackage ../tools/misc/bat { From 5aeec27082e4375970bdad13c0e521160a015df6 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:41:12 +0700 Subject: [PATCH 30/72] beancount: update homepage --- pkgs/development/python-modules/beancount/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 31f8a24d8b76..665fd6806bfa 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "http://furius.ca/beancount/"; + homepage = "https://github.com/beancount/beancount"; description = "Double-entry bookkeeping computer language"; longDescription = '' A double-entry bookkeeping computer language that lets you define From e62da01a80d8af422d33cc397592bf636a1448eb Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:42:23 +0700 Subject: [PATCH 31/72] bee: update homepage --- pkgs/applications/networking/bee/bee.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/bee/bee.nix b/pkgs/applications/networking/bee/bee.nix index 0e269bf9ab3f..d2f1740a573d 100644 --- a/pkgs/applications/networking/bee/bee.nix +++ b/pkgs/applications/networking/bee/bee.nix @@ -62,7 +62,7 @@ buildGoModule { ''; meta = with lib; { - homepage = "https://swarm.ethereum.org/"; + homepage = "https://github.com/ethersphere/bee"; description = "Ethereum Swarm Bee"; longDescription = '' A decentralised storage and communication system for a sovereign digital society. From 05745bdae39fb46e0eef3c93fa0a714c2526d395 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:44:21 +0700 Subject: [PATCH 32/72] bin_replace_string: remove --- .../tools/misc/bin_replace_string/default.nix | 31 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/development/tools/misc/bin_replace_string/default.nix diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix deleted file mode 100644 index a732d6e732c5..000000000000 --- a/pkgs/development/tools/misc/bin_replace_string/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, libelf, txt2man }: - -stdenv.mkDerivation { - pname = "bin_replace_string"; - version = "0.2"; - - src = fetchurl { - sha256 = "1gnpddxwpsfrg4l76x5yplsvbcdbviybciqpn22yq3g3qgnr5c2a"; - url = "ftp://ohnopub.net/mirror/bin_replace_string-0.2.tar.bz2"; - }; - - buildInputs = [ libelf ]; - nativeBuildInputs = [ txt2man ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Edit precompiled binaries"; - longDescription = '' - bin_replace_string edits C-style strings in precompiled binaries. This is - intended to be useful to replace arbitrary strings in binaries whose - source code is not available. However, because of the nature of compiled - binaries, bin_replace_string may only replace a given C-string with a - shorter C-string. - ''; - homepage = "http://ohnopub.net/~ohnobinki/bin_replace_string/"; - downloadPage = "ftp://ohnopub.net/mirror/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c58e2bdae774..6f8a879e1b4d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -83,6 +83,7 @@ mapAliases ({ beret = throw "beret has been removed"; # added 2021-11-16 blastem = throw "blastem has been removed from nixpkgs as it would still require python2."; # added 2022-01-01 bluezFull = bluez; # Added 2019-12-03 + bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # added 2022-01-07 bpftool = bpftools; # Added 2021-05-03 brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24 bridge_utils = bridge-utils; # added 2015-02-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fbbefba0bf0..0b1c105c3a23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14231,8 +14231,6 @@ with pkgs; stdenv; }; - bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; - bingrep = callPackage ../development/tools/analysis/bingrep { }; binutils-unwrapped = callPackage ../development/tools/misc/binutils { From 95d3bdb7a6999f3fd39972463b7a5dcd6eccdcda Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:44:55 +0700 Subject: [PATCH 33/72] bitcoin: update homepage --- pkgs/applications/blockchains/bitcoin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index e1a0dd207a0a..35ab9791ec73 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. ''; - homepage = "https://bitcoin.org/"; + homepage = "https://bitcoin.org/en/"; downloadPage = "https://bitcoincore.org/bin/bitcoin-core-${version}/"; changelog = "https://bitcoincore.org/en/releases/${version}/"; maintainers = with maintainers; [ prusnak roconnor ]; From 45e81e03ac57a51c57485761af8151af6e15c1e2 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:47:07 +0700 Subject: [PATCH 34/72] bsod: remove --- pkgs/misc/emulators/bsod/default.nix | 32 ---------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/misc/emulators/bsod/default.nix diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix deleted file mode 100644 index 869440856f9a..000000000000 --- a/pkgs/misc/emulators/bsod/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{lib, stdenv, fetchurl, ncurses}: - -stdenv.mkDerivation rec { - pname = "bsod"; - version = "0.1"; - - src = fetchurl { - url = "https://www.vanheusden.com/bsod/bsod-${version}.tgz"; - sha256 = "0hqwacazyq5rhc04j8w8w0j0dgb6ca8k66c9lxf6bsyi6wvbhvmd"; - }; - - buildInputs = [ ncurses ]; - - installPhase = '' - mkdir -p $out/bin - cp bsod $out/bin - ''; - - meta = { - description = "Blue Screen Of Death emulator for Unix"; - longDescription = " - This program will let you UNIX user experience the authentic - microsoft windows experience. Bsod displays the famous windows xp - blue screen of death on the console. Errors and drivers causing the - error are selected randomly from a large set of examples."; - homepage = "http://www.vanheusden.com/bsod/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.antono ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6f8a879e1b4d..f7e74c6b4076 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -101,6 +101,7 @@ mapAliases ({ bitwarden_rs-vault = vaultwarden-vault; bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # added 2021-01-02 + bsod = throw "bsod has been removed: deleted by upstream"; # added 2022-01-07 btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b1c105c3a23..51bd0e1a519f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2333,8 +2333,6 @@ with pkgs; breakpointHook = assert stdenv.isLinux; makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; - bsod = callPackage ../misc/emulators/bsod { }; - py65 = python3Packages.callPackage ../misc/emulators/py65 { }; simh = callPackage ../misc/emulators/simh { }; From ea793d9eccff4642d8f423cdc7b3ea4609e9b775 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:48:14 +0700 Subject: [PATCH 35/72] bunny: remove --- .../package-management/bunny/default.nix | 25 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/tools/package-management/bunny/default.nix diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix deleted file mode 100644 index 8ef808610db7..000000000000 --- a/pkgs/tools/package-management/bunny/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitLab }: - -stdenv.mkDerivation rec { - pname = "bunny"; - version = "1.3"; - - src = fetchFromGitLab { - owner = "tim241"; - repo = "bunny"; - rev = version; - sha256 = "0nh2h5kj9b0nkb6yrzf4if7anfdmy9vijzy4bl3s7qck0nzbpy8s"; - }; - - dontBuild = true; - - makeFlags = [ "prefix=$(out)" ]; - - meta = with lib; { - description = "A simple shell script wrapper around multiple package managers"; - homepage = "https://gitlab.com/tim241/bunny"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ buffet ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7e74c6b4076..a87c6b5d10a0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -108,6 +108,7 @@ mapAliases ({ buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 buildkite-agent3 = buildkite-agent; # added 2018-09-26 bundler_HEAD = bundler; # added 2015-11-15 + bunny = throw "bunny has been removed: deleted by upstream"; # added 2022-01-07 bypass403 = throw "bypass403 has been removed: deleted by upstream"; # added 2022-01-07 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51bd0e1a519f..27da81ef92a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1572,8 +1572,6 @@ with pkgs; buildbot-full = with python3Packages; toPythonApplication buildbot-full; buildbot-worker = with python3Packages; toPythonApplication buildbot-worker; - bunny = callPackage ../tools/package-management/bunny { }; - bunyan-rs = callPackage ../development/tools/bunyan-rs { }; callaudiod = callPackage ../applications/audio/callaudiod { }; From 184340bff50ce8f12eb4fb140ddfd2ed0f9f9fc5 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:55:27 +0700 Subject: [PATCH 36/72] caudec: update homepage and fix source URL --- pkgs/applications/audio/caudec/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 15ebb85136b0..a595f285c68a 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -1,15 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }: -let - version = "1.7.5"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "caudec"; - inherit version; + version = "1.7.5"; src = fetchurl { - url = "http://caudec.net/downloads/caudec-${version}.tar.gz"; + url = "http://caudec.cocatre.net/downloads/caudec-${version}.tar.gz"; sha256 = "5d1f5ab3286bb748bd29cbf45df2ad2faf5ed86070f90deccf71c60be832f3d5"; }; @@ -31,7 +27,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://caudec.net/"; + homepage = "https://caudec.cocatre.net/"; description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; From a90680e06f77892311fb6cc45e8179ed32fccb92 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:56:39 +0700 Subject: [PATCH 37/72] cayley: update homepage --- pkgs/servers/cayley/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index 13bf9326c22b..97aac4272cea 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ]; meta = { - homepage = "https://cayley.io/"; + homepage = "https://github.com/cayleygraph/cayley"; description = "A graph database inspired by Freebase and Knowledge Graph"; maintainers = with lib.maintainers; [ sigma ]; license = lib.licenses.asl20; From 84ee8e02f45cb4b4182c53b0c7aacf64f2219902 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:57:33 +0700 Subject: [PATCH 38/72] cde: update homepage --- pkgs/tools/package-management/cde/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index f2c308de5a76..acebe4726755 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://pg.ucsd.edu/cde/manual/"; + homepage = "https://github.com/usnistgov/corr-CDE"; description = "A packaging tool for building portable packages"; license = licenses.gpl3Plus; maintainers = [ maintainers.rlupton20 ]; From 5e04dac5d6fdd4cce69e73946dbb39ce3f0e925b Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:01:51 +0700 Subject: [PATCH 39/72] ceph: update homepage --- pkgs/tools/filesystems/ceph/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 2c6175bec13e..1162c4e69b12 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -85,7 +85,7 @@ let }; getMeta = description: with lib; { - homepage = "https://ceph.io/"; + homepage = "https://ceph.io/en/"; inherit description; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; maintainers = with maintainers; [ adev ak johanot krav ]; From 8641b298b126a289aadfdafa0d2939cd8a65e96d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:03:36 +0700 Subject: [PATCH 40/72] chunkwm: remove --- pkgs/os-specific/darwin/chunkwm/default.nix | 36 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/os-specific/darwin/chunkwm/default.nix diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/pkgs/os-specific/darwin/chunkwm/default.nix deleted file mode 100644 index c0229ba3ae23..000000000000 --- a/pkgs/os-specific/darwin/chunkwm/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchzip, Carbon, Cocoa, ScriptingBridge }: - -stdenv.mkDerivation rec { - pname = "chunkwm"; - version = "0.4.9"; - src = fetchzip { - url = "https://github.com/koekeishiya/chunkwm/archive/v${version}.tar.gz"; - sha256 = "0w8q92q97fdvbwc3qb5w44jn4vi3m65ssdvjp5hh6b7llr17vspl"; - }; - - buildInputs = [ Carbon Cocoa ScriptingBridge ]; - outputs = [ "bin" "out" ]; - - buildPhase = '' - for d in . src/chunkc src/plugins/*; do - pushd $d - buildPhase - popd - done - ''; - - installPhase = '' - mkdir -p $bin/bin $out/bin $out/lib/chunkwm/plugins - cp src/chunkc/bin/chunkc $bin/bin/chunkc - cp bin/chunkwm $out/bin - cp plugins/*.so $out/lib/chunkwm/plugins - ''; - - meta = with lib; { - description = "Tiling window manager for macOS based on plugin architecture"; - homepage = "https://github.com/koekeishiya/chunkwm"; - platforms = platforms.darwin; - maintainers = with maintainers; [ lnl7 ]; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a87c6b5d10a0..be5e1c6b0d76 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -121,6 +121,7 @@ mapAliases ({ cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05 checkbashism = checkbashisms; # added 2016-08-16 chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # added 2020-08-15 + chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # added 2022-01-07 cide = throw "cide was deprecated on 2019-09-11: abandoned by upstream"; cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 cifs_utils = cifs-utils; # added 2016-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27da81ef92a6..0df53768e038 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1951,10 +1951,6 @@ with pkgs; kwakd = callPackage ../servers/kwakd { }; - chunkwm = callPackage ../os-specific/darwin/chunkwm { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa ScriptingBridge; - }; - kwm = callPackage ../os-specific/darwin/kwm { }; khd = callPackage ../os-specific/darwin/khd { From 9fdcccb613693c84ac464c1d31f890f72c801601 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:04:34 +0700 Subject: [PATCH 41/72] circus: update homepage --- pkgs/tools/networking/circus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix index f24c0e629cb0..c9aba8dc4e8b 100644 --- a/pkgs/tools/networking/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { meta = with lib; { description = "A process and socket manager"; - homepage = "https://github.circus.com/circus-tent/circus"; + homepage = "https://github.com/circus-tent/circus"; license = licenses.asl20; }; } From 5e09daba1be25edf68f344da2bc8ab71b264debd Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:10:27 +0700 Subject: [PATCH 42/72] comic-relief: update homepage --- pkgs/data/fonts/comic-relief/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index 1f5ce7f642fa..b5a7e8878876 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -19,7 +19,7 @@ in fetchzip rec { sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff"; meta = with lib; { - homepage = "http://loudifier.com/comic-relief/"; + homepage = "https://fontlibrary.org/en/font/comic-relief"; description = "A font metric-compatible with Microsoft Comic Sans"; longDescription = '' Comic Relief is a typeface designed to be metrically equivalent From 28d7cd8c46a9afec083f5c08c82e117d054a5eb3 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:11:45 +0700 Subject: [PATCH 43/72] coqPackages.CoLoR: update homepage --- pkgs/development/coq-modules/CoLoR/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 46738343431a..24a7f125599d 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -23,7 +23,7 @@ with lib; mkCoqDerivation { enableParallelBuilding = false; meta = { - homepage = "http://color.inria.fr/"; + homepage = "https://github.com/fblanqui/color"; description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant."; maintainers = with maintainers; [ jpas jwiegley ]; }; From af6a78c0cafd67d7c8a21418ddbf2f332a8c3d04 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:14:15 +0700 Subject: [PATCH 44/72] cpuminer-multi: remove --- pkgs/tools/misc/cpuminer-multi/default.nix | 30 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/tools/misc/cpuminer-multi/default.nix diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix deleted file mode 100644 index 3fbdcfae0fe4..000000000000 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, curl, jansson, autoconf, automake -, aesni ? stdenv.hostPlatform.aesSupport }: - -stdenv.mkDerivation { - pname = "cpuminer-multi"; - version = "unstable-2016-03-16"; - - src = fetchFromGitHub { - owner = "hyc"; - repo = "cpuminer-multi"; - rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; - sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v"; - }; - - buildInputs = [ autoconf automake curl jansson ]; - - preConfigure = '' - ./autogen.sh - ''; - - configureFlags = [ (if aesni then "--enable-aes-ni" else "--disable-aes-ni") ]; - - meta = with lib; { - description = "Multi-algo CPUMiner"; - homepage = "https://github.com/wolf9466/cpuminer-multi"; - license = licenses.gpl2; - # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27 - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index be5e1c6b0d76..82b902567ca2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -155,6 +155,7 @@ mapAliases ({ couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03 coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16 cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30 + cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # added 2022-01-07 cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21 cpp-gsl = microsoft_gsl; # added 2019-05-24 cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # added 2021-02-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0df53768e038..ae4b3bca5841 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4171,8 +4171,6 @@ with pkgs; cpuminer = callPackage ../tools/misc/cpuminer { }; - cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; - crabz = callPackage ../tools/compression/crabz { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; From 9334785442ec4a50921f3a46ba5593e99ca8ff0b Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:15:19 +0700 Subject: [PATCH 45/72] crafty: remove --- pkgs/games/crafty/default.nix | 73 --------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 pkgs/games/crafty/default.nix diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix deleted file mode 100644 index b5b53aa3c413..000000000000 --- a/pkgs/games/crafty/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - pname = "crafty"; - version = "25.0.1"; - - src = fetchurl { - url = "http://www.craftychess.com/downloads/source/crafty-${version}.zip"; - sha256 = "0aqgj2q7kdlgbha01qs869cwyja13bc7q2lh4nfhlba2pklknsm8"; - }; - - bookBin = fetchurl { - url = "http://www.craftychess.com/downloads/book/book.bin"; - sha256 = "10rrgkr3hxm7pxdbc2jq8b5g74gfhzk4smahks3k8am1cmyq4p7r"; - }; - - startPgn = fetchurl { - url = "http://craftychess.com/downloads/book/start.pgn.gz"; - sha256 = "12g70mgfifwssfvndzq94pin34dizlixhsga75vgj7dakysi2p7f"; - }; - - nativeBuildInputs = [ unzip ]; - - unpackPhase = '' - mkdir "craftysrc" - unzip $src -d craftysrc - gunzip -c $startPgn > "craftysrc/start.pgn" - ''; - - buildPhase = '' - cd craftysrc - make unix-gcc - ''; - - installPhase = '' - BUILDDIR="$PWD" - mkdir -p $out/bin - cp -p ./crafty $out/bin - - mkdir -p $out/share/crafty - cd $out/share/crafty - - $out/bin/crafty "books create $BUILDDIR/start.pgn 60" - rm -f *.001 - - cp -p ${bookBin} $out/share/crafty/book.bin - - mv $out/bin/crafty $out/bin/.crafty-wrapped - - cat - > $out/bin/crafty < Date: Fri, 7 Jan 2022 14:17:03 +0700 Subject: [PATCH 46/72] crda: update homepage --- pkgs/os-specific/linux/crda/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index d12bba4e1645..ffed5fc36a78 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { to the system configuration. ''; - homepage = "http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/"; + homepage = "https://wireless.wiki.kernel.org/en/developers/regulatory/crda"; license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site platforms = platforms.linux; }; From 5bc97cf9b396396779273af46178cf29ccc6dd1f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 10:50:32 +0100 Subject: [PATCH 47/72] python3Packages.base58check: init at 1.0.2 --- .../python-modules/base58check/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/base58check/default.nix diff --git a/pkgs/development/python-modules/base58check/default.nix b/pkgs/development/python-modules/base58check/default.nix new file mode 100644 index 000000000000..e81eca6e137d --- /dev/null +++ b/pkgs/development/python-modules/base58check/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "base58check"; + version = "1.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "joeblackwaslike"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Tig6beLRDsXC//x4+t/z2BGaJQWzcP0J+QEKx3D0rhs="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "base58check" + ]; + + meta = with lib; { + description = "Implementation of the Base58Check encoding scheme"; + homepage = "https://github.com/joeblackwaslike/base58check"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb114c656ae9..3432418fd8b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1106,6 +1106,8 @@ in { base58 = callPackage ../development/python-modules/base58 { }; + base58check = callPackage ../development/python-modules/base58check { }; + baseline = callPackage ../development/python-modules/baseline { }; baselines = callPackage ../development/python-modules/baselines { }; From 465d38d53afce5697dcf21a513f6564b267bb1b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 11:03:34 +0100 Subject: [PATCH 48/72] python3Packages.bitcoinrpc: init at 0.5.0 --- .../python-modules/bitcoinrpc/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/bitcoinrpc/default.nix diff --git a/pkgs/development/python-modules/bitcoinrpc/default.nix b/pkgs/development/python-modules/bitcoinrpc/default.nix new file mode 100644 index 000000000000..200f3edf038a --- /dev/null +++ b/pkgs/development/python-modules/bitcoinrpc/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, orjson +, httpx +, typing-extensions +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "bitcoinrpc"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bibajz"; + repo = "bitcoin-python-async-rpc"; + rev = "v${version}"; + hash = "sha256-uxkSz99X9ior7l825PaXGIC5XJzO/Opv0vTyY1ixvxU="; + }; + + propagatedBuildInputs = [ + orjson + httpx + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "bitcoinrpc" + ]; + + meta = with lib; { + description = "Bitcoin JSON-RPC client"; + homepage = "https://github.com/bibajz/bitcoin-python-async-rpc"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3432418fd8b3..66056a0392ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1200,6 +1200,8 @@ in { bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; + bitcoinrpc = callPackage ../development/python-modules/bitcoinrpc { }; + bitlist = callPackage ../development/python-modules/bitlist { }; bitmath = callPackage ../development/python-modules/bitmath { }; From 8aae0b20f3af9df3890535de0b3b8935213a393a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 11:17:11 +0100 Subject: [PATCH 49/72] python3Packages.bitcoin-utils-fork-minimal: init at 0.4.11.4 --- .../bitcoin-utils-fork-minimal/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix diff --git a/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix b/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix new file mode 100644 index 000000000000..820fa883676a --- /dev/null +++ b/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix @@ -0,0 +1,45 @@ +{ lib +, base58 +, buildPythonPackage +, ecdsa +, fetchPypi +, sympy +}: + +buildPythonPackage rec { + pname = "bitcoin-utils-fork-minimal"; + version = "0.4.11.4"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-n3tEQkl6KBAno4LY67lZme3TIvsm35VA2yyfWYuIE1c="; + }; + + propagatedBuildInputs = [ + base58 + ecdsa + sympy + ]; + + preConfigure = '' + substituteInPlace setup.py \ + --replace "sympy==1.3" "sympy>=1.3" \ + --replace "base58==2.1.0" "base58>=2.1.0" \ + --replace "ecdsa==0.13.3" "ecdsa>=0.13.3" + ''; + + # Project doesn't ship tests + doCheck = false; + + pythonImportsCheck = [ + "bitcoinutils" + ]; + + meta = with lib; { + description = "Bitcoin utility functions"; + homepage = "https://github.com/doersf/python-bitcoin-utils"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66056a0392ec..7d36016f1752 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1200,6 +1200,8 @@ in { bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; + bitcoin-utils-fork-minimal = callPackage ../development/python-modules/bitcoin-utils-fork-minimal { }; + bitcoinrpc = callPackage ../development/python-modules/bitcoinrpc { }; bitlist = callPackage ../development/python-modules/bitlist { }; From 77f5a8eabc6ee208f215569642d32ca1c788308a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 11:21:05 +0100 Subject: [PATCH 50/72] python3Packages.block-io: update inputs --- .../python-modules/block-io/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index f634bf17ecc0..64ffc5ff4b3e 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -1,8 +1,20 @@ -{ lib, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }: +{ lib +, fetchPypi +, bitcoin-utils-fork-minimal +, buildPythonPackage +, base58 +, pycryptodome +, requests +, setuptools +, pythonOlder +}: buildPythonPackage rec { pname = "block-io"; version = "2.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -11,24 +23,24 @@ buildPythonPackage rec { propagatedBuildInputs = [ base58 - ecdsa + bitcoin-utils-fork-minimal pycryptodome requests - six setuptools ]; preConfigure = '' substituteInPlace setup.py \ - --replace "ecdsa==0.15" "ecdsa>=0.15" \ - --replace "base58==1.0.3" "base58>=1.0.3" + --replace "base58==2.1.0" "base58>=2.1.0" ''; # Tests needs a BlockIO API key to run properly # https://github.com/BlockIo/block_io-python/blob/79006bc8974544b70a2d8e9f19c759941d32648e/test.py#L18 doCheck = false; - pythonImportsCheck = [ "block_io" ]; + pythonImportsCheck = [ + "block_io" + ]; meta = with lib; { description = "Integrate Bitcoin, Dogecoin and Litecoin in your Python applications using block.io"; From 00bcc4cfdab88c05285cf983633de499b1442bc6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 11:36:49 +0100 Subject: [PATCH 51/72] python3Packages.hydra: disable failing tests --- .../python-modules/hydra/default.nix | 43 +++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra/default.nix index 5fb15be0a3f9..645df973fa6a 100644 --- a/pkgs/development/python-modules/hydra/default.nix +++ b/pkgs/development/python-modules/hydra/default.nix @@ -1,9 +1,18 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pytestCheckHook -, importlib-resources, omegaconf, jre_headless, antlr4-python3-runtime }: +{ lib +, antlr4-python3-runtime +, buildPythonPackage +, fetchFromGitHub +, importlib-resources +, jre_headless +, omegaconf +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "hydra"; version = "1.1.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -14,17 +23,35 @@ buildPythonPackage rec { sha256 = "sha256:1svzysrjg47gb6lxx66fzd8wbhpbbsppprpbqssf5aqvhxgay3qk"; }; - nativeBuildInputs = [ jre_headless ]; - checkInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ omegaconf antlr4-python3-runtime ] - ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; + nativeBuildInputs = [ + jre_headless + ]; - # test environment setup broken under Nix for a few tests: + propagatedBuildInputs = [ + antlr4-python3-runtime + omegaconf + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # Test environment setup broken under Nix for a few tests: disabledTests = [ "test_bash_completion_with_dot_in_path" "test_install_uninstall" + "test_config_search_path" + ]; + + disabledTestPaths = [ + "tests/test_hydra.py" + ]; + + pythonImportsCheck = [ + "hydra" ]; - disabledTestPaths = [ "tests/test_hydra.py" ]; meta = with lib; { description = "A framework for configuring complex applications"; From bd72557ae9204b36937c0f65ce3993373bf8ecb1 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Fri, 7 Jan 2022 12:19:05 +0100 Subject: [PATCH 52/72] vscode-extensions.streetsidesoftware.code-spell-checker: 1.10.2 -> 2.0.14 --- pkgs/misc/vscode-extensions/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 98257d87a92a..84b326c4e243 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1501,11 +1501,16 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "1.10.2"; - sha256 = "1ll046rf5dyc7294nbxqk5ya56g2bzqnmxyciqpz2w5x7j75rjib"; + version = "2.0.14"; + sha256 = "sha256-mwcssQvaztrnUuSoo8AWK3FXT4qKmPTRCGVYkAjgfXg="; }; meta = with lib; { - license = licenses.mit; + changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; + description = "Spelling checker for source code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker"; + homepage = "https://streetsidesoftware.github.io/vscode-spell-checker"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ datafoo ]; }; }; From 34334cf242296d2204bd23c4d425bee6ddefc6c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Jan 2022 11:22:58 +0000 Subject: [PATCH 53/72] python38Packages.azure-mgmt-notificationhubs: 7.0.0 -> 8.0.0 --- .../python-modules/azure-mgmt-notificationhubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix index bf9d9bab576b..7b7704401c17 100644 --- a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-notificationhubs"; - version = "7.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "92ffed71a2999ff5db41afd66c6ba5cfef9d467f732c7bb45b7c41db371c6e4a"; + sha256 = "4dd924f4704993e3ebf1d42e2be1cbe0b0d908e695857fa08c4369ae11d0eb36"; }; propagatedBuildInputs = [ From d19a3d449aaecdff960f5956460d5a4544b10464 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 12:32:08 +0100 Subject: [PATCH 54/72] python3Packages.types-requests: 2.26.3 -> 2.27.0 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 3006c2c5e99e..6dec072bb509 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.26.3"; + version = "2.27.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1j+mF4Rtzv/1qi1Z5Hq0/9gG5LsFZxFfetu15DgwL+Q="; + sha256 = "sha256-vFztDc8GdOPx+d7XNM7p+kXFfPZEsInmLI+xLKKOshU="; }; # Module doesn't have tests From 53caa40811ea654d78d01bf2d2b575bd089d52c7 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Fri, 7 Jan 2022 12:37:50 +0100 Subject: [PATCH 55/72] vscode-extensions.davidanson.vscode-markdownlint: 0.42.1 -> 0.45.0 --- pkgs/misc/vscode-extensions/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 98257d87a92a..0e688fba5ce7 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -417,11 +417,16 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.42.1"; - sha256 = "c8c0647e0dd786fe68becca6dc73eade5f4220a26ab9faff8dd813a14b25df51"; + version = "0.45.0"; + sha256 = "sha256-L7y+Lsx1DMS12JtxSl7WkT8jGQLipebNKxknF/Y1ke0="; }; meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; + description = "Markdown linting and style checking for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=DavidAnson.vscode-markdownlint"; + homepage = "https://github.com/DavidAnson/vscode-markdownlint"; license = licenses.mit; + maintainers = with maintainers; [ datafoo ]; }; }; From c673de90c6a100a55d946d698a37c91d015044d0 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Fri, 7 Jan 2022 12:44:25 +0100 Subject: [PATCH 56/72] vscode-extensions.esbenp.prettier-vscode: 9.0.0 -> 9.1.0 --- pkgs/misc/vscode-extensions/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 98257d87a92a..a7fb9b248568 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -623,19 +623,19 @@ let }; esbenp.prettier-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "prettier-vscode"; + publisher = "esbenp"; + version = "9.1.0"; + sha256 = "sha256-lR5BDbDYURCF1Gq5JIm7BcXVvKXPdNBYom0BiVX/3u0="; + }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; description = "Code formatter using prettier"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; homepage = "https://github.com/prettier/prettier-vscode"; license = licenses.mit; - maintainers = with maintainers; [ ]; - }; - mktplcRef = { - name = "prettier-vscode"; - publisher = "esbenp"; - version = "9.0.0"; - sha256 = "1nak1hg46wxkl0kb0zhc343kq2f4nd5q1fqscb29jybd4qdb8lgn"; + maintainers = with maintainers; [ datafoo ]; }; }; From 94c5e47f9abe3deabc27f82686c9bbad1069e833 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Fri, 7 Jan 2022 12:54:19 +0100 Subject: [PATCH 57/72] vscode-extensions.stkb.rewrap: 1.14.0 -> 1.15.4 --- pkgs/misc/vscode-extensions/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 98257d87a92a..a5a684948154 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1489,11 +1489,16 @@ let mktplcRef = { publisher = "stkb"; name = "rewrap"; - version = "1.14.0"; - sha256 = "qRwKX36a1aLzE1tqaOkH7JfE//pvKdPZ07zasPF3Dl4="; + version = "1.15.4"; + sha256 = "sha256-yuXyClvhGsonvddYHDMkLSvwEsD21vOeE54Gs9BRpeg="; }; meta = with lib; { + changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md"; + description = "Hard word wrapping for comments and other text at a given column."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=stkb.rewrap"; + homepage = "https://github.com/stkb/Rewrap#readme"; license = licenses.asl20; + maintainers = with maintainers; [ datafoo ]; }; }; From 7c9aa260f2f84e1143824f544e95e2d1dbc1be35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Jan 2022 12:28:00 +0000 Subject: [PATCH 58/72] python38Packages.shodan: 1.25.0 -> 1.26.0 --- pkgs/development/python-modules/shodan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 9637602cce1f..8b378e844e43 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.25.0"; + version = "1.26.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fivdvBtgv2IAQtABD0t2KoC0MRHb6pwEHXLUMl4mDCM="; + sha256 = "4f2ee19bdcad41a5f4618c8e7e1759f62c337cc2214416b53ad3d0c04a1146bc"; }; propagatedBuildInputs = [ From eb5c249b403dd7a16536e8f1df88ef2534347c31 Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 7 Jan 2022 23:44:01 +1000 Subject: [PATCH 59/72] btop: 1.1.3 -> 1.1.4 --- pkgs/tools/system/btop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 9ffdd46c6b48..50ea70ae48dd 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uKR1ogQwEoyxyWBiLnW8BsOsYgTpeIpKrKspq0JwYjY="; + sha256 = "1q8rp34fjbg9abbw5v6l5h9cmvzqq05cmkgavh8qd5xyimsx3xyh"; }; hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; From 949155cbecf4787874af0791fe3519bca8ef1a27 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 7 Jan 2022 10:43:19 -0300 Subject: [PATCH 60/72] pinta: 2.0 -> 2.0.1 --- pkgs/applications/graphics/pinta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index a4ad25109c84..ff112d7ce67c 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -11,7 +11,7 @@ buildDotnetModule rec { pname = "Pinta"; - version = "2.0"; + version = "2.0.1"; nativeBuildInputs = [ installShellFiles @@ -36,7 +36,7 @@ buildDotnetModule rec { owner = "PintaProject"; repo = "Pinta"; rev = version; - sha256 = "sha256-wqqNPyy5h/hTDm2u5MDZx1ds5qWAxy1/BY/fX4PeA88="; + sha256 = "sha256-iOKJPB2bI/GjeDxzG7r6ew7SGIzgrJTcRXhEYzOpC9k="; }; # FIXME: this should be propagated by wrapGAppsHook already, however for some From c73b3c0383b8a20a2533b9f07abe98ca096b032a Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 7 Jan 2022 09:29:23 -0500 Subject: [PATCH 61/72] oha: 0.4.7 -> 0.5.0 --- pkgs/tools/networking/oha/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix index 4f59810a7623..315a4b6084b6 100644 --- a/pkgs/tools/networking/oha/default.nix +++ b/pkgs/tools/networking/oha/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "oha"; - version = "0.4.7"; + version = "0.5.0"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/gcNVTfLJKA5qzRgAqFSlSI618QBsJTxFE1doOKR7e8="; + sha256 = "sha256-wCoBlbi4/EiTAA1xiZ/taVrokE0ECf8STAlA1sk/pm0="; }; - cargoSha256 = "sha256-o5VKj69Wp7zLR3TS+wNA0D8nP6Cynlr4KtW4JSUm0VE="; + cargoSha256 = "sha256-tcORdyxGViUhKbtxVJaZ1G3uUpyr1pRLu5j8v52lMg8="; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; From bb40350e527facd331c700b6c5a3b744959d9301 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Jan 2022 06:40:12 -0800 Subject: [PATCH 62/72] gnunet-gtk: 0.14.0 -> 0.15.0 (#153286) --- pkgs/applications/networking/p2p/gnunet/gtk.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix index 3711d5a3c1ed..369244604a88 100644 --- a/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnunet-gtk"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "18rc7mb45y17d5nrlpf2p4ixp7ir67gcgjf4hlj4r95ic5zi54wa"; + sha256 = "sha256-FLLlqpQ7Bf+oNRUvx7IniVxFusy/tPYxEP2T6VGF7h8="; }; nativeBuildInputs= [ From 5e89c6580d0c1731b4dfedb1c5a28ecd25e8ee10 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 7 Jan 2022 09:52:51 -0500 Subject: [PATCH 63/72] cargo-tally: 1.0.0 -> 1.0.2 --- pkgs/development/tools/rust/cargo-tally/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 21a5b470a2e9..808cda01fe54 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.0"; + version = "1.0.2"; src = fetchCrate { inherit pname version; - sha256 = "16r60ddrqsss5nagfb5g49md8wwm4zbp9sffbm23bhlqhxh35y0i"; + sha256 = "sha256-m5NLI0C7ett5Fmvs9t1vl2W6h7mjCtEFBc1AzYg9JfY="; }; - cargoSha256 = "0ffq67vy0pa7va8j93g03bralz7lck6ds1hidbpzzkp13pdcgf97"; + cargoSha256 = "sha256-AxjQUyxX5lLFPdEdETvZLHbgMYg/xOo7bcqn1TiDKsE="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration From 593324465fbdbdd02f81b1954751140e56732322 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 7 Jan 2022 09:59:15 -0500 Subject: [PATCH 64/72] csview: 0.3.10 -> 0.3.12 --- pkgs/tools/text/csview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index 58d1fe2a7a68..c0b9c43436f5 100644 --- a/pkgs/tools/text/csview/default.nix +++ b/pkgs/tools/text/csview/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "0.3.10"; + version = "0.3.12"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ezN/hU8SdC/ox+l1KJQixzFwGvfmg3zfUjf/bAtnYRU="; + sha256 = "sha256-1j3u9r5TjdewAyzuCwCkXl/A2yI9L/AS5QGRpz30N7U="; }; - cargoSha256 = "sha256-gEiZIwISlazkBwQPFaIWM6dViumc55no8RQ8E30JfUo="; + cargoSha256 = "sha256-Z+LnWXvVfZa8Mtr9LrieqCBGxaQE1vj1joSttYM5Xhs="; meta = with lib; { description = "A high performance csv viewer with cjk/emoji support"; From 6ececace95544c18aa77886f4266a024b7cd404a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Jan 2022 07:12:40 -0800 Subject: [PATCH 65/72] krapslog: 0.3.0 -> 0.3.1 (#153258) --- pkgs/tools/misc/krapslog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index a499c3eb46b4..691ca64c809c 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-IXbOmeWLhGOijO1xLItw1wzbHxl0Zyd0dHvfcaPWE8U="; + sha256 = "sha256-8m3AATRymIvh0ToldlGdWdmjSyG1CDfS+CfL+l5oj8o="; }; - cargoSha256 = "sha256-2XCtjMV8ko6jnvXYtJhLlNvB1uc0QLO/aYsQX40deBk="; + cargoSha256 = "sha256-2vF+eVuVc5tqVnPV2SgxGLv/DjeYoh3jBiCo0rQQpHE="; buildInputs = lib.optional stdenv.isDarwin libiconv; From 57bf320aad836878752f1b600f087db54abf0eee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Jan 2022 08:10:57 -0800 Subject: [PATCH 66/72] libmysqlconnectorcpp: 8.0.23 -> 8.0.27 (#153186) --- pkgs/development/libraries/libmysqlconnectorcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 40d814814caa..f79f82e9a782 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.23"; + version = "8.0.27"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "sha256-mvBklaaggP7WLacJePHLDGbwWO3V6p7ak0WmS/jsaI8="; + sha256 = "sha256-WIZpj8aCpeh0CCLtm0YbxRtgz5y6304cf+vllYSyv7c="; }; nativeBuildInputs = [ From 1bdceb96281f9146585ac80a12de8cb9858179a8 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 7 Jan 2022 15:09:31 +0300 Subject: [PATCH 67/72] xsecurelock: add coreutils to saver_blank script path This script is used to delay something in a loop that is active while xscreensaver is running. Since it calls `sleep` from coreutils, the effect of `sleep` not being on $PATH is that it turns into a busy loop that does nothing, causing a variety of problems with things like resuming from suspend if a screenlocker is active. Situations where coreutils might not be on $PATH are, for example, cases where xscreensaver is launched via a systemd-unit (e.g. through xss-lock). I've been running xsecurelock with this change for a while (since https://cl.tvl.fyi/c/depot/+/4403) and it has resolved these issues for me. --- pkgs/tools/X11/xsecurelock/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 5c43dc6dff4a..9539a717e611 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , libX11, libXcomposite, libXft, libXmu, libXrandr, libXext, libXScrnSaver -, pam, apacheHttpd, pamtester, xscreensaver }: +, pam, apacheHttpd, pamtester, xscreensaver, coreutils, makeWrapper }: stdenv.mkDerivation rec { pname = "xsecurelock"; @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook pkg-config + autoreconfHook pkg-config makeWrapper ]; + buildInputs = [ libX11 libXcomposite libXft libXmu libXrandr libXext libXScrnSaver pam apacheHttpd pamtester @@ -32,6 +33,10 @@ stdenv.mkDerivation rec { EOF ''; + postInstall = '' + wrapProgram $out/libexec/xsecurelock/saver_blank --prefix PATH : ${coreutils}/bin + ''; + meta = with lib; { description = "X11 screen lock utility with security in mind"; homepage = "https://github.com/google/xsecurelock"; From 292e674bb11a7962a1d597420be914c48f3f8e10 Mon Sep 17 00:00:00 2001 From: Alexander Tsvyashchenko Date: Fri, 7 Jan 2022 18:22:38 +0100 Subject: [PATCH 68/72] python3Packages.flax: init at 0.3.6 (#153761) --- .../python-modules/flax/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/flax/default.nix diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix new file mode 100644 index 000000000000..b8479c0f73ca --- /dev/null +++ b/pkgs/development/python-modules/flax/default.nix @@ -0,0 +1,60 @@ +{ buildPythonPackage +, fetchFromGitHub +, keras +, lib +, matplotlib +, msgpack +, numpy +, optax +, pytestCheckHook +, tensorflow +}: + +buildPythonPackage rec { + pname = "flax"; + version = "0.3.6"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "0zvq0vl88hiwmss49bnm7gdmndr1dfza2bcs1fj88a9r7w9dmlsr"; + }; + + propagatedBuildInputs = [ + matplotlib + msgpack + numpy + optax + ]; + + pythonImportsCheck = [ + "flax" + ]; + + checkInputs = [ + keras + pytestCheckHook + tensorflow + ]; + + disabledTestPaths = [ + # Docs test, needs extra deps + we're not interested in it. + "docs/_ext/codediff_test.py" + + # The tests in `examples` are not designed to be executed from a single test + # session and thus either have the modules that conflict with each other or + # wrong import paths, depending on how they're invoked. Many tests also have + # dependencies that are not packaged in `nixpkgs` (`clu`, `jgraph`, + # `tensorflow_datasets`, `vocabulary`) so the benefits of trying to run them + # would be limited anyway. + "examples/*" + ]; + + meta = with lib; { + description = "Neural network library for JAX"; + homepage = "https://github.com/google/flax"; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de776766d095..54cde5491182 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2951,6 +2951,8 @@ in { inherit (pkgs) flatbuffers; }; + flax = callPackage ../development/python-modules/flax { }; + flexmock = callPackage ../development/python-modules/flexmock { }; flickrapi = callPackage ../development/python-modules/flickrapi { }; From 0701f2904bdc2033981f7f78a4c0857e3348190a Mon Sep 17 00:00:00 2001 From: Alexander Tsvyashchenko Date: Fri, 7 Jan 2022 18:23:20 +0100 Subject: [PATCH 69/72] python3Packages.tensorflow-metadata: init at 1.5.0 (#153767) --- .../tensorflow-metadata/build.patch | 24 ++++++++++ .../tensorflow-metadata/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/tensorflow-metadata/build.patch create mode 100644 pkgs/development/python-modules/tensorflow-metadata/default.nix diff --git a/pkgs/development/python-modules/tensorflow-metadata/build.patch b/pkgs/development/python-modules/tensorflow-metadata/build.patch new file mode 100644 index 000000000000..ff81c5d1e86c --- /dev/null +++ b/pkgs/development/python-modules/tensorflow-metadata/build.patch @@ -0,0 +1,24 @@ +diff --git a/setup.py b/setup.py +index 7a09b2f..94c5aa6 100644 +--- a/setup.py ++++ b/setup.py +@@ -125,7 +125,7 @@ setup( + ], + namespace_packages=[], + install_requires=[ +- 'absl-py>=0.9,<0.13', ++ 'absl-py>=0.9', + 'googleapis-common-protos>=1.52.0,<2', + 'protobuf>=3.13,<4', + ], +@@ -137,8 +137,5 @@ setup( + long_description_content_type='text/markdown', + keywords='tensorflow metadata tfx', + download_url='https://github.com/tensorflow/metadata/tags', +- requires=[], +- cmdclass={ +- 'build': _BuildCommand, +- 'bazel_build': _BazelBuildCommand, +- }) ++ requires=[] ++ ) diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix new file mode 100644 index 000000000000..2a80155c4cd9 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -0,0 +1,46 @@ +{ absl-py +, buildPythonPackage +, fetchFromGitHub +, googleapis-common-protos +, lib +}: + +buildPythonPackage rec { + pname = "tensorflow-metadata"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "tensorflow"; + repo = "metadata"; + rev = "v${version}"; + sha256 = "17p74k6rwswpmj7m16cw9hdam6b4m7v5bahirmc2l1kwfvrn4w33"; + }; + + patches = [ + ./build.patch + ]; + + # Default build pulls in Bazel + extra deps, given the actual build + # is literally three lines (see below) - replace it with custom build. + preBuild = '' + for proto in tensorflow_metadata/proto/v0/*.proto; do + protoc --python_out=. $proto + done + ''; + + propagatedBuildInputs = [ + absl-py + googleapis-common-protos + ]; + + pythonImportsCheck = [ + "tensorflow_metadata" + ]; + + meta = with lib; { + description = "Standard representations for metadata that are useful when training machine learning models with TensorFlow"; + homepage = "https://github.com/tensorflow/metadata"; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 54cde5491182..6ab59cdf54a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9553,6 +9553,8 @@ in { tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { }; + tensorflow-metadata = callPackage ../development/python-modules/tensorflow-metadata { }; + tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; tensorflow = self.tensorflow-build; From 785f04f9863ed1054f5ecc3d27bc555a22c8c06b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Fri, 7 Jan 2022 15:06:07 +0100 Subject: [PATCH 70/72] varnish: use jemalloc instead of glibc's malloc on linux. this is the recommanded default, as glibc cause memory leaks: "We ran into a problem with glibc's malloc on Linux where it seemed like it failed to ever give memory back to the OS, causing the system to swap. We have now switched to jemalloc which appears not to have this problem." (from varnish-cache/doc/changes.rst) --- pkgs/servers/varnish/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 5988c3a211e6..030af847874b 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, fetchpatch, pcre, pcre2, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils -, python3, makeWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, pcre, pcre2, jemalloc, libxslt, groff, ncurses, pkg-config, readline, libedit +, coreutils, python3, makeWrapper }: let common = { version, sha256, extraNativeBuildInputs ? [] }: @@ -19,7 +19,8 @@ let libxslt groff ncurses readline libedit makeWrapper python3 ] ++ lib.optional (lib.versionOlder version "7") pcre - ++ lib.optional (lib.versionAtLeast version "7") pcre2; + ++ lib.optional (lib.versionAtLeast version "7") pcre2 + ++ lib.optional stdenv.hostPlatform.isLinux jemalloc; buildFlags = [ "localstatedir=/var/spool" ]; From 628e9059a9e16e53c851f27e432c5f104beff17a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Jan 2022 13:53:04 +0100 Subject: [PATCH 71/72] ocamlPackages.ca-certs-nss: 3.71.0.1 -> 3.74 --- pkgs/development/ocaml-modules/ca-certs-nss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index 2835852d6708..987c325ee00e 100644 --- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -14,13 +14,13 @@ buildDunePackage rec { pname = "ca-certs-nss"; - version = "3.71.0.1"; + version = "3.74"; minimumOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-v${version}.tbz"; - sha256 = "b83749d983781631745079dccb7345d9ee1b52c1844ce865e97a25349289a124"; + url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz"; + sha256 = "c95f5b2e36a0564e6f65421e0e197d7cfe600d19eb492f8f27c4841cbe68b231"; }; useDune2 = true; From 568e0bc498ee51fdd88e1e94089de05f2fdbd18b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 30 Dec 2021 22:02:43 -0800 Subject: [PATCH 72/72] Revert "python3Packages.pip-tools: 6.3.1 -> 6.4.0" This reverts commit 68f6e0321f2325a06ad25b3c7ab8b11b7691331a. --- pkgs/development/python-modules/pip-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 9d54eef4d706..62bab6694d79 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.4.0"; + version = "6.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "65553a15b1ba34be5e43889345062e38fb9b219ffa23b084ca0d4c4039b6f53b"; + sha256 = "992d968df6f1a19d4d37c53b68b3d4b601b894fb3ee0926d1fa762ebc7c7e9e9"; }; checkInputs = [