From c0b5d5bb9e857594b4b1f77be351e8bb4cec840f Mon Sep 17 00:00:00 2001 From: davidak Date: Mon, 15 Mar 2021 22:47:40 +0100 Subject: [PATCH 01/31] doc: add instructions to remove a package Co-authored-by: Sandro Co-authored-by: Ben Siraphob --- .../submitting-changes.chapter.md | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 44e981f12a5..5293e104a37 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -82,6 +82,52 @@ If a security fix applies to both master and a stable release then, similar to r Critical security fixes may by-pass the staging branches and be delivered directly to release branches such as `master` and `release-*`. +## Deprecating/removing packages {#submitting-changes-deprecating-packages} + +There is currently no policy when to remove a package. + +Before removing a package, one should try to find a new maintainer or fix smaller issues first. + +### Steps to remove a package from Nixpkgs + +We use jbidwatcher as an example for a discontinued project here. + +1. Have Nixpkgs checked out locally and up to date. +1. Create a new branch for your change, e.g. `git checkout -b jbidwatcher` +1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher` +1. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`). +1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/misc/vim-plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.) + + For example in this case: + ``` + jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15 + ``` + + The throw message should explain in short why the package was removed for users that still have it installed. + +1. Test if the changes introduced any issues by running `nix-env -qaP -f . --show-trace`. It should show the list of packages without errors. +1. Commit the changes. Explain again why the package was removed. If it was declared discontinued upstream, add a link to the source. + + ```ShellSession + $ git add pkgs/applications/misc/jbidwatcher/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/aliases.nix + $ git commit + ``` + + Example commit message: + + ``` + jbidwatcher: remove + + project was discontinued in march 2021. the program does not work anymore because ebay changed the login. + + https://web.archive.org/web/20210315205723/http://www.jbidwatcher.com/ + ``` + +1. Push changes to your GitHub fork with `git push` +1. Create a pull request against Nixpkgs. Mention the package maintainer. + +This is how the pull request looks like in this case: [https://github.com/NixOS/nixpkgs/pull/116470](https://github.com/NixOS/nixpkgs/pull/116470) + ## Pull Request Template {#submitting-changes-pull-request-template} The pull request template helps determine what steps have been made for a contribution so far, and will help guide maintainers on the status of a change. The motivation section of the PR should include any extra details the title does not address and link any existing issues related to the pull request. From 765296d96fcf6568d1500d16b6159019636ab724 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 21 Apr 2021 08:32:28 +1000 Subject: [PATCH 02/31] nix-update: 0.3.2 -> 0.4.0 https://github.com/Mic92/nix-update/releases/tag/0.4.0 --- pkgs/tools/package-management/nix-update/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 3c420a55652..296f3be49cc 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -3,21 +3,23 @@ , fetchFromGitHub , nixFlakes , nix-prefetch +, nixpkgs-fmt +, nixpkgs-review }: buildPythonApplication rec { pname = "nix-update"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "1ykxr0yah7zl06igm7wiji9zx3y0xpjc37hbfhn6gnir6ssa0kqp"; + sha256 = "sha256-n3YuNypKFaBtO5Fhf7Z3Wgh0+WH5bQWR0W0uHCYKtuY="; }; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch ]) + "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch nixpkgs-fmt nixpkgs-review ]) ]; checkPhase = '' From 444ea090dafb85868fca189fbf371b28ec2f08f9 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 17 Apr 2021 10:15:06 -0700 Subject: [PATCH 03/31] honeytrap: init at unstable-2020-12-10 --- pkgs/tools/security/honeytrap/default.nix | 28 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/security/honeytrap/default.nix diff --git a/pkgs/tools/security/honeytrap/default.nix b/pkgs/tools/security/honeytrap/default.nix new file mode 100644 index 00000000000..735d5d69bd8 --- /dev/null +++ b/pkgs/tools/security/honeytrap/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule { + pname = "honeytrap"; + version = "unstable-2020-12-10"; + + src = fetchFromGitHub { + owner = "honeytrap"; + repo = "honeytrap"; + rev = "affd7b21a5aa1b57f086e6871753cb98ce088d76"; + sha256 = "y1SWlBFgX3bFoSRGJ45DdC1DoIK5BfO9Vpi2h57wWtU="; + }; + + # Otherwise, will try to install a "scripts" binary; it's only used in + # dockerize.sh, which we don't care about. + subPackages = [ "." ]; + + vendorSha256 = "W8w66weYzCpZ+hmFyK2F6wdFz6aAZ9UxMhccNy1X1R8="; + + meta = with lib; { + description = "Advanced Honeypot framework"; + homepage = "https://github.com/honeytrap/honeytrap"; + license = licenses.asl20; + maintainers = teams.determinatesystems.members; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13be95c1d87..689175e4391 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29006,6 +29006,8 @@ in hologram = callPackage ../tools/security/hologram { }; + honeytrap = callPackage ../tools/security/honeytrap { }; + tini = callPackage ../applications/virtualization/tini {}; ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; From a2dd59e0ff0639cdbe413c4fd456a22bbd0c88a4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 21 Apr 2021 15:00:23 +0200 Subject: [PATCH 04/31] chromium: 90.0.4430.72 -> 90.0.4430.85 https://chromereleases.googleblog.com/2021/04/stable-channel-update-for-desktop_20.html This update includes 7 security fixes. Google is aware of reports that exploits for CVE-2021-21224 exist in the wild. CVEs: CVE-2021-21222 CVE-2021-21223 CVE-2021-21224 CVE-2021-21225 CVE-2021-21226 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index dd22d989963..92fa271bff6 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "90.0.4430.72", - "sha256": "0hw916j55lm3qnidfp92i8w6zywdd47rhihn9pn23b7ziz58ik55", - "sha256bin64": "0k1m786b94kh7r2c58qj8b9a39yr4m30kkrxk5d9q7dn1abl3wa3", + "version": "90.0.4430.85", + "sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81", + "sha256bin64": "0li9w6zfsmx5r90jm5v5gfv3l2a76jndg6z5jvb9yx9xvrp9gpir", "deps": { "gn": { "version": "2021-02-09", From a9a31573e444f6b3511b9d537e947a530a770e54 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Wed, 21 Apr 2021 17:12:48 +0200 Subject: [PATCH 05/31] phpPackages.composer: 2.0.11 -> 2.0.12 --- pkgs/development/php-packages/composer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index d704b5f9a27..a7be06f1d04 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.0.11"; + version = "2.0.12"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-6r8pFwcglqlGeRk3YlATGeYh4rNppKElaywn9OaYRHc="; + sha256 = "sha256-guqMFTfPrOt+VvYATHzN+Z3a/OcjfAc3TZIOY1cwpjE="; }; dontUnpack = true; From 9c39fef460574d2177d726b6bd7115debfedbeeb Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 21 Apr 2021 18:13:24 +0200 Subject: [PATCH 06/31] tor-browser-bundle-bin: 10.0.15 -> 10.0.16 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index b4ca094be13..3f3eec49c94 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -88,19 +88,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.15"; + version = "10.0.16"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "1ah69jmfgik063f9gkvyv9d4k706pqihmzc4k7cc95zyd17v8wrs"; + sha256 = "07h2gd6cwwq17lrwjpfah1xvr8ny8700qvi971qacrr7ssicw2pw"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "0gyhxfs4qpg6ys038d52cxnmb4khbng1w4hcsavi2rlgv18bz75p"; + sha256 = "145kniiby5nnd0ll3v2gggzxz52bqbrdp72hvh96i8qnzi0fq25a"; }; }; in From ff06494b48f22f6e445317258c9ec7ce41ac9abb Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Wed, 21 Apr 2021 18:11:23 +0200 Subject: [PATCH 07/31] python3Packages.untokenize: init at 0.1.1 --- .../python-modules/untokenize/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/untokenize/default.nix diff --git a/pkgs/development/python-modules/untokenize/default.nix b/pkgs/development/python-modules/untokenize/default.nix new file mode 100644 index 00000000000..55becfeac4e --- /dev/null +++ b/pkgs/development/python-modules/untokenize/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "untokenize"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "3865dbbbb8efb4bb5eaa72f1be7f3e0be00ea8b7f125c69cbd1f5fda926f37a2"; + }; + + checkPhase = "${python.interpreter} -m unittest discover"; + + meta = with lib; { + description = "Transforms tokens into original source code while preserving whitespace"; + homepage = "https://github.com/myint/untokenize"; + license = licenses.mit; + maintainers = with maintainers; [ FlorianFranzen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59e57c5298c..3d971780450 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8751,6 +8751,8 @@ in { untangle = callPackage ../development/python-modules/untangle { }; + untokenize = callPackage ../development/python-modules/untokenize { }; + upass = callPackage ../development/python-modules/upass { }; update_checker = callPackage ../development/python-modules/update_checker { }; From 71ccdd243fc6b6e5df94452712e05be397ab411b Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 21 Apr 2021 19:58:15 +0200 Subject: [PATCH 08/31] vapoursynth: R52 -> R53 --- pkgs/development/libraries/vapoursynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 8ef209fe805..3b6362f7396 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -10,13 +10,13 @@ with lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R52"; + version = "R53"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4"; + sha256 = "0qcsfkpkry0cmvi60khjwvfz4fqhy23nqmn4pb9qrwll26sn9dcr"; }; patches = [ From 3ff8a6406e30b1a1a01562f45f10d56b06c0abb9 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Wed, 21 Apr 2021 18:28:16 +0200 Subject: [PATCH 09/31] python3Packages.unify: init at 0.5 --- .../python-modules/unify/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/unify/default.nix diff --git a/pkgs/development/python-modules/unify/default.nix b/pkgs/development/python-modules/unify/default.nix new file mode 100644 index 00000000000..a1061ad9df9 --- /dev/null +++ b/pkgs/development/python-modules/unify/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, untokenize +, python +}: + +buildPythonPackage rec { + pname = "unify"; + version = "0.5"; + + # PyPi release is missing tests (see https://github.com/myint/unify/pull/18) + src = fetchFromGitHub { + owner = "myint"; + repo = "unify"; + rev = "v${version}"; + sha256 = "1l6xxygaigacsxf0g5f7w5gpqha1ava6mcns81kqqy6vw91pyrbi"; + }; + + propagatedBuildInputs = [ untokenize ]; + + checkPhase = "${python.interpreter} -m unittest discover"; + + meta = with lib; { + description = "Modifies strings to all use the same quote where possible"; + homepage = "https://github.com/myint/unify"; + license = licenses.mit; + maintainers = with maintainers; [ FlorianFranzen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d971780450..f6d3728ba3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8733,6 +8733,8 @@ in { unifi = callPackage ../development/python-modules/unifi { }; + unify = callPackage ../development/python-modules/unify { }; + unifiled = callPackage ../development/python-modules/unifiled { }; units = callPackage ../development/python-modules/units { }; From a24fb17c960c670a42a263c7c708e31e9ce225fb Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Wed, 21 Apr 2021 20:12:38 +0200 Subject: [PATCH 10/31] binwalk: init from python3Packages.binwalk --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad15c084ab..7ccffd6365b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1744,6 +1744,8 @@ in bindfs = callPackage ../tools/filesystems/bindfs { }; + binwalk = with python3Packages; toPythonApplication binwalk; + birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; bitbucket-cli = python2Packages.bitbucket-cli; From 36b6a70302649c020a25ac3bf0afac14ce7a564c Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Wed, 21 Apr 2021 20:07:10 +0200 Subject: [PATCH 11/31] unify: init from python3Packages.unify --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad15c084ab..05ec02277c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3454,6 +3454,8 @@ in unifdef = callPackage ../development/tools/misc/unifdef { }; + unify = with python3Packages; toPythonApplication unify; + unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; From a0b99746691a5432faf210b87ccef1c2040648e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 21 Apr 2021 20:17:35 +0200 Subject: [PATCH 12/31] cinnamon.cinnamon-common: fix build regression It's probably fallout from PR #118479 --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 127516e58c1..65eede25832 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -19,6 +19,7 @@ , libsoup , libstartup_notification , libXtst +, libXdamage , muffin , networkmanager , pkg-config @@ -79,6 +80,7 @@ stdenv.mkDerivation rec { libsoup libstartup_notification libXtst + libXdamage muffin networkmanager pkg-config From acf90e478d970767da3b42652e99598f6dc414bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 21 Apr 2021 20:33:51 +0200 Subject: [PATCH 13/31] mate.marco: fix build regression It's probably fallout from PR #118479. Whole `mate` builds for me now. --- pkgs/desktops/mate/marco/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 3c16004010c..e06379b9107 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop +, libXdamage, libXpresent, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "marco"; @@ -20,6 +21,8 @@ stdenv.mkDerivation rec { libxml2 libcanberra-gtk3 libgtop + libXdamage + libXpresent libstartup_notification gtk3 gnome3.zenity From 96bf6939b3fc0da5ca6185c88080dd3a54f49335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 21 Apr 2021 21:42:13 +0200 Subject: [PATCH 14/31] keybase-gui: fix build regression autoPatchelf wasn't finding some libraries anymore. It was probably fallout from PR #118479. --- pkgs/tools/security/keybase/gui.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index cfc282c303c..8894a77a86a 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev +{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev, libdrm, mesa , dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libappindicator-gtk3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook , runtimeShell, gsettings-desktop-schemas }: @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { xorg.libXrender xorg.libXtst xorg.libxcb + libdrm + mesa.out ]; runtimeDependencies = [ From 5ff547e729631db540ab7207471baba01ec09312 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 21 Apr 2021 21:49:48 +0200 Subject: [PATCH 15/31] nixos/ipfs: fix typo in comment This typo was introduced in 4044d81d5cea617e58ec9682f9cc447dde326850. --- nixos/modules/services/network-filesystems/ipfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 2082d513161..88d355ff32c 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -296,7 +296,7 @@ in { systemd.sockets.ipfs-api = { wantedBy = [ "sockets.target" ]; - # We also include "%t/ipfs.sock" because tere is no way to put the "%t" + # We also include "%t/ipfs.sock" because there is no way to put the "%t" # in the multiaddr. socketConfig.ListenStream = let fromCfg = multiaddrToListenStream cfg.apiAddress; From e205a4800fda0a61b50946d351d4ae635fa0fb75 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 21 Apr 2021 21:56:21 +0200 Subject: [PATCH 16/31] nixos/cpu-freq: fix typo in description This typo was introduced when the option was first added in 2011, almost 10 years ago (ae82e7b048e8ef1f402e0e9cfbaf3b1d04bf8052). --- nixos/modules/tasks/cpu-freq.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix index 513382936e4..f1219c07c50 100644 --- a/nixos/modules/tasks/cpu-freq.nix +++ b/nixos/modules/tasks/cpu-freq.nix @@ -19,7 +19,7 @@ in default = null; example = "ondemand"; description = '' - Configure the governor used to regulate the frequence of the + Configure the governor used to regulate the frequency of the available CPUs. By default, the kernel configures the performance governor, although this may be overwritten in your hardware-configuration.nix file. From fb8c527586523cdedc249ab4060809c7164711e3 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 20 Apr 2021 13:10:36 +0200 Subject: [PATCH 17/31] ocamlPackages.irmin: 2.5.2 -> 2.5.3 https://github.com/mirage/irmin/releases/tag/2.5.3 --- pkgs/development/ocaml-modules/irmin/ppx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index abb21fd7c53..7c59e1eaef3 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "ac8d75144cafdaf4b5e106b540a27338245510b7e33a8c412d393c9d50cae490"; + sha256 = "2c8ef24cc57379c3a138f121fea350ee7b6077abc22a4fdc6a47d0c81585f3f6"; }; minimumOCamlVersion = "4.08"; From 529ecceaa66aa91008db5c331877eb4303cb0e3d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 21 Apr 2021 13:50:26 +0000 Subject: [PATCH 18/31] =?UTF-8?q?jenkins:=202.277.2=20=E2=86=92=202.277.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 669dc846e10..5373b2d359b 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.277.2"; + version = "2.277.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "08lv5v5kxp9ln798gjmh8j9a8r8xc471fbhiz2l7gxncpxn50ga2"; + sha256 = "1awixb55bkpqcvf2s59aph3kxdd70g9x1a5s5kly33kwrplcf8iy"; }; buildCommand = '' From bde376538ec37774424410ee68cad1d2312cca80 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 22 Apr 2021 06:46:01 +1000 Subject: [PATCH 19/31] podman: 3.1.1 -> 3.1.2 https://github.com/containers/podman/releases/tag/v3.1.2 --- pkgs/applications/virtualization/podman/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 956baea8856..c8b8467def5 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , pkg-config , installShellFiles @@ -16,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "1ihpz50c50frw9nrjp0vna2lg50kwlar6y6vr4s5sjiwza1qv2d2"; + sha256 = "sha256-PS41e7myv5xCSJIeT+SRj4rLVCXpthq7KeHisYoSiOE="; }; patches = [ From d0b4feab81c73dfb150ecf6f9b3c60e442f46f72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Apr 2021 22:51:08 +0200 Subject: [PATCH 20/31] python3Packages.pysonos: 0.0.40 -> 0.0.43 --- pkgs/development/python-modules/pysonos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 704f3c44c4e..308dd4e7f25 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.40"; + version = "0.0.43"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "v${version}"; - sha256 = "0a0c7jwv39nbvpdcx32sd8kjmj4nyrd7k0yxhpmxdnx4zr4vvzqg"; + sha256 = "sha256-OobKlAymXXvQH6m77Uqn2eoTlWgs8EBxYIDFJ5wwMKA="; }; propagatedBuildInputs = [ ifaddr requests xmltodict ]; From cf3102118b6fc909f677b63976d0c570c2162743 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 21 Apr 2021 22:58:05 +0200 Subject: [PATCH 21/31] cryptomator: 1.5.14 -> 1.5.15 --- pkgs/tools/security/cryptomator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 465e05077b2..ec18a5ed10c 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -6,20 +6,20 @@ let pname = "cryptomator"; - version = "1.5.14"; + version = "1.5.15"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - sha256 = "05zgan1i2dzipzw8x510lg2l40dz9hvk43nrwpi0kg9l1qs9sxrq"; + sha256 = "06n7wda7gfalvsg1rlcm51ss73nlbhh95z6zq18yvn040clkzkij"; }; icons = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator-linux"; rev = version; - sha256 = "0gb5sd5bkpxv4hff1i09rxr90pi5d15vjsfrk9m8221xiypqmccp"; + sha256 = "1sqbx858zglv0xkpjya0cpbkxf2hkj1xvxhnir3176y2xyjv6aib"; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) @@ -44,7 +44,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0gvpjc77g99vcwk77nknvg8z33xbskcfwx3015nhhc089b2frq02"; + outputHash = "195ysv9l861y9d1lvmvi7wmk172ynlba9n233blpaigq88cjn208"; }; in stdenv.mkDerivation rec { From 6d44df98607b1a65730e1dc629ea8a18adec5dc6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Apr 2021 23:17:02 +0200 Subject: [PATCH 22/31] python3Packages.hyperion-py: init at 0.7.4 --- .../python-modules/hyperion-py/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/hyperion-py/default.nix diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix new file mode 100644 index 00000000000..c282be29c65 --- /dev/null +++ b/pkgs/development/python-modules/hyperion-py/default.nix @@ -0,0 +1,52 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, poetry-core +, pytest-aiohttp +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "hyperion-py"; + version = "0.7.4"; + disabled = pythonOlder "3.8"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dermotduffy"; + repo = pname; + rev = "v${version}"; + sha256 = "00x12ppmvlxs3qbdxq06wnzakvwm2m39qhmpp27qfpl137b0qqyj"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-asyncio + pytest-aiohttp + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --timeout=9 --cov=hyperion" "" + ''; + + pythonImportsCheck = [ "hyperion" ]; + + meta = with lib; { + description = "Python package for Hyperion Ambient Lighting"; + homepage = "https://github.com/dermotduffy/hyperion-py"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01219719acc..8448cc56070 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3245,6 +3245,8 @@ in { hyperframe = callPackage ../development/python-modules/hyperframe { }; + hyperion-py = callPackage ../development/python-modules/hyperion-py { }; + hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { }; hyperlink = callPackage ../development/python-modules/hyperlink { }; From eaeade4e2c3881afd3c23268f2a5e2c65ac5f186 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Apr 2021 23:17:59 +0200 Subject: [PATCH 23/31] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 97aa0d5c64a..b71be6be6dd 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -373,7 +373,7 @@ "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti "hydrawise" = ps: with ps; [ hydrawiser ]; - "hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py + "hyperion" = ps: with ps; [ hyperion-py ]; "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ iaqualink ]; "icloud" = ps: with ps; [ pyicloud ]; From c14b8f6fc0fbf0dbea06f43981cbef6a75c4913d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Apr 2021 23:19:47 +0200 Subject: [PATCH 24/31] home-assistant: enable hyperion tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9e4b5271d0c..f3d312cd3f5 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -261,6 +261,7 @@ in with py.pkgs; buildPythonApplication rec { "html5" "http" "hue" + "hyperion" "iaqualink" "ifttt" "image" From e967fbf6f7cd0d8de4e4ca933e39919c9551f5c9 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Sat, 10 Apr 2021 21:16:29 +0200 Subject: [PATCH 25/31] texmacs: 1.99.18 -> 1.99.19 --- pkgs/applications/editors/texmacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index dd5e5e61b29..d628eeadab6 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -16,7 +16,7 @@ let pname = "TeXmacs"; - version = "1.99.18"; + version = "1.99.19"; common = callPackage ./common.nix { inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; @@ -26,7 +26,7 @@ mkDerivation { src = fetchurl { url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - sha256 = "0il3fwgw20421aj90wg8kyhkwk6lbgb3bb2g5qamh5lk90yj725i"; + sha256 = "1izwqb0z4gqiglv57mjswk6sjivny73kd2sxrf3nmj7wr12pn5m8"; }; nativeBuildInputs = [ cmake pkg-config ]; From 5119a3386cf7f4209311d98c213299b44f5b70c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Apr 2021 23:47:30 +0200 Subject: [PATCH 26/31] python3Packages.tailer: init at 0.4.1 --- .../python-modules/tailer/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/tailer/default.nix diff --git a/pkgs/development/python-modules/tailer/default.nix b/pkgs/development/python-modules/tailer/default.nix new file mode 100644 index 00000000000..b8e19b7d97d --- /dev/null +++ b/pkgs/development/python-modules/tailer/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "tailer"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "six8"; + repo = "pytailer"; + rev = version; + sha256 = "1s5p5m3q9k7r1m0wx5wcxf20xzs0rj14qwg1ydwhf6adr17y2w5y"; + }; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m doctest -v src/tailer/__init__.py + runHook postCheck + ''; + + pythonImportsCheck = [ "tailer" ]; + + meta = with lib; { + description = "Python implementation implementation of GNU tail and head"; + homepage = "https://github.com/six8/pytailer"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01219719acc..9177faa2f92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8284,6 +8284,8 @@ in { tahoma-api = callPackage ../development/python-modules/tahoma-api { }; + tailer = callPackage ../development/python-modules/tailer { }; + tarman = callPackage ../development/python-modules/tarman { }; tasklib = callPackage ../development/python-modules/tasklib { }; From af2ff60af0c083a8f890fbfc78fef0d571444d5a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Apr 2021 23:52:59 +0200 Subject: [PATCH 27/31] python3Packages.dsmr-parser: init at 0.29 --- .../python-modules/dsmr-parser/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/dsmr-parser/default.nix diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix new file mode 100644 index 00000000000..155927368ee --- /dev/null +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pyserial-asyncio +, pytestCheckHook +, pytz +, tailer +}: + +buildPythonPackage rec { + pname = "dsmr-parser"; + version = "0.29"; + + src = fetchFromGitHub { + owner = "ndokter"; + repo = "dsmr_parser"; + rev = "v${version}"; + sha256 = "11d6cwmabzc8p6jkqwj72nrj7p6cxbvr0x3jdrxyx6zki8chyw4p"; + }; + + propagatedBuildInputs = [ + pyserial + pyserial-asyncio + pytz + tailer + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "dsmr_parser" ]; + + meta = with lib; { + description = "Python module to parse Dutch Smart Meter Requirements (DSMR)"; + homepage = "https://github.com/ndokter/dsmr_parser"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9177faa2f92..f2f7369b7ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2109,6 +2109,8 @@ in { ds4drv = callPackage ../development/python-modules/ds4drv { }; + dsmr-parser = callPackage ../development/python-modules/dsmr-parser { }; + dtopt = callPackage ../development/python-modules/dtopt { }; duckdb = callPackage ../development/python-modules/duckdb { From d4c673e80a7108cec9bc60b4850c6c74562c8ff2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Apr 2021 23:53:47 +0200 Subject: [PATCH 28/31] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 97aa0d5c64a..59acf801627 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -187,7 +187,7 @@ "doorbird" = ps: with ps; [ aiohttp-cors ]; # missing inputs: doorbirdpy "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ ]; - "dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser + "dsmr" = ps: with ps; [ dsmr-parser ]; "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "dte_energy_bridge" = ps: with ps; [ ]; "dublin_bus_transport" = ps: with ps; [ ]; From 811cde032053ac38345ee9238c66b06bb86fe915 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Apr 2021 23:55:09 +0200 Subject: [PATCH 29/31] home-assistant: enable dsmr tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9e4b5271d0c..d421c2256b7 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -228,6 +228,7 @@ in with py.pkgs; buildPythonApplication rec { "devolo_home_control" "dhcp" "discovery" + "dsmr" "econet" "emulated_hue" "esphome" From b07b0deed5433e3b6bb5ef10f1e455290479c104 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 21 Apr 2021 08:30:26 +1000 Subject: [PATCH 30/31] nixpkgs-review: 2.5.0 -> 2.6.0 https://github.com/Mic92/nixpkgs-review/releases/tag/2.6.0 --- pkgs/tools/package-management/nixpkgs-review/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index d3fcac6277f..2229e0c6a1d 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -7,19 +7,21 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "1k4i54j5if86qf9dmwm8ybfc4j7ap40y82f03hxfxb7lzq5cqmcv"; + sha256 = "sha256-096oSvc9DidURGKE0FNEBOQz82+RGg6aJo8o9HhaSp0="; }; makeWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes git ]) ]; + doCheck = false; + meta = with lib; { description = "Review pull-requests on https://github.com/NixOS/nixpkgs"; homepage = "https://github.com/Mic92/nixpkgs-review"; From 25ef296a8ca511fb7c7623771011e8ccb916f590 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 Apr 2021 01:07:27 +0200 Subject: [PATCH 31/31] python-packages.nix: remove trailing whitespace satisfies editorconfig action. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c8841b12a3..7895757e23b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2031,7 +2031,7 @@ in { ds-store = callPackage ../development/python-modules/ds-store { }; ds4drv = callPackage ../development/python-modules/ds4drv { }; - + dsmr-parser = callPackage ../development/python-modules/dsmr-parser { }; duckdb = callPackage ../development/python-modules/duckdb {