gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2022-07-30 00:02:12 +00:00
committed by GitHub
parent 50de8aa60e d2f9abdcc0
commit 6ed636d15c
71 changed files with 444 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/systems/inspect.nix
+1
View File
@@ -16,6 +16,7 @@ rec {
isx86 = { cpu = { family = "x86"; }; };
isAarch32 = { cpu = { family = "arm"; bits = 32; }; };
isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
isAarch = { cpu = { family = "arm"; }; };
isMips = { cpu = { family = "mips"; }; };
isMips32 = { cpu = { family = "mips"; bits = 32; }; };
isMips64 = { cpu = { family = "mips"; bits = 64; }; };
nixos/doc/manual/from_md/installation/installing.chapter.xml
+20 -1
View File
@@ -426,7 +426,9 @@ OK
</term>
<listitem>
<para>
You <emphasis>must</emphasis> set the option
You must select a boot-loader, either system-boot or
GRUB. The recommended option is systemd-boot: set the
option
<xref linkend="opt-boot.loader.systemd-boot.enable" />
to <literal>true</literal>.
<literal>nixos-generate-config</literal> should do this
@@ -440,6 +442,23 @@ OK
<link linkend="opt-boot.loader.systemd-boot.enable"><literal>boot.loader.systemd-boot</literal></link>
as well.
</para>
<para>
If you want to use GRUB, set
<xref linkend="opt-boot.loader.grub.device" /> to
<literal>nodev</literal> and
<xref linkend="opt-boot.loader.grub.efiSupport" /> to
<literal>true</literal>.
</para>
<para>
With system-boot, you should not need any special
configuration to detect other installed systems. With
GRUB, set
<xref linkend="opt-boot.loader.grub.useOSProber" /> to
<literal>true</literal>, but this will only detect
windows partitions, not other linux distributions. If
you dual boot another linux distribution, use
system-boot instead.
</para>
</listitem>
</varlistentry>
</variablelist>
nixos/doc/manual/installation/installing.chapter.md
+11 -1
View File
@@ -303,7 +303,8 @@ Use the following commands:
UEFI systems
: You *must* set the option [](#opt-boot.loader.systemd-boot.enable)
: You must select a boot-loader, either system-boot or GRUB. The recommended
option is systemd-boot: set the option [](#opt-boot.loader.systemd-boot.enable)
to `true`. `nixos-generate-config` should do this automatically
for new configurations when booted in UEFI mode.
@@ -312,6 +313,15 @@ Use the following commands:
[`boot.loader.systemd-boot`](#opt-boot.loader.systemd-boot.enable)
as well.
: If you want to use GRUB, set [](#opt-boot.loader.grub.device) to `nodev` and
[](#opt-boot.loader.grub.efiSupport) to `true`.
: With system-boot, you should not need any special configuration to detect
other installed systems. With GRUB, set [](#opt-boot.loader.grub.useOSProber)
to `true`, but this will only detect windows partitions, not other linux
distributions. If you dual boot another linux distribution, use system-boot
instead.
If you need to configure networking for your machine the
configuration options are described in [](#sec-networking). In
particular, while wifi is supported on the installation image, it is
pkgs/applications/misc/authy/default.nix
+3 -3
View File
@@ -10,12 +10,12 @@
stdenv.mkDerivation rec {
pname = "authy";
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version'
version = "2.2.0";
rev = "10";
version = "2.2.1";
rev = "11";
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap";
sha256 = "sha256-sB9/fVV/qp+DfjxpvzIUHsLkeEu35i2rEv1/JYMytG8=";
sha256 = "sha256-/a0pMXVd7mEp7oaN2mBIJv5uOv1zQ3gvfgiz1XL9ZmM=";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ];
pkgs/applications/misc/inkcut/default.nix
+23
View File
@@ -1,4 +1,5 @@
{ lib
, fetchpatch
, python3Packages
, fetchFromGitHub
, wrapQtAppsHook
@@ -18,6 +19,28 @@ buildPythonApplication rec {
sha256 = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU=";
};
patches = [
# fix opening the extension on inkscape 1.2
# https://github.com/inkcut/inkcut/pull/340
(fetchpatch {
url = "https://github.com/inkcut/inkcut/commit/d5d5d0ab3c588c576b668f4c7b07a10609ba2fd0.patch";
hash = "sha256-szfiOujuV7OOwYK/OU51m9FK6dzkbWds+h0cr5dGIg4=";
})
# fix loading a document from stdin (as used from the extension)
# https://github.com/inkcut/inkcut/issues/341
(fetchpatch {
url = "https://github.com/inkcut/inkcut/commit/748ab4157f87afec37dadd715094e87d02c9c739.patch";
hash = "sha256-ZGiwZru2bUYu749YSz5vxmGwLTAoYIAsafcX6PmdbYo=";
revert = true;
})
# fix distutils deprecation error
# https://github.com/inkcut/inkcut/pull/343
(fetchpatch {
url = "https://github.com/inkcut/inkcut/commit/9fb95204981bcc51401a1bc10caa02d1fae0d6cb.patch";
hash = "sha256-nriys7IWPGykZjVz+DIDsE9Tm40DewkHQlIUaxFwtzM=";
})
];
postPatch = ''
substituteInPlace inkcut/device/transports/printer/plugin.py \
--replace ", 'lpr', " ", '${cups}/bin/lpr', "
pkgs/applications/misc/pass-secret-service/default.nix
+3 -9
View File
@@ -12,21 +12,15 @@ python3.pkgs.buildPythonApplication rec {
# PyPI has old alpha version. Since then the project has switched from using a
# seemingly abandoned D-Bus package pydbus and started using maintained
# dbus-next. So let's use latest from GitHub.
version = "unstable-2022-03-21";
version = "unstable-2022-07-18";
src = fetchFromGitHub {
owner = "mdellweg";
repo = "pass_secret_service";
rev = "149f8557e07098eee2f46561eea61e83255ac59b";
sha256 = "sha256-+/pFi6+K8rl0Ihm6cp/emUQVtau6+Apl8/VEr9AI0Xs=";
rev = "fadc09be718ae1e507eeb8719f3a2ea23edb6d7a";
hash = "sha256-lrNU5bkG4/fMu5rDywfiI8vNHyBsMf/fiWIeEHug03c=";
};
patches = [
# Only needed until https://github.com/mdellweg/pass_secret_service/pull/30
# is merged.
./int_from_bytes-deprecation-fix.patch
];
# Need to specify session.conf file for tests because it won't be found under
# /etc/ in check phase.
postPatch = ''
pkgs/applications/misc/pass-secret-service/int_from_bytes-deprecation-fix.patch
-22
View File
@@ -1,22 +0,0 @@
--- a/pass_secret_service/interfaces/session.py
+++ b/pass_secret_service/interfaces/session.py
@@ -4,7 +4,6 @@
import os
import hmac
from hashlib import sha256
-from cryptography.utils import int_from_bytes
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives.ciphers import Cipher
from cryptography.hazmat.primitives.ciphers.modes import CBC
@@ -27,9 +26,9 @@ class Session(ServiceInterface, SerialMixin):
@classmethod
@run_in_executor
def _create_dh(cls, input):
- priv_key = int_from_bytes(os.urandom(0x80), "big")
+ priv_key = int.from_bytes(os.urandom(0x80), "big")
pub_key = pow(2, priv_key, dh_prime)
- shared_secret = pow(int_from_bytes(input, "big"), priv_key, dh_prime)
+ shared_secret = pow(int.from_bytes(input, "big"), priv_key, dh_prime)
salt = b"\x00" * 0x20
shared_key = hmac.new(salt, shared_secret.to_bytes(0x80, "big"), sha256).digest()
aes_key = hmac.new(shared_key, b"\x01", sha256).digest()[:0x10]
pkgs/applications/misc/somebar/default.nix
+43
View File
@@ -0,0 +1,43 @@
{ lib
, stdenv
, fetchFromSourcehut
, meson
, ninja
, pkg-config
, wayland
, pango
, wayland-protocols
, conf ? null
}:
let
# There is a configuration in src/config.def.hpp, which we use by default
configFile = if lib.isDerivation conf || builtins.isPath conf then conf else "src/config.def.hpp";
in
stdenv.mkDerivation rec {
pname = "somebar";
version = "1.0.0";
src = fetchFromSourcehut {
owner = "~raphi";
repo = "somebar";
rev = "${version}";
sha256 = "sha256-snCW7dC8JI/pg1+HLjX0JXsTzwa3akA6rLcSNgKLF0c=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ pango wayland wayland-protocols ];
prePatch = ''
cp ${configFile} src/config.hpp
'';
meta = with lib; {
homepage = "https://git.sr.ht/~raphi/somebar";
description = "dwm-like bar for dwl";
license = licenses.mit;
maintainers = with maintainers; [ magnouvean ];
platforms = platforms.linux;
};
}
pkgs/applications/networking/calls/default.nix
+3 -2
View File
@@ -32,14 +32,15 @@
stdenv.mkDerivation rec {
pname = "calls";
version = "41.1";
version = "42.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = version;
sha256 = "1vbw9x5s3ww11f3lnqivc74rjlmi9fk1hzaq1idrdcck3gvif0h8";
fetchSubmodules = true;
hash = "sha256-ASKK9PB5FAD10CR5O+L2WgMjCzmIalithHL8jV0USiM=";
};
outputs = [ "out" "devdoc" ];
pkgs/applications/networking/cluster/fluxcd/default.nix
+4 -4
View File
@@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.31.4";
sha256 = "182h6is1kq3yc7il1a0xr5mbrsn3z900dkzxb4m79gl5lsrpb1vm";
manifestsSha256 = "0h37ydgykl5kc50zwqn8xyi89aby75937cqaiw1hkpnw9ilc0akz";
version = "0.31.5";
sha256 = "0dv34y79229n63i5as0qxf3lmlsfyk8p277i09hrq1vn86wnjdm7";
manifestsSha256 = "1p5f05lgbv2hhl5dbank2mmhmhlkxn1rfnh09x02j22ldrvk3zzl";
manifests = fetchzip {
url =
@@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-2DeX5si2yVh1C+ikkg9xEpcf2trEBr0qPp+9fgbMfO4=";
vendorSha256 = "sha256-bTvVf6fsrWLayOwwxBo2iOz5Di4dHEiV45uGkAyWrMU=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests
pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "signal-cli";
version = "0.10.8";
version = "0.10.9";
# Building from source would be preferred, but is much more involved.
src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz";
sha256 = "sha256-vZBFYPim/qBC8hJHvp5gK6P2JxIs9rzR/hIMjW3kNM8=";
sha256 = "sha256-2XmEUMx222yseewpiJY2rvc+JIMo7ROw3NA/4WIJnm4=";
};
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.50.0"; # Please backport all updates to the stable channel.
version = "5.52.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "sha256-3/a0+FTRSI7MdI/4mAhKl/KEBoEM1rqTUUWTpNFJTSA=";
sha256 = "sha256-KFldVpKICRX2n/ccvqxpt1Dz6QwH2g+wqXRHAXI/iyY=";
};
nativeBuildInputs = [
pkgs/applications/networking/nextcloud-client/default.nix
+2 -2
View File
@@ -26,7 +26,7 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "3.5.2";
version = "3.5.3";
outputs = [ "out" "dev" ];
@@ -34,7 +34,7 @@ mkDerivation rec {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "sha256-lNsAdYErd3m1bNhvSDVJ5Rfqt8lutNJ1+2DCmntL6pM=";
sha256 = "sha256-J6ukQ29DpCgmX9MF+evWXAy3usl0xB/xv4inBPS8nQI=";
};
patches = [
pkgs/applications/version-management/commitizen/default.nix
+6 -2
View File
@@ -16,6 +16,7 @@
, termcolor
, tomlkit
, typing-extensions
, chardet
, argcomplete, fetchPypi
}:
@@ -34,13 +35,13 @@ in
buildPythonApplication rec {
pname = "commitizen";
version = "2.21.2";
version = "2.29.2";
src = fetchFromGitHub {
owner = "commitizen-tools";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7S676bpSrlAqpbgDj9nAo0WjeitbbHoYc693MJm35Js=";
hash = "sha256-4mK+GA1rfctJkMv4ZMfXE/qih/9fF0kwT6bIcLVB/Bk=";
deepClone = true;
};
@@ -49,6 +50,7 @@ buildPythonApplication rec {
nativeBuildInputs = [ poetry ];
propagatedBuildInputs = [
chardet
termcolor
questionary
colorama
@@ -85,6 +87,8 @@ buildPythonApplication rec {
"test_bump_on_git_with_hooks_no_verify_disabled"
"test_bump_on_git_with_hooks_no_verify_enabled"
"test_bump_patch_increment"
"test_bump_pre_commit_changelog"
"test_bump_pre_commit_changelog_fails_always"
"test_bump_tag_exists_raises_exception"
"test_bump_when_bumpping_is_not_support"
"test_bump_when_version_inconsistent_in_version_files"
pkgs/applications/version-management/mercurial/default.nix
+3 -3
View File
@@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.2";
version = "6.2.1";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-04K14/q4kxEmATIBcxQWV0s1roV4dAS7KggZ9Bu4iXI=";
sha256 = "sha256-isXXog0cKtVNTCY9E0FkZG3DSo46a+1pz76rr404gto=";
};
format = "other";
@@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "mercurial-${version}";
sha256 = "sha256-L4BbU6GTq54DFucqvBZeWtA8zUPvPCwmtIxv/SxgAXk=";
sha256 = "sha256-shmeTQSCpQLrRUbL5bu9nAiPideZUe31YNCrClLM1eI=";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;
pkgs/development/python-modules/adafruit-platformdetect/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.26.0";
version = "3.27.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-lkzTJfjJNKsMmLet9VXv5Ao8+Dks4P0+0nRpWHHs3G0=";
hash = "sha256-Ez3VQO52GgPhTXr1xlxr4BvouI41PVzppkutiqVjrUI=";
};
nativeBuildInputs = [
pkgs/development/python-modules/apptools/default.nix
+9 -8
View File
@@ -26,11 +26,20 @@ buildPythonPackage rec {
};
patches = [
# python310: Fix tests
# https://github.com/enthought/apptools/issues/303
(fetchpatch {
url = "https://github.com/enthought/apptools/commit/10fb73916124f7ae7edf6c6688a05ad95678488f.patch";
sha256 = "sha256-izAcP5RWobLvnk2PQx31SX/TUGkw+prbYbjamYVmtjY=";
name = "fix_python310_tests.patch";
})
# python39: importlib_resources -> importlib.resources. This patch will be included
# in the next release after 5.1.0.
(fetchpatch {
url = "https://github.com/enthought/apptools/commit/0ae4f52f19a8c0ca9d7926e17c7de949097f24b4.patch";
sha256 = "165aiwjisr5c3lasg7xblcha7y1y5bq23vi3g9gc80c24bzwcbsw";
name = "fix_importlib-resources_naming.patch";
})
];
@@ -52,14 +61,6 @@ buildPythonPackage rec {
export HOME=$TMP
'';
disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [
# https://github.com/enthought/apptools/issues/303
"apptools/io/h5/tests/test_dict_node.py"
"apptools/io/h5/tests/test_file.py"
"apptools/io/h5/tests/test_table_node.py"
];
pythonImportsCheck = [
"apptools"
];
pkgs/development/python-modules/detect-secrets/default.nix
+9 -5
View File
@@ -2,11 +2,11 @@
, buildPythonPackage
, fetchFromGitHub
, gibberish-detector
, isPy27
, mock
, pkgs
, pyahocorasick
, pytestCheckHook
, pythonOlder
, pyyaml
, requests
, responses
@@ -15,14 +15,16 @@
buildPythonPackage rec {
pname = "detect-secrets";
version = "1.2.0";
disabled = isPy27;
version = "1.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Yelp";
repo = pname;
rev = "v${version}";
hash = "sha256-4VcV06iaL3NAj7qF8RyfWV1zgrt928AQfjGeuO2Pbjk=";
hash = "sha256-Dl/2HgCacDko/ug9nGA9X+LyOkuDot11H28lxrgkwdE=";
leaveDotGit = true;
};
@@ -58,7 +60,9 @@ buildPythonPackage rec {
"test_start_halfway"
];
pythonImportsCheck = [ "detect_secrets" ];
pythonImportsCheck = [
"detect_secrets"
];
meta = with lib; {
description = "An enterprise friendly way of detecting and preventing secrets in code";
pkgs/development/python-modules/dvc-data/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "dvc-data";
version = "0.0.24";
version = "0.1.5";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-Sk4l9TL0SU6sPrBBed/Y4xDB/GzVzv2YTUD0IdjhB2M=";
hash = "sha256-SQ4w2Yqho5kbM4fRQkji69wOV8rYAIyFFve7pTEjgMM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/json-schema-for-humans/default.nix
+3 -6
View File
@@ -2,7 +2,6 @@
, beautifulsoup4
, buildPythonPackage
, click
, dataclasses
, dataclasses-json
, fetchFromGitHub
, htmlmin
@@ -19,16 +18,16 @@
buildPythonPackage rec {
pname = "json-schema-for-humans";
version = "0.41.3";
version = "0.41.6";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "coveooss";
repo = pname;
rev = "v${version}";
hash = "sha256-PEialHz5MJxi4PbtHYpx2CY78KgAKclijbF6cPr36vY=";
hash = "sha256-t5t+tZwhzOHpI2nc69baWtZamEOeouseMuVBnCQyjzQ=";
};
postPatch = ''
@@ -50,8 +49,6 @@ buildPythonPackage rec {
pytz
pyyaml
requests
] ++ lib.optionals (pythonOlder "3.7") [
dataclasses
];
checkInputs = [
pkgs/development/python-modules/plantuml-markdown/default.nix
+65
View File
@@ -0,0 +1,65 @@
{ buildPythonPackage
, fetchFromGitHub
, lib
, plantuml
, markdown
, requests
, six
, runCommand
, writeText
, plantuml-markdown
}:
let
pname = "plantuml-markdown";
version = "3.6.2";
in
buildPythonPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "mikitex70";
repo = pname;
rev = version;
sha256 = "sha256-IADKU4EQHLLH5uD5iBAUiumFp5nyTNGt1LWoWdfbvJM=";
};
propagatedBuildInputs = [
plantuml
markdown
requests
six
];
# The package uses a custom script that downloads a certain version of plantuml for testing.
doCheck = false;
pythonImportsCheck = [ "plantuml_markdown" ];
passthru.tests.example-doc =
let
exampleDoc = writeText "plantuml-markdown-example-doc.md" ''
```plantuml
Bob -> Alice: Hello
```
'';
in
runCommand "plantuml-markdown-example-doc"
{
nativeBuildInputs = [ plantuml-markdown ];
} ''
markdown_py -x plantuml_markdown ${exampleDoc} > $out
! grep -q "Error" $out
'';
meta = with lib; {
description = "PlantUML plugin for Python-Markdown";
longDescription = ''
This plugin implements a block extension which can be used to specify a PlantUML
diagram which will be converted into an image and inserted in the document.
'';
homepage = "https://github.com/mikitex70/plantuml-markdown";
license = licenses.bsd2;
maintainers = with maintainers; [ nikstur ];
};
}
pkgs/development/python-modules/pygls/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pygls";
version = "0.11.3";
version = "0.12";
format = "setuptools";
disabled = !isPy3k;
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "openlawlibrary";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/nmDaA67XzrrmfwlBm5syTS4hn25m30Zb3gvOdL+bR8=";
sha256 = "sha256-PEfGxOUsiZ5WLmoQkOP2RRWJlIKi+42lOu55C3C+k8A=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/pyshp/default.nix
+28 -8
View File
@@ -1,19 +1,39 @@
{ lib, buildPythonPackage, fetchPypi
, setuptools }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
version = "2.3.0";
pname = "pyshp";
version = "2.3.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-glBk6kA6zxNehGz4sJJEmUMOa+HNN6DzS+cTCQZhfTw=";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "GeospatialPython";
repo = pname;
rev = version;
hash = "sha256-yfxhgk8a1rdpGVkE1sjJqT6tiFLimhu2m2SjGxLI6wo=";
};
pythonImportsCheck = [ "shapefile" ];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"shapefile"
];
disabledTests = [
# Requires network access
"test_reader_url"
];
meta = with lib; {
description = "Pure Python read/write support for ESRI Shapefile format";
description = "Python read/write support for ESRI Shapefile format";
homepage = "https://github.com/GeospatialPython/pyshp";
license = licenses.mit;
maintainers = with maintainers; [ ];
pkgs/development/python-modules/questionary/default.nix
+3 -3
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "questionary";
version = "1.10.0";
version = "unstable-2022-07-27";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "tmbo";
repo = pname;
rev = version;
sha256 = "14k24fq2nmk90iv0k7pnmmdhmk8z261397wg52sfcsccyhpdw3i7";
rev = "848b040c5b7086ffe75bd92c656e15e94d905146";
hash = "sha256-W0d1Uoy5JdN3BFfeyk1GG0HBzmgKoBApaGad0UykZaY=";
};
nativeBuildInputs = [
pkgs/development/python-modules/types-setuptools/default.nix
+2 -2
View File
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
version = "63.2.1";
version = "63.2.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-KVekCt38pccSX9jThqnv2lN5CYxuZqCOAiV/0c6kITE=";
sha256 = "sha256-qaoMAdXzRDzVRAJtX/yXuV3a33MdqxNBnDk9Q/2GF8A=";
};
# Module doesn't have tests
pkgs/development/tools/build-managers/scala-cli/sources.json
-4
View File
@@ -1,10 +1,6 @@
{
"version": "0.1.10",
"assets": {
"aarch64-darwin": {
"asset": "scala-cli-x86_64-apple-darwin.gz",
"sha256": "1dqvvdwmakdbbq02h33impv84jzks6ba33jgaf2py4rri6hr84rg"
},
"x86_64-darwin": {
"asset": "scala-cli-x86_64-apple-darwin.gz",
"sha256": "1dqvvdwmakdbbq02h33impv84jzks6ba33jgaf2py4rri6hr84rg"
pkgs/development/tools/fnlfmt/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fnlfmt";
version = "0.2.2";
version = "0.2.3";
src = fetchFromSourcehut {
owner = "~technomancy";
repo = pname;
rev = version;
sha256 = "sha256-ZuSXeAhxfH0F/Y0nwqisxLMwh21Kub7viNcXD3FVYOc=";
sha256 = "sha256-FKmr5Xihyk+ikYN8WXBq5UFJziwEb8xaUBswNt/JMBg=";
};
nativeBuildInputs = [ fennel ];
pkgs/development/tools/operator-sdk/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "operator-sdk";
version = "1.18.1";
version = "1.22.2";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BusShYGgaUGwLMWr/EHS7kDUTnTJyHzWUztlaMJskAg=";
sha256 = "sha256-SpSdVJeN+rOZ6jeFPKadXKQLBZmrLjbrBrJsK9zDiZg=";
};
vendorSha256 = "sha256-VH2ALKSr+UFk26Y5/1yhLP//wc1t8f9O5dMg0RGz4ZM=";
vendorSha256 = "sha256-MiA3XbdSwzZLilvrqlNU8e2nMAfhmVnNeG1oUx4ISRU=";
doCheck = false;
pkgs/development/tools/oras/default.nix
+3 -3
View File
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "oras";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "oras-project";
repo = "oras";
rev = "v${version}";
sha256 = "sha256-6W7vmWFjULIJnOVtgSrCEKw/83W8jNSbM0AF4LZZR6U=";
sha256 = "sha256-QmyMDmZXOXD+6T+7Xl9kPFeOrkP1styzwwWi5tH9aO0=";
};
vendorSha256 = "sha256-3UKsH4Jbq7G5PRwhn5lW0NR80jhmuzT9daa++v2sFWk=";
vendorSha256 = "sha256-JoSo716o1RmMlAFSauzgzH6ypE/Kxo/PniJ2PGdfKZ8=";
ldflags = [
"-s"
pkgs/development/tools/protoc-gen-go/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "protoc-gen-go";
version = "1.28.0";
version = "1.28.1";
src = fetchFromGitHub {
owner = "protocolbuffers";
repo = "protobuf-go";
rev = "v${version}";
sha256 = "sha256-GXXhBXzeFgS4DjY3jDRaJu/9PbfUnmWJiE4BwDBh7Ns=";
sha256 = "sha256-7Cg7fByLR9jX3OSCqJfLw5PAHDQi/gopkjtkbobnyWM=";
};
vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y=";
pkgs/development/tools/py-spy/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "py-spy";
version = "0.3.11";
version = "0.3.12";
src = fetchFromGitHub {
owner = "benfred";
repo = "py-spy";
rev = "v${version}";
sha256 = "sha256-4Zp4IGd4lKBC0ye2/7Tfpz8vJzm0VnkKqx/2k3mCj3A=";
sha256 = "sha256-k58PPJAF9MsKRlscFSqdtTY5/rriaF0mXjgkADT+F4s=";
};
NIX_CFLAGS_COMPILE = "-L${libunwind}/lib";
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
checkInputs = [ python3 ];
cargoSha256 = "sha256-LEtmzCoT8esBYh9PkCGpzUU7miaWd3Ao0z/LzxhP39A=";
cargoSha256 = "sha256-DC+EfJ671/bvFoHHjpJlFCO/phdndNcldnP3DsIKqAg=";
meta = with lib; {
description = "Sampling profiler for Python programs";
pkgs/development/tools/selene/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "selene";
version = "0.16.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "kampfkarren";
repo = pname;
rev = version;
sha256 = "sha256-S0EeFJS90bzQ7C+hN4CyZ7l9wmizT2d3P6utshI5JWs=";
sha256 = "sha256-ScO2ih+Y8R1OrazSmLlz9QtTUjQ6tIPf5F5juj2nc7Y=";
};
cargoSha256 = "sha256-3J1Q595LxAI0LBP4/cLHDrMbZBnoA2+OSr8/erQcN+0=";
cargoSha256 = "sha256-pJZrNjgtYjribIKo4DWR47dnyoSuy9sSRPd+ginDlOU=";
nativeBuildInputs = lib.optional robloxSupport pkg-config;
pkgs/games/polymc/default.nix
+2 -2
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "polymc";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "PolyMC";
repo = "PolyMC";
rev = version;
sha256 = "sha256-gaPqCAC/tE6nUONgWSrVm3oBzSnOhZ5xiAJ+QyX+8rA=";
sha256 = "sha256-Pu2Eb3g6gwCZjJN0N6S/N82eBMLduQQUzXo8nMmtE+Y=";
fetchSubmodules = true;
};
pkgs/os-specific/linux/kernel/linux-4.14.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.289";
version = "4.14.290";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1v24mv49skgijcbafgai0glrzwiv2j1hndkz7v6ygc18jxh5fqg6";
sha256 = "0zyxb99a7fa2l85vnzmvg2nry99clj20d4j38piqm921iqxak2j4";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.19.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.253";
version = "4.19.254";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1jc2j0wskgr1bdzpz6sn2bvafpviiin6mwr93yykcczzfjijr8yz";
sha256 = "1rd40wmdaymbly2zvf60mjqsflkd4n1y232qz0ixn1rfl28yz62i";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.9.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.9.324";
version = "4.9.325";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0g51vfp0g3py82l3q66p7nvl03h6l1nlny18gangji75a3c39yh4";
sha256 = "04msx0x0d8v93zjr3jj0qqkgg7m4hb7rj6hk5vzrzasmgbjmb3dl";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.10.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.132";
version = "5.10.134";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0aps3kglzw480ps9agw1k3zn8ipibwkrx13kzijfl7g0xqqsj1bx";
sha256 = "0s9j4zzck9880kvyb18i2ng6dc16p0dwsi95mkwdhg83vyn16dgc";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.15.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.56";
version = "5.15.58";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "08w2kgc0v0ld7nxbary7d9fr2vxrsmqby7l4fhf7njgi6wsbp9p9";
sha256 = "1a2gzjfymfafvk8cvibr1zdfydzxg0c5j772c9hqwcabkibxjnyp";
};
} // (args.argsOverride or { }))
pkgs/os-specific/linux/kernel/linux-5.18.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.18.13";
version = "5.18.15";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1nkb4wl2v2pflqnfgmas1pmkr8wm14lm1c8py9sa5k1gwvzil3j3";
sha256 = "0g5yvhq7rmkzvfl4w50l7bg56a20insvg4s4nvgnk2iqvkmlz039";
};
} // (args.argsOverride or { }))
pkgs/os-specific/linux/kernel/linux-5.4.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.207";
version = "5.4.208";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1wwpd26qhv6i00p0yxjisns6qiz9bfrxvn1xb4ylwr8ls7zyx78v";
sha256 = "0i0fxv04r6g5ha84chih5cqsy59cv67pjxp8zfrdk1qapwddyvgh";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/xf86-input-wacom/default.nix
+2 -2
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "xf86-input-wacom";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "linuxwacom";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-WitvT1y9KpXJriMr6Z9CrmAQdKPBZ5g9fP2nIgzJzAc=";
sha256 = "sha256-AYjO7B0Z6G1JqpLdvm9LS+ujz7iUp8UwZ9X1WQ/dGk0=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/servers/monitoring/exportarr/default.nix
+38
View File
@@ -0,0 +1,38 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "exportarr";
version = "1.1.0";
src = fetchFromGitHub {
owner = "onedr0p";
repo = "exportarr";
rev = "v${version}";
hash = "sha256-KTuOhyBFS6fgA9N70vq+5fJIGVsgEZ7Uxls8efqLuII=";
};
vendorSha256 = "sha256-Yox3LAVbTZqsDmk45uSuKgITRz3zE+HTAKxVf9wdtjE=";
subPackages = [ "cmd/exportarr" ];
ldflags = [
"-s"
"-w"
] ++ lib.optionals stdenv.isLinux [
"-extldflags=-static"
];
tags = lib.optionals stdenv.isLinux [ "netgo" ];
meta = with lib; {
description = "AIO Prometheus Exporter for Sonarr, Radarr or Lidarr";
homepage = "https://github.com/onedr0p/exportarr";
changelog = "https://github.com/onedr0p/exportarr/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ azahi ];
};
}
pkgs/servers/monitoring/grafana/default.nix
+3 -3
View File
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "9.0.4";
version = "9.0.5";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
@@ -10,12 +10,12 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-V28wUkgWLUTRBNbx5xAdLUcFGU2DQ5Az5SSIJPv393U=";
sha256 = "sha256-TYT1eJ9jg82GFunYofPMCWuHB60qFg1lWTH2iapyUlc=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-UU/THOSYJfbgx/Mn3rMZiODeHX4I6l/7Kpg5mBq5FUI=";
sha256 = "sha256-NljayyDOVazm5OyQw+XlHJgW0caC4TSmR56QwTTWrlw=";
};
vendorSha256 = "sha256-6Z1qvn5HTybKAjsst8kSGYCbEIBsPyhNswVGGiMD9B8=";
pkgs/servers/redpanda/default.nix
+2 -2
View File
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchzip }:
let
version = "22.1.3";
version = "22.1.6";
platform = if stdenv.isLinux then "linux" else "darwin";
arch = if stdenv.isAarch64 then "arm" else "amd";
sha256s = {
darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g=";
darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4=";
linux.amd = "sha256-Uz7KjbsH3lKRL0iI73DxwS5rcIkPQiMFkIQsc06gF0k=";
linux.amd = "sha256-17fLmvjv7+uCnOXfIgWqK8gL8GVOEvOgKOuH6HsfAbI=";
linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8=";
};
in stdenv.mkDerivation rec {
pkgs/servers/roundcube/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "roundcube";
version = "1.5.3";
version = "1.6.0";
src = fetchurl {
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
sha256 = "sha256-S8+sIZ8uAAXJEtrDIndDzB7Q3tacgi90yBpw0EHlo70=";
sha256 = "sha256-JAnM3+LkZfCGy5/BjIjf4Kr2zMI5JFZJdQYSCZIWlLo=";
};
patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
pkgs/shells/fish/plugins/autopair-fish.nix
+20
View File
@@ -0,0 +1,20 @@
{ lib, stdenv, buildFishPlugin, fetchFromGitHub }:
buildFishPlugin rec {
pname = "autopair.fish";
version = "1.0.4";
src = fetchFromGitHub {
owner = "jorgebucaran";
repo = pname;
rev = version;
sha256 = "sha256-s1o188TlwpUQEN3X5MxUlD/2CFCpEkWu83U9O+wg3VU=";
};
meta = with lib; {
description = "Auto-complete matching pairs in the Fish command line.";
homepage = "https://github.com/jorgebucaran/autopair.fish";
license = licenses.mit;
maintainers = with maintainers; [ thehedgeh0g ];
};
}
pkgs/shells/fish/plugins/default.nix
+2
View File
@@ -2,6 +2,8 @@
lib.makeScope newScope (self: with self; {
autopair-fish = callPackage ./autopair-fish.nix { };
buildFishPlugin = callPackage ./build-fish-plugin.nix { };
clownfish = callPackage ./clownfish.nix { };
pkgs/tools/admin/procs/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "procs";
version = "0.12.3";
version = "0.13.0";
src = fetchFromGitHub {
owner = "dalance";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XR6HhMu5AN1vkR3YtDlogTN9/aEExFQtATyKUqWjyAM=";
sha256 = "sha256-O5q+T6GO03Wf26CLyEgS45h7O38HsVZ+EJi8TgFcNaI=";
};
cargoSha256 = "sha256-U1ewV/t66jrFRMdu5ddPWyg08C2IGFr6rudPFRIkPsg=";
cargoSha256 = "sha256-JZsDKeiF/Mg4P6dLaN+8+TLHnCsB97d9TDn4cSdzZZE=";
nativeBuildInputs = [ installShellFiles ];
pkgs/tools/graphics/agi/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "agi";
version = "3.1.0-dev-20220627";
version = "3.1.0-dev-20220713";
src = fetchzip {
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
sha256 = "sha256-gJ7vz95KqmTQp+sf1q99Sk7aYooLHVAyYliKzfM/fWU=";
sha256 = "sha256-ch3crmvueXk4xJ4LjG4MrYkaCTd+41INAz+/ClI+Mpw=";
};
nativeBuildInputs = [
pkgs/tools/graphics/directx-shader-compiler/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "directx-shader-compiler";
version = "1.6.2112";
version = "1.7.2207";
# Put headers in dev, there are lot of them which aren't necessary for
# using the compiler binary.
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "microsoft";
repo = "DirectXShaderCompiler";
rev = "v${version}";
hash = "sha256-+oh7oWJCE0CLehnqpE2J9aIfMFbtfLAKwI9ETmCg/TA=";
hash = "sha256-yvhraZPJ6ocsg7/22/AzDbl/Rz7qXRQiXBxE1zB1QPA=";
fetchSubmodules = true;
};
pkgs/tools/misc/opentelemetry-collector/contrib.nix
+3 -3
View File
@@ -6,17 +6,17 @@
buildGoModule rec {
pname = "opentelemetry-collector-contrib";
version = "0.51.0";
version = "0.56.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector-contrib";
rev = "v${version}";
sha256 = "sha256-lMTOJFGuJhdXOvCk70Bee97Vb0HBCDnOLeK2q7S4hW8=";
sha256 = "sha256-uNUMXtDlnC9HHBw+QJj5p21pWMfr2kGeVghpTLFBlsg=";
};
# proxy vendor to avoid hash missmatches between linux and macOS
proxyVendor = true;
vendorSha256 = "sha256-G3sIWkYKYnqDmmwspQNw+8yU/SWBBr8KX7Osae9mXe4=";
vendorSha256 = "sha256-2VfzdGgzF9A1PGv1Dum0Me10OCKK27h9ZLvb1uWscmk=";
subPackages = [ "cmd/otelcontribcol" ];
pkgs/tools/networking/dnsmonster/default.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "dnsmonster";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "mosajjal";
repo = pname;
rev = "v${version}";
hash = "sha256-1tYC76g3GOqMaosAYYXOrOKTdW7muPTaeeLzGUsjogE=";
hash = "sha256-5+ivBnpE4odmm7N1FVJcKw5VlEkPiGOadsFy4Vq6gVo=";
};
vendorSha256 = "sha256-2gWifzBjAx+c/if6ZZQ/s73oPPTY9eJfHYL4F/058h0=";
vendorSha256 = "sha256-WCgaf34l+4dq79STBtUp1wX02ldKuTYvB+op/UTAtNQ=";
buildInputs = [
libpcap
pkgs/tools/networking/mozillavpn/default.nix
+25 -55
View File
@@ -1,17 +1,15 @@
{ buildGoModule
, cmake
, fetchFromGitHub
, fetchpatch
, go
, lib
, pkg-config
, polkit
, python3
, qmake
, qt5compat
, qtbase
, qtcharts
, qtgraphicaleffects
, qtnetworkauth
, qtquickcontrols2
, qttools
, qtwebsockets
, rustPlatform
@@ -22,50 +20,18 @@
}:
let
glean_parser_4_1_1 = python3.pkgs.buildPythonPackage rec {
pname = "glean_parser";
version = "4.1.1";
src = python3.pkgs.fetchPypi {
inherit pname version;
hash = "sha256-4noazRqjjJNI2kTO714kSp70jZpWmqHWR2vnkgAftLE=";
};
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
propagatedBuildInputs = with python3.pkgs; [
appdirs
click
diskcache
jinja2
jsonschema
pyyaml
setuptools
yamllint
];
postPatch = ''
substituteInPlace setup.py --replace '"pytest-runner", ' ""
'';
doCheck = false;
};
pname = "mozillavpn";
version = "2.8.3";
version = "2.9.0";
src = fetchFromGitHub {
owner = "mozilla-mobile";
repo = "mozilla-vpn-client";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-eKgoRE/JDEQEFp7xYY60ARDgw/n5VoZpD/Gb/CWzHuo=";
hash = "sha256-arz8hTgQfPFSZesSddcnZoyLfoLQsQT8LIsl+3ZfA0M=";
};
patches = [
# Rust bridge: Add Cargo.lock file
(fetchpatch {
url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/05c9a366cf9dc4e378485c8e9d494f77c35dbb8c.patch";
hash = "sha256-fG+SATbJpGqpCFXSWEiBo4dYx6RLtJYR0yTdBqN6Fww=";
})
];
netfilter-go-modules = (buildGoModule {
inherit pname version src patches;
inherit pname version src;
vendorSha256 = "KFYMim5U8WlJHValvIBQgEN+17SDv0JVbH03IiyfDc0=";
modRoot = "linux/netfilter";
}).go-modules;
@@ -74,25 +40,25 @@ let
in
stdenv.mkDerivation {
inherit pname version src patches cargoRoot;
inherit pname version src cargoRoot;
buildInputs = [
polkit
qt5compat
qtbase
qtcharts
qtgraphicaleffects
qtnetworkauth
qtquickcontrols2
qtwebsockets
];
nativeBuildInputs = [
glean_parser_4_1_1
cmake
go
pkg-config
python3
python3.pkgs.glean-parser
python3.pkgs.lxml
python3.pkgs.pyyaml
qmake
qttools
python3.pkgs.setuptools
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
which
@@ -100,29 +66,33 @@ stdenv.mkDerivation {
];
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src patches;
inherit src;
name = "${pname}-${version}";
preBuild = "cd ${cargoRoot}";
hash = "sha256-C0wPmGVXbhUs0IzeIMZD6724P0XTOzeK1bzrnUMPlWo=";
hash = "sha256-lJfDLyoVDSFiZyWcBTI085MorWHPcNW4i7ua1+Ip3rA=";
};
postPatch = ''
for file in linux/*.service linux/extra/*.desktop src/platforms/linux/daemon/*.service; do
substituteInPlace "$file" --replace /usr/bin/mozillavpn "$out/bin/mozillavpn"
done
'';
preBuild = ''
substituteInPlace scripts/addon/build.py \
--replace 'qtbinpath = args.qtpath' 'qtbinpath = "${qttools.dev}/bin"' \
--replace 'rcc = os.path.join(qtbinpath, rcc_bin)' 'rcc = "${qtbase.dev}/libexec/rcc"'
substituteInPlace src/cmake/linux.cmake \
--replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system"
ln -s '${netfilter-go-modules}' linux/netfilter/vendor
python3 scripts/utils/generate_glean.py
python3 scripts/utils/import_languages.py --qt_path '${lib.getDev qttools}/bin'
'';
qmakeFlags = [
"USRPATH=$(out)"
"ETCPATH=$(out)/etc"
"CONFIG-=debug" # https://github.com/mozilla-mobile/mozilla-vpn-client/pull/3539
cmakeFlags = [
"-DQT_LCONVERT_EXECUTABLE=${qttools.dev}/bin/lconvert"
"-DQT_LUPDATE_EXECUTABLE=${qttools.dev}/bin/lupdate"
"-DQT_LRELEASE_EXECUTABLE=${qttools.dev}/bin/lrelease"
];
qtWrapperArgs =
[ "--prefix" "PATH" ":" (lib.makeBinPath [ wireguard-tools ]) ];
pkgs/tools/networking/mubeng/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "mubeng";
version = "0.9.3";
version = "0.10.0";
src = fetchFromGitHub {
owner = "kitabisa";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qEIPu4miZpWL19N36DsKMbckXbHDTTZjp2ccZrV3LFc=";
sha256 = "sha256-z81/WbqhMJPliT5rrW4UY8gseV7R2UDQIUOjZuUgLTI=";
};
vendorSha256 = "sha256-sAcDyGNOSm+BnsYyrR2x1vkGo6ZEykhkF7L9lzPrD+o=";
vendorSha256 = "sha256-CjAFntwpHvUOaaLHDOT9Dctptv5EFW62X8XWT4SvT2A=";
ldflags = [ "-s" "-w" "-X ktbs.dev/mubeng/common.Version=${version}" ];
pkgs/tools/networking/proxify/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "proxify";
version = "0.0.6";
version = "0.0.7";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "proxify";
rev = "v${version}";
sha256 = "sha256-g6HYwcQ4zAPLdu2o7oS1uWyFMp5FpGuJVXPtfAqYHJc=";
sha256 = "sha256-6YsduuiPgwxcSkqEcMxEhubte87IxWV9Qa1Vyv0Pd5w=";
};
vendorSha256 = "sha256-JJhxVfvcqOW6zvg+m8lIcrRgxIStFKXMuWo1BMmIv+o=";
vendorSha256 = "sha256-ewPimn70cheToU33g3p9s0MHxQdbKiqhGReKLgiHOSI=";
meta = with lib; {
description = "Proxy tool for HTTP/HTTPS traffic capture";
pkgs/tools/networking/suckit/default.nix
+7 -4
View File
@@ -9,23 +9,26 @@
rustPlatform.buildRustPackage rec {
pname = "suckit";
version = "0.1.2";
version = "0.2.0";
src = fetchFromGitHub {
owner = "skallwar";
repo = pname;
rev = "v${version}";
sha256 = "0wr03yvrqa9p6m127fl4hcf9057i11zld898qz4kbdyiynpi0166";
sha256 = "sha256-M4/vD1sVny7hAf4h56Z2xy7yuCqH/H3qHYod6haZOs0=";
};
cargoSha256 = "sha256-6otIWAAf9pI4A8kxK3dyOVpkw+SJ3/YAvTahDSXMWNc=";
cargoSha256 = "sha256-JsH7TL9iITawuECm1hzs5oXFtnoUqLT4ug2CafoO2ao=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
# requires internet access
checkFlags = [ "--skip=test_download_url" ];
checkFlags = [
"--skip=test_download_url"
"--skip=test_external_download"
];
meta = with lib; {
description = "Recursively visit and download a website's content to your disk";
pkgs/tools/security/cliam/default.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "cliam";
version = "1.0.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "securisec";
repo = pname;
rev = version;
hash = "sha256-bq7u6pknokyY4WwO1qMYPuY86UZlDgeYEa1AJpk8d+4=";
hash = "sha256-TEpAY1yY5AFTg5yUZMvTFdZiQ7yBi0rjYgCCksiMfDU=";
};
vendorSha256 = "sha256-aGBA97EvIUv9myqcrtltiVxh1/0VtrQy2j9GU6r197g=";
vendorSha256 = "sha256-VCai9rxpnlpviN5W/VIRcNGvPljE2gbFnxA1OKhVElk=";
nativeBuildInputs = [
installShellFiles
pkgs/tools/security/dontgo403/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dontgo403";
version = "0.3";
version = "0.5";
src = fetchFromGitHub {
owner = "devploit";
repo = pname;
rev = version;
hash = "sha256-QHkmnhOLdyci3PAhf/JIiYlCta8DJ3cZb1S6Sim0qGQ=";
hash = "sha256-aVPmS4qIa9v7jnK1YG9EUV81frhu3/0x3zY7akPkpeg=";
};
vendorSha256 = "sha256-jF+CSmLHMdlFpttYf3pK84wdfFAHSVPAK8S5zunUzB0=";
pkgs/tools/security/exploitdb/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2022-07-22";
version = "2022-07-27";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-36zfLPXAeYVJQ448E5xuwrNR4cb7xpjwqOQY/WcteQ0=";
hash = "sha256-4GVlnr7ga+1xOb9cFKNeb0HELj8A8NgxwsKTnNpWqJI=";
};
nativeBuildInputs = [
pkgs/tools/security/faraday-agent-dispatcher/default.nix
+3 -3
View File
@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "faraday-agent-dispatcher";
version = "2.1.3";
version = "2.2.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "infobyte";
repo = "faraday_agent_dispatcher";
rev = version;
hash = "sha256-lqCW1/wRXfN7C9c6TPvninueOgrhzNdjRJ9fuueMyH0=";
rev = "refs/tags/${version}";
hash = "sha256-dTXTR2H37FDfnpY4Ts6NoYAnJX52yqRZeD2Yf8S/kS8=";
};
nativeBuildInputs = with python3.pkgs; [
pkgs/tools/security/faraday-cli/default.nix
+3 -3
View File
@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "faraday-cli";
version = "2.1.5";
version = "2.1.6";
format = "setuptools";
src = fetchFromGitHub {
owner = "infobyte";
repo = pname;
rev = "v${version}";
hash = "sha256-kl5yOJTMobccZoaIoWwQubCrswPa69I5Kmuox7JqAXs=";
rev = "refs/tags/${version}";
hash = "sha256-ofL3tRYV2bwF+RYGoLpg/UQPg9HwrCepWAQxXiJkV2E=";
};
propagatedBuildInputs = with python3.pkgs; [
pkgs/tools/security/git-hound/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "git-hound";
version = "1.3";
version = "1.4";
src = fetchFromGitHub {
owner = "tillson";
repo = pname;
rev = "v${version}";
sha256 = "1l2bif7qpc1yl93ih01g9jci7ba47rsnpq9js88rz216q93dzmsf";
sha256 = "sha256-HD5OK8HjnLDbyC/TmVI2HfBRIUCyyHTbA3JvKoeXV5E=";
};
vendorSha256 = "055hpfjbqng513c9rscb8jhnlxj7p82sr8cbsvwnzk569n71qwma";
vendorSha256 = "sha256-qnIcjk2mzG/51ouhrAW6R3ZqoUSL6ZzYCOVZvKS7sBQ=";
meta = with lib; {
description = "Reconnaissance tool for GitHub code search";
pkgs/tools/security/gitleaks/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gitleaks";
version = "8.8.12";
version = "8.9.0";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rrTZuDMKZqDWFHbnqDbPd5L6g7ff1lZpSpwTgYFd0Uw=";
sha256 = "sha256-LH8iW2RsBq+mxGXR/RKsIqPWMqHNlhQ9Ye9Z/LOdmYQ=";
};
vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk=";
pkgs/tools/security/kube-hunter/default.nix
-1
View File
@@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
netaddr
netifaces
scapy
requests
prettytable
urllib3
pkgs/tools/security/lethe/default.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "lethe";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "kostassoid";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0UYUzef7ja8nc2zs7eWqqXQfVVbEJEH9/NRRHVkvkYk=";
sha256 = "sha256-uMpqN9xgA0S861JChfJebU6azxJN8ScftmX8yJV8NM8=";
};
cargoSha256 = "sha256-suE8USKTZECVlTX4Wpz3vapo/Wmn7qaC3eyAJ3gmzqk=";
cargoSha256 = "sha256-GeZ/25ZaD/vyQo02SUt1JtNUL2QCg0varOJC1M3Ji9s=";
buildInputs = lib.optional stdenv.isDarwin Security;
pkgs/tools/security/metabigor/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "metabigor";
version = "1.10";
version = "1.12.1";
src = fetchFromGitHub {
owner = "j3ssie";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ADpnSsGZQbXaSGidPmxwkQOl+P8ZupqRaDUh7t+XoDw=";
sha256 = "sha256-T1P+jAAsKObKRaoxH8c/DMEfXtmSrvnDd5Y3ocKcCSc=";
};
vendorSha256 = "sha256-la7bgeimycltFB7l6vNBYdlBIv4kD+HX7f2mo+eZhXM=";
vendorSha256 = "sha256-V+72l2TvhEWgDg7kvn5OOjYcyEgWGLgTGnt58Bu+AEQ=";
# Disabled for now as there are some failures ("undefined:")
doCheck = false;
pkgs/tools/security/monsoon/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "monsoon";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "RedTeamPentesting";
repo = "monsoon";
rev = "v${version}";
sha256 = "01c84s11m645mqaa2vdnbsj0kb842arqjhicgjv0ahb7qdw65zz4";
sha256 = "sha256-eXzD47qFkouYJkqWHbs2g2pbl3I7vWgIU6TqN3MEYQI=";
};
vendorSha256 = "1g84az07hv8w0jha2yl4f5jm0p9nkbawgw9l7cpmn8ckbfa54l7q";
vendorSha256 = "sha256-tG+qV4Q77wT6x8y5cjZUaAWpL//sMUg1Ce3jS/dXF+Y=";
# tests fails on darwin
doCheck = !stdenv.isDarwin;
pkgs/tools/security/nmap-formatter/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nmap-formatter";
version = "1.0.2";
version = "2.0.1";
src = fetchFromGitHub {
owner = "vdjagilev";
repo = pname;
rev = "v${version}";
hash = "sha256-ePhm1qwluHhMC0oS/qEHkZv04nAdh2IDSkIW507MLjo=";
hash = "sha256-Jhjvtk8SDs//eBW+2+yLcIXf/NetfBUrKvzKCj+VyMg=";
};
vendorSha256 = "sha256-zkPXjCC+ZdR14O60ZaGFYdEZVxQ5z99HVmLOR10qqfg=";
vendorSha256 = "sha256-u36eHSb6YlGJNkgmRDclxTsdkONLKn8J/GKaoCgy+Qk=";
meta = with lib; {
description = "Tool that allows you to convert nmap output";
pkgs/tools/security/nwipe/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "nwipe";
version = "0.33";
version = "0.34";
src = fetchFromGitHub {
owner = "martijnvanbrummelen";
repo = "nwipe";
rev = "v${version}";
sha256 = "sha256-i+cK2XTdWc3ByG9i+rfwL3Ds8Sl15/wZwEc5nrcWdeY=";
sha256 = "sha256-7WI8AwWkg9rOjAbOyDgCVOpeMxvJ5Bd1yvzfSv6TPLs=";
};
nativeBuildInputs = [
pkgs/top-level/all-packages.nix
+5 -1
View File
@@ -5687,7 +5687,7 @@ with pkgs;
mcrcon = callPackage ../tools/networking/mcrcon {};
mozillavpn = libsForQt5.callPackage ../tools/networking/mozillavpn { };
mozillavpn = qt6Packages.callPackage ../tools/networking/mozillavpn { };
mozwire = callPackage ../tools/networking/mozwire {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -5983,6 +5983,8 @@ with pkgs;
expect = callPackage ../tools/misc/expect { };
exportarr = callPackage ../servers/monitoring/exportarr { };
expliot = callPackage ../tools/security/expliot { };
f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { };
@@ -10833,6 +10835,8 @@ with pkgs;
sourceHighlight = callPackage ../tools/text/source-highlight { };
somebar = callPackage ../applications/misc/somebar { };
spacebar = callPackage ../os-specific/darwin/spacebar {
inherit (darwin.apple_sdk.frameworks)
Carbon Cocoa ScriptingBridge SkyLight;
pkgs/top-level/python-packages.nix
+4
View File
@@ -6775,6 +6775,10 @@ in {
plantuml = callPackage ../development/python-modules/plantuml { };
plantuml-markdown = callPackage ../development/python-modules/plantuml-markdown {
inherit (pkgs) plantuml;
};
plaster = callPackage ../development/python-modules/plaster { };
plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy { };