diff options
-rw-r--r-- | .github/CODEOWNERS | 4 | ||||
-rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/navi/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/fluxcd/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/nomad/1.0.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/remote/remmina/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/picat/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/interpreters/dhall/build-dhall-github-package.nix | 8 | ||||
-rw-r--r-- | pkgs/development/python-modules/breathe/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/pyelftools/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/python-modules/upnpy/default.nix | 27 | ||||
-rw-r--r-- | pkgs/os-specific/linux/beefi/default.nix | 44 | ||||
-rw-r--r-- | pkgs/os-specific/linux/usbguard/default.nix | 50 | ||||
-rw-r--r-- | pkgs/servers/coturn/default.nix | 27 | ||||
-rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/admin/mycli/default.nix | 25 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
18 files changed, 183 insertions, 64 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 093239566ce3..8491532ee387 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -158,8 +158,8 @@ /nixos/modules/services/networking/ntp @thoughtpolice # Dhall -/pkgs/development/dhall-modules @Gabriel439 @Profpatsch -/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch +/pkgs/development/dhall-modules @Gabriel439 @Profpatsch @ehmry +/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch @ehmry # Idris /pkgs/development/idris-modules @Infinisil diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2bc0ae5f0425..5f02e8650ff6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9305,6 +9305,12 @@ githubId = 303489; name = "Manuel Bärenz"; }; + tu-maurice = { + email = "valentin.gehrke+nixpkgs@zom.bi"; + github = "tu-maurice"; + githubId = 16151097; + name = "Valentin Gehrke"; + }; tv = { email = "tv@krebsco.de"; github = "4z3"; diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 46d463645e56..9428443d2957 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "04ks38s6d3nkdj0arhxw8f3sfw796l97fbqxsm7b9g5d2953a6cs"; + sha256 = "0nzjcahnx637m24xhzgrhvaic52b1bqx6lkklmy8xlbka7i2xid2"; }; - cargoSha256 = "1zwar1l793809bsgqnwrgi50y76bd78qd4s8lw6d64f4z72dh80g"; + cargoSha256 = "12xyh57b6lblplh87fw1cvfwzkx9bz9qbhii34n4yzfzp6sv530n"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index e368ecff8683..ee3428ae468f 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxcd"; - version = "0.5.9"; + version = "0.6.0"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "1fic1hgsjhail9p2ki7qqr0vl5av3gfb8y3h9ygzq4j869780bsq"; + sha256 = "16jq6ygm7and4fixh8f7jjv45vgjmyy8wghwnkhwb0140j6lj3ym"; }; - vendorSha256 = "15zn40pi1rw0yqxm9fpmj4l179rg846r3m89imh96g2v3gk8qqcv"; + vendorSha256 = "1909czaa0q03xh1qvg3f2qzwfwlqyc0akg2c98wd7qrnk1yzzdxy"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index 0b7b7c12d1a6..ff4434399bd7 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.1"; - sha256 = "07k81csyxhgc7bgn297zlqyvc55qb5fmiavi7dk81rdpg5m2zjvv"; + version = "1.0.2"; + sha256 = "1l9j6k5dzh9ym9j75mam10vd9b5qh4xqfj6d63bjp7gkk4hd1jxx"; } diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index feb707412468..23b8cb317355 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libX11 , freerdp, libssh, libgcrypt, gnutls -, pcre, libdbusmenu-gtk3, libappindicator-gtk3 +, pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.7"; + version = "1.4.10"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "0h09f2amj7ab78fzil2w7cr22d21ad5mp1r2fa70w26g7ra3jzk9"; + sha256 = "sha256-n3YfLKCv6CoBeUIv+1yN6RIih63PTFj5zr+dZDJwYdw="; }; nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas glib gtk3 gettext libxkbfile libX11 freerdp libssh libgcrypt gnutls - pcre libdbusmenu-gtk3 libappindicator-gtk3 + pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core openssl gnome3.adwaita-icon-theme json-glib libsodium webkitgtk diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix index 4898f991079c..960b5ce1c2c9 100644 --- a/pkgs/development/compilers/picat/default.nix +++ b/pkgs/development/compilers/picat/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { pname = "picat"; - version = "3.0p3"; + version = "3.0p4"; src = fetchurl { - url = "http://picat-lang.org/download/picat30_3_src.tar.gz"; - sha256 = "052w0vk2xfmky5nv280ysb8in6vaph7i79yvbddqmahzszarq5hw"; + url = "http://picat-lang.org/download/picat30_4_src.tar.gz"; + sha256 = "1rwin44m7ni2h2v51sh2r8gj2k6wm6f86zgaylrria9jr57inpqj"; }; buildInputs = [ zlib ]; diff --git a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix index 0978e47754b9..53adc5a9b125 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix @@ -25,8 +25,10 @@ lib.makePackageOverridable }@args: let + versionedName = "${name}-${rev}"; + src = fetchFromGitHub ({ - name = "${name}-source"; + name = "${versionedName}-source"; inherit owner repo rev; } // removeAttrs args [ @@ -45,7 +47,9 @@ lib.makePackageOverridable in buildDhallPackage - ( { inherit name dependencies source; + ( { inherit dependencies source; + + name = versionedName; code = "${src}/${prefix}${file}"; } diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index e283c9ee6bed..e765ba316db0 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.25.1"; + version = "4.26.0"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "bf81658ed31f8f586247d203923479fcde6c3797d376c804bdafa7e56ffd43b5"; + sha256 = "72543e3ef896b402eec4067c8be2f384570a27421b803ea6980455d7a9859cb1"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index 5686a6ffadb2..258c97a3c112 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -1,18 +1,19 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , python +, stdenv }: buildPythonPackage rec { pname = "pyelftools"; - version = "unstable-2020-09-23"; + version = "0.27"; src = fetchFromGitHub { owner = "eliben"; repo = pname; - rev = "ab84e68837113b2d700ad379d94c1dd4a73125ea"; - sha256 = "sha256-O7l1kj0k8bOSOtZJVzS674oVnM+X3oP00Ybs0qjb64Q="; + rev = "v${version}"; + sha256 = "09igdym2qj2fvfcazbz25qybmgz7ccrn25xn3havfkdkka0z0i3p"; }; doCheck = stdenv.is64bit && !stdenv.isDarwin; @@ -25,10 +26,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "elftools" ]; meta = with lib; { - description = "A library for analyzing ELF files and DWARF debugging information"; + description = "Python library for analyzing ELF files and DWARF debugging information"; homepage = "https://github.com/eliben/pyelftools"; license = licenses.publicDomain; maintainers = with maintainers; [ igsha pamplemousse ]; }; - } diff --git a/pkgs/development/python-modules/upnpy/default.nix b/pkgs/development/python-modules/upnpy/default.nix new file mode 100644 index 000000000000..d64ff4b875c8 --- /dev/null +++ b/pkgs/development/python-modules/upnpy/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "upnpy"; + version = "1.1.8"; + + src = fetchFromGitHub { + owner = "5kyc0d3r"; + repo = pname; + rev = "v${version}"; + sha256 = "17rqcmmwsl0m4722b1cr74f80kqwq7cgxsy7lq9c88zf6srcgjsf"; + }; + + # Project has not published tests yet + doCheck = false; + pythonImportsCheck = [ "upnpy" ]; + + meta = with lib; { + description = "UPnP client library for Python"; + homepage = "https://github.com/5kyc0d3r/upnpy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/os-specific/linux/beefi/default.nix b/pkgs/os-specific/linux/beefi/default.nix new file mode 100644 index 000000000000..959a43faea91 --- /dev/null +++ b/pkgs/os-specific/linux/beefi/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchFromGitHub +, installShellFiles +, binutils-unwrapped +, systemd }: + +stdenv.mkDerivation rec { + pname = "beefi"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "jfeick"; + repo = "beefi"; + rev = version; + sha256 = "1180avalbw414q1gnfqdgc9zg3k9y0401kw9qvcn51qph81d04v5"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ + binutils-unwrapped + systemd + ]; + + patchPhase = '' + substituteInPlace beefi \ + --replace objcopy ${binutils-unwrapped}/bin/objcopy \ + --replace /usr/lib/systemd ${systemd}/lib/systemd + ''; + + installPhase = '' + install -Dm755 beefi $out/bin/beefi + installManPage beefi.1 + ''; + + meta = with lib; { + description = "A small script to create bootable EFISTUB kernel images"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ tu-maurice ]; + homepage = "https://github.com/jfeick/beefi"; + }; +} diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index e2746c7a1e7a..a2f0b99e8d81 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -1,28 +1,40 @@ -{ - stdenv, fetchurl, lib, - pkgconfig, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl, asciidoc, - dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, - audit, - libgcrypt ? null, - libsodium ? null +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, asciidoc +, pkgconfig +, libxslt +, libxml2 +, docbook_xml_dtd_45 +, docbook_xsl +, dbus-glib +, libcap_ng +, libqb +, libseccomp +, polkit +, protobuf +, audit +, libgcrypt +, libsodium }: -with stdenv.lib; - assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { - version = "0.7.8"; + version = "1.0.0"; pname = "usbguard"; - repo = "https://github.com/USBGuard/usbguard"; - - src = fetchurl { - url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1il5immqfxh2cj8wn1bfk7l42inflzgjf07yqprpz7r3lalbxc25"; + src = fetchFromGitHub { + owner = "USBGuard"; + repo = pname; + rev = "usbguard-${version}"; + sha256 = "sha256-CPuBQmDOpXWn0jPo4HRyDCZUpDy5NmbvUHxXoVbMd/I="; + fetchSubmodules = true; }; nativeBuildInputs = [ + autoreconfHook asciidoc pkgconfig libxslt # xsltproc @@ -54,8 +66,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "The USBGuard software framework helps to protect your computer against BadUSB"; + longDescription = '' + USBGuard is a software framework for implementing USB device authorization + policies (what kind of USB devices are authorized) as well as method of + use policies (how a USB device may interact with the system). Simply put, + it is a USB device whitelisting tool. + ''; homepage = "https://usbguard.github.io/"; license = licenses.gpl2Plus; maintainers = [ maintainers.tnias ]; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 91ecfc113cd0..73b1ba01844a 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,17 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, libevent }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, openssl +, libevent +, pkg-config +, libprom +, libpromhttp +, libmicrohttpd +}: stdenv.mkDerivation rec { pname = "coturn"; - version = "4.5.1.3"; + version = "4.5.2"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = version; - sha256 = "1801931k4qdvc7jvaqxvjyhbh1xsvjz0pjajf6xc222n4ggar1q5"; + sha256 = "1s7ncc82ny4bb3qkn3fqr0144xsr7h2y8xmzsf5037h6j8f7j3v8"; }; - buildInputs = [ openssl libevent ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + openssl + libevent + libprom + libpromhttp + libmicrohttpd + ]; patches = [ ./pure-configure.patch @@ -23,6 +40,6 @@ stdenv.mkDerivation rec { description = "A TURN server"; platforms = platforms.all; broken = stdenv.isDarwin; # 2018-10-21 - maintainers = [ maintainers.ralith ]; + maintainers = with maintainers; [ ralith _0x4A6F ]; }; } diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 61f41daf2423..8830b0d7e04f 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1rfaa4b34mijlqxi9savzjplk1z83rs1z8iyx89zbw21fyry08kb"; + sha256 = "0ziz7cipi3m4aiba6ljz8419w2rps20rii6nwv0pyq5j7qvlvnqp"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "15izl7bvv7m96nyrs93b60fivr7gi2i306ryq6ynxrbq0nq43iya"; + sha256 = "1a9mqhqzmn0zfc1ab6jmac15yn192cmqkijw34di3ld6syqvaziw"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "322.0.0"; + version = "323.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 01b82dde4d51..92752335d320 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -1,22 +1,30 @@ { lib , python3 , glibcLocales -, fetchpatch }: with python3.pkgs; buildPythonApplication rec { pname = "mycli"; - version = "1.22.2"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "1lq2x95553vdmhw13cxcgsd2g2i32izhsb7hxd4m1iwf9b3msbpv"; + sha256 = "sha256-k1UHpEoszThUvoL4h59vGZ71bAx26VJ0iT/YuVQk/Lk="; }; propagatedBuildInputs = [ - paramiko pymysql configobj sqlparse prompt_toolkit pygments click pycrypto cli-helpers + cli-helpers + click + configobj + paramiko + prompt_toolkit + pycrypto + pygments + pymysql + pyperclip + sqlparse ]; checkInputs = [ pytest mock glibcLocales ]; @@ -29,15 +37,6 @@ buildPythonApplication rec { --ignore=mycli/packages/paramiko_stub/__init__.py ''; - patches = [ - # TODO: remove with next release (v1.22.3 or v1.23) - (fetchpatch { - url = "https://github.com/dbcli/mycli/commit/17f093d7b70ab2d9f3c6eababa041bf76f029aac.patch"; - sha256 = "sha256-VwfbtzUtElV+ErH+NJb+3pRtSaF0yVK8gEWCvlzZNHI="; - excludes = [ "changelog.md" "mycli/AUTHORS" ]; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "sqlparse>=0.3.0,<0.4.0" "sqlparse" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f8ac68cfd49..42627e9025d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18407,6 +18407,8 @@ in batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { }; + beefi = callPackage ../os-specific/linux/beefi { }; + blktrace = callPackage ../os-specific/linux/blktrace { }; bluez5 = callPackage ../os-specific/linux/bluez { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3fe9360dd098..cb786ff781ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7869,6 +7869,8 @@ in { update-dotdee = callPackage ../development/python-modules/update-dotdee { }; + upnpy = callPackage ../development/python-modules/upnpy { }; + uproot3 = callPackage ../development/python-modules/uproot3 { }; uproot3-methods = callPackage ../development/python-modules/uproot3-methods { }; |