From 1838712a15df62f354993d68187225b8f70cc5dc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 15 May 2022 10:40:32 +0100 Subject: [PATCH 01/28] i3lock-blur: pull patch pending upstream inclusion for -fno-common toolchain support Without the change build on upstream gcc-10 fals as: ld: i3lock-unlock_indicator.o:/build/source/x86_64-pc-linux-gnu/../../source/unlock_indicator.c:39: multiple definition of `input_position'; i3lock-i3lock.o:/build/source/x86_64-pc-linux-gnu/../../source/i3lock.c:73: first defined here --- pkgs/applications/window-managers/i3/lock-blur.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/applications/window-managers/i3/lock-blur.nix index 4018a34b571a..47875ec47c32 100644 --- a/pkgs/applications/window-managers/i3/lock-blur.nix +++ b/pkgs/applications/window-managers/i3/lock-blur.nix @@ -1,4 +1,4 @@ -{ i3lock-color, lib, stdenv, fetchFromGitHub }: +{ i3lock-color, lib, stdenv, fetchFromGitHub, fetchpatch }: i3lock-color.overrideAttrs (oldAttrs : rec { pname = "i3lock-blur"; @@ -11,6 +11,16 @@ i3lock-color.overrideAttrs (oldAttrs : rec { sha256 = "sha256-rBQHYVD9rurzTEXrgEnOziOP22D2EePC1+EV9Wi2pa0="; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common toolchain + # support: https://github.com/karulont/i3lock-blur/pull/22 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/karulont/i3lock-blur/commit/ec8fe0e7f7d78bf445602ed517efd5c324bb32f7.patch"; + sha256 = "sha256-0hXUr+ZEB1tpI3xw80/hGzKyeGuna4CQmEvK6t0VBqU="; + }) + ]; + meta = with lib; { description = "An improved screenlocker based upon XCB and PAM with background blurring filter"; homepage = "https://github.com/karulont/i3lock-blur/"; From 80367c8db877e65ba7727c834fae8ce078295f0d Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sat, 30 Apr 2022 15:30:56 +1200 Subject: [PATCH 02/28] nixos/nextcloud: Remove confusing comment There is a comment above the invocation of 'nextcloud-occ app:enable', stating that the script should not fail if any of the apps cannot be enabled, but there is nothing in place to suppress errors. The app:enable command already continues installing the remaining apps when one fails to install, and we do not want to suppress errors in the setup script, so this just removes the comment about not failing. --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index a4b886821ebf..fda151c2a4dc 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -811,7 +811,7 @@ in { ${occ}/bin/nextcloud-occ config:system:delete trusted_domains ${optionalString (cfg.extraAppsEnable && cfg.extraApps != { }) '' - # Try to enable apps (don't fail when one of them cannot be enabled , eg. due to incompatible version) + # Try to enable apps ${occ}/bin/nextcloud-occ app:enable ${concatStringsSep " " (attrNames cfg.extraApps)} ''} From e373b1a746317dc089e3dc16e06d5994746cfa78 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 11 May 2022 23:17:54 +0200 Subject: [PATCH 03/28] vimPlugins.diffview-nvim: add plenary as dependency --- .../editors/vim/plugins/generated.nix | 2 +- .../editors/vim/plugins/overrides.nix | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4e35fd632b1f..3f04e59e81da 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2143,7 +2143,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; - diffview-nvim = buildVimPluginFrom2Nix { + diffview-nvim = buildNeovimPluginFrom2Nix { pname = "diffview.nvim"; version = "2022-05-09"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 494d42a4c46f..df5d30d18db5 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -230,6 +230,13 @@ self: super: { }; }); + diffview-nvim = super.diffview-nvim.overrideAttrs (oa: { + dependencies = with self; [ plenary-nvim ]; + + doInstallCheck = true; + nvimRequireCheck = "diffview"; + }); + direnv-vim = super.direnv-vim.overrideAttrs (oa: { preFixup = oa.preFixup or "" + '' substituteInPlace $out/autoload/direnv.vim \ @@ -316,6 +323,10 @@ self: super: { configurePhase = "cd plugins/nvim"; }); + gitlinker-nvim = super.gitlinker-nvim.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; + }); + gitsigns-nvim = super.gitsigns-nvim.overrideAttrs (old: { dependencies = with self; [ plenary-nvim ]; }); @@ -526,6 +537,10 @@ self: super: { }); }); + octo-nvim = super.octo-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim plenary-nvim ]; + }); + onehalf = super.onehalf.overrideAttrs (old: { configurePhase = "cd vim"; }); From a2d4d474c21a9543192e9c9eb56e67885e73a137 Mon Sep 17 00:00:00 2001 From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com"> Date: Wed, 11 May 2022 10:51:35 +0200 Subject: [PATCH 04/28] vimPlugins.nvim-biscuits: init at 2021-11-12 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3f04e59e81da..4fec127eda6f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4666,6 +4666,18 @@ final: prev: meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; + nvim-biscuits = buildVimPluginFrom2Nix { + pname = "nvim-biscuits"; + version = "2021-11-12"; + src = fetchFromGitHub { + owner = "code-biscuits"; + repo = "nvim-biscuits"; + rev = "15a0cb1273bd36d5a734210cdc3406fb4bcfb733"; + sha256 = "15incx76ps8k4bra3s6ml66ckjhzjgbc7q2njs61yzfg46vdbhsd"; + }; + meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; + }; + nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; version = "2022-04-30"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e3806c71a2f6..1e2b24db37f5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -393,6 +393,7 @@ https://github.com/catppuccin/nvim/,,catppuccin-nvim https://github.com/nathanmsmith/nvim-ale-diagnostic/,, https://github.com/windwp/nvim-autopairs/,, https://github.com/RRethy/nvim-base16/,, +https://github.com/code-biscuits/nvim-biscuits/,HEAD, https://github.com/kevinhwang91/nvim-bqf/,, https://github.com/ojroques/nvim-bufdel/,, https://github.com/roxma/nvim-cm-racer/,, From d7bfa0dcc49491c7683a84e7edbf24b1c3bddcc6 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 16 May 2022 11:13:18 +0200 Subject: [PATCH 05/28] vim/update.py: mark some plugins as neovim ones so that they use buildNeovimFrom2Nix I want to avoid adding a more complex heuristic for now or adding a column to vim-plugin-names. --- pkgs/applications/editors/vim/plugins/update.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index 1214e36372a6..f63bd867f368 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -116,7 +116,13 @@ class VimEditor(pluginupdate.Editor): def main(): global luaPlugins - luaPlugins = run_nix_expr(GET_PLUGINS_LUA) + + # whitelist + luaPlugins = run_nix_expr(GET_PLUGINS_LUA) + [ + "diffview-nvim", + "marks-nvim", + "nvim-biscuits" + ] editor = VimEditor("vim", ROOT, GET_PLUGINS) parser = editor.create_parser() From 30e0227fde47a5a3314012a122668d70ff06dc96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 01:07:46 +0000 Subject: [PATCH 06/28] btrfs-progs: 5.17 -> 5.18 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 9d68d4fa272c..e623b2d067f4 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.17"; + version = "5.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-Y7d4/kwrrRjjcdzljtNUiOCPWDkhNnRU/diFB6PQ2J4="; + sha256 = "sha256-HeYQdiKwvi9tdyYfl6K91AKR27aCqsfc4IYy0XH3oTQ="; }; nativeBuildInputs = [ From 5331c6475c37612f426d9998ea1ad03783faed6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 11:00:00 +0000 Subject: [PATCH 07/28] python310Packages.aws-lambda-builders: 1.16.0 -> 1.17.0 --- .../python-modules/aws-lambda-builders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 6d4baf0f553e..1761da057bf8 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.16.0"; + version = "1.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - sha256 = "sha256-XJDukyYTtnAHiHACi5gEJ9VPjqv8Y4V7oe4q3l5fpMA="; + sha256 = "sha256-EkAtRqUHwmH0LG/bkXBbZ3TMgXDtcqLfUBySPbrgWmc="; }; propagatedBuildInputs = [ From fcc0c1acbbb5c88101ef1a18c438987c28504f20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 May 2022 16:36:07 +0200 Subject: [PATCH 08/28] python310Packages.aws-lambda-builders: switch to pytestCheckHook --- .../aws-lambda-builders/default.nix | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 1761da057bf8..12d788149e4e 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -1,11 +1,12 @@ { lib , buildPythonPackage , fetchFromGitHub -, six -, pytest , mock , parameterized +, pyelftools +, pytestCheckHook , pythonOlder +, six }: buildPythonPackage rec { @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - sha256 = "sha256-EkAtRqUHwmH0LG/bkXBbZ3TMgXDtcqLfUBySPbrgWmc="; + hash = "sha256-EkAtRqUHwmH0LG/bkXBbZ3TMgXDtcqLfUBySPbrgWmc="; }; propagatedBuildInputs = [ @@ -27,19 +28,36 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest mock parameterized + pyelftools + pytestCheckHook ]; - checkPhase = '' - export PATH=$out/bin:$PATH - pytest tests/functional -k 'not can_invoke_pip' - ''; + disabledTests = [ + # CLI don't work in the sandbox + "test_run_hello_workflow" + # Don't tests integrations + "TestCustomMakeWorkflow" + "TestDotnet31" + "TestDotnet6" + "TestGoWorkflow" + "TestJavaGradle" + "TestJavaMaven" + "TestNodejsNpmWorkflow" + "TestNodejsNpmWorkflowWithEsbuild" + "TestPipRunner" + "TestPythonPipWorkflow" + "TestRubyWorkflow" + ]; + + pythonImportsCheck = [ + "aws_lambda_builders" + ]; meta = with lib; { + description = "Tool to compile, build and package AWS Lambda functions"; homepage = "https://github.com/awslabs/aws-lambda-builders"; - description = "A tool to compile, build and package AWS Lambda functions"; longDescription = '' Lambda Builders is a Python library to compile, build and package AWS Lambda functions for several runtimes & frameworks. From 5b062820b68d6ae747b2a5acafa82128066d5a21 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 26 May 2022 22:09:52 +0200 Subject: [PATCH 09/28] kind: 0.11.1 -> 0.14.0 - https://github.com/kubernetes-sigs/kind/releases/tag/v0.12.0 - https://github.com/kubernetes-sigs/kind/releases/tag/v0.13.0 - https://github.com/kubernetes-sigs/kind/releases/tag/v0.14.0 Changes: - update/fix nixos specific kernel module path patch - change build options to match upstream - pin major go version to match upstream --- pkgs/development/tools/kind/default.nix | 10 +++++-- .../tools/kind/kernel-module-path.patch | 28 +++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index e667238b9b09..a85d6e154a6b 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "kind"; - version = "0.11.1"; + version = "0.14.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "sha256-pjg52ONseKNw06EOBzD6Elge+Cz+C3llPvjJPHkn1cw="; + sha256 = "sha256-yCzznSVWuVEkaoj9bo0WOp3Dvl3t1UJ/DwtXv5dp+dQ="; }; patches = [ @@ -18,7 +18,11 @@ buildGoModule rec { ./kernel-module-path.patch ]; - vendorSha256 = "sha256-HiVdekSZrC/RkMSvcwm1mv6AE4bA5kayUsMdVCbckiE="; + vendorSha256 = "sha256-/UDmTyngydoso9F/iPp5JYlsfi0VNfHfTsxdGDaTK+w="; + + CGO_ENABLED = 0; + GOFLAGS = [ "-trimpath" ]; + ldFlags = [ "-buildid=" "-w" ]; doCheck = false; diff --git a/pkgs/development/tools/kind/kernel-module-path.patch b/pkgs/development/tools/kind/kernel-module-path.patch index 833cd3388ec2..bb4c7bd0eaa2 100644 --- a/pkgs/development/tools/kind/kernel-module-path.patch +++ b/pkgs/development/tools/kind/kernel-module-path.patch @@ -1,6 +1,6 @@ diff --git a/pkg/cluster/internal/providers/common/getmodules.go b/pkg/cluster/internal/providers/common/getmodules.go new file mode 100644 -index 00000000..f42a883d +index 00000000..1cce5675 --- /dev/null +++ b/pkg/cluster/internal/providers/common/getmodules.go @@ -0,0 +1,15 @@ @@ -9,39 +9,39 @@ index 00000000..f42a883d +import "os" + +const ( -+ fhsKernalModulePath = "/lib/modules" -+ nixKernalModulePath = "/run/booted-system/kernel-modules/lib" ++ fhsKernelModulePath = "/lib/modules" ++ nixKernelModulePath = "/run/booted-system/kernel-modules/lib/modules" +) + +func GetKernelModulePath() string { -+ if _, err := os.Stat(nixKernalModulePath); !os.IsNotExist(err) { -+ return nixKernalModulePath ++ if _, err := os.Stat(nixKernelModulePath); !os.IsNotExist(err) { ++ return nixKernelModulePath + } -+ return fhsKernalModulePath ++ return fhsKernelModulePath +} diff --git a/pkg/cluster/internal/providers/docker/provision.go b/pkg/cluster/internal/providers/docker/provision.go -index 50161861..86d5b7b6 100644 +index 97b05594..3aaa9830 100644 --- a/pkg/cluster/internal/providers/docker/provision.go +++ b/pkg/cluster/internal/providers/docker/provision.go -@@ -242,7 +242,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n +@@ -225,7 +225,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n // (please don't depend on doing this though!) "--volume", "/var", // some k8s things want to read /lib/modules - "--volume", "/lib/modules:/lib/modules:ro", + "--volume", fmt.Sprintf("%s:/lib/modules:ro", common.GetKernelModulePath()), + // propagate KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER to the entrypoint script + "-e", "KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER", }, - args..., - ) diff --git a/pkg/cluster/internal/providers/podman/provision.go b/pkg/cluster/internal/providers/podman/provision.go -index 51dce486..3bc36b42 100644 +index 50aa7018..7e25a4de 100644 --- a/pkg/cluster/internal/providers/podman/provision.go +++ b/pkg/cluster/internal/providers/podman/provision.go -@@ -205,7 +205,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n +@@ -189,7 +189,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n // dev: devices on the volume will be able to be used by processes within the container "--volume", fmt.Sprintf("%s:/var:suid,exec,dev", varVolume), // some k8s things want to read /lib/modules - "--volume", "/lib/modules:/lib/modules:ro", + "--volume", fmt.Sprintf("%s:/lib/modules:ro", common.GetKernelModulePath()), + // propagate KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER to the entrypoint script + "-e", "KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER", }, - args..., - ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdb1dc71df2c..56dd6ebbfbf7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15730,7 +15730,7 @@ with pkgs; kcov = callPackage ../development/tools/analysis/kcov { }; - kind = callPackage ../development/tools/kind { }; + kind = callPackage ../development/tools/kind { buildGoModule = buildGo118Module; }; khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { }; From 012075c6d65e4ae044997d9f6c3d14019ae7d26b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 27 May 2022 00:39:27 +0200 Subject: [PATCH 10/28] python310Packages.teslajsonpy: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 11235e13a81b..5912e474ff5c 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "2.2.0"; + version = "2.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-/y+ZXNqNbSIjQeTDacu3/Fd+6FrDrW3Nigptj0f5KTg="; + sha256 = "sha256-fDHtdznxawX+gmFedxQLTTEvpDhhZLSbEndtXOgahUM="; }; nativeBuildInputs = [ From ec5bc0bec1c0cd39b2a463962e77d7ce513e3e37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 01:21:05 +0000 Subject: [PATCH 11/28] python310Packages.httpx-socks: 0.7.3 -> 0.7.4 --- pkgs/development/python-modules/httpx-socks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index f8334593904c..74f2f41eb260 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.7.3"; + version = "0.7.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "romis2012"; repo = pname; - rev = "v${version}"; - sha256 = "11wnhx9nfsg5lsnlgh33zngyhc2klichpfrkwajbbyq95fdqj8ri"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-+eWGmCHkXQA+JaEgofqUeFyGyMxSctal+jsqsShFM58="; }; propagatedBuildInputs = [ From 413fd920dfdacb7f0f9eb05b86a1d6badca71319 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 03:43:07 +0000 Subject: [PATCH 12/28] python310Packages.types-redis: 4.2.5 -> 4.2.6 --- pkgs/development/python-modules/types-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 4ec556a5feea..28a196145c0c 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.2.5"; + version = "4.2.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iPBNmfIMIMPQEpw3YB+ecMAbcfH670c3Zs+j3dvV5dU="; + sha256 = "sha256-1q3HcYXPQLMAgWdnpkwO6e4LIdwXTo5cI7foPUMYnLg="; }; # Module doesn't have tests From 729ecda1c83cfe011aa90de774293fed426b576d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 04:12:43 +0000 Subject: [PATCH 13/28] python310Packages.pyradios: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/pyradios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyradios/default.nix b/pkgs/development/python-modules/pyradios/default.nix index da140669e8d2..15677945b0d6 100644 --- a/pkgs/development/python-modules/pyradios/default.nix +++ b/pkgs/development/python-modules/pyradios/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyradios"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0fd3b234c635d9e628bdadb9dc3a820405631b54977402719a641d2e1cc3f7b6"; + sha256 = "sha256-O30ExmvWu4spwDytFVPWGjR8w3XSTaWd2Z0LGQibq9g="; }; propagatedBuildInputs = [ From 5310cea96532c2eac6f849b7d3e613a53407ddd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 04:51:12 +0000 Subject: [PATCH 14/28] python310Packages.pex: 2.1.89 -> 2.1.90 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 6fba5f820d96..3ccaef81fa4d 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.89"; + version = "2.1.90"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7/rJe/A6CbkminjFuL+8eIdj0kYzNMKynWX0umAMRAA="; + hash = "sha256-F9kpkp1Z70TWZjg97X0ZHMommswj07sJxQXiKVPMnRU="; }; nativeBuildInputs = [ From 4118f60176750c5e068d783ff2e69a999df38828 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 05:33:25 +0000 Subject: [PATCH 15/28] certgraph: 20210224 -> 20220513 --- pkgs/tools/security/certgraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/certgraph/default.nix b/pkgs/tools/security/certgraph/default.nix index f15ec8f89e03..f18f0ca3b2cb 100644 --- a/pkgs/tools/security/certgraph/default.nix +++ b/pkgs/tools/security/certgraph/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "certgraph"; - version = "20210224"; + version = "20220513"; src = fetchFromGitHub { owner = "lanrat"; repo = pname; rev = version; - sha256 = "14l2bls25xwd8gnsmshc588br72rwz1s0gjnsnqksri4ksqkdqlz"; + sha256 = "sha256-7tvPiJHZE9X7I79DFNF1ZAQiaAkrtrXiD2fY7AkbWMk="; }; - vendorSha256 = "1vih64z0zwmaflc0pwvnwyj5fhrc8qfp0kvrz73nnfpcrcan2693"; + vendorSha256 = "sha256-ErTn7pUCtz6ip2kL8FCe+3Rhs876xtqto+z5nZqQ6cI="; meta = with lib; { description = "Intelligence tool to crawl the graph of certificate alternate names"; From 1070949eeac033ac6367e808a8f0a948ab49c2cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 05:46:48 +0000 Subject: [PATCH 16/28] python310Packages.trimesh: 3.12.4 -> 3.12.5 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 08325e2106c0..edade9f1fbb1 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.12.4"; + version = "3.12.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lAbeCTjEUsNnjhJZNHs4ir8V0bJZUnBIGYYEXV80wyg="; + sha256 = "sha256-CTWxN7boesxRFxMy+k1BOejuvoSFg/JDYYCC0Aud+Es="; }; propagatedBuildInputs = [ numpy ]; From bb9ebb541920de2c6ac4e173519abc061e608b2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 05:48:59 +0000 Subject: [PATCH 17/28] checkip: 0.35.2 -> 0.38.0 --- pkgs/tools/networking/checkip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index 1ae0f0036026..35bdcf7e4a24 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "checkip"; - version = "0.35.2"; + version = "0.38.0"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O6jVedVwzC575s7LS0gx1t6mUizQGv4Gcqra57vXX+w="; + sha256 = "sha256-F+Sc3t1GYpGR+EEP+9GpzfaiWNQVpDivzpS66E7Li3A="; }; - vendorSha256 = "sha256-NHu1hZFPT2k8izrvvz7w0vlVe/nKH0nS4oXUGS8CWcc="; + vendorSha256 = "sha256-aiqnJ1PjrwSC6YtixNvyTxgbs8z2radcETNhKHGlPk0="; # Requires network doCheck = false; From 4d2af291355b13edc20e40a57a61e17a046c60b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 05:55:02 +0000 Subject: [PATCH 18/28] checkmate: 0.5.9 -> 0.6.9 --- pkgs/development/tools/checkmate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/checkmate/default.nix b/pkgs/development/tools/checkmate/default.nix index 6ca90b28f4e7..1de648ffc917 100644 --- a/pkgs/development/tools/checkmate/default.nix +++ b/pkgs/development/tools/checkmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "checkmate"; - version = "0.5.9"; + version = "0.6.9"; src = fetchFromGitHub { owner = "adedayo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V7b8NEKzS4wDIhFJkAve94Tl3tzYtnbG01GzyRj8yfA="; + sha256 = "sha256-Zs8vyPD1BpjA5EXzeKyfv9CzhD0iIp1LNLlqCp+zpaY="; }; - vendorSha256 = "sha256-uQRAVbLnzY+E3glMJ3AvmbtmwD2LkuqCh2mUpqZbmaA="; + vendorSha256 = "sha256-Wln6vf9FJ1VJgdll5a7QS+M6PCM151EB8aOb9fFkSXo="; subPackages = [ "." ]; From c9924f2b269eb50c940b6721b5155fbc88d5576d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 01:59:51 +0000 Subject: [PATCH 19/28] broadlink-cli: 0.18.1 -> 0.18.2 --- pkgs/tools/misc/broadlink-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix index ee99e643b1f7..1d9a45cb5610 100644 --- a/pkgs/tools/misc/broadlink-cli/default.nix +++ b/pkgs/tools/misc/broadlink-cli/default.nix @@ -2,15 +2,15 @@ python3Packages.buildPythonApplication rec { pname = "broadlink-cli"; - version = "0.18.1"; + version = "0.18.2"; # the tools are available as part of the source distribution from GH but # not pypi, so we have to fetch them here. src = fetchFromGitHub { owner = "mjg59"; repo = "python-broadlink"; - rev = version; - sha256 = "sha256-x7RVCu5xOwhUOxXIHP7ZAe1/9F9ecf9RgL9I53e9Mcw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-JX+Io5EP1OgtP7T+UQtkfCPWE1rd3MTrCYRhU9C0+0c="; }; format = "other"; From 1152adbc9456b320e2e387cba4ec70f5a2bed464 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 22 May 2022 11:17:29 +0100 Subject: [PATCH 20/28] minicom: 2.7.1 -> 2.8 Among other things fixes build failure on -fno-common toolchains. --- pkgs/tools/misc/minicom/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index d237c3b7fdd5..f5d0e5e32264 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchgit, autoreconfHook, makeWrapper, pkg-config +{ lib, stdenv, fetchFromGitLab, autoreconfHook, makeWrapper, pkg-config , lrzsz, ncurses, libiconv }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "minicom"; - version = "2.7.1"; + version = "2.8"; - # The repository isn't tagged properly, so we need to use commit refs - src = fetchgit { - url = "https://salsa.debian.org/minicom-team/minicom.git"; - rev = "6ea8033b6864aa35d14fb8b87e104e4f783635ce"; - sha256 = "0j95727xni4r122dalp09963gvc1nqa18l1d4wzz8746kw5s2rrb"; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "minicom-team"; + repo = pname; + rev = version; + sha256 = "165zhi88swvkhl3v17223r0f27hb3y0qzrgl51jkk0my2m4xscgg"; }; buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin libiconv; From bf8134d8603c6b5b92ea94c48798b9db8f3e1630 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 26 May 2022 16:55:44 +0300 Subject: [PATCH 21/28] libsForQt5.qtforkawesome: init at 0.0.4 --- .../libraries/qtforkawesome/default.nix | 56 +++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/libraries/qtforkawesome/default.nix diff --git a/pkgs/development/libraries/qtforkawesome/default.nix b/pkgs/development/libraries/qtforkawesome/default.nix new file mode 100644 index 000000000000..03579e024c6c --- /dev/null +++ b/pkgs/development/libraries/qtforkawesome/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, cpp-utilities +, qtutilities +, qttools +, qtbase +, cmake +, perl +}: + +let + fork_awesome_release = fetchFromGitHub { + owner = "ForkAwesome"; + repo = "Fork-Awesome"; + rev = "1.2.0"; + sha256 = "sha256-zG6/0dWjU7/y/oDZuSEv+54Mchng64LVyV8bluskYzc="; + }; +in stdenv.mkDerivation rec { + pname = "qtforkawesome"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "Martchus"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-J3F+ikz6gQqV+JsOX8EpMOWoTmI6UK5KndFALUo4oiU="; + }; + + buildInputs = [ + qtbase + cpp-utilities + qtutilities + ]; + nativeBuildInputs = [ + cmake + qttools + perl + perl.pkgs.YAML + ]; + cmakeFlags = [ + "-DFORK_AWESOME_FONT_FILE=${fork_awesome_release}/fonts/forkawesome-webfont.woff2" + "-DFORK_AWESOME_ICON_DEFINITIONS=${fork_awesome_release}/src/icons/icons.yml" + ]; + + dontWrapQtApps = true; + + meta = with lib; { + homepage = "https://github.com/Martchus/qtforkawesome"; + description = "Library that bundles ForkAwesome for use within Qt applications"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 770cf9011200..fc5956645173 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -195,6 +195,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qtfeedback = callPackage ../development/libraries/qtfeedback { }; + qtforkawesome = callPackage ../development/libraries/qtforkawesome { }; + qtutilities = callPackage ../development/libraries/qtutilities { }; qtinstaller = callPackage ../development/libraries/qtinstaller { }; From 803b9d6343a10de2bc102810eb774db28a051ad7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 26 May 2022 09:14:47 +0300 Subject: [PATCH 22/28] syncthingtray: 1.1.3 -> 1.1.20 --- pkgs/applications/misc/syncthingtray/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index dc4569c6fca3..e81edefdfa62 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -7,6 +7,8 @@ , extra-cmake-modules , cpp-utilities , qtutilities +, qtforkawesome +, boost , cmake , kio , plasma-framework @@ -19,17 +21,23 @@ }: mkDerivation rec { - version = "1.1.3"; + version = "1.1.20"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-ovit2XSkxSjcbpqQUv8IzMqfsfItbtXLbx0/Vy0+J0Y="; + sha256 = "sha256-T0ddAROwVSh+IKGZZNDMC7YB2IfQZal2pAQ5ArirtjI="; }; - buildInputs = [ qtbase cpp-utilities qtutilities ] + buildInputs = [ + qtbase + cpp-utilities + qtutilities + boost + qtforkawesome + ] ++ lib.optionals webviewSupport [ qtwebengine ] ++ lib.optionals jsSupport [ qtdeclarative ] ++ lib.optionals kioPluginSupport [ kio ] From 28786e1055670386475100633ce86dbec681dfde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 07:24:52 +0000 Subject: [PATCH 23/28] cpp-utilities: 5.14.0 -> 5.15.0 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 996609451bf1..f2f331eec687 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.14.0"; + version = "5.15.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WS/2iLwVIYZBu4/uuKgEQ5H/BdeG2aMeZBucFPvlOpI="; + sha256 = "sha256-3D/5Bl5vANZrHtJGehoHwQ0mDrL8TJ7iK2GoViiuj6E="; }; nativeBuildInputs = [ cmake ]; From 22094b83b9bb537d75d1d0bd7e04d82398eced40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 08:14:03 +0000 Subject: [PATCH 24/28] dalfox: 2.7.4 -> 2.7.5 --- pkgs/tools/security/dalfox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/dalfox/default.nix b/pkgs/tools/security/dalfox/default.nix index 02c7fa01962f..84eccdad312f 100644 --- a/pkgs/tools/security/dalfox/default.nix +++ b/pkgs/tools/security/dalfox/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dalfox"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "hahwul"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wNoZ8bXPnYO3qQO+Is5IRGukLj+QfA+xalKC6NVc5+0="; + sha256 = "sha256-MCKXhDhpFLZTf0CYS3W4+4FykTuBu7q3Dy+R7RNp11s="; }; - vendorSha256 = "sha256-qaRUlgxGqZu5T3GHONT4MyHfHr/L6cqP7o0dV4OCOLY="; + vendorSha256 = "sha256-GW2DgfHEKKWBfW5A7DYqhV2jP3FLDjzpYOMWSTNCN0Q="; meta = with lib; { description = "Tool for analysing parameter and XSS scanning"; From f4d905e9725a3f695f931c3a8b6ad76d60cea3f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 03:48:42 +0000 Subject: [PATCH 25/28] gnome.gnome-initial-setup: 42.1.1 -> 42.2 --- pkgs/desktops/gnome/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 07f6274e01c7..21dda0e092fd 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "42.1.1"; + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "kRfuQpH2/oX95/Fh4FBEA8PPquX3GxjwHjAmUZY2UtI="; + sha256 = "TYPZiySavhW7Kz5+eurZxH+Ei8p7agkavJCLdlQavns="; }; patches = [ From 6ce77e631fa8a05b4ac743f0ec6697648d030fdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 04:03:49 +0000 Subject: [PATCH 26/28] gnome.gvfs: 1.50.1 -> 1.50.2 --- pkgs/development/libraries/gvfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 685a77bbd598..28ced142caf4 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.50.1"; + version = "1.50.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "dPb0EU9kJJOEroNKv6tjkjGLdCLOUyFV1rSbrh/cQFY="; + sha256 = "A9crjBXvQ4EQ8M9Fe1ZVJmyLUV0EErMPTVXPoNoGrF4="; }; postPatch = '' From 78bcc66570cc438d7b2d1ee3b4737c8c2cbbfb8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 10:51:44 +0000 Subject: [PATCH 27/28] python310Packages.aioqsw: 0.0.8 -> 0.1.0 --- pkgs/development/python-modules/aioqsw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix index d788b1e8c7cb..aca857ab6e68 100644 --- a/pkgs/development/python-modules/aioqsw/default.nix +++ b/pkgs/development/python-modules/aioqsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioqsw"; - version = "0.0.8"; + version = "0.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FSH7MWtxYdJjCLpit2IhxXUFkGWml6P0SroUJ3iorRw="; + hash = "sha256-/4d7FXz0LBKKnJemmhOXZrnRrVuFaKojLaUn0SXcFaw="; }; propagatedBuildInputs = [ From 3d6cf755ba4a1f021c08f9c3fbe52fee1b86e2fe Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 25 May 2022 04:20:00 +0000 Subject: [PATCH 28/28] ocamlPackages.opam-file-format: 2.1.3 -> 2.1.4 https://github.com/ocaml/opam-file-format/releases/tag/2.1.4 --- pkgs/development/ocaml-modules/opam-file-format/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix index d0ec77c4556f..6e71531f9dcd 100644 --- a/pkgs/development/ocaml-modules/opam-file-format/default.nix +++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "opam-file-format"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "ocaml"; repo = pname; rev = version; - sha256 = "1fxhppdmrysr2nb5z3c448h17np48f3ga9jih33acj78r4rdblcs"; + sha256 = "sha256-wnAnvLNOc9FRBdLIFR08OKVaIjSEqJrcCIn4hmtYtjY="; }; useDune2 = true; @@ -18,5 +18,6 @@ buildDunePackage rec { license = licenses.lgpl21; maintainers = with maintainers; [ vbgl ]; homepage = "https://github.com/ocaml/opam-file-format/"; + changelog = "https://github.com/ocaml/opam-file-format/raw/${version}/CHANGES"; }; }