From 82a6b7b258da754be9155519edc3d632edc3fb9a Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 26 Jan 2021 22:49:13 +0100 Subject: [PATCH 001/119] trousers: 0.3.14 -> 0.3.15 Fix CVE-2020-24332, CVE-2020-24330 and CVE-2020-24331. --- .../trousers/allow-non-tss-config-file-owner.patch | 4 ++-- pkgs/tools/security/trousers/default.nix | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch b/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch index 774a14f72ba..391eb1ad589 100644 --- a/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch +++ b/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch @@ -7,10 +7,10 @@ diff -ur trousers-0.3.11.2.orig/src/tcsd/tcsd_conf.c trousers-0.3.11.2/src/tcsd/ +#ifndef ALLOW_NON_TSS_CONFIG_FILE /* make sure user/group TSS owns the conf file */ - if (pw->pw_uid != stat_buf.st_uid || grp->gr_gid != stat_buf.st_gid) { + if (stat_buf.st_uid != 0 || grp->gr_gid != stat_buf.st_gid) { LogError("TCSD config file (%s) must be user/group %s/%s", tcsd_config_file, @@ -775,6 +776,7 @@ - LogError("TCSD config file (%s) must be mode 0600", tcsd_config_file); + LogError("TCSD config file (%s) must be mode 0640", tcsd_config_file); return TCSERR(TSS_E_INTERNAL_ERROR); } +#endif diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index c7a11e16f39..16536409b5e 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -1,17 +1,15 @@ -{ lib, stdenv, fetchurl, openssl, pkg-config }: +{ lib, stdenv, fetchurl, openssl, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "trousers"; - version = "0.3.14"; + version = "0.3.15"; src = fetchurl { url = "mirror://sourceforge/trousers/trousers/${version}/${pname}-${version}.tar.gz"; - sha256 = "0iwgsbrbb7nfqgl61x8aailwxm8akxh9gkcwxhsvf50x4qx72l6f"; + sha256 = "0zy7r9cnr2gvwr2fb1q4fc5xnvx405ymcbrdv7qsqwl3a4zfjnqy"; }; - sourceRoot = "."; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl ]; patches = [ ./allow-non-tss-config-file-owner.patch ]; From a20706a61ef3101a9c852fcf8c10c004582e8d9f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 16:29:48 +0000 Subject: [PATCH 002/119] sqlcipher: 4.4.2 -> 4.4.3 --- pkgs/development/libraries/sqlcipher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 9097d5abe54..44da759409e 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -4,13 +4,13 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "0zhww6fpnfflnzp6091npz38ab6cpq75v3ghqvcj5kqg09vqm5na"; + sha256 = "sha256-E23PTNnVZbBQtHL0YjUwHNVUA76XS8rlARBOVvX6zZw="; }; nativeBuildInputs = [ installShellFiles ]; From 9acbc0c674c9161b9c810e3a41eddafca54168cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 1 Apr 2021 12:30:38 -0300 Subject: [PATCH 003/119] mate: define mateUpdateScript attribute --- pkgs/desktops/mate/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 10c278c8bf9..291d26afcd5 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -1,10 +1,18 @@ -{ newScope }: +{ pkgs, newScope }: let callPackage = newScope self; self = rec { + # Update script tailored to mate packages from git repository + mateUpdateScript = { pname, version, odd-unstable ? true, url ? "https://pub.mate-desktop.org/releases" }: + pkgs.genericUpdater { + inherit pname version odd-unstable; + attrPath = "mate.${pname}"; + versionLister = "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions ${url}"; + }; + atril = callPackage ./atril { }; caja = callPackage ./caja { }; caja-dropbox = callPackage ./caja-dropbox { }; From 8a3c28afb5c54df9c381d36751785618e9139e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 1 Apr 2021 13:07:58 -0300 Subject: [PATCH 004/119] mate: remove old update script --- pkgs/desktops/mate/update.sh | 64 ------------------------------------ 1 file changed, 64 deletions(-) delete mode 100755 pkgs/desktops/mate/update.sh diff --git a/pkgs/desktops/mate/update.sh b/pkgs/desktops/mate/update.sh deleted file mode 100755 index d214e07f8cd..00000000000 --- a/pkgs/desktops/mate/update.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p libarchive curl common-updater-scripts - -set -eu -o pipefail - -cd "$(dirname "${BASH_SOURCE[0]}")" -root=../../.. -export NIXPKGS_ALLOW_UNFREE=1 - -mate_version=1.24 -theme_version=3.22 -materepo=https://pub.mate-desktop.org/releases/${mate_version} -themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version} - -version() { - (cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"') -} - -update_package() { - local p=$1 - echo $p - echo "# $p" >> git-commits.txt - - local repo - if [ "$p" = "mate-themes" ]; then - repo=$themerepo - else - repo=$materepo - fi - - local p_version_old=$(version mate.$p) - local p_versions=$(curl -sS ${repo}/ | sed -rne "s/.*\"$p-([0-9]+\\.[0-9]+\\.[0-9]+)\\.tar\\.xz.*/\\1/p") - local p_version=$(echo $p_versions | sed -e 's/ /\n/g' | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -n1) - - if [[ -z "$p_version" ]]; then - echo "unavailable $p" - echo "# $p not found" >> git-commits.txt - echo - return - fi - - if [[ "$p_version" = "$p_version_old" ]]; then - echo "nothing to do, $p $p_version is current" - echo - return - fi - - # Download package and save hash and file path. - local url="$repo/$p-${p_version}.tar.xz" - mapfile -t prefetch < <(nix-prefetch-url --print-path "$url") - local hash=${prefetch[0]} - local path=${prefetch[1]} - echo "$p: $p_version_old -> $p_version" - (cd "$root" && update-source-version mate.$p "$p_version" "$hash") - echo " git add pkgs/desktops/mate/$p" >> git-commits.txt - echo " git commit -m \"mate.$p: $p_version_old -> $p_version\"" >> git-commits.txt - echo -} - -for d in $(ls -A --indicator-style=none); do - if [ -d $d ]; then - update_package $d - fi -done From a191b2320c5270d1542d3ff04b947af0228b41bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 16:58:16 -0300 Subject: [PATCH 005/119] mate: add passthru update script --- pkgs/desktops/mate/atril/default.nix | 3 +++ pkgs/desktops/mate/caja-dropbox/default.nix | 4 +++- pkgs/desktops/mate/caja-extensions/default.nix | 4 +++- pkgs/desktops/mate/caja-with-extensions/default.nix | 2 +- pkgs/desktops/mate/caja/default.nix | 4 +++- pkgs/desktops/mate/engrampa/default.nix | 4 +++- pkgs/desktops/mate/eom/default.nix | 4 +++- pkgs/desktops/mate/libmatekbd/default.nix | 4 +++- pkgs/desktops/mate/libmatemixer/default.nix | 5 ++++- pkgs/desktops/mate/libmateweather/default.nix | 4 +++- pkgs/desktops/mate/marco/default.nix | 4 +++- pkgs/desktops/mate/mate-applets/default.nix | 4 +++- pkgs/desktops/mate/mate-backgrounds/default.nix | 4 +++- pkgs/desktops/mate/mate-calc/default.nix | 4 +++- pkgs/desktops/mate/mate-common/default.nix | 4 +++- pkgs/desktops/mate/mate-control-center/default.nix | 5 ++++- pkgs/desktops/mate/mate-desktop/default.nix | 4 +++- pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 4 +++- pkgs/desktops/mate/mate-icon-theme/default.nix | 4 +++- pkgs/desktops/mate/mate-indicator-applet/default.nix | 4 +++- pkgs/desktops/mate/mate-media/default.nix | 4 +++- pkgs/desktops/mate/mate-menus/default.nix | 4 +++- pkgs/desktops/mate/mate-netbook/default.nix | 4 +++- pkgs/desktops/mate/mate-notification-daemon/default.nix | 4 +++- pkgs/desktops/mate/mate-panel/default.nix | 4 +++- pkgs/desktops/mate/mate-polkit/default.nix | 4 +++- pkgs/desktops/mate/mate-power-manager/default.nix | 4 +++- pkgs/desktops/mate/mate-screensaver/default.nix | 4 +++- pkgs/desktops/mate/mate-sensors-applet/default.nix | 4 +++- pkgs/desktops/mate/mate-session-manager/default.nix | 4 +++- pkgs/desktops/mate/mate-settings-daemon/default.nix | 4 +++- pkgs/desktops/mate/mate-system-monitor/default.nix | 4 +++- pkgs/desktops/mate/mate-terminal/default.nix | 4 +++- pkgs/desktops/mate/mate-themes/default.nix | 7 ++++++- pkgs/desktops/mate/mate-tweak/default.nix | 8 ++++++++ pkgs/desktops/mate/mate-user-guide/default.nix | 4 +++- pkgs/desktops/mate/mate-user-share/default.nix | 4 +++- pkgs/desktops/mate/mate-utils/default.nix | 4 +++- pkgs/desktops/mate/mozo/default.nix | 4 +++- pkgs/desktops/mate/pluma/default.nix | 4 +++- pkgs/desktops/mate/python-caja/default.nix | 4 +++- 41 files changed, 131 insertions(+), 39 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 3f68da288c0..53bec98603b 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -17,6 +17,7 @@ , enablePostScript ? true, libspectre , enableXps ? true, libgxps , enableImages ? false +, mateUpdateScript }: with lib; @@ -67,6 +68,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "A simple multi-page document viewer for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 92176493afc..ded175db092 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, substituteAll , pkg-config, gobject-introspection, gdk-pixbuf -, gtk3, mate, python3, dropbox }: +, gtk3, mate, python3, dropbox, mateUpdateScript }: let dropboxd = "${dropbox}/bin/dropbox"; @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Dropbox extension for Caja file manager"; homepage = "https://github.com/mate-desktop/caja-dropbox"; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 64a036fd389..99438bdd610 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "caja-extensions"; @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Set of extensions for Caja file manager"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/caja-with-extensions/default.nix b/pkgs/desktops/mate/caja-with-extensions/default.nix index 35e3cd198f6..125e39d1f46 100644 --- a/pkgs/desktops/mate/caja-with-extensions/default.nix +++ b/pkgs/desktops/mate/caja-with-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ] }: +{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ], mateUpdateScript }: stdenv.mkDerivation { pname = "${caja.pname}-with-extensions"; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 890d3d61548..db1fafffa2a 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "caja"; @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "File manager for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 591cac7d886..26be2ec2bf3 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "engrampa"; @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "Archive Manager for MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 8b447f14d8b..c4760e1e6dc 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "eom"; @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "An image viewing and cataloging program for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 1b66bb97efe..92bfd4fe833 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier, mateUpdateScript }: stdenv.mkDerivation rec { pname = "libmatekbd"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Keyboard management library for MATE"; homepage = "https://github.com/mate-desktop/libmatekbd"; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 29d6127c3b3..bc44710e6e7 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -2,7 +2,8 @@ , alsaSupport ? stdenv.isLinux, alsaLib , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , ossSupport ? false - }: +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "libmatemixer"; @@ -23,6 +24,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Mixer library for MATE"; homepage = "https://github.com/mate-desktop/libmatemixer"; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 0f5deb8f550..a88ba7c6ed3 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata, mateUpdateScript }: stdenv.mkDerivation rec { pname = "libmateweather"; @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Library to access weather information from online services for MATE"; homepage = "https://github.com/mate-desktop/libmateweather"; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 3c16004010c..2ad91a6b8d4 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,4 @@ -{ 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, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "marco"; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "MATE default window manager"; homepage = "https://github.com/mate-desktop/marco"; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index bfa5a1a5d95..e2a324b9671 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-applets"; @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Applets for use with the MATE panel"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index b990a53b04a..26aedcc2818 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext }: +{ lib, stdenv, fetchurl, meson, ninja, gettext, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-backgrounds"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { ninja ]; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Background images and data for MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index 2805c86fe89..a5a71bcce56 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-calc"; @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Calculator for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index 7a2ac74522f..57f50ad8389 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-common"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "Common files for development of MATE packages"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 262ca75ac79..362eaf906b8 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, - desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook + desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook, + mateUpdateScript }: stdenv.mkDerivation rec { @@ -49,6 +50,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Utilities to configure the MATE desktop"; homepage = "https://github.com/mate-desktop/mate-control-center"; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 9102ae3e8b5..4270b0a1f92 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-desktop"; @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Library with common API for various MATE modules"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index fd280f3d96e..f0bca054ae8 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-icon-theme-faenza"; @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "Faenza icon theme from MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 530a7b66ff1..d6c16c1c717 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-icon-theme"; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "Icon themes from MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index a26b593101a..804bf2352d0 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-indicator-applet"; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { homepage = "https://github.com/mate-desktop/mate-indicator-applet"; description = "MATE panel indicator applet"; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index f4d8bd73884..fa6b6e4305a 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-media"; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Media tools for MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 1333af0cdd9..751dcd50859 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3 }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-menus"; @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Menu system for MATE"; homepage = "https://github.com/mate-desktop/mate-menus"; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 3912ab47c8e..dc10cca40a4 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-netbook"; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "MATE utilities for netbooks"; longDescription = '' diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 5e867085bb1..20461847d34 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3, - libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }: + libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-notification-daemon"; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Notification daemon for MATE Desktop"; homepage = "https://github.com/mate-desktop/mate-notification-daemon"; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 1ada0171911..e089811211c 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-panel"; @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "The MATE panel"; homepage = "https://github.com/mate-desktop/mate-panel"; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 67690161f55..174e2e46624 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-polkit"; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Integrates polkit authentication for MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index e0c46076a65..2bc98cb1cb0 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "The MATE Power Manager"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index fe309352346..ee59f6d8263 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-screensaver"; @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Screen saver and locker for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 6fed2a65444..4d0fd068af8 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { homepage = "https://github.com/mate-desktop/mate-sensors-applet"; description = "MATE panel applet for hardware sensors"; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 08a119ad8d2..74c36145de1 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd, libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate, - wrapGAppsHook, fetchpatch + wrapGAppsHook, fetchpatch, mateUpdateScript }: stdenv.mkDerivation rec { @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "mate" ]; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "MATE Desktop session manager"; homepage = "https://github.com/mate-desktop/mate-session-manager"; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 0a483269c5e..90b931403c7 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, gettext, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, - wrapGAppsHook }: + wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-settings-daemon"; @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "MATE settings daemon"; homepage = "https://github.com/mate-desktop/mate-settings-daemon"; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 2d89cb2494b..7e106cbd20d 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-system-monitor"; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "System monitor for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 48588cc6d6d..d17d2fafd1b 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-terminal"; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "The MATE Terminal Emulator"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 3c0d9cf1b02..b220478184a 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, mate-icon-theme, gtk2, gtk3, - gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }: + gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-themes"; @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { + inherit pname version; + url = "https://pub.mate-desktop.org/releases/themes"; + }; + meta = { description = "A set of themes from MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index ce97bc416e6..4f49b5f3002 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -9,6 +9,8 @@ , gobject-introspection , wrapGAppsHook , glib +, genericUpdater +, common-updater-scripts }: python3Packages.buildPythonApplication rec { @@ -72,6 +74,12 @@ python3Packages.buildPythonApplication rec { done ''; + passthru.updateScript = genericUpdater { + inherit pname version; + attrPath = "mate.${pname}"; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + }; + meta = with lib; { description = "Tweak tool for the MATE Desktop"; homepage = "https://github.com/ubuntu-mate/mate-tweak"; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 2a91cac5a54..d7c83cc9820 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp }: +{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-user-guide"; @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "MATE User Guide"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 8aa9591003c..6b653498ce3 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-user-share"; @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "User level public file sharing for the MATE desktop"; homepage = "https://github.com/mate-desktop/mate-user-share"; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index c58a3d4bc64..ac235168860 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-utils"; @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Utilities for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 4d893cd2e74..2487ed97f01 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: +{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection, mateUpdateScript }: python3.pkgs.buildPythonApplication rec { pname = "mozo"; @@ -20,6 +20,8 @@ python3.pkgs.buildPythonApplication rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "MATE Desktop menu editor"; homepage = "https://github.com/mate-desktop/mozo"; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index a879f2df5d1..2fa584b4598 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "pluma"; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "Powerful text editor for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 2c59d78e86a..8104da3420e 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages, mateUpdateScript }: stdenv.mkDerivation rec { pname = "python-caja"; @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Python binding for Caja components"; homepage = "https://github.com/mate-desktop/python-caja"; From 8c2f8c7aa805fb8f85d82dd9abbd23805f0c13cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 006/119] mate.caja: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/caja/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index db1fafffa2a..44721a2cab2 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "caja"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0"; + sha256 = "0ylgb4b31vwgqmmknrhm4m9gfa1rzb9azpdd9myi0hscrr3h22z5"; }; nativeBuildInputs = [ From d3022948ee33c242fa6953db7f65d759abd18526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 007/119] mate.atril: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/atril/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 53bec98603b..1a6d947153e 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -24,11 +24,11 @@ with lib; stdenv.mkDerivation rec { pname = "atril"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0967gxw7h2qh2kpwl0jgv58hicz6aa92kr12mnykbpikad25s95y"; + sha256 = "06nyicj96dqcv035yqnzmm6pk3m35glxj0ny6lk1vwqkk2l750xl"; }; nativeBuildInputs = [ From 5ff5c807d6782da02fbea00420156708d14c6bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 008/119] mate.engrampa: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/engrampa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 26be2ec2bf3..6ba30c16f59 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "engrampa"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0akjnz85qkpiqgj1ccn41rzbfid4l3r3nsm4s9s779ilzd7f097y"; + sha256 = "0x26djz73g3fjwzcpr7k60xb6qx5izhw7lf2ggn34iwpihl0sa7f"; }; nativeBuildInputs = [ From a1579e8b7d1373762848dd42ee80415afa5592b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 009/119] mate.eom: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/eom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index c4760e1e6dc..75d37e5ea35 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eom"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0dralsc0dvs0l38cysdhx6kiaiqlb8qi6g9xz2cm6mjqyq3d3f9f"; + sha256 = "08rjckr1hdw7c31f2hzz3vq0rn0c5z3hmvl409y6k6ns583k1bgf"; }; nativeBuildInputs = [ From e623def756230623520911decafc7112f2b3cd29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 010/119] mate.marco: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/marco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 2ad91a6b8d4..c5e3372dc48 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "marco"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "109b41pjrc1b4slw6sx1lakdhrc46x829vczzk4bz3j15kcszg54"; + sha256 = "19s2y2s9immp86ni3395mgxl605m2wn10m8399y9qkgw2b5m10s9"; }; nativeBuildInputs = [ From 43a72457e023b5534eb32dfdd34fd0f3bea39b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 011/119] mate.mate-calc: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index a5a71bcce56..a3e8d3b5951 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-calc"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0imdimq5d5rjq8mkjcrsd683a2bn9acmhc0lmvyw71y0040inbaw"; + sha256 = "1yg8j0dqy37fljd20pwxdgna3f1v7k9wmdr9l4r1nqf4a7zwi96l"; }; nativeBuildInputs = [ From b7d8444898e93b7b5041a2458254d104b0ecccb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 012/119] mate.mate-control-center: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 362eaf906b8..b9c80180087 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "mate-control-center"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08bai47fsmbxlw2lhig9n6c8sxr24ixkd1spq3j0635yzcqighb0"; + sha256 = "18vsqkcl4n3k5aa05fqha61jc3133zw07gd604sm0krslwrwdn39"; }; nativeBuildInputs = [ From 5907b7cb413eb2901e9050f34086153b818b8dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 013/119] mate.mate-notification-daemon: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-notification-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 20461847d34..28497084fb6 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-notification-daemon"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ybzr8mni5pgrspf8hqnisd0r0hwdlgk7n5mzsh7xisbkgivpw2b"; + sha256 = "02mf9186cbziyvz7ycb0j9b7rn085a7f9hrm03n28q5kz0z1k92q"; }; nativeBuildInputs = [ From 00815c91035a72dac7433ec5435f93f02ecce2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 014/119] mate.mate-panel: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index e089811211c..c332b700227 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xblqrhfazd01h0jdmx4hvavkb7f9anbd4rjsk5r6wxhp027l64l"; + sha256 = "1sj851h71nq4ssrsd4k5b0vayxmspl5x3rhf488b2xpcj81vmi9h"; }; nativeBuildInputs = [ From 8228ca4025badfcb32d8f0c2a53c40853d985065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 015/119] mate.mate-power-manager: 1.24.2 -> 1.24.3 --- pkgs/desktops/mate/mate-power-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 2bc98cb1cb0..fe74cf2505a 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-power-manager"; - version = "1.24.2"; + version = "1.24.3"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fni41p3kraxwjnx9l5mdspng0zib1gfdxwlaiyq31mh4g79yjyj"; + sha256 = "1rmcrpii3hl35qjznk6h5cq72n60cs12n294hjyakxr9kvgns7l6"; }; nativeBuildInputs = [ From 48752e4e3981ca5249d86579c854f11935acd707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 016/119] mate.mate-screensaver: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-screensaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index ee59f6d8263..f132bbcd26d 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-screensaver"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0imb1z2yvz1h95dzq396c569kkxys9mb2dyc6qxxxcnc5w02a2dw"; + sha256 = "18hxhglryfcbpbns9izigiws7lvdv5dnsaaz226ih3aar5db1ysy"; }; nativeBuildInputs = [ From e1a9cfc9b77caab3664b2e083944c269ceb4758b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 017/119] mate.mate-session-manager: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-session-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 74c36145de1..bdd129e0dec 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-session-manager"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zwq8symyp3ijs28pyrknsdi9byf4dpp9wp93ndwdhi0vaip5i51"; + sha256 = "1jcb5k2fx2rwwbrslgv1xlzaiwiwjnxjwnp503qf8cg89w69q2vb"; }; patches = [ From b54b1ea41de30f21fc445c9c3b079b0855f1c014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 018/119] mate.mate-themes: 3.22.21 -> 3.22.22 --- pkgs/desktops/mate/mate-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index b220478184a..8153ea1ec7a 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-themes"; - version = "3.22.21"; + version = "3.22.22"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n"; + sha256 = "18crdwfpfm3br4pv94wy7rpmzzb69im4j8dgq1b7c8gcbbzay05x"; }; nativeBuildInputs = [ pkg-config gettext gtk3 ]; From ebfbb86478b7469350c8e8f4b97e26fd4346fb41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 019/119] mate.mate-settings-daemon: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 90b931403c7..ed908759877 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-settings-daemon"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0n1ywr3ir5p536s7azdbw2mh40ylqlpx3a74mjrivbms1rpjxyab"; + sha256 = "051r7xrx1byllsszbwsk646sq4izyag9yxg8jw2rm6x6mgwb89cc"; }; nativeBuildInputs = [ From 359463ea6cdce8d1a35c626f031543b8de428424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 020/119] mate.mate-system-monitor: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-system-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 7e106cbd20d..4527c91eed6 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-system-monitor"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1i2r4lw6xsk972yp15g5hm8p8xx9pp6jmcvvzbdq80xyx3x898qz"; + sha256 = "1mbny5hs5805398krvcsvi1jfhyq9a9dfciyrnis67n2yisr1hzp"; }; nativeBuildInputs = [ From 0beeb25b501ffec9aa5640e28303f7d7ac865475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 021/119] mate.mate-tweak: 20.10.0 -> 21.04.3 --- pkgs/desktops/mate/mate-tweak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index 4f49b5f3002..830cf092f80 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "mate-tweak"; - version = "20.10.0"; + version = "21.04.3"; src = fetchFromGitHub { owner = "ubuntu-mate"; repo = pname; rev = version; - sha256 = "08gw5i5wjxmzn92h9fv6g7q9i00n8shv1wlpy6cb31xy9wbmjph6"; + sha256 = "0vpzy7awhb1xfsdjsrchy5b9dygj4ixdcvgx5v5w8hllmi4yxpc1"; }; nativeBuildInputs = [ From f320df2d41f68c1bbe6092f185170b7e1b6698fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 022/119] mate.mozo: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mozo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 2487ed97f01..4122e823165 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mozo"; - version = "1.24.0"; + version = "1.24.1"; format = "other"; doCheck = false; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3"; + sha256 = "14ps43gdh1sfvq49yhl58gxq3rc0d25i2d7r4ghlzf07ssxl53b0"; }; nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ]; From 538f4509085ff62f9994638c025eb40846b5fafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 023/119] mate.pluma: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/pluma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 2fa584b4598..ddebf5a1bb5 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pluma"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sgc5f480icr2ans6gd3akvcax58mr4jp3zjk3xn7bx1mw9i299f"; + sha256 = "183frfhll3sb4r12p24160j1c1cfd102nlp5rrwvyv5qqm7i2fg4"; }; nativeBuildInputs = [ From 21b93fa0cc8c2e296d7078a3300bf1b1f607c141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 22:04:39 -0300 Subject: [PATCH 024/119] mate: add some line wrappings Co-authored-by: Sandro --- pkgs/desktops/mate/marco/default.nix | 3 ++- pkgs/desktops/mate/mate-applets/default.nix | 4 +++- pkgs/desktops/mate/mate-control-center/default.nix | 8 ++++---- pkgs/desktops/mate/mate-sensors-applet/default.nix | 3 ++- pkgs/desktops/mate/mate-user-share/default.nix | 3 ++- pkgs/desktops/mate/mate-utils/default.nix | 3 ++- pkgs/desktops/mate/pluma/default.nix | 3 ++- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index c5e3372dc48..aa2ee9d4913 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, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop +, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "marco"; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index e2a324b9671..1046e431a3b 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3 +, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook +, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-applets"; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index b9c80180087..fd675f0406c 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib, - libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, - desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook, - mateUpdateScript +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib +, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3 +, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook +, mateUpdateScript }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 4d0fd068af8..849f767c7c2 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify +, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 6b653498ce3..1126e585135 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2 +, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-user-share"; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index ac235168860..0b7b181bd57 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3 +, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-utils"; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index ddebf5a1bb5..279e443e525 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3 +, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "pluma"; From 5cf6870d1f9ea5ed143258b4c2293992442e2241 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 11 Apr 2021 20:50:53 +0200 Subject: [PATCH 025/119] wine{Unstable,Staging}: 6.5 -> 6.6 --- pkgs/misc/emulators/wine/sources.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 7f02ead3e02..549e9c7a551 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,10 +44,17 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.5"; + version = "6.6"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-BgD9IIwGkl1mNNKfVDu6CmQ2HDTpvXYJwvDiCWEK00c="; - inherit (stable) mono gecko32 gecko64; + sha256 = "sha256-meUixtzArB1T0gG/MFSJH98RhkJXRzw+s0HjdnH9hK0="; + inherit (stable) gecko32 gecko64; + + ## see http://wiki.winehq.org/Mono + mono = fetchurl rec { + version = "6.1.1"; + url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; + sha256 = "sha256-rDsUvq/eNLhIIofllwABE9wGqRXzLJ/QbHfrgZB544s="; + }; patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE @@ -58,7 +65,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-u6wDavrFirN1e0fFra4ui3i4PnJF0gcENYoIyNwhIYc="; + sha256 = "sha256-ur7ZD9F/V4TkR4YzxwsuhP/Dq/svH29T4hFkp/ZNtTQ="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 65234f091107959952095e2e45f5a4dd1d087004 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 03:18:07 +0200 Subject: [PATCH 026/119] nixos/test/prometheus-exporters/bird: fix race condition The bird socket would not always be instantly present, when the exporter was queried, leading to the test sometimes failing in its entirety. --- nixos/tests/prometheus-exporters.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 62c0080dd51..cf3518286fd 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -132,7 +132,9 @@ let exporterTest = '' wait_for_unit("prometheus-bird-exporter.service") wait_for_open_port(9324) - succeed("curl -sSf http://localhost:9324/metrics | grep -q 'MyObviousTestString'") + wait_until_succeeds( + "curl -sSf http://localhost:9324/metrics | grep -q 'MyObviousTestString'" + ) ''; }; From e7d4fa42395d7ccba66cc9b945ad690b64642ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 17 Apr 2021 18:33:31 +0200 Subject: [PATCH 027/119] flexoptix-app: Init at 5.9.0 --- pkgs/tools/misc/flexoptix-app/default.nix | 47 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/tools/misc/flexoptix-app/default.nix diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix new file mode 100644 index 00000000000..40f30bd7ad9 --- /dev/null +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -0,0 +1,47 @@ +{ lib, appimageTools, fetchurl }: let + pname = "flexoptix-app"; + version = "5.9.0"; + name = "${pname}-${version}"; + + src = fetchurl { + name = "${name}.AppImage"; + url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; + sha256 = "0gbqaj9b11mxx0knmmh2d5863kaslbb3r6c4h8rjhg8qy4cws7hj"; + }; + + udevRules = fetchurl { + url = "https://www.flexoptix.net/skin/udev_rules/99-tprogrammer.rules"; + sha256 = "0mr1bhgvavq1ax4206z1vr2y64s3r676w9jjl9ysziklbrsvk5rr"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + +in appimageTools.wrapType2 { + inherit name src; + + multiPkgs = null; # no 32bit needed + extraPkgs = { pkgs, ... }@args: [ + pkgs.hidapi + ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; + + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps + substituteInPlace $out/share/applications/flexoptix-app.desktop \ + --replace 'Exec=AppRun' "Exec=$out/bin/${pname}" + mkdir -p $out/lib/udev/rules.d + ln -s ${udevRules} $out/lib/udev/rules.d/99-tprogrammer.rules + ''; + + meta = { + description = "Configure FLEXOPTIX Universal Transcievers in seconds"; + homepage = "https://www.flexoptix.net"; + changelog = "https://www.flexoptix.net/en/flexoptix-app/?os=linux#flexapp__modal__changelog"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ das_j ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad05948227e..a63851f08ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4472,6 +4472,8 @@ in flent = python3Packages.callPackage ../applications/networking/flent { }; + flexoptix-app = callPackage ../tools/misc/flexoptix-app { }; + flpsed = callPackage ../applications/editors/flpsed { }; fluentd = callPackage ../tools/misc/fluentd { }; From 7d6380769c6b87e03f015cfe0376a0b7484a5b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 17 Apr 2021 18:33:41 +0200 Subject: [PATCH 028/119] nixos/flexoptix-app: Add the module --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/flexoptix-app.nix | 25 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 nixos/modules/programs/flexoptix-app.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f72be732216..78e49a58be6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -131,6 +131,7 @@ ./programs/file-roller.nix ./programs/firejail.nix ./programs/fish.nix + ./programs/flexoptix-app.nix ./programs/freetds.nix ./programs/fuse.nix ./programs/geary.nix diff --git a/nixos/modules/programs/flexoptix-app.nix b/nixos/modules/programs/flexoptix-app.nix new file mode 100644 index 00000000000..93dcdfeb514 --- /dev/null +++ b/nixos/modules/programs/flexoptix-app.nix @@ -0,0 +1,25 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.flexoptix-app; +in { + options = { + programs.flexoptix-app = { + enable = mkEnableOption "FLEXOPTIX app + udev rules"; + + package = mkOption { + description = "FLEXOPTIX app package to use"; + type = types.package; + default = pkgs.flexoptix-app; + defaultText = "\${pkgs.flexoptix-app}"; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + }; +} From 15cd5fc57ead4d312acbc3edad680ebe4fc0706a Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 18 Apr 2021 16:15:48 +0200 Subject: [PATCH 029/119] nixos/nginx: set isSystemUser --- nixos/modules/services/web-servers/nginx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 389911ffcce..b9ff1332955 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -879,6 +879,7 @@ in users.users = optionalAttrs (cfg.user == "nginx") { nginx = { group = cfg.group; + isSystemUser = true; uid = config.ids.uids.nginx; }; }; From f0975780a72c4a626c0a1537cd50ec57cbc7d850 Mon Sep 17 00:00:00 2001 From: Taeer Bar-Yam Date: Tue, 20 Apr 2021 16:45:30 -0400 Subject: [PATCH 030/119] mar1d: 0.2.0 -> 0.3.0 --- pkgs/games/mar1d/default.nix | 68 ++++++++++++------------------------ 1 file changed, 22 insertions(+), 46 deletions(-) diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index 1323e1a8ac9..1715a68f5d8 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -1,58 +1,34 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake +{ stdenv +, lib +, SDL2 +, SDL2_mixer , libGLU -, xlibsWrapper -, xorg -, xinput_calibrator -, doxygen -, libpthreadstubs -, alsaLib -, alsaOss -, libao -, width ? 30 -, mute ? false -, effects ? false -, sensitivity ? 5 -, reverseY ? false +, libconfig +, meson +, ninja +, pkg-config +, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "MAR1D"; - version = "0.2.0"; - options = "-w${toString width}" - + " -s${toString sensitivity}" - + (if mute then " -m" else "") - + (if effects then " -f" else "") - + (if reverseY then " -r" else ""); + version = "0.3.0"; src = fetchFromGitHub { - sha256 = "152w5dnlxzv60cl24r5cmrj2q5ar0jiimrmxnp87kf4d2dpbnaq7"; + sha256 = "sha256-/QZH2H0PFCLeweXUE11vimLnJTt86PjnTnHC9vWkKsk="; rev = "v${version}"; - repo = "fp_mario"; - owner = "olynch"; + repo = "MAR1D"; + owner = "Radvendii"; }; - buildInputs = - [ - alsaLib - alsaOss - cmake - doxygen - libao - libpthreadstubs - libGLU - xlibsWrapper - xinput_calibrator - xorg.libXrandr - xorg.libXi - xorg.xinput - xorg.libXxf86vm - ]; + nativeBuildInputs = [ meson ninja pkg-config ]; - preConfigure = '' - cd src - ''; + buildInputs = [ + SDL2 + SDL2_mixer + libconfig + libGLU + ]; meta = with lib; { description = "First person Super Mario Bros"; @@ -62,9 +38,9 @@ stdenv.mkDerivation rec { original, however, the game still takes place in a two dimensional world. You must view the world as mario does, as a one dimensional line. ''; - homepage = "https://github.com/olynch/fp_mario"; + homepage = "https://mar1d.com"; license = licenses.agpl3; maintainers = with maintainers; [ taeer ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 15a78be3c3b282eb6a5f82c048b949d2468689ad Mon Sep 17 00:00:00 2001 From: Louis Blin <45168934+lbpdt@users.noreply.github.com> Date: Thu, 22 Apr 2021 10:51:17 +0100 Subject: [PATCH 031/119] terraform-provider-rancher2: 1.8.3 -> 1.13.0 Also update the repository to be sourced from Rancher's org on GitHub, as the old repo under `terraform-providers/` has been archived: https://github.com/terraform-providers/terraform-provider-rancher2 The 'About' section mentions how the new location is under `rancher/`: https://github.com/rancher/terraform-provider-rancher2 --- .../cluster/terraform-providers/providers.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 290460e1e5f..33fba6e5a0f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -823,11 +823,13 @@ "version": "1.5.0" }, "rancher2": { - "owner": "terraform-providers", + "owner": "rancher", + "provider-source-address": "registry.terraform.io/hashicorp/rancher2", "repo": "terraform-provider-rancher2", - "rev": "v1.8.3", - "sha256": "1k2d9j17b7sssliraww6as196ihdcra1ylhg1qbynklpr0asiwna", - "version": "1.8.3" + "rev": "v1.13.0", + "sha256": "0xczv9qsviryiw95yd6cl1nnb0daxs971fm733gfvwm36jvmyr89", + "vendorSha256": "0apy6qbmshfj4pzz9nqdhyk6h7l9qwrccz30q8ljl928pj49q04c", + "version": "1.13.0" }, "random": { "owner": "hashicorp", From 81229d3afe9c66b210e3fa13b5c43b36f09d098b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 Apr 2021 13:14:39 +0200 Subject: [PATCH 032/119] wordpress: 5.6.2 -> 5.7.1 Fixes: CVE-2021-29447, CVE-2021-29450 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 330470f0fd5..8ad888e759b 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.6.2"; + version = "5.7.1"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-W9/U3i6jALXolDFraiI/a+PNPoNHim0rZHzaqSy4gkI="; + sha256 = "08c9g80lhs4h2psf3ykn0l4k1yyy0x21kxjqy8ckjpjvw3281nd4"; }; installPhase = '' From 9dd668c1fbc92b8785b5ecccfe863256ca3b9def Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 22 Apr 2021 08:47:48 +0200 Subject: [PATCH 033/119] vault: 1.7.0 -> 1.7.1 Fixes CVE-2021-27668 and CVE-2021-27400. Changelog: https://github.com/hashicorp/vault/blob/b41bb14cf6d6d2e0c6acc89c32deada52f744cd2/CHANGELOG.md --- pkgs/tools/security/vault/default.nix | 4 ++-- pkgs/tools/security/vault/vault-bin.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index f8e831ef2c3..e04ab9df08c 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1lsz8fyjcxamvs9n3m974q2jxhv828fb5p6qx8wlqdaahqgrc8qg"; + sha256 = "0ncy99gw2pp5v2qbbgvri7qlirjj8qsvgjmjqyx3gddlpzpyiz3q"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index fc8b2865f25..40ce05331f9 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip }: let - version = "1.7.0"; + version = "1.7.1"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "0d8wqxqilv1jdf4dl7w2jp3lfh0w0rawidmhjlj3ykpg6l3gblma"; + sha256 = "021qa8jcqwy27q83lvamvv5zqnkwk5y0jsb8al5yxpgzxqnmsyb1"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "128r0phm5i1cpayz0ia8qsmnk1ia3qylidy9f8iwk3l8r834s4yd"; + sha256 = "02hhxpa8craa91nfgvwziswisfdnqw4gbwrxyxr753v1y00y1sz8"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "01vxjv95his8jqin2cwcw691wdwn6p876rp021bmvr6diw6clkrp"; + sha256 = "141zzfwrjdjv8ymrdc4mxs2f4cphdir4xjaa40s571ri38in33zh"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "0ahdv14fz7ybl11b61z7j13nbjd6hp6fcpc5bk6y8lh4qj8x0pzg"; + sha256 = "1plrmmy86zb2ij49dk2mwn364i2n83ch4gjz5pln2d4wjx21gpaq"; }; }; From 7501beac87f5fefc84a5ca59ad9a78bffff9df9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 22 Apr 2021 10:23:43 -0300 Subject: [PATCH 034/119] mate: fix licenses --- pkgs/desktops/mate/atril/default.nix | 2 +- pkgs/desktops/mate/caja-dropbox/default.nix | 2 +- pkgs/desktops/mate/caja-extensions/default.nix | 2 +- pkgs/desktops/mate/caja/default.nix | 8 ++++---- pkgs/desktops/mate/engrampa/default.nix | 8 ++++---- pkgs/desktops/mate/eom/default.nix | 2 +- pkgs/desktops/mate/libmatekbd/default.nix | 2 +- pkgs/desktops/mate/libmatemixer/default.nix | 2 +- pkgs/desktops/mate/libmateweather/default.nix | 2 +- pkgs/desktops/mate/marco/default.nix | 2 +- pkgs/desktops/mate/mate-backgrounds/default.nix | 2 +- pkgs/desktops/mate/mate-common/default.nix | 2 +- pkgs/desktops/mate/mate-control-center/default.nix | 2 +- pkgs/desktops/mate/mate-desktop/default.nix | 2 +- pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 8 ++++---- pkgs/desktops/mate/mate-icon-theme/default.nix | 2 +- pkgs/desktops/mate/mate-media/default.nix | 2 +- pkgs/desktops/mate/mate-menus/default.nix | 2 +- pkgs/desktops/mate/mate-netbook/default.nix | 2 +- pkgs/desktops/mate/mate-notification-daemon/default.nix | 2 +- pkgs/desktops/mate/mate-panel/default.nix | 2 +- pkgs/desktops/mate/mate-power-manager/default.nix | 2 +- pkgs/desktops/mate/mate-session-manager/default.nix | 2 +- pkgs/desktops/mate/mate-settings-daemon/default.nix | 2 +- pkgs/desktops/mate/mate-terminal/default.nix | 2 +- pkgs/desktops/mate/mate-themes/default.nix | 8 ++++---- pkgs/desktops/mate/pluma/default.nix | 8 ++++---- 27 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 1a6d947153e..7e8afde588c 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple multi-page document viewer for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index ded175db092..3b96f67b12a 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Dropbox extension for Caja file manager"; homepage = "https://github.com/mate-desktop/caja-dropbox"; - license = with licenses; [ gpl3 cc-by-nd-30 ]; + license = with licenses; [ gpl3Plus cc-by-nd-30 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 99438bdd610..5c08074f045 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Set of extensions for Caja file manager"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 44721a2cab2..c533f78849c 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "File manager for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = with lib.licenses; [ gpl2 lgpl2 ]; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 6ba30c16f59..81d34b8b125 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "Archive Manager for MATE"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 75d37e5ea35..27c12079654 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "An image viewing and cataloging program for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 92bfd4fe833..8d0b567f161 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Keyboard management library for MATE"; homepage = "https://github.com/mate-desktop/libmatekbd"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index bc44710e6e7..9d42c23c714 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mixer library for MATE"; homepage = "https://github.com/mate-desktop/libmatemixer"; - license = with licenses; [ gpl2 lgpl2 ]; + license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index a88ba7c6ed3..b042df0fe1a 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to access weather information from online services for MATE"; homepage = "https://github.com/mate-desktop/libmateweather"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index aa2ee9d4913..b652be0f71b 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MATE default window manager"; homepage = "https://github.com/mate-desktop/marco"; - license = [ licenses.gpl2 ]; + license = [ licenses.gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 26aedcc2818..cfe1325b839 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Background images and data for MATE"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2; + license = with licenses; [ gpl2Plus cc-by-sa-40 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index 57f50ad8389..58314df673a 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Common files for development of MATE packages"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index fd675f0406c..b94e7ecfd06 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utilities to configure the MATE desktop"; homepage = "https://github.com/mate-desktop/mate-control-center"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 4270b0a1f92..b1b59dc6402 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library with common API for various MATE modules"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index f0bca054ae8..7dc4423fb6b 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "Faenza icon theme from MATE"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index d6c16c1c717..cf18cf528f2 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Icon themes from MATE"; homepage = "https://mate-desktop.org"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index fa6b6e4305a..6072e81fb3c 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Media tools for MATE"; homepage = "https://mate-desktop.org"; - license = licenses.gpl3; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo maintainers.chpatrick ]; }; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 751dcd50859..5b11c20380a 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Menu system for MATE"; homepage = "https://github.com/mate-desktop/mate-menus"; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index dc10cca40a4..9b7a5ae6718 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { devices with low resolution displays. ''; homepage = "https://mate-desktop.org"; - license = with licenses; [ gpl3 lgpl2Plus ]; + license = with licenses; [ gpl3Only lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 28497084fb6..62181418fdf 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Notification daemon for MATE Desktop"; homepage = "https://github.com/mate-desktop/mate-notification-daemon"; - license = licenses.gpl2; + license = with licenses; [ gpl2Plus gpl3Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index c332b700227..328fcfd20de 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The MATE panel"; homepage = "https://github.com/mate-desktop/mate-panel"; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index fe74cf2505a..3a99538d929 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The MATE Power Manager"; homepage = "https://mate-desktop.org"; - license = licenses.gpl3; + license = with licenses; [ gpl2Plus fdl11Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ romildo chpatrick ]; }; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index bdd129e0dec..0f8ac83085d 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MATE Desktop session manager"; homepage = "https://github.com/mate-desktop/mate-session-manager"; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index ed908759877..6c35a1d6312 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MATE settings daemon"; homepage = "https://github.com/mate-desktop/mate-settings-daemon"; - license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2Plus gpl3Plus lgpl2Plus mit ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index d17d2fafd1b..2c4d4223ecc 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The MATE Terminal Emulator"; homepage = "https://mate-desktop.org"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 8153ea1ec7a..6a1be82c8a6 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { url = "https://pub.mate-desktop.org/releases/themes"; }; - meta = { + meta = with lib; { description = "A set of themes from MATE"; homepage = "https://mate-desktop.org"; - license = lib.licenses.lgpl21; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = with licenses; [ lgpl21Plus lgpl3Only gpl3Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 279e443e525..4c98c9cf520 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "Powerful text editor for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } From 3922a641d0862d50892b9524d75761f89bfae69e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 22 Apr 2021 10:40:54 -0300 Subject: [PATCH 035/119] mate.mate-session-manager: fix stale substituteInPlace --- pkgs/desktops/mate/mate-session-manager/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 0f8ac83085d..c0cd12bd273 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { postFixup = '' substituteInPlace $out/share/xsessions/mate.desktop \ - --replace "Exec=mate-session" "Exec=$out/bin/mate-session" \ - --replace "TryExec=mate-session" "TryExec=$out/bin/mate-session" + --replace "Exec=mate-session" "Exec=$out/bin/mate-session" ''; passthru.providedSessions = [ "mate" ]; From 96c6bde310f712d2515128ced4b1b04497f81102 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Thu, 22 Apr 2021 12:23:54 -0400 Subject: [PATCH 036/119] pulseeffects: 5.0.2 -> 5.0.3 Mostly bug fixes. Warning: This issue exhibits crashing with Priority Type: Real Time. Luckily due to bugfixes this usually isn't necessary anymore. Please disable that option if you are having issues. --- pkgs/applications/audio/pulseeffects/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 33b15e977e7..7a7c7175a45 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -46,15 +46,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - # 5.0.3 crashes. Test carefully before updating. - # https://github.com/wwmm/pulseeffects/issues/927 - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "14ir25q6bws26im6qmj3k6hkfdh5pc6mbvln7wkdwy5dv0vix3cm"; + sha256 = "1dicvq17vajk3vr4g1y80599ahkw0dp5ynlany1cfljfjz40s8sx"; }; nativeBuildInputs = [ From d6eefb728e7f565149f53da09b317a84820a671d Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Thu, 22 Apr 2021 19:28:58 +0200 Subject: [PATCH 037/119] workstyle: 0.2.1 --- .../window-managers/i3/workstyle.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/window-managers/i3/workstyle.nix diff --git a/pkgs/applications/window-managers/i3/workstyle.nix b/pkgs/applications/window-managers/i3/workstyle.nix new file mode 100644 index 00000000000..b245139abef --- /dev/null +++ b/pkgs/applications/window-managers/i3/workstyle.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "workstyle"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "pierrechevalier83"; + repo = pname; + rev = "43b0b5bc0a66d40289ff26b8317f50510df0c5f9"; + sha256 = "0f4hwf236823qmqy31fczjb1hf3fvvac3x79jz2l7li55r6fd8hn"; + }; + + cargoSha256 = "1hy68wvsxncsy4yx4biigfvwyq18c7yp1g543c6nca15cdzs1c54"; + + doCheck = false; # No tests + + meta = with lib; { + description = "Sway workspaces with style"; + homepage = "https://github.com/pierrechevalier83/workstyle"; + license = licenses.mit; + maintainers = with maintainers; [ FlorianFranzen ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8f781f0e10..6ed695d9d8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23786,6 +23786,8 @@ in wlroots = wlroots_0_12; }; + workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; + windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; From c4727f753fe8be3459f11546919c900c05774c14 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Apr 2021 00:58:47 +0200 Subject: [PATCH 038/119] python3Packages.pycocotools: init at 2.0.2 --- .../python-modules/pycocotools/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pycocotools/default.nix diff --git a/pkgs/development/python-modules/pycocotools/default.nix b/pkgs/development/python-modules/pycocotools/default.nix new file mode 100644 index 00000000000..a6cdf877a07 --- /dev/null +++ b/pkgs/development/python-modules/pycocotools/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cython +, matplotlib +}: + +buildPythonPackage rec { + pname = "pycocotools"; + version = "2.0.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "06hz0iz4kqxhqby4j7bah8l41kg68bb118jawp172i4vg497lw94"; + }; + + propagatedBuildInputs = [ + cython + matplotlib + ]; + + pythonImportsCheck = [ + "pycocotools.coco" + "pycocotools.cocoeval" + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Official APIs for the MS-COCO dataset"; + homepage = "https://github.com/cocodataset/cocoapi/tree/master/PythonAPI"; + license = licenses.bsd2; + maintainers = with maintainers; [ hexa piegames ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c877b355873..2e3e3cb6f73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5682,6 +5682,8 @@ in { pycmarkgfm = callPackage ../development/python-modules/pycmarkgfm { }; + pycocotools = callPackage ../development/python-modules/pycocotools { }; + pycodestyle = callPackage ../development/python-modules/pycodestyle { }; pycognito = callPackage ../development/python-modules/pycognito { }; From 2cbebb37425d06396c70a08f5df2e65b03801d1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Apr 2021 00:59:29 +0200 Subject: [PATCH 039/119] python3Packages.seqeval: init at 1.2.2 --- .../python-modules/seqeval/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/seqeval/default.nix diff --git a/pkgs/development/python-modules/seqeval/default.nix b/pkgs/development/python-modules/seqeval/default.nix new file mode 100644 index 00000000000..15322632ad7 --- /dev/null +++ b/pkgs/development/python-modules/seqeval/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scikitlearn +, perl +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "seqeval"; + version = "1.2.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "chakki-works"; + repo = "seqeval"; + rev = "v${version}"; + sha256 = "0qv05gn54kc4wpmwnflmfqw4gwwb8lxqhkiihl0pvl7s2i7qzx2j"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "use_scm_version=True," "version='${version}'," \ + --replace "setup_requires=['setuptools_scm']," "setup_requires=[]," + ''; + + propagatedBuildInputs = [ + numpy + scikitlearn + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # tests call perl script and get stuck in there + "test_statistical_tests" + "test_by_ground_truth" + ]; + + meta = with lib; { + description = "A Python framework for sequence labeling evaluation"; + homepage = "https://github.com/chakki-works/seqeval"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e3e3cb6f73..65ca752fa14 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7745,6 +7745,8 @@ in { seqdiag = callPackage ../development/python-modules/seqdiag { }; + seqeval = callPackage ../development/python-modules/seqeval { }; + sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { pythonPackages = self; pythonSupport = true; From 768a94035ff3304be208d66625c58109eb8a165a Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 23 Apr 2021 20:09:31 +0200 Subject: [PATCH 040/119] minio: 2021-04-06T23-11-00Z -> 2021-04-22T15-44-28Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 3fed8691ec5..b0d7f1048bc 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2021-04-06T23-11-00Z"; + version = "2021-04-22T15-44-28Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-gwf6qA63EFxGQxk8DiAiqLpIYVhVQDQYPffLNP5JfVw="; + sha256 = "147a4vgf2hdpbndska443axzvxx56bmc0011m3cq4ca1vm783k8q"; }; - vendorSha256 = "sha256-VeYc+UtocpeNSV+0MocZj/83X/SMMv5PX2cPIPBV/sk="; + vendorSha256 = "0qj1zab97q8s5gy7a304wqi832y8m083cnk8hllz8lz9yjcw6q92"; doCheck = false; From 261b8a48a12ce5150a9a94a78dff5cffb402d1a7 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 23 Apr 2021 16:07:46 -0400 Subject: [PATCH 041/119] liburing: fix build on 32-bit ARM Apply an upstream patch to fix compiling some of the tests. --- pkgs/development/libraries/liburing/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 10554cb528e..ddd7c7b207d 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "0has1yd1ns5q5jgcmhrbgwhbwq0wix3p7xv3dyrwdf784p56izkn"; }; + patches = [ + # Fix build on 32-bit ARM + (fetchpatch { + url = "https://github.com/axboe/liburing/commit/808b6c72ab753bda0c300b5683cfd31750d1d49b.patch"; + sha256 = "1x7a9c5a6rwhfsbjqmhbnwh2aiin6yylckrqdjbzljrprzf11wrd"; + }) + ]; + separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. From 0bab17566ab3031433481dc456894a13ecba62ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 23:12:21 +0200 Subject: [PATCH 042/119] python3Packages.pymetno: 0.8.2 -> 0.8.3 --- pkgs/development/python-modules/pymetno/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index 5e0131352c3..0115893700a 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -8,15 +8,15 @@ }: buildPythonPackage rec { - pname = "PyMetno"; - version = "0.8.2"; + pname = "pymetno"; + version = "0.8.3"; format = "setuptools"; src = fetchFromGitHub { - repo = pname; owner = "Danielhiversen"; + repo = "PyMetno"; rev = version; - sha256 = "0b1zm60yqj1mivc3zqw2qm9rqh8cbmx0r58jyyvm3pxzq5cafdg5"; + sha256 = "sha256-dvZz+wv9B07yKM4E4fQ9VQOgeil9KxZxcGk6D0kWY4g="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "A library to communicate with the met.no api"; + description = "A library to communicate with the met.no API"; homepage = "https://github.com/Danielhiversen/pyMetno/"; license = licenses.mit; maintainers = with maintainers; [ flyfloh ]; From fc55a1bdd4a863e354c3b7fa8bf19fb874949124 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Apr 2021 23:34:26 +0200 Subject: [PATCH 043/119] nixos/tests/prometheus-exporters/bird: set router id Previously bird would refuse to start up because the router id wasn't set. > bird[682]: Cannot determine router ID, please configure it manually --- nixos/tests/prometheus-exporters.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index cf3518286fd..9aa430c25a4 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -118,6 +118,8 @@ let metricProvider = { services.bird2.enable = true; services.bird2.config = '' + router id 127.0.0.1; + protocol kernel MyObviousTestString { ipv4 { import all; From 532493b50893e463e8bb3c76641cb4d31c7c3835 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 18 Apr 2021 22:53:35 +0000 Subject: [PATCH 044/119] lib.systems.doubles.netbsd: expand These are all the architectures supported by Nixpkgs on other platforms, that are also supported by NetBSD. (So I haven't added any architectures that are new to Nixpkgs here, even though NetBSD supports some that we don't have.) --- lib/systems/doubles.nix | 4 +++- lib/tests/systems.nix | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 7ad40c8c62c..6f638be585b 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -33,7 +33,9 @@ let "mmix-mmixware" # NetBSD - "i686-netbsd" "x86_64-netbsd" + "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" + "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" + "riscv64-netbsd" "x86_64-netbsd" # none "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none" diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index c0800df25ed..36f82b783b4 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -15,9 +15,9 @@ in with lib.systems.doubles; lib.runTests { testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox); - testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-none" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ]; + testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ]; testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; - testmips = mseteq mips [ "mipsel-linux" ]; + testmips = mseteq mips [ "mipsel-linux" "mipsel-netbsd" ]; testmmix = mseteq mmix [ "mmix-mmixware" ]; testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; @@ -29,7 +29,7 @@ with lib.systems.doubles; lib.runTests { testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" ]; - testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]; + testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox); From d407a38a96d029d7a44df091ac898a27f648b277 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Apr 2021 01:50:09 +0200 Subject: [PATCH 045/119] ajour: 1.0.0 -> 1.1.0 --- pkgs/tools/games/ajour/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index 3bc87680c52..9cb79ceabe0 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "sha256-u48U4WGlrSl8T3YF7cjApyjNaUI4YyyHEy0TgJw7r/Y="; + sha256 = "1xzsgxkdwdqcr8xs9ajr1ykfjjz95z9k7b7l644yijg31xf1lbq6"; }; - cargoSha256 = "sha256-Hdid70AB4AKtSsQBsr6K/de4nvI3rvghEWIwM7mpRIA="; + cargoSha256 = "02g25wr0f2bjr7zmpll3iicc6i8wk1j9iavagg1vhbpynp6z013x"; nativeBuildInputs = [ autoPatchelfHook From 49155acb742d6fcffd7acc971053dfed92b12547 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Apr 2021 01:19:01 +0200 Subject: [PATCH 046/119] handlr: 0.5.0 -> 0.6.1 Adds the missing shared-mime-info dependency and fixes tests. --- pkgs/tools/misc/handlr/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/handlr/default.nix b/pkgs/tools/misc/handlr/default.nix index 1d825c866c4..978168d3676 100644 --- a/pkgs/tools/misc/handlr/default.nix +++ b/pkgs/tools/misc/handlr/default.nix @@ -1,20 +1,23 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, shared-mime-info }: rustPlatform.buildRustPackage rec { pname = "handlr"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "1f4gmlqzgw1r8n0w9dr9lpsn94f2hlnak9bbq5xgf6jwgc9mwqzg"; + sha256 = "0mxkirsicagvfyihcb06g2bsz5h0zp7xc87vldp4amgddzaxhpbg"; }; - cargoSha256 = "16d4dywwkgvvxw6ninrx87rqhx0whdq3yy01m27qjy4gz6z6ad8p"; + cargoSha256 = "11glh6f0cjrq76212h80na2rgwpzjmk0j78y3i98nv203rkrczid"; - # Most tests fail (at least some due to directory permissions) - doCheck = false; + nativeBuildInputs = [ shared-mime-info ]; + + preCheck = '' + export HOME=$TEMPDIR + ''; meta = with lib; { description = "Alternative to xdg-open to manage default applications with ease"; From d788c091b6348dd897c438a1ec2ad40822170e3c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Apr 2021 02:50:53 +0200 Subject: [PATCH 047/119] common-updater-scripts: remove lib dependency So that the script can be used outside of nixpkgs. --- pkgs/common-updater/scripts/update-source-version | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 90543a9cfc6..831f65e4d90 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -99,11 +99,10 @@ if [[ -z "$oldUrl" ]]; then die "Couldn't evaluate source url from '$attr.src'!" fi -drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; lib.getName $attr" | tr -d '"') -oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (lib.getVersion $attr)" | tr -d '"') +oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"') -if [[ -z "$drvName" || -z "$oldVersion" ]]; then - die "Couldn't evaluate name and version from '$attr.name'!" +if [[ -z "$oldVersion" ]]; then + die "Couldn't find out the old version of '$attr'!" fi if [[ "$oldVersion" = "$newVersion" ]]; then From 228276fbd0174eb60199b795c369f4363acd6713 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 Apr 2021 23:56:11 +0800 Subject: [PATCH 048/119] doc/builders/images/*.xml: Convert to markdown --- doc/builders/images.xml | 4 +- doc/builders/images/appimagetools.section.md | 48 +++++++++ doc/builders/images/appimagetools.xml | 102 ------------------- doc/builders/images/snap/example-firefox.nix | 28 ----- doc/builders/images/snap/example-hello.nix | 12 --- doc/builders/images/snaptools.section.md | 71 +++++++++++++ doc/builders/images/snaptools.xml | 59 ----------- 7 files changed, 121 insertions(+), 203 deletions(-) create mode 100644 doc/builders/images/appimagetools.section.md delete mode 100644 doc/builders/images/appimagetools.xml delete mode 100644 doc/builders/images/snap/example-firefox.nix delete mode 100644 doc/builders/images/snap/example-hello.nix create mode 100644 doc/builders/images/snaptools.section.md delete mode 100644 doc/builders/images/snaptools.xml diff --git a/doc/builders/images.xml b/doc/builders/images.xml index d7d25029189..cd10d69a96d 100644 --- a/doc/builders/images.xml +++ b/doc/builders/images.xml @@ -5,8 +5,8 @@ This chapter describes tools for creating various types of images. - + - + diff --git a/doc/builders/images/appimagetools.section.md b/doc/builders/images/appimagetools.section.md new file mode 100644 index 00000000000..7ab4e4e9d85 --- /dev/null +++ b/doc/builders/images/appimagetools.section.md @@ -0,0 +1,48 @@ +# pkgs.appimageTools {#sec-pkgs-appimageTools} + +`pkgs.appimageTools` is a set of functions for extracting and wrapping [AppImage](https://appimage.org/) files. They are meant to be used if traditional packaging from source is infeasible, or it would take too long. To quickly run an AppImage file, `pkgs.appimage-run` can be used as well. + +::: warning +The `appimageTools` API is unstable and may be subject to backwards-incompatible changes in the future. +::: + +## AppImage formats {#ssec-pkgs-appimageTools-formats} + +There are different formats for AppImages, see [the specification](https://github.com/AppImage/AppImageSpec/blob/74ad9ca2f94bf864a4a0dac1f369dd4f00bd1c28/draft.md#image-format) for details. + +- Type 1 images are ISO 9660 files that are also ELF executables. +- Type 2 images are ELF executables with an appended filesystem. + +They can be told apart with `file -k`: + +```ShellSession +$ file -k type1.AppImage +type1.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) ISO 9660 CD-ROM filesystem data 'AppImage' (Lepton 3.x), scale 0-0, +spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: offset 0.000000, slope 0.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=d629f6099d2344ad82818172add1d38c5e11bc6d, stripped\012- data + +$ file -k type2.AppImage +type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped\012- data +``` + +Note how the type 1 AppImage is described as an `ISO 9660 CD-ROM filesystem`, and the type 2 AppImage is not. + +## Wrapping {#ssec-pkgs-appimageTools-wrapping} + +Depending on the type of AppImage you're wrapping, you'll have to use `wrapType1` or `wrapType2`. + +```nix +appimageTools.wrapType2 { # or wrapType1 + name = "patchwork"; + src = fetchurl { + url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage"; + sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s"; + }; + extraPkgs = pkgs: with pkgs; [ ]; +} +``` + +- `name` specifies the name of the resulting image. +- `src` specifies the AppImage file to extract. +- `extraPkgs` allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs: + - Looking through the extracted AppImage files, reading its scripts and running `patchelf` and `ldd` on its executables. This can also be done in `appimage-run`, by setting `APPIMAGE_DEBUG_EXEC=bash`. + - Running `strace -vfefile` on the wrapped executable, looking for libraries that can't be found. diff --git a/doc/builders/images/appimagetools.xml b/doc/builders/images/appimagetools.xml deleted file mode 100644 index 45c5619abd9..00000000000 --- a/doc/builders/images/appimagetools.xml +++ /dev/null @@ -1,102 +0,0 @@ -
- pkgs.appimageTools - - - pkgs.appimageTools is a set of functions for extracting and wrapping AppImage files. They are meant to be used if traditional packaging from source is infeasible, or it would take too long. To quickly run an AppImage file, pkgs.appimage-run can be used as well. - - - - - The appimageTools API is unstable and may be subject to backwards-incompatible changes in the future. - - - -
- AppImage formats - - - There are different formats for AppImages, see the specification for details. - - - - - - Type 1 images are ISO 9660 files that are also ELF executables. - - - - - Type 2 images are ELF executables with an appended filesystem. - - - - - - They can be told apart with file -k: - - - -$ file -k type1.AppImage -type1.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) ISO 9660 CD-ROM filesystem data 'AppImage' (Lepton 3.x), scale 0-0, -spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: offset 0.000000, slope 0.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=d629f6099d2344ad82818172add1d38c5e11bc6d, stripped\012- data - -$ file -k type2.AppImage -type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped\012- data - - - - Note how the type 1 AppImage is described as an ISO 9660 CD-ROM filesystem, and the type 2 AppImage is not. - -
- -
- Wrapping - - - Depending on the type of AppImage you're wrapping, you'll have to use wrapType1 or wrapType2. - - - -appimageTools.wrapType2 { # or wrapType1 - name = "patchwork"; - src = fetchurl { - url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage"; - sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s"; - }; - extraPkgs = pkgs: with pkgs; [ ]; -} - - - - - name specifies the name of the resulting image. - - - - - src specifies the AppImage file to extract. - - - - - extraPkgs allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs: - - - - Looking through the extracted AppImage files, reading its scripts and running patchelf and ldd on its executables. This can also be done in appimage-run, by setting APPIMAGE_DEBUG_EXEC=bash. - - - - - Running strace -vfefile on the wrapped executable, looking for libraries that can't be found. - - - - - - -
-
diff --git a/doc/builders/images/snap/example-firefox.nix b/doc/builders/images/snap/example-firefox.nix deleted file mode 100644 index d58c98a65a2..00000000000 --- a/doc/builders/images/snap/example-firefox.nix +++ /dev/null @@ -1,28 +0,0 @@ -let - inherit (import { }) snapTools firefox; -in snapTools.makeSnap { - meta = { - name = "nix-example-firefox"; - summary = firefox.meta.description; - architectures = [ "amd64" ]; - apps.nix-example-firefox = { - command = "${firefox}/bin/firefox"; - plugs = [ - "pulseaudio" - "camera" - "browser-support" - "avahi-observe" - "cups-control" - "desktop" - "desktop-legacy" - "gsettings" - "home" - "network" - "mount-observe" - "removable-media" - "x11" - ]; - }; - confinement = "strict"; - }; -} diff --git a/doc/builders/images/snap/example-hello.nix b/doc/builders/images/snap/example-hello.nix deleted file mode 100644 index 123da80c547..00000000000 --- a/doc/builders/images/snap/example-hello.nix +++ /dev/null @@ -1,12 +0,0 @@ -let - inherit (import { }) snapTools hello; -in snapTools.makeSnap { - meta = { - name = "hello"; - summary = hello.meta.description; - description = hello.meta.longDescription; - architectures = [ "amd64" ]; - confinement = "strict"; - apps.hello.command = "${hello}/bin/hello"; - }; -} diff --git a/doc/builders/images/snaptools.section.md b/doc/builders/images/snaptools.section.md new file mode 100644 index 00000000000..9e1403b8828 --- /dev/null +++ b/doc/builders/images/snaptools.section.md @@ -0,0 +1,71 @@ +# pkgs.snapTools {#sec-pkgs-snapTools} + +`pkgs.snapTools` is a set of functions for creating Snapcraft images. Snap and Snapcraft is not used to perform these operations. + +## The makeSnap Function {#ssec-pkgs-snapTools-makeSnap-signature} + +`makeSnap` takes a single named argument, `meta`. This argument mirrors [the upstream `snap.yaml` format](https://docs.snapcraft.io/snap-format) exactly. + +The `base` should not be specified, as `makeSnap` will force set it. + +Currently, `makeSnap` does not support creating GUI stubs. + +## Build a Hello World Snap {#ssec-pkgs-snapTools-build-a-snap-hello} + +The following expression packages GNU Hello as a Snapcraft snap. + +```{#ex-snapTools-buildSnap-hello .nix} +let + inherit (import { }) snapTools hello; +in snapTools.makeSnap { + meta = { + name = "hello"; + summary = hello.meta.description; + description = hello.meta.longDescription; + architectures = [ "amd64" ]; + confinement = "strict"; + apps.hello.command = "${hello}/bin/hello"; + }; +} +``` + +`nix-build` this expression and install it with `snap install ./result --dangerous`. `hello` will now be the Snapcraft version of the package. + +## Build a Graphical Snap {#ssec-pkgs-snapTools-build-a-snap-firefox} + +Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package. + +```{#ex-snapTools-buildSnap-firefox .nix} +let + inherit (import { }) snapTools firefox; +in snapTools.makeSnap { + meta = { + name = "nix-example-firefox"; + summary = firefox.meta.description; + architectures = [ "amd64" ]; + apps.nix-example-firefox = { + command = "${firefox}/bin/firefox"; + plugs = [ + "pulseaudio" + "camera" + "browser-support" + "avahi-observe" + "cups-control" + "desktop" + "desktop-legacy" + "gsettings" + "home" + "network" + "mount-observe" + "removable-media" + "x11" + ]; + }; + confinement = "strict"; + }; +} +``` + +`nix-build` this expression and install it with `snap install ./result --dangerous`. `nix-example-firefox` will now be the Snapcraft version of the Firefox package. + +The specific meaning behind plugs can be looked up in the [Snapcraft interface documentation](https://docs.snapcraft.io/supported-interfaces). diff --git a/doc/builders/images/snaptools.xml b/doc/builders/images/snaptools.xml deleted file mode 100644 index bbe2e3f5e14..00000000000 --- a/doc/builders/images/snaptools.xml +++ /dev/null @@ -1,59 +0,0 @@ -
- pkgs.snapTools - - - pkgs.snapTools is a set of functions for creating Snapcraft images. Snap and Snapcraft is not used to perform these operations. - - -
- The makeSnap Function - - - makeSnap takes a single named argument, meta. This argument mirrors the upstream snap.yaml format exactly. - - - - The base should not be specified, as makeSnap will force set it. - - - - Currently, makeSnap does not support creating GUI stubs. - -
- -
- Build a Hello World Snap - - - Making a Hello World Snap - - The following expression packages GNU Hello as a Snapcraft snap. - - - - nix-build this expression and install it with snap install ./result --dangerous. hello will now be the Snapcraft version of the package. - - -
- -
- Build a Hello World Snap - - - Making a Graphical Snap - - Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package. - - - - nix-build this expression and install it with snap install ./result --dangerous. nix-example-firefox will now be the Snapcraft version of the Firefox package. - - - The specific meaning behind plugs can be looked up in the Snapcraft interface documentation. - - -
-
From 3c781e6d191b716e0f693d6ee214f11a1ae4f832 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Apr 2021 02:56:20 +0200 Subject: [PATCH 049/119] common-updater-scripts: handle default.nix without arguments So that the script can be used outside of nixpkgs. For example, the default.nix recommended by flake-compat does not take arguments. --- pkgs/common-updater/scripts/update-source-version | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 831f65e4d90..0c914ebee2c 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -59,6 +59,9 @@ newVersion=${args[1]} newHash=${args[2]} newUrl=${args[3]} +# Third-party repositories might not accept arguments in their default.nix. +importTree="(let tree = import ./.; in if builtins.isFunction tree then tree {} else tree)" + if (( "${#args[*]}" < 2 )); then echo "$scriptName: Too few arguments" usage @@ -93,13 +96,13 @@ if [[ $(grep --count "$oldHash" "$nixFile") != 1 ]]; then die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!" fi -oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"') +oldUrl=$(nix-instantiate $systemArg --eval -E "with $importTree; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"') if [[ -z "$oldUrl" ]]; then die "Couldn't evaluate source url from '$attr.src'!" fi -oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"') +oldVersion=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"') if [[ -z "$oldVersion" ]]; then die "Couldn't find out the old version of '$attr'!" @@ -114,7 +117,7 @@ if [[ "$oldVersion" = "$newVersion" ]]; then fi if [[ -n "$newRevision" ]]; then - oldRevision=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.src.rev" | tr -d '"') + oldRevision=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.src.rev" | tr -d '"') if [[ -z "$oldRevision" ]]; then die "Couldn't evaluate source revision from '$attr.src'!" fi From 38e20a3242a8dbd50d1c7d2dc060232edb7d907f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Apr 2021 03:42:01 +0200 Subject: [PATCH 050/119] common-updater-scripts: Replace flake source by local path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When update-source-version is run in a repo with flake-compat, it would find the files in Nix store. Let’s replace them with the local path of the repository. --- pkgs/common-updater/scripts/update-source-version | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 0c914ebee2c..15792e1502e 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -83,6 +83,14 @@ if [[ -z "$nixFile" ]]; then if [[ ! -f "$nixFile" ]]; then die "Couldn't evaluate '$attr.meta.position' to locate the .nix file!" fi + + # flake-compat will return paths in the Nix store, we need to correct for that. + possiblyOutPath=$(nix-instantiate $systemArg --eval -E "with $importTree; outPath" | tr -d '"') + if [[ -n "$possiblyOutPath" ]]; then + outPathEscaped=$(echo "$possiblyOutPath" | sed 's#[$^*\\.[|]#\\&#g') + pwdEscaped=$(echo "$PWD" | sed 's#[$^*\\.[|]#\\&#g') + nixFile=$(echo "$nixFile" | sed "s|^$outPathEscaped|$pwdEscaped|") + fi fi oldHashAlgo=$(nix-instantiate $systemArg --eval --strict -A "$attr.src.drvAttrs.outputHashAlgo" | tr -d '"') From 0fffe0ed7ebba191780cc94aa5e16014adf57910 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Fri, 23 Apr 2021 18:47:37 -0700 Subject: [PATCH 051/119] just: fix Darwin build --- pkgs/development/tools/just/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index c6863d535dd..5b3f966399f 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }: +{ lib, fetchFromGitHub, stdenv, rustPlatform, coreutils, bash, installShellFiles, libiconv }: rustPlatform.buildRustPackage rec { pname = "just"; @@ -14,6 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-YDIGZRbszhgWM7iAc2i89jyndZvZZsg63ADQfqFxfXw="; nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; postInstall = '' installManPage man/just.1 From 3771de8ae019afbf0d37ffe390f3fec92cd2dffd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Apr 2021 04:36:58 +0200 Subject: [PATCH 052/119] common-updater-scripts: Support attribute lookup in flake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In flakes, packages are not exposed directly but instead they are declared inside “packages” or “legacyPackages” output under their host platform. flake-compat reflects this. Let’s look for an attribute also in these outputs if the direct lookup fails. --- .../scripts/update-source-version | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 15792e1502e..d5c23466ee0 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -19,6 +19,7 @@ args=() for arg in "$@"; do case $arg in --system=*) + system="${arg#*=}" systemArg="--system ${arg#*=}" ;; --version-key=*) @@ -78,6 +79,26 @@ if [[ -z "$versionKey" ]]; then versionKey=version fi +# Allow finding packages among flake outputs in repos using flake-compat. +pname=$(nix-instantiate $systemArg --eval --strict -A "$attr.name" || echo) +if [[ -z "$pname" ]]; then + if [[ -z "$system" ]]; then + system=$(nix-instantiate --eval -E 'builtins.currentSystem' | tr -d '"') + fi + + pname=$(nix-instantiate $systemArg --eval --strict -A "packages.$system.$attr.name" || echo) + if [[ -n "$pname" ]]; then + attr="packages.$system.$attr" + else + pname=$(nix-instantiate $systemArg --eval --strict -A "legacyPackages.$system.$attr.name" || echo) + if [[ -n "$pname" ]]; then + attr="legacyPackages.$system.$attr" + else + die "Could not find attribute '$attr'!" + fi + fi +fi + if [[ -z "$nixFile" ]]; then nixFile=$(nix-instantiate $systemArg --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') if [[ ! -f "$nixFile" ]]; then From 4e96143fe57ec6f4cd599f71eb713168cf758d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 23 Apr 2021 22:19:21 -0500 Subject: [PATCH 053/119] pgsync: init at 0.6.6 --- .../development/tools/database/pgsync/Gemfile | 2 + .../tools/database/pgsync/Gemfile.lock | 23 +++++++ .../tools/database/pgsync/default.nix | 15 +++++ .../tools/database/pgsync/gemset.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 106 insertions(+) create mode 100644 pkgs/development/tools/database/pgsync/Gemfile create mode 100644 pkgs/development/tools/database/pgsync/Gemfile.lock create mode 100644 pkgs/development/tools/database/pgsync/default.nix create mode 100644 pkgs/development/tools/database/pgsync/gemset.nix diff --git a/pkgs/development/tools/database/pgsync/Gemfile b/pkgs/development/tools/database/pgsync/Gemfile new file mode 100644 index 00000000000..f87a033ad7d --- /dev/null +++ b/pkgs/development/tools/database/pgsync/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'pgsync' diff --git a/pkgs/development/tools/database/pgsync/Gemfile.lock b/pkgs/development/tools/database/pgsync/Gemfile.lock new file mode 100644 index 00000000000..5ee736430af --- /dev/null +++ b/pkgs/development/tools/database/pgsync/Gemfile.lock @@ -0,0 +1,23 @@ +GEM + remote: https://rubygems.org/ + specs: + parallel (1.20.1) + pg (1.2.3) + pgsync (0.6.6) + parallel + pg (>= 0.18.2) + slop (>= 4.8.2) + tty-spinner + slop (4.8.2) + tty-cursor (0.7.1) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + +PLATFORMS + ruby + +DEPENDENCIES + pgsync + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/development/tools/database/pgsync/default.nix b/pkgs/development/tools/database/pgsync/default.nix new file mode 100644 index 00000000000..f89b25bf0a7 --- /dev/null +++ b/pkgs/development/tools/database/pgsync/default.nix @@ -0,0 +1,15 @@ +{ lib, bundlerApp }: + +bundlerApp rec { + gemdir = ./.; + pname = "pgsync"; + exes = [ "pgsync" ]; + + meta = with lib; { + description = "Sync data from one Postgres database to another (like `pg_dump`/`pg_restore`)"; + homepage = "https://github.com/ankane/pgsync"; + license = with licenses; mit; + maintainers = with maintainers; [ fabianhjr ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/database/pgsync/gemset.nix b/pkgs/development/tools/database/pgsync/gemset.nix new file mode 100644 index 00000000000..18a83397072 --- /dev/null +++ b/pkgs/development/tools/database/pgsync/gemset.nix @@ -0,0 +1,64 @@ +{ + parallel = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; + type = "gem"; + }; + version = "1.20.1"; + }; + pg = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + type = "gem"; + }; + version = "1.2.3"; + }; + pgsync = { + dependencies = ["parallel" "pg" "slop" "tty-spinner"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wjvcfsgm7xxhb2lxil19qjxvvihqxbjd2ykmm5d43p0h2l9wvxr"; + type = "gem"; + }; + version = "0.6.6"; + }; + slop = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05d1xv8r9cmd0mmlqpa853yzd7xhcyha063w1g8dpf84scxbxmd3"; + type = "gem"; + }; + version = "4.8.2"; + }; + tty-cursor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; + type = "gem"; + }; + version = "0.7.1"; + }; + tty-spinner = { + dependencies = ["tty-cursor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf"; + type = "gem"; + }; + version = "0.9.3"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69c97493219..64b5f04dd9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7481,6 +7481,8 @@ in pgmetrics = callPackage ../tools/misc/pgmetrics { }; + pgsync = callPackage ../development/tools/database/pgsync { }; + pdsh = callPackage ../tools/networking/pdsh { rsh = true; # enable internal rsh implementation ssh = openssh; From 67ace3a32d386ffe7c464b8f43bf662a110ab3d4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 24 Apr 2021 04:20:00 +0000 Subject: [PATCH 054/119] goaccess: 1.4 -> 1.4.6 --- pkgs/tools/misc/goaccess/default.nix | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 4a02e921f47..5ccf4b96d81 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,36 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, libmaxminddb, fetchpatch }: +{ lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }: stdenv.mkDerivation rec { - version = "1.4"; + version = "1.4.6"; pname = "goaccess"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "1gkpjg39f3afdwm9128jqjsfap07p8s027czzlnxfmi5hpzvkyz8"; + sha256 = "1l3j3i4vb7ni7i047qvi9a3hs43ym24r6hfcnqsbhgrb731jf3qx"; }; - patches = [ - (fetchpatch { - url = "https://github.com/allinurl/goaccess/commit/514618cdd69453497fbf67913ccb37a0a0b07391.patch"; - sha256 = "11lp7mabfl6ibgzsd9nw10k2xvcm0hrimrwidl06r8dqn2jzjxf6"; - }) - ]; - configureFlags = [ - "--enable-geoip=mmdb" "--enable-utf8" - ]; + "--with-openssl" + ] ++ lib.optionals withGeolocation [ "--enable-geoip=mmdb" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libmaxminddb - ncurses - glib - ]; + buildInputs = [ ncurses openssl ] + ++ lib.optionals withGeolocation [ libmaxminddb ] + ++ lib.optionals stdenv.isDarwin [ gettext ]; meta = { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; homepage = "https://goaccess.io"; + changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog"; license = lib.licenses.mit; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ ederoyd46 ]; From b22752a770847cd8bb6f3396992b7cb373fa45f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 24 Apr 2021 07:27:17 +0200 Subject: [PATCH 055/119] gdu: disable tests --- pkgs/tools/system/gdu/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 348d635584f..787702efff6 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -35,7 +35,14 @@ buildGoModule rec { installManPage gdu.1 ''; - doCheck = !(stdenv.isAarch64 || stdenv.isDarwin); + # tests fail with: + # dir_test.go:76: + # Error Trace: dir_test.go:76 + # Error: Not equal: + # expected: 0 + # actual : 512 + # Test: TestFlags + doCheck = false; meta = with lib; { description = "Disk usage analyzer with console interface"; From 6d495d51e19fc474aa8b587c4bc09f60ed3cd706 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sat, 24 Apr 2021 08:53:06 +0200 Subject: [PATCH 056/119] pixelnuke: init 2019-05-19 (#119709) Co-authored-by: Christoph Neidahl Co-authored-by: Sandro --- .../graphics/pixelnuke/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/graphics/pixelnuke/default.nix diff --git a/pkgs/applications/graphics/pixelnuke/default.nix b/pkgs/applications/graphics/pixelnuke/default.nix new file mode 100644 index 00000000000..4cb2440cb8e --- /dev/null +++ b/pkgs/applications/graphics/pixelnuke/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, libevent, glew, glfw }: + +stdenv.mkDerivation { + pname = "pixelnuke"; + version = "unstable-2019-05-19"; + + src = fetchFromGitHub { + owner = "defnull"; + repo = "pixelflut"; + rev = "3458157a242ba1789de7ce308480f4e1cbacc916"; + sha256 = "03dp0p00chy00njl4w02ahxqiwqpjsrvwg8j4yi4dgckkc3gbh40"; + }; + + sourceRoot = "source/pixelnuke"; + + buildInputs = [ libevent glew glfw ]; + + installPhase = '' + install -Dm755 ./pixelnuke $out/bin/pixelnuke + ''; + + meta = with lib; { + description = "Multiplayer canvas (C implementation)"; + homepage = "https://cccgoe.de/wiki/Pixelflut"; + license = licenses.unlicense; + platforms = platforms.linux; + maintainers = with maintainers; [ mrVanDalo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f1b7ebc854..b29088abf31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23695,6 +23695,8 @@ in '' + (drv.postInstall or ""); }); + pixelnuke = callPackage ../applications/graphics/pixelnuke { }; + slack = callPackage ../applications/networking/instant-messengers/slack { }; slack-cli = callPackage ../tools/networking/slack-cli { }; From d42e8b35d157d4e8ea7112d299aad55554a10ca2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:38 +0200 Subject: [PATCH 057/119] python3Packages.archinfo: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index fc83073a3a2..7802df99ebe 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.6790"; + version = "9.0.6852"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A4WvRElahRv/XmlmS4WexMqm8FIZ1SSUnbdoAWWECMk="; + sha256 = "sha256-NlL/uRI568HYkt8T2kuzyHNXpWybOLbFduE+1dzm4Qo="; }; checkInputs = [ From ac1adaa1848ceecb9048c2f2b913e208c94fce7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:41 +0200 Subject: [PATCH 058/119] python3Packages.ailment: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 121182083d3..f7194f8dd2f 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.6790"; + version = "9.0.6852"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RcLa18JqQ7c8u+fhyNHmJEXt/Lg73JDAImtUtiaZbTw="; + sha256 = "sha256-yIYZubZ8073voe4C78QITP3Pau/mrpNTyhPpU/QftXo="; }; propagatedBuildInputs = [ pyvex ]; From 8533e7d446fccd7d214152d7ded4cc1c3e154501 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:43 +0200 Subject: [PATCH 059/119] python3Packages.pyvex: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 566cd79b01c..fa3d2119ae8 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.6790"; + version = "9.0.6852"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bqOLHGlLQ12nYzbv9H9nJ0/Q5APJb/9B82YtHk3IvYQ="; + sha256 = "sha256-O84QErqHIRYQZh9mR71opm+j7kb9a4s5f1yj0WNiJAM="; }; propagatedBuildInputs = [ From bad41dc48e4cab66c37dcab30523edb8f6645b97 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:46 +0200 Subject: [PATCH 060/119] python3Packages.claripy: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 9f077df96f0..c3a715c1527 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.6790"; + version = "9.0.6852"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GpWHj3bNgr7nQoIKM4VQtVkbObxqw6QkuEmfmPEiJmE="; + sha256 = "sha256-31zaL3PJDXyLvVD3Xdc2qoLSrXipwTawHoj+I+Y6fng="; }; # Use upstream z3 implementation From c9f255825e8c4e9e5a33d8218112fab7214828c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:49 +0200 Subject: [PATCH 061/119] python3Packages.cle: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index feaab56600f..4daab505962 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.6790"; + version = "9.0.6852"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zQggVRdc8fV1ulFnOlzYLvSOSOP3+dY8j+6lo+pXSkM="; + sha256 = "sha256-IRyRio3M7YZtdBqb7PGoWs2Lyt8hjBLYM1zQYbhjYEs="; }; propagatedBuildInputs = [ From c150ea08736b8bbc4ee950fe41fde743b8a40dd4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:52 +0200 Subject: [PATCH 062/119] python3Packages.angr: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 1875c1deea0..b67c3524fae 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -42,14 +42,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.6790"; + version = "9.0.6852"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-PRghK/BdgxGpPuinkGr+rREza1pQXz2gxnXiSmxBSTc="; + sha256 = "sha256-8BN706jqflhKmHVLQ1Y0k3GMScB1Hs5E/zndgq0sXB8="; }; propagatedBuildInputs = [ From f728aa666bde888473c2979f6797ef6bc576f795 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:54 +0200 Subject: [PATCH 063/119] python3Packages.angrop: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 45c092cf0d6..1237ed6fa46 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.6790"; + version = "9.0.6852"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "16r22ajkj8sxbgsym0i85xdjvphgf1566p5s7d915kkj37qdrrpy"; + sha256 = "sha256-uOf2d3TbTdLobqfdOUSVQ/mqyD3TaYPlPCNFsqcPrXo="; }; propagatedBuildInputs = [ From 793562da349112cb3669386d6e800a1e33a41a6a Mon Sep 17 00:00:00 2001 From: hdhog Date: Sat, 24 Apr 2021 11:16:07 +0400 Subject: [PATCH 064/119] git-chglog: 0.9.1 -> 0.14.2 (#120097) --- .../git-and-tools/git-chglog/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix b/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix index 05d5dfe9605..8ec57f2e69e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix @@ -1,20 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "git-chglog"; - version = "0.9.1"; - - goPackagePath = "github.com/git-chglog/git-chglog"; + version = "0.14.2"; src = fetchFromGitHub { owner = "git-chglog"; repo = "git-chglog"; - rev = version; - sha256 = "08x7w1jlvxxvwnz6pvkjmfd3nqayd8n15r9jbqi2amrp31z0gq0p"; + rev = "v${version}"; + sha256 = "124bqywkj37gv61fswgrg528bf3rjqms1664x22lkn0sqh22zyv1"; }; + vendorSha256 = "09zjypmcc3ra7sw81q1pbbrlpxxp4k00p1cfkrrih8wvb25z89h5"; + + buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=v${version}" ]; + + subPackages = [ "cmd/git-chglog" ]; + meta = with lib; { description = "CHANGELOG generator implemented in Go (Golang)"; + homepage = "https://github.com/git-chglog/git-chglog"; license = licenses.mit; maintainers = with maintainers; [ ldenefle ]; }; From 755633ea54894e8f50a038c1e619e509d51bb93f Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 24 Apr 2021 16:32:01 +0900 Subject: [PATCH 065/119] cryfs: disable tests on Darwin The tests [require macFUSE to be installed][1] on Darwin. This change disable the tests because Hydra doesn't have it installed. [1]: https://github.com/NixOS/nixpkgs/blob/master/doc/builders/packages/fuse.section.md --- pkgs/tools/filesystems/cryfs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index a0dc3124159..0da6c4c2099 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -62,7 +62,8 @@ stdenv.mkDerivation rec { "-DBUILD_TESTING:BOOL=${if doCheck then "TRUE" else "FALSE"}" ] ++ lib.optional doCheck "-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake"; - doCheck = true; + # macFUSE needs to be installed for the test to succeed on Darwin + doCheck = !stdenv.isDarwin; checkPhase = '' # Skip CMakeFiles directory and tests depending on fuse (does not work well with sandboxing) From 31014c4a2888cd4f782b0cba246f3b8036d63b30 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 23 Apr 2021 06:38:58 +0200 Subject: [PATCH 066/119] ocamlPackages.mirage-crypto*: 0.9.2 -> 0.10.0 https://github.com/mirage/mirage-crypto/releases/tag/v0.10.0 --- pkgs/development/ocaml-modules/mirage-crypto/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index eec6f447dc4..2eda6d5f55e 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config +{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, bigarray-compat, pkg-config , withFreestanding ? false , ocaml-freestanding }: @@ -7,11 +7,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.9.2"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "da200c0afdbe63474ab19f2bc616e26c10b0e4fbb53fb97fefb2794212f5d442"; + sha256 = "20915c53ddb658c53f588c414f13676bc8ad3cd734d9ed909225ea080dd8144d"; }; useDune2 = true; @@ -21,7 +21,7 @@ buildDunePackage rec { nativeBuildInputs = [ dune-configurator pkg-config ]; propagatedBuildInputs = [ - cstruct eqaf + cstruct eqaf bigarray-compat ] ++ lib.optionals withFreestanding [ ocaml-freestanding ]; From 7c5e7d69eb3a04100047f2b43dc22fd78db2b8a8 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 24 Apr 2021 09:55:46 +0200 Subject: [PATCH 067/119] python3Packages.survey: 3.4.2 -> 3.4.3 --- pkgs/development/python-modules/survey/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix index 99a2d85aaa2..34b1eed1727 100644 --- a/pkgs/development/python-modules/survey/default.nix +++ b/pkgs/development/python-modules/survey/default.nix @@ -1,16 +1,19 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , wrapio }: buildPythonPackage rec { pname = "survey"; - version = "3.4.2"; + version = "3.4.3"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aF7ZS5oxeIOb7mJsrusdc3HefcPE+3OTXcJB/pjJxFY="; + sha256 = "sha256-TK89quY3bpNIEz1n3Ecew4FnTH6QgeSLdDNV86gq7+I="; }; propagatedBuildInputs = [ From efa5a31633a93bb3f12b6c0499ad1bbb28766850 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 24 Apr 2021 09:59:40 +0200 Subject: [PATCH 068/119] wine{Unstable,Staging}: 6.6 -> 6.7 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 549e9c7a551..0fe4e4da92d 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.6"; + version = "6.7"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-meUixtzArB1T0gG/MFSJH98RhkJXRzw+s0HjdnH9hK0="; + sha256 = "sha256-wwUUt3YdRhFRSuAhyx41QSjXfv9UooPxQB7nAid7vqQ="; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono @@ -65,7 +65,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-ur7ZD9F/V4TkR4YzxwsuhP/Dq/svH29T4hFkp/ZNtTQ="; + sha256 = "sha256-fWriizSk2+U7Mpn6w/Dlrevd4vc5MnlSWSGxQDf2p+M="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From a663a7e18cb1b24d664614ef083ee17822bdf61d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 24 Apr 2021 10:13:40 +0200 Subject: [PATCH 069/119] pythonPackages.pyturbojpeg: 1.4.2 -> 1.4.3 https://github.com/lilohuang/PyTurboJPEG/releases/tag/v1.4.3 --- pkgs/development/python-modules/pyturbojpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix index cb74224770d..abfc34e6481 100644 --- a/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.4.2"; + version = "1.4.3"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - sha256 = "sha256-dWmj/huCkborcShf2BT+L3ybEfgdKVIGiJnkz755xwo="; + sha256 = "sha256-Q7KVfR9kA32QPQFWgSSCVB5sNOmSF8y5J4dmBc14jvg="; }; patches = [ From 02c2a942d9c0cd6e2b992168d15a1dae5806d24c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 24 Apr 2021 10:59:07 +0200 Subject: [PATCH 070/119] python3Packages.dask-glm: fix eval --- pkgs/development/python-modules/dask-glm/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 85196369512..ca25e05bb1e 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -9,7 +9,6 @@ , scipy , scikitlearn , pytest -, setuptools-scm }: buildPythonPackage rec { @@ -23,7 +22,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest ]; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ]; checkPhase = '' From adb13fb8a289e02bacfd474252e9c6b72888a225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 23 Apr 2021 09:53:35 +0200 Subject: [PATCH 071/119] telegraf: 1.18.0 -> 1.18.1 --- pkgs/servers/monitoring/telegraf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 285db02e1cc..37a4b3e87da 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.18.0"; + version = "1.18.1"; excludedPackages = "test"; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-1sFl+F3g2anssW59eKbjPdVCIyGq8JuoJGXVQZys854="; + sha256 = "sha256-iFigbnqUXWQrhDovwQYZsr8llkB9553c5LgcKJ78yZ4="; }; vendorSha256 = "sha256-m53S/L71nyioCBbIDDAWEnqStBdqTFGq16y5ozsXq1c="; From 94d73b52f2914eed2558c1a155f0c574e76f6c03 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 24 Apr 2021 11:16:47 +0200 Subject: [PATCH 072/119] python3Packages.panel: 0.11.1 -> 0.11.3 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- .../python-modules/panel/node/node-packages.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index fa8dbddd04e..58ae09af14b 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -15,7 +15,7 @@ let node = callPackage ./node {}; in buildPythonPackage rec { pname = "panel"; - version = "0.11.1"; + version = "0.11.3"; # Don't forget to also update the node packages # 1. retrieve the package.json file @@ -23,7 +23,7 @@ in buildPythonPackage rec { # 3. node2nix src = fetchPypi { inherit pname version; - sha256 = "ce531e5c0c8a8ae74d523762aeb1666650caebbe1867aba16129d29791e921f9"; + sha256 = "sha256-HpHYHysPE6MRxR0kek5C7sunHMfBsUGdZfxamz2jcLc="; }; # Since 0.10.0 panel attempts to fetch from the web. diff --git a/pkgs/development/python-modules/panel/node/node-packages.nix b/pkgs/development/python-modules/panel/node/node-packages.nix index 7b591b6e469..6e45b64d5c6 100644 --- a/pkgs/development/python-modules/panel/node/node-packages.nix +++ b/pkgs/development/python-modules/panel/node/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@bokeh/bokehjs-2.3.0" = { + "@bokeh/bokehjs-2.3.1" = { name = "_at_bokeh_slash_bokehjs"; packageName = "@bokeh/bokehjs"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.0.tgz"; - sha512 = "geKBhYUVJ5IaY0UNk9k2P0yiYLCj+DOeNjdDneuTJ8K5R9fs0Rpp4iiaQKUGr1yUyQHGHLU8sk4CFZ+Bd5ZILg=="; + url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.1.tgz"; + sha512 = "DlNZaqAJFUw38IuSk2TUOcfyiK8Ya3kDRpYt/RgVUftIDW2CWLbBo47kbug9+ykEF49rcnlxcCXhNXzpg4V7gw=="; }; }; "@bokeh/numbro-1.6.2" = { @@ -476,10 +476,10 @@ let args = { name = "_at_holoviz_slash_panel"; packageName = "@holoviz/panel"; - version = "0.11.1"; + version = "0.11.3"; src = ./.; dependencies = [ - sources."@bokeh/bokehjs-2.3.0" + sources."@bokeh/bokehjs-2.3.1" sources."@bokeh/numbro-1.6.2" (sources."@bokeh/slickgrid-2.4.2702" // { dependencies = [ From 61f2b36624b039c1ea35e3eba72d094e6bbb1e15 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 24 Apr 2021 11:20:05 +0200 Subject: [PATCH 073/119] ddcutil: 1.0.1 -> 1.1.0 --- pkgs/tools/misc/ddcutil/default.nix | 4 +- pkgs/tools/misc/ddcutil/nixos-paths.diff | 54 ++++++++++++------------ 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 1717b88f194..b1a42f57703 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "sha256-F/tKW81bAyYtwpxhl5XC8YyMB+6S0XmqqigwJY2WFDU="; + sha256 = "0wv8a8zjahzmi4qx0lc24mwyi3jklj1yxqq26fwklmfh5dv1y8yc"; }; patches = [ diff --git a/pkgs/tools/misc/ddcutil/nixos-paths.diff b/pkgs/tools/misc/ddcutil/nixos-paths.diff index e45eb88b519..54d17ea5bfe 100644 --- a/pkgs/tools/misc/ddcutil/nixos-paths.diff +++ b/pkgs/tools/misc/ddcutil/nixos-paths.diff @@ -1,32 +1,30 @@ -diff --git a/src/app_sysenv/query_sysenv_modules.c b/src/app_sysenv/query_sysenv_modules.c -index 59df64f1..fb244dd0 100644 ---- a/src/app_sysenv/query_sysenv_modules.c -+++ b/src/app_sysenv/query_sysenv_modules.c -@@ -50,7 +50,9 @@ bool is_module_loadable(char * module_name, int depth) { - g_snprintf(module_name_ko, 100, "%s.ko", module_name); - - char dirname[PATH_MAX]; -- g_snprintf(dirname, PATH_MAX, "/lib/modules/%s/kernel/drivers/i2c", utsbuf.release); -+ g_snprintf(dirname, PATH_MAX, -+ "/run/booted-system/kernel-modules/lib/modules/%s/kernel/drivers/i2c", -+ utsbuf.release); - - struct dirent *dent; - DIR *d; -diff --git a/src/util/linux_util.c b/src/util/linux_util.c -index 5eb8491c..3a129ccf 100644 --- a/src/util/linux_util.c +++ b/src/util/linux_util.c -@@ -29,8 +29,10 @@ bool is_module_builtin(char * module_name) - int rc = uname(&utsbuf); - assert(rc == 0); +@@ -125,6 +125,7 @@ + "lib64", + "lib32", + "usr/lib", // needed for arch? ++ "run/booted-system/kernel-modules/lib", // NixOS + NULL}; + int result = -1; + int ndx = 0; +@@ -204,14 +205,15 @@ + if (debug) + printf("(%s) machine: %s", __func__, utsbuf.machine); -- char modules_builtin_fn[100]; -- snprintf(modules_builtin_fn, 100, "/lib/modules/%s/modules.builtin", utsbuf.release); -+ char modules_builtin_fn[PATH_MAX]; -+ snprintf(modules_builtin_fn, PATH_MAX, -+ "/run/booted-system/kernel-modules/lib/modules/%s/modules.builtin", -+ utsbuf.release); +- char * libdirs[3]; ++ char * libdirs[4]; + libdirs[0] = "lib"; ++ libdirs[1] = "run/booted-system/kernel-modules/lib"; + if (streq(utsbuf.machine, "amd_64")){ +- libdirs[1] = "lib64"; +- libdirs[2] = NULL; ++ libdirs[2] = "lib64"; ++ libdirs[3] = NULL; + } + else +- libdirs[1] = NULL; ++ libdirs[2] = NULL; - char ko_name[40]; - snprintf(ko_name, 40, "%s.ko", module_name); + int libsndx = 0; + bool found = false; From 8fce6f76254543f8faf7900590a998d95cbc917f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 24 Apr 2021 11:22:10 +0200 Subject: [PATCH 074/119] python3Packages.pyviz-comms: 2.0.1 -> 0.7.6 Downgrade to 0.7.6 because its dependents (panel, holoviews) do not seem to be compatible yet with this 2.x. --- pkgs/development/python-modules/pyviz-comms/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index d2771da1b52..e9e07de4df2 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -2,15 +2,16 @@ , fetchPypi , lib , param +, panel }: buildPythonPackage rec { pname = "pyviz_comms"; - version = "2.0.1"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "be63957a49772895ddebeac02c697e1675e0bdf1515824f60fcc261914f23624"; + sha256 = "sha256-zZZJqeqd/LmzTXj5pk4YcKqLa5TeVG4smca7U9ZKtdE="; }; propagatedBuildInputs = [ param ]; @@ -18,6 +19,10 @@ buildPythonPackage rec { # there are not tests with the package doCheck = false; + passthru.tests = { + inherit panel; + }; + meta = with lib; { description = "Launch jobs, organize the output, and dissect the results"; homepage = "https://pyviz.org/"; From 8aab788d4a703ee3e0edae7630d94952a2e6cd4f Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 24 Apr 2021 11:30:02 +0200 Subject: [PATCH 075/119] check_systemd: 2.2.1 -> 2.3.1 --- pkgs/servers/monitoring/nagios/plugins/check_systemd.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix b/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix index 06cd0cf9b2d..fb2d9c5f4e7 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "check_systemd"; - version = "2.2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Josef-Friedrich"; repo = pname; rev = "v${version}"; - sha256 = "04r14dhqzrdndn235dvr6afy4s4g4asynsgvj99cmyq55nah4asn"; + sha256 = "11sc0gycxzq1vfvin501jnwnky2ky6ns64yjiw8vq9vmkbf8nni6"; }; propagatedBuildInputs = with python3Packages; [ nagiosplugin ]; @@ -29,6 +29,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Nagios / Icinga monitoring plugin to check systemd for failed units"; inherit (src.meta) homepage; + changelog = "https://github.com/Josef-Friedrich/check_systemd/releases"; maintainers = with maintainers; [ symphorien ]; license = licenses.lgpl2Only; platforms = platforms.linux; From bc222c449ec0129034d49de361e34053587fba21 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 24 Apr 2021 11:30:23 +0200 Subject: [PATCH 076/119] gdu: remove unused input --- pkgs/tools/system/gdu/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 787702efff6..3b7ef2c88d9 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , installShellFiles From a902d99422c6a522ffae7b8ad7711e23c7490d42 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 24 Apr 2021 11:31:11 +0200 Subject: [PATCH 077/119] llvmPackages_12: Always use the attribute name for pname This might be a bit debatable but upstream uses "xx" instead of "++" when using it as identifier / in the code (file/directory names, build scripts, website URLs, etc.) so we should probably too. And at least the attribute name and pname will be consistent now. --- pkgs/development/compilers/llvm/12/default.nix | 4 ++-- .../compilers/llvm/12/{libc++ => libcxx}/default.nix | 2 +- .../compilers/llvm/12/{libc++abi => libcxxabi}/default.nix | 2 +- .../llvm/12/{libc++abi => libcxxabi}/libcxxabi-wasm.patch | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/compilers/llvm/12/{libc++ => libcxx}/default.nix (98%) rename pkgs/development/compilers/llvm/12/{libc++abi => libcxxabi}/default.nix (99%) rename pkgs/development/compilers/llvm/12/{libc++abi => libcxxabi}/libcxxabi-wasm.patch (100%) diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 00922ed96e2..5b25f37bc2c 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -192,12 +192,12 @@ let libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - libcxx = callPackage ./libc++ ({ inherit llvm_meta; } // + libcxx = callPackage ./libcxx ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); - libcxxabi = callPackage ./libc++abi ({ inherit llvm_meta; } // + libcxxabi = callPackage ./libcxxabi ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; libunwind = libraries.libunwind; diff --git a/pkgs/development/compilers/llvm/12/libc++/default.nix b/pkgs/development/compilers/llvm/12/libcxx/default.nix similarity index 98% rename from pkgs/development/compilers/llvm/12/libc++/default.nix rename to pkgs/development/compilers/llvm/12/libcxx/default.nix index d85d890879e..7b3b26b959e 100644 --- a/pkgs/development/compilers/llvm/12/libc++/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxx/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation { - pname = "libc++"; + pname = "libcxx"; inherit version; src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx"; diff --git a/pkgs/development/compilers/llvm/12/libc++abi/default.nix b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix similarity index 99% rename from pkgs/development/compilers/llvm/12/libc++abi/default.nix rename to pkgs/development/compilers/llvm/12/libcxxabi/default.nix index 22ec211a3b0..dab6c583e88 100644 --- a/pkgs/development/compilers/llvm/12/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation { - pname = "libc++abi"; + pname = "libcxxabi"; inherit version; src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a"; diff --git a/pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch similarity index 100% rename from pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch rename to pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch From e4f8498c0bc5add1d704f2c8cc7fd39a48088f0b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 24 Apr 2021 11:40:28 +0200 Subject: [PATCH 078/119] llvmPackages_12: Create subdirectories for the last two packages For consistency. Now all packages will have their own subdirectory (continuation of 781e69d19c4). --- .../compilers/llvm/12/{bintools.nix => bintools/default.nix} | 0 pkgs/development/compilers/llvm/12/default.nix | 4 ++-- .../compilers/llvm/12/{openmp.nix => openmp/default.nix} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/compilers/llvm/12/{bintools.nix => bintools/default.nix} (100%) rename pkgs/development/compilers/llvm/12/{openmp.nix => openmp/default.nix} (100%) diff --git a/pkgs/development/compilers/llvm/12/bintools.nix b/pkgs/development/compilers/llvm/12/bintools/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/12/bintools.nix rename to pkgs/development/compilers/llvm/12/bintools/default.nix diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 5b25f37bc2c..a6d68d2e2a4 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -108,7 +108,7 @@ let # doesn’t support like LLVM. Probably we should move to some other # file. - bintools = callPackage ./bintools.nix {}; + bintools = callPackage ./bintools {}; lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; @@ -203,7 +203,7 @@ let libunwind = libraries.libunwind; })); - openmp = callPackage ./openmp.nix { inherit llvm_meta; }; + openmp = callPackage ./openmp { inherit llvm_meta; }; libunwind = callPackage ./libunwind ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { diff --git a/pkgs/development/compilers/llvm/12/openmp.nix b/pkgs/development/compilers/llvm/12/openmp/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/12/openmp.nix rename to pkgs/development/compilers/llvm/12/openmp/default.nix From 5d41312d3319338ded07f3f63c2ea9691fc29f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 24 Apr 2021 11:50:58 +0200 Subject: [PATCH 079/119] prs: 0.2.8 -> 0.2.9 (#120494) https://gitlab.com/timvisee/prs/-/blob/v0.2.9/CHANGELOG.md --- pkgs/tools/security/prs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix index 854f28a8f4c..1b705241458 100644 --- a/pkgs/tools/security/prs/default.nix +++ b/pkgs/tools/security/prs/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "v${version}"; - sha256 = "sha256-TPgS3gtSfCAtQyQCZ0HadxvmX6+dP/3SE/WumzzYUAw="; + sha256 = "sha256-9qaRhTfdppU72w8jDwD1e8ABuGG+9GyrRIUVsry4Vos="; }; - cargoSha256 = "sha256-djKtmQHBVXEfn91avJCsVJwEJIE3xL1umvoLAIyXSrw="; + cargoSha256 = "sha256-j+kyllMcYj7/Ig5ho548L1wW+TtuQOc/zkxT6SNNN6w="; postPatch = '' # The GPGME backend is recommended From 754e384fce95b476f8fa7f1c4af12a7985586fc7 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 24 Apr 2021 11:58:34 +0200 Subject: [PATCH 080/119] pdns-recursor: 4.4.2 -> 4.4.3 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index fff18486ab0..e6468ef550f 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "1kzmliim2pwh04y3y6bpai9fm0qmdicrmff09fv5h5wahi4pzfdh"; + sha256 = "01dypbqq6ynrdr3dqwbz8dzpkd2ykgaz9mqhaz3i1hqc21c14hgq"; }; nativeBuildInputs = [ pkg-config ]; From a82f2a0146f899bdea479d77d285b1473a7d27ef Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 24 Apr 2021 12:17:13 +0200 Subject: [PATCH 081/119] ungoogled-chromium: 89.0.4389.114 -> 90.0.4430.85 --- .../networking/browsers/chromium/common.nix | 10 +--------- .../browsers/chromium/upstream-info.json | 16 ++++++++-------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 08bf466797a..cf9538ea50a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -161,15 +161,7 @@ let patches = [ ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags - # ++ optional (versionRange "68" "72") (githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000") - ] ++ optional (versionRange "89" "90.0.4402.0") (githubPatch - # To fix the build of chromiumBeta and chromiumDev: - "b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9" # add dependency on opus in webcodecs - "1r4wmwaxz5xbffmj5wspv2xj8s32j9p6jnwimjmalqg3al2ba64x" - ) ++ optional (versionRange "89" "90.0.4422.0") (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/61b0ab526d2aa3c62fa20bb756461ca9a482f6c6/trunk/chromium-fix-libva-redef.patch"; - sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny"; - }) ++ optional (chromiumVersionAtLeast "90") + ] ++ optional (chromiumVersionAtLeast "90") ./patches/fix-missing-atspi2-dependency.patch ++ optionals (chromiumVersionAtLeast "91") [ ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 65bddbda87d..21d54f7733d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,19 +44,19 @@ } }, "ungoogled-chromium": { - "version": "89.0.4389.114", - "sha256": "007df9p78bbmk3iyfi8qn57mmn68qqrdhx6z8n2hl8ksd7lspw7j", - "sha256bin64": "06wblyvyr93032fbzwm6qpzz4jjm6adziq4i4n6kmfdix2ajif8a", + "version": "90.0.4430.85", + "sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81", + "sha256bin64": "0li9w6zfsmx5r90jm5v5gfv3l2a76jndg6z5jvb9yx9xvrp9gpir", "deps": { "gn": { - "version": "2021-01-07", + "version": "2021-02-09", "url": "https://gn.googlesource.com/gn", - "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140", - "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d" + "rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3", + "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn" }, "ungoogled-patches": { - "rev": "89.0.4389.114-1", - "sha256": "0cr2i51gxhgl55c8f9w0ra3m5q2dk03sf7p2qn4bqq1l1l72hw6s" + "rev": "90.0.4430.85-1", + "sha256": "04nrx6fgkizmza50xj236m4rb1j8yaw0cw5790df1vlmbsc81667" } } } From 60b30e4ef6beb178af07f36776da878fff7ed596 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 24 Apr 2021 12:39:37 +0200 Subject: [PATCH 082/119] mkvtoolnix: 55.0.0 -> 56.0.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index d26acfd7c0b..23bad049d6f 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "55.0.0"; + version = "56.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "129azp4cpdd05f6072gkxdjj811aqs29nbw6v6qm8vv47gfvjcf7"; + sha256 = "0nhpp1zkggxqjj7lhj6as5mcjcz5yk3l1d1xcgs7i9153blam1yj"; }; nativeBuildInputs = [ From eb335f697eb7fd4e8f10e6d3ec1467a2e7dc0ead Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 24 Apr 2021 12:45:55 +0200 Subject: [PATCH 083/119] chromium: Warn about and cleanup old chromiumVersionAtLeast conditionals --- .../networking/browsers/chromium/common.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index cf9538ea50a..2b480bc55d9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -110,16 +110,19 @@ let buildPath = "out/${buildType}"; libExecPath = "$out/libexec/${packageName}"; + warnObsoleteVersionConditional = min-version: result: + let ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version; + in if versionAtLeast ungoogled-version min-version + then warn "chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it." + result + else result; chromiumVersionAtLeast = min-version: - versionAtLeast upstream-info.version min-version; + let result = versionAtLeast upstream-info.version min-version; + in warnObsoleteVersionConditional min-version result; versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; - ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version; - in if versionAtLeast ungoogled-version upto-version - then warn "chromium: ungoogled version ${ungoogled-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." - result - else result; + in warnObsoleteVersionConditional upto-version result; ungoogler = ungoogled-chromium { inherit (upstream-info.deps.ungoogled-patches) rev sha256; @@ -161,9 +164,9 @@ let patches = [ ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags - ] ++ optional (chromiumVersionAtLeast "90") + # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): ./patches/fix-missing-atspi2-dependency.patch - ++ optionals (chromiumVersionAtLeast "91") [ + ] ++ optionals (chromiumVersionAtLeast "91") [ ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch ]; @@ -276,12 +279,9 @@ let } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; - } // optionalAttrs (chromiumVersionAtLeast "89") { - rtc_pipewire_version = "0.3"; # TODO: Can be removed once ungoogled-chromium is at M90 # Disable PGO (defaults to 2 since M89) because it fails without additional changes: # error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version chrome_pgo_phase = 0; - } // optionalAttrs (chromiumVersionAtLeast "90") { # Disable build with TFLite library because it fails without additional changes: # ninja: error: '../../chrome/test/data/simple_test.tflite', needed by 'test_data/simple_test.tflite', missing and no known rule to make it # Note: chrome/test/data/simple_test.tflite is in the Git repository but not in chromium-90.0.4400.8.tar.xz From 3f151a56170b5b7d1cd7580864a2ee9d18bf1c90 Mon Sep 17 00:00:00 2001 From: Vincent Cui Date: Sat, 24 Apr 2021 13:33:12 +0200 Subject: [PATCH 084/119] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 60 ++++++++++++++--------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 5a5c66c538f..b57fee1f0dd 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -209,12 +209,12 @@ let auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-04-18"; + version = "2021-04-24"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "482329bad5d8e8fbd61ac2041e8a3c88a45dbe20"; - sha256 = "1yrccyygnz29p9vx1jvyj4imbq3m9rlm37m3cbb9azxmmvdbm0l3"; + rev = "6e87fa2ed6b6fe7ccd14fe4b30cc00be47afc3c6"; + sha256 = "00d3ga6rpzwcz2pcdgwrnr2xymh1hizs46zzc8jjmrj58k8sg033"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-04-23"; + version = "2021-04-24"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "5b286768438921cbc77d6cfb4a7046ea45c8adfc"; - sha256 = "1g5g1yqr78l620vr7vslx15j2f4dfg4bb8wwjgfqx0pw5lc982yc"; + rev = "e7c2807bf0c029864f346024981f1a7927044393"; + sha256 = "063jk33l7yz467b0v00s3h5gb3lbwb0x5gh4r5bignlhm518sfa3"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -425,12 +425,12 @@ let ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2021-03-03"; + version = "2021-04-24"; src = fetchFromGitHub { owner = "chuling"; repo = "ci_dark"; - rev = "9063153b05ca47c030a5f656411dbbed33697678"; - sha256 = "011017ywcgjcflsl21fjcrz7ap68aqvgx5y5z64075qkrk1pqgz1"; + rev = "4c314000b5a21a1b9f52442a0c80e4b3fd4f0a1f"; + sha256 = "1wxsgaixdmb8v87kavvyyiyqlkn7ck5g39hkq4j19747jnb6lvqf"; }; meta.homepage = "https://github.com/chuling/ci_dark/"; }; @@ -485,12 +485,12 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-03-21"; + version = "2021-04-24"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "8f27377229c5d2dcee9ae9cda8dea0fad4a5ac3b"; - sha256 = "0ri0rlz4fwxli6ssz69zyifrdwhc8yx4p996rw8d2m76nm7hflv0"; + rev = "70f0691e14c8e55290e554591c0a2661dea530fa"; + sha256 = "1m3kwgng7xi8xycc0dcx0wr9i7q0anx9lpax0r4p2a26vaqam539"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -3144,24 +3144,24 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-04-22"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "41f982b646b29059749bd588ba783cb99d8fc781"; - sha256 = "0z2kl2iqs8vcb8l4r508ny3h7vl3vm1l6cjsl5bi1s7387pizxbl"; + rev = "c6cb4fcbc91b0404ae157f1942e305d66073ca1a"; + sha256 = "07mncx8bzigbh6yy7nbsgjb3g3fm1kx73wb6p7jl6h9ay3fmgrfc"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2021-03-15"; + version = "2021-04-24"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "b26acb69a5a4940f9eb3fd6f4bca8e1cc16fa5ce"; - sha256 = "16dkgmcfdx1n72khlwrcykwwpcjzz2mdh7dc53vb4j0pbmqmnna2"; + rev = "f144a3bb6a39ef5c07173fe08e6f3ce8f5f184ba"; + sha256 = "1zax0vx77fqx7jr1xipfy0dp3l05gzbqdvc1wvq2cnjvqd7s8i2v"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -3336,12 +3336,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-04-23"; + version = "2021-04-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "af3537fbe57a2a37ab2b620c9ecc487e31b4da64"; - sha256 = "1z4k0a8gyz8ycd6wq8npg056l0axz3vj7pipxcpi1i9xa4kx3j6i"; + rev = "b68f0cc70022fedec9b9190904d6035393111cdf"; + sha256 = "07zp1fbah65f7lglfkmdzi6cyfchlaf1ap02wzwixiv5hpy6zji4"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4117,12 +4117,12 @@ let sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-04-17"; + version = "2021-04-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "764bd716f08f1441e0020b8ae0c8d1b53970e4a9"; - sha256 = "1f21mn67cdiyq2pi92agvvzfprvr78kqc89bc3wh2k8ij47szmp6"; + rev = "784de58d2bcad8b16bce972c1727fb0cb07e43b2"; + sha256 = "04wlqd902fy474mk7688y2mysy8vsm3pf36d59bxd3jlspgp6zcl"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4213,12 +4213,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2021-03-02"; + version = "2021-04-24"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "f0d785f7607be60c282b5f5a5d32a2e51560c07c"; - sha256 = "1gbnhl1w0krlf2ppiz4h4fvnrjf8i0552nckhd67gfba2nqha0z4"; + rev = "f4773c0d2f7453fea23f5f69f433547f3d62ea0a"; + sha256 = "06fsfsvrq6sqyqpmj693vn810c6zvzn16781mw6bb2912cmyrs5z"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -8805,12 +8805,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-04-15"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "0d8a69f9e16a90cfed591264170dea0c5b686b81"; - sha256 = "014f85wg1c20cysn8qayw71d49qmv1vzzbgikzrd9msfqsp4l5qj"; + rev = "91c011f6c156f405ed259c9749ea049726ef8912"; + sha256 = "1pwq5wxyky38nhs8ckcl6x4yxkia5lk5hcd12l1d5iimddjfsx9i"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From fff666d4f759eeae646fe93acb3dc805fa2f78f7 Mon Sep 17 00:00:00 2001 From: "\"Vincent Cui\"" <"wenvincent.cui@gmail.com"> Date: Sat, 24 Apr 2021 13:30:58 +0200 Subject: [PATCH 085/119] vimPlugins: resolve github repository redirects --- pkgs/misc/vim-plugins/generated.nix | 4 ++-- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b57fee1f0dd..1252e48f03b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -427,12 +427,12 @@ let pname = "ci_dark"; version = "2021-04-24"; src = fetchFromGitHub { - owner = "chuling"; + owner = "yunlingz"; repo = "ci_dark"; rev = "4c314000b5a21a1b9f52442a0c80e4b3fd4f0a1f"; sha256 = "1wxsgaixdmb8v87kavvyyiyqlkn7ck5g39hkq4j19747jnb6lvqf"; }; - meta.homepage = "https://github.com/chuling/ci_dark/"; + meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; clang_complete = buildVimPluginFrom2Nix { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5421387e950..8780df866de 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -62,7 +62,6 @@ chriskempson/base16-vim ChristianChiarulli/nvcode-color-schemes.vim christoomey/vim-sort-motion christoomey/vim-tmux-navigator -chuling/ci_dark ckarnell/antonys-macro-repeater clojure-vim/vim-jack-in cloudhead/neovim-fuzzy @@ -751,5 +750,6 @@ ycm-core/YouCompleteMe Yggdroot/indentLine Yilin-Yang/vim-markbar yuki-yano/ncm2-dictionary +yunlingz/ci_dark zah/nim.vim ziglang/zig.vim From 888acb76a758ab7bfc3766b2a00aea2e90af5b8a Mon Sep 17 00:00:00 2001 From: Vincent Cui Date: Mon, 12 Apr 2021 17:50:27 +0200 Subject: [PATCH 086/119] vimPlugins.LeaderF: init at 2021-04-02 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 1252e48f03b..a16d6c36414 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2170,6 +2170,18 @@ let meta.homepage = "https://github.com/latex-box-team/latex-box/"; }; + LeaderF = buildVimPluginFrom2Nix { + pname = "LeaderF"; + version = "2021-04-16"; + src = fetchFromGitHub { + owner = "Yggdroot"; + repo = "LeaderF"; + rev = "6c49ab524b883495193ff3a4eab5c7846aba4261"; + sha256 = "19dyd148silyaiprjrcd23y62kcsp6hpvpansmpxri55x53a772w"; + }; + meta.homepage = "https://github.com/Yggdroot/LeaderF/"; + }; + lean-vim = buildVimPluginFrom2Nix { pname = "lean-vim"; version = "2021-01-02"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8780df866de..495a98fd5d9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -748,6 +748,7 @@ Xuyuanp/nerdtree-git-plugin yamatsum/nvim-nonicons@main ycm-core/YouCompleteMe Yggdroot/indentLine +Yggdroot/LeaderF Yilin-Yang/vim-markbar yuki-yano/ncm2-dictionary yunlingz/ci_dark From 16f6bc4f01b0034659b4993f0c1d85a4aa5c2b7c Mon Sep 17 00:00:00 2001 From: "\"Vincent Cui\"" <"wenvincent.cui@gmail.com"> Date: Mon, 12 Apr 2021 17:51:29 +0200 Subject: [PATCH 087/119] vimPlugins.wildfire-vim: init at 2014-11-16 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index a16d6c36414..54df7a572c7 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -8911,6 +8911,18 @@ let meta.homepage = "https://github.com/mattn/webapi-vim/"; }; + wildfire-vim = buildVimPluginFrom2Nix { + pname = "wildfire-vim"; + version = "2014-11-16"; + src = fetchFromGitHub { + owner = "gcmt"; + repo = "wildfire.vim"; + rev = "e2baded7162260e05d2527f5bca9fca81f0bc8f2"; + sha256 = "01i12x8brsnqicj5vclg57nv6ha7nz70gilphf6sr14xr741ra1y"; + }; + meta.homepage = "https://github.com/gcmt/wildfire.vim/"; + }; + wmgraphviz-vim = buildVimPluginFrom2Nix { pname = "wmgraphviz-vim"; version = "2018-04-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 495a98fd5d9..e743921aff7 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -139,6 +139,7 @@ fruit-in/vim-nong-theme fsharp/vim-fsharp fszymanski/deoplete-emoji garbas/vim-snipmate +gcmt/wildfire.vim gennaro-tedesco/nvim-peekup gentoo/gentoo-syntax GEverding/vim-hocon From d1ad812ec14bc1f68e9cef3b013219e6c588ca66 Mon Sep 17 00:00:00 2001 From: Vincent Cui Date: Mon, 12 Apr 2021 17:55:43 +0200 Subject: [PATCH 088/119] vimPlugins.suda-vim: init at 2021-02-20 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 54df7a572c7..722ab2cff99 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4284,6 +4284,18 @@ let meta.homepage = "https://github.com/darfink/starsearch.vim/"; }; + suda-vim = buildVimPluginFrom2Nix { + pname = "suda-vim"; + version = "2021-02-20"; + src = fetchFromGitHub { + owner = "lambdalisue"; + repo = "suda.vim"; + rev = "fbb138f5090c3db4dabeba15326397a09df6b73b"; + sha256 = "01kys8q3gycxqf760ydq1k8wq20brjvl1gxpl8j87jvnyx87kmnf"; + }; + meta.homepage = "https://github.com/lambdalisue/suda.vim/"; + }; + SudoEdit-vim = buildVimPluginFrom2Nix { pname = "SudoEdit-vim"; version = "2020-02-27"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e743921aff7..4c375e562e9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -292,6 +292,7 @@ kyazdani42/nvim-tree.lua kyazdani42/nvim-web-devicons lambdalisue/fern.vim lambdalisue/gina.vim +lambdalisue/suda.vim lambdalisue/vim-gista lambdalisue/vim-manpager lambdalisue/vim-pager From de69947e83ac5736afff83a25f6eeef28ca0306d Mon Sep 17 00:00:00 2001 From: "\"Vincent Cui\"" <"wenvincent.cui@gmail.com"> Date: Mon, 19 Apr 2021 23:06:48 +0200 Subject: [PATCH 089/119] vimPlugins.vim-xtabline: init at 2021-01-31 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 722ab2cff99..c80a42366de 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -8646,6 +8646,18 @@ let meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; + vim-xtabline = buildVimPluginFrom2Nix { + pname = "vim-xtabline"; + version = "2021-01-31"; + src = fetchFromGitHub { + owner = "mg979"; + repo = "vim-xtabline"; + rev = "654675222adde47c9d72caa400e35c7e680fe5a1"; + sha256 = "1f7d4vmr7n5v7h5a1bjcvxaqygrdi33y0vdx4yjfdswi835yd45h"; + }; + meta.homepage = "https://github.com/mg979/vim-xtabline/"; + }; + vim-yaml = buildVimPluginFrom2Nix { pname = "vim-yaml"; version = "2021-01-14"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4c375e562e9..856b1042898 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -367,6 +367,7 @@ mfukar/robotframework-vim mfussenegger/nvim-dap mfussenegger/nvim-jdtls mg979/vim-visual-multi +mg979/vim-xtabline mhartington/oceanic-next mhinz/vim-crates mhinz/vim-grepper From 12ece3309846609807429d414ee630600dced644 Mon Sep 17 00:00:00 2001 From: "\"Vincent Cui\"" <"wenvincent.cui@gmail.com"> Date: Mon, 19 Apr 2021 23:08:00 +0200 Subject: [PATCH 090/119] vimPlugins.vim-helm: init at 2020-01-02 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index c80a42366de..3264ed2c891 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -6314,6 +6314,18 @@ let meta.homepage = "https://github.com/bitc/vim-hdevtools/"; }; + vim-helm = buildVimPluginFrom2Nix { + pname = "vim-helm"; + version = "2020-01-02"; + src = fetchFromGitHub { + owner = "towolf"; + repo = "vim-helm"; + rev = "2c2e2e936607ed93f8f75de2066d04feff0e8e81"; + sha256 = "1vlaqcxxsbys0ybk2x7ri1flyx412ak0dmanqg1cdig6xzhna2kc"; + }; + meta.homepage = "https://github.com/towolf/vim-helm/"; + }; + vim-hexokinase = buildVimPluginFrom2Nix { pname = "vim-hexokinase"; version = "2021-03-31"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 856b1042898..08f73590e3f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -626,6 +626,7 @@ tommcdo/vim-ninja-feet tomtom/tcomment_vim tomtom/tlib_vim tools-life/taskwiki +towolf/vim-helm tpope/vim-abolish tpope/vim-capslock tpope/vim-commentary From 7b0b4c048a2ef1f719e1e196e6b5786411643a68 Mon Sep 17 00:00:00 2001 From: Vincent Cui Date: Mon, 19 Apr 2021 23:10:09 +0200 Subject: [PATCH 091/119] vimPlugins.lazygit-nvim: init at 2021-03-25 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 3264ed2c891..651515c3150 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2170,6 +2170,18 @@ let meta.homepage = "https://github.com/latex-box-team/latex-box/"; }; + lazygit-nvim = buildVimPluginFrom2Nix { + pname = "lazygit-nvim"; + version = "2021-03-25"; + src = fetchFromGitHub { + owner = "kdheepak"; + repo = "lazygit.nvim"; + rev = "fb5ab7d26ac414a7e7bfff6b89f69e2dd2fd3884"; + sha256 = "1nn6zhjqfk88jmavl9y8li4y08v3wb2m2kskq9yf36hadw29im30"; + }; + meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; + }; + LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; version = "2021-04-16"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 08f73590e3f..ecaa316c465 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -269,6 +269,7 @@ kana/vim-textobj-user kassio/neoterm kbenzie/vim-spirv kchmck/vim-coffee-script +kdheepak/lazygit.nvim KeitaNakamura/neodark.vim keith/investigate.vim keith/rspec.vim From c6e9a834b7dfad93d341a676b8c8f61c4b484d1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 16:53:41 +0200 Subject: [PATCH 092/119] python3Packages.homeconnect: init at 0.6.3 --- .../python-modules/homeconnect/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/homeconnect/default.nix diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix new file mode 100644 index 00000000000..98aab26ffac --- /dev/null +++ b/pkgs/development/python-modules/homeconnect/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, requests_oauthlib +}: + +buildPythonPackage rec { + pname = "homeconnect"; + version = "0.6.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n4h4mi23zw3v6fbkz17fa6kkl5v9bfmj0p57jvfzcfww511y9mn"; + }; + + propagatedBuildInputs = [ + requests + requests_oauthlib + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "homeconnect" ]; + + meta = with lib; { + description = "Python client for the BSH Home Connect REST API"; + homepage = "https://github.com/DavidMStraub/homeconnect"; + changelog = "https://github.com/DavidMStraub/homeconnect/releases/tag/v${version}"; + 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 ce472c130a0..8724724fd33 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3195,6 +3195,8 @@ in { homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { }; + homeconnect = callPackage ../development/python-modules/homeconnect { }; + homematicip = callPackage ../development/python-modules/homematicip { }; homepluscontrol = callPackage ../development/python-modules/homepluscontrol { }; From 240032766127394394a23a3fb1d42c8824db1251 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 14:54:31 +0200 Subject: [PATCH 093/119] 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 9fa085816de..4f906e4bd5e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -351,7 +351,7 @@ "hitron_coda" = ps: with ps; [ ]; "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 - "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect + "home_connect" = ps: with ps; [ aiohttp-cors homeconnect ]; "home_plus_control" = ps: with ps; [ aiohttp-cors homepluscontrol ]; "homeassistant" = ps: with ps; [ ]; "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ]; From 766e69873920d62946613570572177edf4abb8b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 14:55:29 +0200 Subject: [PATCH 094/119] home-assistant: enable home_connect 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 f3f3efc8e6b..92391cd185e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -267,6 +267,7 @@ in with py.pkgs; buildPythonApplication rec { "hddtemp" "history" "history_stats" + "home_connect" "home_plus_control" "homekit" "homekit_controller" From 53a3fc28563c22f78768c3cc479206257183f5f8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 16 Apr 2021 04:20:00 +0000 Subject: [PATCH 095/119] ocamlPackages.sedlex_2: 2.2 -> 2.3 --- pkgs/development/ocaml-modules/sedlex/2.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix index 927acc1819e..6db40dd9c7e 100644 --- a/pkgs/development/ocaml-modules/sedlex/2.nix +++ b/pkgs/development/ocaml-modules/sedlex/2.nix @@ -4,12 +4,11 @@ , buildDunePackage , ocaml , gen -, ppx_tools_versioned -, ocaml-migrate-parsetree +, ppxlib , uchar }: -if lib.versionOlder ocaml.version "4.02.3" +if lib.versionOlder ocaml.version "4.08" then throw "sedlex is not available for OCaml ${ocaml.version}" else @@ -32,7 +31,7 @@ let in buildDunePackage rec { pname = "sedlex"; - version = "2.2"; + version = "2.3"; useDune2 = true; @@ -40,11 +39,11 @@ buildDunePackage rec { owner = "ocaml-community"; repo = "sedlex"; rev = "v${version}"; - sha256 = "18dwl2is5j26z6b1c47b81wvcpxw44fasppdadsrs9vsw63rwcm3"; + sha256 = "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar"; }; propagatedBuildInputs = [ - gen uchar ocaml-migrate-parsetree ppx_tools_versioned + gen uchar ppxlib ]; preBuild = '' @@ -60,6 +59,7 @@ buildDunePackage rec { meta = { homepage = "https://github.com/ocaml-community/sedlex"; + changelog = "https://github.com/ocaml-community/sedlex/raw/v${version}/CHANGES"; description = "An OCaml lexer generator for Unicode"; license = lib.licenses.mit; maintainers = [ lib.maintainers.marsam ]; From ddf567cd5a26eefab925ebc2e50d15d61e82257a Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 24 Apr 2021 17:12:51 +0200 Subject: [PATCH 096/119] nixos/nagios: use the correct option to restart on config change X-ReloadIfChanged is incorrect, apparently https://github.com/NixOS/nixpkgs/pull/120324#discussion_r619472321 We restart instead of reloading because nagios unit file has no ExecReload. --- nixos/modules/services/monitoring/nagios.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 9ac6869068f..61214508a9c 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -192,6 +192,7 @@ in path = [ pkgs.nagios ] ++ cfg.plugins; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + restartTriggers = [ nagiosCfgFile ]; serviceConfig = { User = "nagios"; @@ -201,7 +202,6 @@ in LogsDirectory = "nagios"; StateDirectory = "nagios"; ExecStart = "${pkgs.nagios}/bin/nagios /etc/nagios.cfg"; - X-ReloadIfChanged = nagiosCfgFile; }; }; From d79d927cca0ac03067e5727a3d1da60590ad8f17 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 24 Apr 2021 09:37:38 -0700 Subject: [PATCH 097/119] steamPackages.steam: 1.0.0.69 -> 1.0.0.70 --- pkgs/games/steam/steam.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 2c5932cf7fa..8e715b4856f 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -2,7 +2,7 @@ let traceLog = "/tmp/steam-trace-dependencies.log"; - version = "1.0.0.69"; + version = "1.0.0.70"; in stdenv.mkDerivation { pname = "steam-original"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; - sha256 = "sha256-b5g4AUprE/lTunJs59IDlGu5O/1dB0kBvCFq0Eqyx2c="; + sha256 = "sha256-n/iKV3jHsA77GPMk1M0MKC1fQ42tEgG8Ppgi4/9qLf8="; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; From 69a4de62515cb3980fbb5c68120d607a3bbca5c4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 24 Apr 2021 09:48:44 -0700 Subject: [PATCH 098/119] steamPackages.steam: use stable archive to avoid 404s --- pkgs/games/steam/steam.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 8e715b4856f..f9883633576 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { - url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; + url = "https://repo.steampowered.com/steam/archive/stable/steam_${version}.tar.gz"; sha256 = "sha256-n/iKV3jHsA77GPMk1M0MKC1fQ42tEgG8Ppgi4/9qLf8="; }; From 019cf935eb7beb9fe7d1ebfe271a9b03c0d8740a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 18:51:26 +0200 Subject: [PATCH 099/119] python3Packages.smhi-pkg: init at 1.0.14 --- .../python-modules/smhi-pkg/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/smhi-pkg/default.nix diff --git a/pkgs/development/python-modules/smhi-pkg/default.nix b/pkgs/development/python-modules/smhi-pkg/default.nix new file mode 100644 index 00000000000..3308697cf54 --- /dev/null +++ b/pkgs/development/python-modules/smhi-pkg/default.nix @@ -0,0 +1,47 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "smhi-pkg"; + version = "1.0.14"; + + src = fetchFromGitHub { + owner = "joysoftware"; + repo = "pypi_smhi"; + rev = version; + sha256 = "186xwrg3hvr0hszq2kxvygd241q2sp11gfk6mwj9z4zqywwfcbn3"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # Disable tests that needs network access + "test_smhi_integration_test" + "test_smhi_async_integration_test" + "test_smhi_async_integration_test_use_session" + "test_smhi_async_get_forecast_integration2" + "test_async_error_from_api" + ]; + + pythonImportsCheck = [ "smhi" ]; + + meta = with lib; { + description = "Python library for accessing SMHI open forecast data"; + homepage = "https://github.com/joysoftware/pypi_smhi"; + changelog = "https://github.com/joysoftware/pypi_smhi/releases/tag/${version}"; + 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 ce472c130a0..96f22b7f986 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7997,6 +7997,8 @@ in { smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { }; + smhi-pkg = callPackage ../development/python-modules/smhi-pkg { }; + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 smmap = callPackage ../development/python-modules/smmap { }; From cee055528dcef460c3d5e49eb147d9fd55675d4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 18:54:23 +0200 Subject: [PATCH 100/119] 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 9fa085816de..e972a7b5cd5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -760,7 +760,7 @@ "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings "smarttub" = ps: with ps; [ python-smarttub ]; "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty - "smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg + "smhi" = ps: with ps; [ smhi-pkg ]; "sms" = ps: with ps; [ python-gammu ]; "smtp" = ps: with ps; [ ]; "snapcast" = ps: with ps; [ snapcast ]; From e1054f07f1c3fae9f8b96cb9d46cf75ddc27216f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 18:54:51 +0200 Subject: [PATCH 101/119] home-assistant: enable smhi 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 f3f3efc8e6b..32fd0d31b11 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -356,6 +356,7 @@ in with py.pkgs; buildPythonApplication rec { "simulated" "sleepiq" "sma" + "smhi" "sensor" "slack" "smarttub" From 9d95ba3dd6aaf60082e040f7762a81fb9cc23c67 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 24 Apr 2021 13:05:17 -0400 Subject: [PATCH 102/119] actions: add some permission restrictions --- .github/workflows/labels.yml | 4 ++++ .github/workflows/manual-nixos.yml | 2 ++ .github/workflows/manual-nixpkgs.yml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 4232ceb6236..4d1e2a2a0f9 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -4,6 +4,10 @@ on: pull_request_target: types: [edited, opened, synchronize, reopened] +permissions: + contents: read + pull-requests: write + jobs: labels: runs-on: ubuntu-latest diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index fa1f8fc6911..c885f6f7665 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -1,5 +1,7 @@ name: "Build NixOS manual" +permissions: read-all + on: pull_request_target: branches: diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 192a4c6868a..6f7ad10efd9 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -1,5 +1,7 @@ name: "Build Nixpkgs manual" +permissions: read-all + on: pull_request_target: branches: From 47d3e955fc40c045c3aafee19a9bd82d3d221abe Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 24 Apr 2021 15:43:26 +0300 Subject: [PATCH 103/119] nixos/mastodon/sandbox: add @privileged and @raw-io to SystemCallFilter --- nixos/modules/services/web-apps/mastodon.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 16e8ae2ec0b..661320b5d00 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -31,6 +31,8 @@ let // (if cfg.smtp.authenticate then { SMTP_LOGIN = cfg.smtp.user; } else {}) // cfg.extraConfig; + systemCallsList = [ "@clock" "@cpu-emulation" "@debug" "@keyring" "@module" "@mount" "@obsolete" "@raw-io" "@reboot" "@resources" "@setuid" "@swap" ]; + cfgService = { # User and group User = cfg.user; @@ -68,7 +70,6 @@ let PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @reboot @resources @setuid @swap"; }; envFile = pkgs.writeText "mastodon.env" (lib.concatMapStrings (s: s + "\n") ( @@ -432,6 +433,8 @@ in { serviceConfig = { Type = "oneshot"; WorkingDirectory = cfg.package; + # System Call Filtering + SystemCallFilter = "~" + lib.concatStringsSep " " systemCallsList; } // cfgService; after = [ "network.target" ]; @@ -457,6 +460,8 @@ in { Type = "oneshot"; EnvironmentFile = "/var/lib/mastodon/.secrets_env"; WorkingDirectory = cfg.package; + # System Call Filtering + SystemCallFilter = "~" + lib.concatStringsSep " " systemCallsList; } // cfgService; after = [ "mastodon-init-dirs.service" "network.target" ] ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []); wantedBy = [ "multi-user.target" ]; @@ -481,6 +486,8 @@ in { # Runtime directory and mode RuntimeDirectory = "mastodon-streaming"; RuntimeDirectoryMode = "0750"; + # System Call Filtering + SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]); } // cfgService; }; @@ -503,6 +510,8 @@ in { # Runtime directory and mode RuntimeDirectory = "mastodon-web"; RuntimeDirectoryMode = "0750"; + # System Call Filtering + SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]); } // cfgService; path = with pkgs; [ file imagemagick ffmpeg ]; }; @@ -522,6 +531,8 @@ in { RestartSec = 20; EnvironmentFile = "/var/lib/mastodon/.secrets_env"; WorkingDirectory = cfg.package; + # System Call Filtering + SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]); } // cfgService; path = with pkgs; [ file imagemagick ffmpeg ]; }; From d6ed686eb2c121cc5150c742702f908bcb6d9ab7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 24 Apr 2021 13:21:42 -0400 Subject: [PATCH 104/119] Add NixOS/Security as a reviewer for .github/workflows --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b85e9226121..fc116b32d5f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -11,7 +11,7 @@ /.github/CODEOWNERS @edolstra # GitHub actions -/.github/workflows @Mic92 @zowoq +/.github/workflows @NixOS/Security @Mic92 @zowoq /.github/workflows/merge-staging @FRidh # EditorConfig From bdb72489444ab0522f4a143ea53b655a91b1845d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 24 Apr 2021 14:00:42 +0200 Subject: [PATCH 105/119] binwalk: 2.2.0 -> 2.3.1 Releases notes: https://github.com/ReFirmLabs/binwalk/releases/tag/v2.3.1 https://github.com/ReFirmLabs/binwalk/releases/tag/v2.3.0 --- pkgs/development/python-modules/binwalk/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index a3e48d20c60..609c0392c77 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "binwalk"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "ReFirmLabs"; repo = "binwalk"; rev = "v${version}"; - sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; + sha256 = "108mj4jjffdmaz6wjvglbv44j7fkhspaxz1rj2bi1fcnwsri5wsm"; }; propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ] @@ -53,5 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/ReFirmLabs/binwalk"; description = "A tool for searching a given binary image for embedded files"; maintainers = [ maintainers.koral ]; + license = licenses.mit; }; } From ad521d005b56821c79e98ce65132bca5732ea677 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 24 Apr 2021 11:25:35 -0700 Subject: [PATCH 106/119] buck: use jdk8 --- pkgs/development/tools/build-managers/buck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index c275d5bc30a..0b893ea808a 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, jdk11, ant, python3, watchman, bash, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jdk8, ant, python3, watchman, bash, makeWrapper }: stdenv.mkDerivation rec { pname = "buck"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { grep -l -r '/bin/bash' --null | xargs -0 sed -i -e "s!/bin/bash!${bash}/bin/bash!g" ''; - nativeBuildInputs = [ makeWrapper python3 jdk11 ant watchman ]; + nativeBuildInputs = [ makeWrapper python3 jdk8 ant watchman ]; buildPhase = '' # Set correct version, see https://github.com/facebook/buck/issues/2607 @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D -m755 buck-out/gen/*/programs/buck.pex $out/bin/buck wrapProgram $out/bin/buck \ - --prefix PATH : "${lib.makeBinPath [ jdk11 watchman python3 ]}" + --prefix PATH : "${lib.makeBinPath [ jdk8 watchman python3 ]}" ''; meta = with lib; { From 8e93e344776909de1c486237be6a02c2aac6f7ad Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sun, 25 Apr 2021 05:12:44 +0900 Subject: [PATCH 107/119] nushell: 0.29.0 -> 0.30.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 70022b5c2a8..ee291ccdc03 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-RZz8hmcLOJRz0HpPXc3121B1UcbtDgCFv8Zdv29E+XQ="; + sha256 = "104zrj15kmc0a698dc8dxbzhg1rjqn38v3wqcwg2xiickglpgd5f"; }; - cargoSha256 = "sha256-V6Qdg8xSm2/6BbSEOH5mH92Gjx+xy0J2CZ9FQxmhI88="; + cargoSha256 = "1c6yhkj1hyr82y82nff6gy9kq9z0mbq3ivlq8rir10pnqy4j5791"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; From 3e1c06654b94d35f529b061199c7ae5063b0d1b6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 24 Apr 2021 22:56:54 +0200 Subject: [PATCH 108/119] airspy: 1.0.9 -> 1.0.10 --- pkgs/applications/radio/airspy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix index 6299fe21d29..6cb0f40f129 100644 --- a/pkgs/applications/radio/airspy/default.nix +++ b/pkgs/applications/radio/airspy/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "airspy"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "airspy"; repo = "airspyone_host"; rev = "v${version}"; - sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x"; + sha256 = "1v7sfkkxc6f8ny1p9xrax1agkl6q583mjx8k0lrrwdz31rf9qgw9"; }; postPatch = '' From d9b11e53b1e30d3d64a96a4156dd67df5c571881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 24 Apr 2021 21:57:02 +0200 Subject: [PATCH 109/119] python3Packages.angr: extend pythonImportsCheck --- pkgs/development/python-modules/angr/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index b67c3524fae..588e647647d 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -81,7 +81,9 @@ buildPythonPackage rec { # Tests have additional requirements, e.g., pypcode and angr binaries # cle is executing the tests with the angr binaries doCheck = false; - pythonImportsCheck = [ "angr" ]; + + # See http://angr.io/api-doc/ + pythonImportsCheck = [ "angr" "claripy" "cle" "pyvex" "archinfo" ]; meta = with lib; { description = "Powerful and user-friendly binary analysis platform"; From bce7201f725e0aa867f74185dc0f0e9c7bb8403a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 22:47:33 +0200 Subject: [PATCH 110/119] python3Packages.pysmartapp: init at 0.3.3 --- .../python-modules/pysmartapp/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 ++- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/pysmartapp/default.nix diff --git a/pkgs/development/python-modules/pysmartapp/default.nix b/pkgs/development/python-modules/pysmartapp/default.nix new file mode 100644 index 00000000000..abf3796ae7f --- /dev/null +++ b/pkgs/development/python-modules/pysmartapp/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpsig +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pysmartapp"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "andrewsayre"; + repo = pname; + rev = version; + sha256 = "03wk44siqxl15pa46x5vkg4q0mnga34ir7qn897576z2ivbx7awh"; + }; + + propagatedBuildInputs = [ + httpsig + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pysmartapp" ]; + + meta = with lib; { + description = "Python implementation to work with SmartApp lifecycle events"; + homepage = "https://github.com/andrewsayre/pysmartapp"; + changelog = "https://github.com/andrewsayre/pysmartapp/releases/tag/${version}"; + 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 4616e1e898b..efe6a8e59e2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6518,10 +6518,12 @@ in { pysmappee = callPackage ../development/python-modules/pysmappee { }; - pysmb = callPackage ../development/python-modules/pysmb { }; - pysmart-smartx = callPackage ../development/python-modules/pysmart-smartx { }; + pysmartapp = callPackage ../development/python-modules/pysmartapp { }; + + pysmb = callPackage ../development/python-modules/pysmb { }; + pysmbc = callPackage ../development/python-modules/pysmbc { }; pysmf = callPackage ../development/python-modules/pysmf { }; From a0755baff358228799076e9f97f76ea9c9eb58d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 22:49:10 +0200 Subject: [PATCH 111/119] python3Packages.pysmartthings: init at 0.7.6 --- .../python-modules/pysmartthings/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/pysmartthings/default.nix diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix new file mode 100644 index 00000000000..e8a295c319c --- /dev/null +++ b/pkgs/development/python-modules/pysmartthings/default.nix @@ -0,0 +1,38 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pysmartthings"; + version = "0.7.6"; + + src = fetchFromGitHub { + owner = "andrewsayre"; + repo = pname; + rev = version; + sha256 = "0m91lfzdbmq6qv6bihd278psi9ghldxpa1d0dsbii2zf338188qj"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pysmartthings" ]; + + meta = with lib; { + description = "Python library for interacting with the SmartThings cloud API"; + homepage = "https://github.com/andrewsayre/pysmartthings"; + changelog = "https://github.com/andrewsayre/pysmartthings/releases/tag/${version}"; + 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 efe6a8e59e2..fc78e1b143d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6522,6 +6522,8 @@ in { pysmartapp = callPackage ../development/python-modules/pysmartapp { }; + pysmartthings = callPackage ../development/python-modules/pysmartthings { }; + pysmb = callPackage ../development/python-modules/pysmb { }; pysmbc = callPackage ../development/python-modules/pysmbc { }; From 55c3640e8980777087ad9da5c905b4148d14ff84 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 22:50:51 +0200 Subject: [PATCH 112/119] 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 b586eaaf69b..d3270846a53 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -757,7 +757,7 @@ "smappee" = ps: with ps; [ aiohttp-cors pysmappee ]; "smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab - "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings + "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa pysmartapp pysmartthings ]; "smarttub" = ps: with ps; [ python-smarttub ]; "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty "smhi" = ps: with ps; [ smhi-pkg ]; From fe9a9942e24e5e45dd2796637275b05b57a283a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 23:08:08 +0200 Subject: [PATCH 113/119] home-assistant: enable smartthings 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 ca447584b5d..1953faea95f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -360,6 +360,7 @@ in with py.pkgs; buildPythonApplication rec { "smhi" "sensor" "slack" + "smartthings" "smarttub" "smtp" "smappee" From 70c96f0e02dcfdc559da4bc699c751d9fb1b2dab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 24 Nov 2020 21:54:33 +0100 Subject: [PATCH 114/119] babeld: add patch to skip per interface rp_filter setup This is in preparation to run babeld as DynamicUser and was submitted upstream in https://github.com/jech/babeld/pull/68 and will be part of the 1.10 release. --- pkgs/tools/networking/babeld/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index a889821c947..5c7b26ced05 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nixosTests }: +{ lib, stdenv, fetchurl, fetchpatch, nixosTests }: stdenv.mkDerivation rec { pname = "babeld"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "01vzhrspnm4sy9ggaz9n3bfl5hy3qlynr218j3mdcddzm3h00kqm"; }; + patches = [ + (fetchpatch { + # Skip kernel_setup_interface when `skip-kernel-setup` is enabled. + url = "https://github.com/jech/babeld/commit/f9698a5616842467ad08a5f9ed3d6fcfa2dd2898.patch"; + sha256 = "00kj2jxsfq0pjk5wrkslyvkww57makxlwa4fd82g7g9hrgahpqwr"; + }) + ]; + preBuild = '' makeFlags="PREFIX=$out ETCDIR=$out/etc" ''; From e8988f7a30ba6e4a55c06673a8b672b75bb25d76 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 24 Nov 2020 22:41:21 +0100 Subject: [PATCH 115/119] nixos/babeld: run as DynamicUser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The last bits to prevent babeld from running unprivileged was its kernel_setup_interface routine, that wants to set per interface rp_filter. This behaviour has been disabled in a patch that has been submitted upstream at https://github.com/jech/babeld/pull/68 and reuses the skip-kernel-setup config option. → Overall exposure level for babeld.service: 1.7 OK 🙂 --- nixos/doc/manual/release-notes/rl-2105.xml | 7 +++++++ nixos/modules/services/networking/babeld.nix | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index e0552c25a85..5fbef88c4a5 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -680,6 +680,13 @@ environment.systemPackages = [ All CUDA toolkit versions prior to CUDA 10 have been removed. + + + The babeld service is now being run as an unprivileged user. To achieve that the module configures + skip-kernel-setup true and takes care of setting forwarding and rp_filter sysctls by itself as well + as for each interface in services.babeld.interfaces. + + diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix index e16e56121c4..97dca002a00 100644 --- a/nixos/modules/services/networking/babeld.nix +++ b/nixos/modules/services/networking/babeld.nix @@ -19,7 +19,10 @@ let "interface ${name} ${paramsString interface}\n"; configFile = with cfg; pkgs.writeText "babeld.conf" ( - (optionalString (cfg.interfaceDefaults != null) '' + '' + skip-kernel-setup true + '' + + (optionalString (cfg.interfaceDefaults != null) '' default ${paramsString cfg.interfaceDefaults} '') + (concatMapStrings interfaceConfig (attrNames cfg.interfaces)) @@ -84,13 +87,22 @@ in config = mkIf config.services.babeld.enable { + boot.kernel.sysctl = { + "net.ipv6.conf.all.forwarding" = 1; + "net.ipv6.conf.all.accept_redirects" = 0; + "net.ipv4.conf.all.forwarding" = 1; + "net.ipv4.conf.all.rp_filter" = 0; + } // lib.mapAttrs' (ifname: _: lib.nameValuePair "net.ipv4.conf.${ifname}.rp_filter" (lib.mkDefault 0)) config.services.babeld.interfaces; + systemd.services.babeld = { description = "Babel routing daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile} -I /run/babeld/babeld.pid -S /var/lib/babeld/state"; + AmbientCapabilities = [ "CAP_NET_ADMIN" ]; CapabilityBoundingSet = [ "CAP_NET_ADMIN" ]; + DynamicUser = true; IPAddressAllow = [ "fe80::/64" "ff00::/8" "::1/128" "127.0.0.0/8" ]; IPAddressDeny = "any"; LockPersonality = true; @@ -98,7 +110,7 @@ in MemoryDenyWriteExecute = true; ProtectSystem = "strict"; ProtectClock = true; - ProtectKernelTunables = false; # Couldn't write sysctl: Read-only file system + ProtectKernelTunables = true; ProtectKernelModules = true; ProtectKernelLogs = true; ProtectControlGroups = true; From ceb26b53d817cd60218dc95e00192c20ff0bea54 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 24 Nov 2020 22:45:40 +0100 Subject: [PATCH 116/119] nixos/tests/babeld: drop forwarding sysctls They are now set as part of the babeld module. --- nixos/tests/babeld.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/tests/babeld.nix b/nixos/tests/babeld.nix index 5817ea4ce14..d4df6f86d08 100644 --- a/nixos/tests/babeld.nix +++ b/nixos/tests/babeld.nix @@ -25,9 +25,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { { virtualisation.vlans = [ 10 20 ]; - boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1; - boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; - networking = { useDHCP = false; firewall.enable = false; @@ -74,9 +71,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { { virtualisation.vlans = [ 20 30 ]; - boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1; - boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; - networking = { useDHCP = false; firewall.enable = false; From 4dee1684ff3a074163c6c8f7e8cdc28895dce77f Mon Sep 17 00:00:00 2001 From: Antonio Yang Date: Sun, 25 Apr 2021 08:06:08 +0800 Subject: [PATCH 117/119] himalaya: 0.2.6 -> 0.2.7 --- .../networking/mailreaders/himalaya/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index 76f1e92d5f5..8b601101845 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "1fl3lingb4wdh6bz4calzbibixg44wnnwi1qh0js1ijp8b6ll560"; + sha256 = "0yp3gc5hmlrs5rcmb2qbi4iqb5ndflgqw20qa7ziqayrdd15kzpn"; }; - cargoSha256 = "10p8di71w7hn36b1994wgk33fnj641lsp80zmccinlg5fiwyzncx"; + cargoSha256 = "1abz3s9c3byqc0vaws839hjlf96ivq4zbjyijsbg004ffbmbccpn"; nativeBuildInputs = [ ] ++ lib.optionals (enableCompletions) [ installShellFiles ] @@ -34,9 +34,6 @@ rustPlatform.buildRustPackage rec { openssl ]; - # The completions are correctly installed, and there is issue that himalaya - # generate empty completion files without mail configure. - # This supposed to be fixed in 0.2.7 postInstall = lib.optionalString enableCompletions '' # Install shell function installShellCompletion --cmd himalaya \ From 4f75c6e4386616154914154515d55d53d11e0fe5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 24 Apr 2021 22:18:52 -0400 Subject: [PATCH 118/119] drawing: 0.4.13 -> 0.8.0 --- pkgs/applications/graphics/drawing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index 0feb72f64aa..a2b4e949499 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "drawing"; - version = "0.4.13"; + version = "0.8.0"; format = "other"; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { owner = "maoschanz"; repo = pname; rev = version; - sha256 = "0mj2nmfrckv89srgkn16fnbrb35f5a655ak8bb3rd9na3hd5bq53"; + sha256 = "03cx6acb0ph7b3difshjfddi8ld79wp8d12bdp7dp1q1820j5mz0"; }; nativeBuildInputs = [ From 4b7ccb341881d1773f250c2a2e3fa6d5cab6d848 Mon Sep 17 00:00:00 2001 From: Evils Date: Wed, 12 Aug 2020 21:16:20 +0200 Subject: [PATCH 119/119] stlink: 1.6.0 -> 1.7.0 --- .../development/tools/misc/stlink/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index e67fd9ca7a8..5bad6493c49 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -9,25 +9,22 @@ let in stdenv.mkDerivation rec { pname = "stlink"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { - owner = "texane"; + owner = "stlink-org"; repo = "stlink"; rev = "v${version}"; - sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x"; + sha256 = "03xypffpbp4imrczbxmq69vgkr7mbp0ps9dk815br5wwlz6vgygl"; }; buildInputs = [ libusb1' ]; nativeBuildInputs = [ cmake ]; - patchPhase = '' - sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt - sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt - ''; - preInstall = '' - mkdir -p $out/etc/udev/rules.d - mkdir -p $out/etc/modprobe.d - ''; + + cmakeFlags = [ + "-DSTLINK_MODPROBED_DIR=${placeholder "out"}/etc/modprobe.d" + "-DSTLINK_UDEV_RULES_DIR=${placeholder "out"}/lib/udev/rules.d" + ]; meta = with lib; { description = "In-circuit debug and programming for ST-Link devices";