nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-14 00:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-05-27 12:01:16 +00:00 committed by GitHub
commit 1c7c098d79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 217 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -830,7 +830,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)}
''}

14
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -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 {
@ -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";

15
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -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";
});

8
pkgs/applications/editors/vim/plugins/update.py
View File

@ -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()

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -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/,,

14
pkgs/applications/misc/syncthingtray/default.nix
View File

@ -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 ]

12
pkgs/applications/window-managers/i3/lock-blur.nix
View File

@ -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/";

4
pkgs/desktops/gnome/core/gnome-initial-setup/default.nix
View File

@ -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 = [

4
pkgs/development/libraries/cpp-utilities/default.nix
View File

@ -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 ];

4
pkgs/development/libraries/gvfs/default.nix
View File

@ -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 = ''

56
pkgs/development/libraries/qtforkawesome/default.nix Normal file
View File

@ -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;
};
}

5
pkgs/development/ocaml-modules/opam-file-format/default.nix
View File

@ -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";
};
}

4
pkgs/development/python-modules/aioqsw/default.nix
View File

@ -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 = [

38
pkgs/development/python-modules/aws-lambda-builders/default.nix
View File

@ -1,16 +1,17 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, six
, pytest
, mock
, parameterized
, pyelftools
, pytestCheckHook
, pythonOlder
, six
}:
buildPythonPackage rec {
pname = "aws-lambda-builders";
version = "1.16.0";
version = "1.17.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +20,7 @@ buildPythonPackage rec {
owner = "awslabs";
repo = "aws-lambda-builders";
rev = "refs/tags/v${version}";
sha256 = "sha256-XJDukyYTtnAHiHACi5gEJ9VPjqv8Y4V7oe4q3l5fpMA=";
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.

6
pkgs/development/python-modules/httpx-socks/default.nix
View File

@ -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 = [

4
pkgs/development/python-modules/pex/default.nix
View File

@ -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 = [

4
pkgs/development/python-modules/pyradios/default.nix
View File

@ -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 = [

4
pkgs/development/python-modules/teslajsonpy/default.nix
View File

@ -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 = [

4
pkgs/development/python-modules/trimesh/default.nix
View File

@ -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 ];

4
pkgs/development/python-modules/types-redis/default.nix
View File

@ -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

6
pkgs/development/tools/checkmate/default.nix
View File

@ -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 = [ "." ];

10
pkgs/development/tools/kind/default.nix
View File

@ -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;

28
pkgs/development/tools/kind/kernel-module-path.patch
View File

@ -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...,
)

4
pkgs/tools/filesystems/btrfs-progs/default.nix
View File

@ -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 = [

6
pkgs/tools/misc/broadlink-cli/default.nix
View File

@ -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";

17
pkgs/tools/misc/minicom/default.nix
View File

@ -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;

6
pkgs/tools/networking/checkip/default.nix
View File

@ -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;

6
pkgs/tools/security/certgraph/default.nix
View File

@ -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";

6
pkgs/tools/security/dalfox/default.nix
View File

@ -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";

2
pkgs/top-level/all-packages.nix
View File

@ -15736,7 +15736,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 { };

2
pkgs/top-level/qt5-packages.nix
View File

@ -197,6 +197,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 { };