From e0adda4113a1172f1ae575d1e97e66df3277b0bd Mon Sep 17 00:00:00 2001 From: Sheng Wang Date: Wed, 12 May 2021 12:59:28 +0900 Subject: [PATCH 01/61] nixos/pam: prioritize safer auth methods over fingerprints Currently if fprintd is enabled, pam will ask for fingerprint regardless of other configured authentication modules (e.g. yubikey). This change make fingerprint the last resort of authentication before asking for password. --- nixos/modules/security/pam.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 523ad1ed407b..7ed01e5707ff 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -397,8 +397,6 @@ let "auth required pam_faillock.so"} ${optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth) "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=${lib.concatStringsSep ":" config.services.openssh.authorizedKeysFiles}"} - ${optionalString cfg.fprintAuth - "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"} ${let p11 = config.security.pam.p11; in optionalString cfg.p11Auth "auth ${p11.control} ${pkgs.pam_p11}/lib/security/pam_p11.so ${pkgs.opensc}/lib/opensc-pkcs11.so"} ${let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth @@ -409,6 +407,8 @@ let "auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} ${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"} + ${optionalString cfg.fprintAuth + "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"} '' + # Modules in this block require having the password set in PAM_AUTHTOK. # pam_unix is marked as 'sufficient' on NixOS which means nothing will run From 7969b9d1a89cd44f1da136ca04146d4201fff181 Mon Sep 17 00:00:00 2001 From: Philipp Mildenberger Date: Fri, 7 May 2021 18:20:27 +0200 Subject: [PATCH 02/61] maintainers: add Philipp-M --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2448ad3f93da..d0dcb204402a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7941,6 +7941,12 @@ githubId = 1640697; name = "Philipp Hausmann"; }; + Philipp-M = { + email = "philipp@mildenberger.me"; + github = "Philipp-M"; + githubId = 9267430; + name = "Philipp Mildenberger"; + }; Phlogistique = { email = "noe.rubinstein@gmail.com"; github = "Phlogistique"; From 04a16067b470b90b9c512b81674691ec4bb44967 Mon Sep 17 00:00:00 2001 From: Philipp Mildenberger Date: Fri, 7 May 2021 18:21:08 +0200 Subject: [PATCH 03/61] efm-langserver: init at 0.0.31 --- .../tools/efm-langserver/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/efm-langserver/default.nix diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/development/tools/efm-langserver/default.nix new file mode 100644 index 000000000000..34de6d889448 --- /dev/null +++ b/pkgs/development/tools/efm-langserver/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "efm-langserver"; + version = "0.0.31"; + + src = fetchFromGitHub { + owner = "mattn"; + repo = "efm-langserver"; + rev = "v${version}"; + sha256 = "sha256-4NdD+WwvlqfJdPqXTz9LUyriJyLPppi8jH6dxYupe6A="; + }; + + vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI="; + subPackages = [ "." ]; + + meta = with lib; { + description = "General purpose Language Server"; + maintainers = with maintainers; [ Philipp-M ]; + homepage = "https://github.com/mattn/efm-langserver"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19cbe826b9fd..906ebe1f0411 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13266,6 +13266,8 @@ in effitask = callPackage ../applications/misc/effitask { }; + efm-langserver = callPackage ../development/tools/efm-langserver { }; + egypt = callPackage ../development/tools/analysis/egypt { }; elfinfo = callPackage ../development/tools/misc/elfinfo { }; From 2742e6196126d52d010490cc32108a3e78a0ff91 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 21 Jun 2021 16:18:51 +0200 Subject: [PATCH 04/61] dovecot: add optional lua support --- pkgs/servers/mail/dovecot/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 337405ff6729..3b8be8f26c6e 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -6,6 +6,7 @@ , withMySQL ? false, libmysqlclient , withPgSQL ? false, postgresql , withSQLite ? true, sqlite +, withLua ? false, lua5_3 }: stdenv.mkDerivation rec { @@ -18,7 +19,8 @@ stdenv.mkDerivation rec { ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] ++ lib.optional withMySQL libmysqlclient ++ lib.optional withPgSQL postgresql - ++ lib.optional withSQLite sqlite; + ++ lib.optional withSQLite sqlite + ++ lib.optional withLua lua5_3; src = fetchurl { url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; @@ -79,7 +81,8 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.isDarwin) "--enable-static" ++ lib.optional withMySQL "--with-mysql" ++ lib.optional withPgSQL "--with-pgsql" - ++ lib.optional withSQLite "--with-sqlite"; + ++ lib.optional withSQLite "--with-sqlite" + ++ lib.optional withLua "--with-lua"; meta = { homepage = "https://dovecot.org/"; From 36f6ee3debea72336ea65a29a8084fc7b878457e Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Sat, 19 Jun 2021 15:00:34 -0400 Subject: [PATCH 05/61] hash-identifier: init at 1.2 --- .../security/hash-identifier/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/security/hash-identifier/default.nix diff --git a/pkgs/tools/security/hash-identifier/default.nix b/pkgs/tools/security/hash-identifier/default.nix new file mode 100644 index 000000000000..5e9b49dd73db --- /dev/null +++ b/pkgs/tools/security/hash-identifier/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitLab, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "hash-identifier"; + version = "1.2"; + + src = fetchFromGitLab { + owner = "kalilinux"; + repo = "packages/hash-identifier"; + rev = "kali/${version}+git20180314-0kali1"; + sha256 = "1amz48ijwjjkccg6gmdn3ffnyp2p52ksagy4m9gy8l2v5wj3j32h"; + }; + + format = "other"; # no setup.py + + installPhase = '' + install -Dm0775 hash-id.py $out/bin/hash-identifier + ''; + + meta = with lib; { + description = "Software to identify the different types of hashes used to encrypt data and especially passwords."; + homepage = "https://github.com/blackploit/hash-identifier"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ ethancedwards8 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40be91d9a71a..28611555b91d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5603,6 +5603,8 @@ in hash_extender = callPackage ../tools/security/hash_extender { }; + hash-identifier = callPackage ../tools/security/hash-identifier { }; + hash-slinger = callPackage ../tools/security/hash-slinger { }; haskell-language-server = callPackage ../development/tools/haskell/haskell-language-server/withWrapper.nix { }; From 3b5153599756c9b6c7d8f1f380a5409f94b295e9 Mon Sep 17 00:00:00 2001 From: ckie Date: Thu, 24 Jun 2021 13:14:38 +0300 Subject: [PATCH 06/61] nvidia_x11_beta: 465.31 -> 472.42.01 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 8fc439aeb3c9..2cf9cddef4d6 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -27,10 +27,10 @@ rec { else legacy_390; beta = generic { - version = "465.31"; - sha256_64bit = "YAjQAckzWGMEnDOOe6arlkBvT3rzFCeqjBjG0ncnLNo="; - settingsSha256 = "33zHXxfG/t6REbHqhYjzBhtuus7jP34r2wK90sBT9vE="; - persistencedSha256 = "1r/QqjOxg6836mQ46hNsPscKliNAtpN9xW6M++02woY="; + version = "470.42.01"; + sha256_64bit = "04w9nmi3vyww07pmgbd2r1x37s5p6xiy4qg9s06a1kjwzpm59xfd"; + settingsSha256 = "Ohbkm7j0/V0kzcxfsHujBkrdnaefneoLutf2Rju2hIQ="; + persistencedSha256 = "1gfj4ffkidbhgjzdi6sv2sngdcb27w7b0rvfnj129rs36mcxy02j"; }; # Vulkan developer beta driver From 7954d11725da3e0592d98bfc380477946447afc7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 24 Jun 2021 12:11:32 +0000 Subject: [PATCH 07/61] appstream: 0.14.3 -> 0.14.4 --- pkgs/development/libraries/appstream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 96c6b3623983..c39ea78a7757 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "appstream"; - version = "0.14.3"; + version = "0.14.4"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "ximion"; repo = "appstream"; rev = "v${version}"; - sha256 = "sha256-wCQR+4/F5lVqWHHcH/WS4irBGRivz3c1imasyLDIZIs="; + sha256 = "sha256-DJXCw50f+8c58bJw6xx0ECfkc9/KcWaeA+ne2zmTyhg="; }; patches = [ From 167fde46fc34e9cb8a7dc39b14c16be20e77ca9b Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 24 Jun 2021 19:07:18 +0800 Subject: [PATCH 08/61] linux_xanmod: enable preemption --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 3274b1aa20e0..e56d3c878c93 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -15,6 +15,11 @@ buildLinux (args // rec { sha256 = "sha256-eFIWlguU1hnkAgTbRxSMTStq0X7XW4IT1/9XlQSgdMQ="; }; + structuredExtraConfig = with lib.kernel; { + PREEMPT = lib.mkForce yes; + PREEMPT_VOLUNTARY = lib.mkForce no; + }; + extraMeta = { branch = "5.12-cacule"; maintainers = with lib.maintainers; [ fortuneteller2k ]; From a5252d1f003d2dcbebdf1ab1d5517c65afc0c8b0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 25 Jun 2021 00:53:18 +0200 Subject: [PATCH 09/61] inkscape: Fix parsing paths by Python extensions --- pkgs/applications/graphics/inkscape/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 813db0984751..c65dfa1b6c08 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -4,6 +4,7 @@ , cairo , cmake , fetchurl +, fetchpatch , gettext , ghostscript , glib @@ -71,6 +72,15 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) + + # Fix parsing paths by Python extensions. + # https://gitlab.com/inkscape/extensions/-/merge_requests/342 + (fetchpatch { + url = "https://gitlab.com/inkscape/extensions/-/commit/a82c382c610d37837c8f3f5b13224bab8fd3667e.patch"; + sha256 = "YWrgjCnQ9q6BUsxSLQojIXnDzPxM/SgrIfj1gxQ/JKM="; + stripLen = 1; + extraPrefix = "share/extensions/"; + }) ]; postPatch = '' From 4a7755fd214b0570264b5ded317d2c0345bc6e72 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 25 Jun 2021 04:20:00 +0000 Subject: [PATCH 10/61] libpg_query: 13-2.0.4 -> 13-2.0.5 https://github.com/pganalyze/libpg_query/releases/tag/13-2.0.5 --- pkgs/development/libraries/libpg_query/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix index 711cfe14e156..98f657e293d2 100644 --- a/pkgs/development/libraries/libpg_query/default.nix +++ b/pkgs/development/libraries/libpg_query/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpg_query"; - version = "13-2.0.4"; + version = "13-2.0.5"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - sha256 = "0d88fh613kh1izb6w288bfh7s3db4nz8cxyhmhq3lb7gl4axs2pv"; + sha256 = "1jr95hrqmxdqvn1546x04hdhp1aq7dv7881rspar14ksz7f7382r"; }; nativeBuildInputs = [ which ]; From 1dea82ff051d2d3054ca0f34571bddfa640564d8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 25 Jun 2021 00:54:53 +0200 Subject: [PATCH 11/61] python3.pkgs.inkex: init from inkscape This is useful for testing Inkscape extensions. --- .../python-modules/inkex/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/inkex/default.nix diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix new file mode 100644 index 000000000000..c1c5479dfd8f --- /dev/null +++ b/pkgs/development/python-modules/inkex/default.nix @@ -0,0 +1,41 @@ +{ buildPythonPackage +, inkscape +, lxml +, python +}: + +buildPythonPackage { + pname = "inkex"; + inherit (inkscape) version; + + format = "other"; + + propagatedBuildInputs = [ + lxml + ]; + + # We just copy the files. + dontUnpack = true; + dontBuild = true; + + # No tests installed. + doCheck = false; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/${python.sitePackages}" + cp -r "${inkscape}/share/inkscape/extensions/inkex" "$out/${python.sitePackages}" + + runHook postInstall + ''; + + meta = inkscape.meta // { + description = "Inkscape Extensions Library"; + longDescription = '' + This module provides support for inkscape extensions, it includes support for opening svg files and processing them. + + Standalone, it is especially useful for running tests for Inkscape extensions. + ''; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e8624e496da..1b1f62511ec3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3493,6 +3493,8 @@ in { injector = callPackage ../development/python-modules/injector { }; + inkex = callPackage ../development/python-modules/inkex { }; + inotify-simple = callPackage ../development/python-modules/inotify-simple { }; inquirer = callPackage ../development/python-modules/inquirer { }; From 75ea980211fcc35c472a1dad534d42e838471e20 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 24 Jun 2021 21:17:00 +0200 Subject: [PATCH 12/61] inkscape-extensions.applytransforms: 0.0.0+unstable=2021-05-11 --- .../graphics/inkscape/extensions.nix | 3 ++ .../extensions/applytransforms/default.nix | 42 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix diff --git a/pkgs/applications/graphics/inkscape/extensions.nix b/pkgs/applications/graphics/inkscape/extensions.nix index affd934e9368..63010a19f14d 100644 --- a/pkgs/applications/graphics/inkscape/extensions.nix +++ b/pkgs/applications/graphics/inkscape/extensions.nix @@ -2,9 +2,12 @@ , fetchFromGitHub , runCommand , inkcut +, callPackage }: { + applytransforms = callPackage ./extensions/applytransforms { }; + hexmap = stdenv.mkDerivation { name = "hexmap"; version = "2020-06-06"; diff --git a/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix new file mode 100644 index 000000000000..131daffffb9d --- /dev/null +++ b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +}: + +stdenv.mkDerivation { + pname = "inkscape-applytransforms"; + version = "0.0.0+unstable=2021-05-11"; + + src = fetchFromGitHub { + owner = "Klowner"; + repo = "inkscape-applytransforms"; + rev = "5b3ed4af0fb66e399e686fc2b649b56db84f6042"; + sha256 = "XWwkuw+Um/cflRWjIeIgQUxJLrk2DLDmx7K+pMWvIlI="; + }; + + checkInputs = [ + python3.pkgs.inkex + python3.pkgs.pytestCheckHook + ]; + + dontBuild = true; + + doCheck = true; + + installPhase = '' + runHook preInstall + + install -Dt "$out/share/inkscape/extensions" *.inx *.py + + runHook postInstall + ''; + + meta = with lib; { + description = "Inkscape extension which removes all matrix transforms by applying them recursively to shapes"; + homepage = "https://github.com/Klowner/inkscape-applytransforms"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.all; + }; +} From 5efd65b2d94b0ac0cf155e013b6747fa22bc04c3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 25 Jun 2021 01:25:41 +0200 Subject: [PATCH 13/61] inkscape-with-extension: make enabling all extensions easier Previously, we needed something like inkscape-with-extensions.override { inkscapeExtensions = builtins.filter lib.isDerivation (builtins.attrValues inkscape-extensions); } Now, we can just do inkscape-with-extensions.override { inkscapeExtensions = null; } --- .../applications/graphics/inkscape/with-extensions.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/with-extensions.nix b/pkgs/applications/graphics/inkscape/with-extensions.nix index c558a6bb0622..14fffadd0360 100644 --- a/pkgs/applications/graphics/inkscape/with-extensions.nix +++ b/pkgs/applications/graphics/inkscape/with-extensions.nix @@ -2,13 +2,19 @@ , inkscape , symlinkJoin , makeWrapper -, inkscapeExtensions ? [] +, inkscapeExtensions ? [ ] +, inkscape-extensions }: +let + allExtensions = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues inkscape-extensions); + selectedExtensions = if inkscapeExtensions == null then allExtensions else inkscapeExtensions; +in + symlinkJoin { name = "inkscape-with-extensions-${lib.getVersion inkscape}"; - paths = [ inkscape ] ++ inkscapeExtensions; + paths = [ inkscape ] ++ selectedExtensions; nativeBuildInputs = [ makeWrapper ]; From 309498cae0d57ff969e8a96b15137492fc9f5a1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Jun 2021 14:26:00 +0000 Subject: [PATCH 14/61] thrift: 0.14.1 -> 0.14.2 --- pkgs/development/libraries/thrift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 04d9280e7b36..a34fc36484d9 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "thrift"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - sha256 = "198c855mjy5byqfb941hiyq2j37baz63f0wcfy4vp8y8v4f5xnhk"; + sha256 = "sha256-QZG/wLdJDiDMafn03G6ZH7thLUVRqp7vHb9/TEfOVU0="; }; # Workaround to make the python wrapper not drop this package: From cbe2ac46a4fa16c8084064d521af908be0005b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=9B=87=E5=B4=A9=E4=B9=83=E9=9F=B3?= Date: Fri, 25 Jun 2021 17:03:27 +0200 Subject: [PATCH 15/61] tailscale: 1.8.8 -> 1.10.0 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index fe7e68566a8d..56acbf3d22a9 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.8.8"; + version = "1.10.0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "00pd4hm8gj200xagc33a73kdbwykwj4nhi596lybji0k231wylz5"; + sha256 = "0smc2xqbqc2p4jj1c98gzzxbr28sbx8z8625hbrng9m39vwylfxf"; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "0cppblz1mnyb3c8xcry5mnf566s6l9409vf9572n1rs1bg91dvgn"; + vendorSha256 = "1mq5bbz9vsxhcrwxpsdnhp8q8zrnp6jpqggn9n5kqr82f3bizwxv"; doCheck = false; From 4c10d0da45b1d5d0dcaf4342fd221f77c2d5705d Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 25 Jun 2021 19:05:20 +0200 Subject: [PATCH 16/61] foot: 1.7.2 -> 1.8.0 * https://codeberg.org/dnkl/foot/releases/tag/1.8.0 * Enable grapheme shaping via fcft and utf8proc. Requires `tweak.grapheme-shaping=yes` in foot.ini as well. --- pkgs/applications/terminal-emulators/foot/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 5062329834c4..6667b309d1b3 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -16,6 +16,7 @@ , tllist , wayland-protocols , pkg-config +, utf8proc , allowPgo ? true , python3 # for PGO # for clang stdenv check @@ -25,7 +26,7 @@ }: let - version = "1.7.2"; + version = "1.8.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -39,7 +40,7 @@ let src = fetchurl { url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py"; - sha256 = "019bdiqfi3wx2lwrv3nhq83knc1r3lmqd5zgisa33wwshm2kyv7p"; + sha256 = "0w4d0rxi54p8lvbynypcywqqwbbzmyyzc0svjab27ngmdj1034ii"; }; dontUnpack = true; @@ -93,7 +94,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; - sha256 = "0iabj9c0dj1r0m89i5gk2jdmwj4wfsai8na54x2w4fq406q6g9nh"; + sha256 = "07irlhkvziv51cp5zn1yz8ljfnrnfjcykv5pgfwmpslw3nl5szxv"; }; nativeBuildInputs = [ @@ -115,6 +116,7 @@ stdenv.mkDerivation rec { wayland libxkbcommon fcft + utf8proc ]; # recommended build flags for performance optimized foot builds From 7e0e95b7763440bfdb9b1897f034fe02ce63e7dc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 25 Jun 2021 18:47:52 +0200 Subject: [PATCH 17/61] hikari: Build with wlroots 0.14 --- pkgs/applications/window-managers/hikari/default.nix | 11 ++++++++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 23c7d9f680f6..2ec1ff26a793 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, +{ lib, stdenv, fetchzip, fetchpatch, pkg-config, bmake, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman, libucl, wayland, wayland-protocols, wlroots, mesa, @@ -23,6 +23,15 @@ stdenv.mkDerivation { sha256 = "0vxwma2r9mb2h0c3dkpvf8dbrc2x2ykhc5bb0vd72sl9pwj4jxmy"; }; + patches = [ + # To fix the build with wlroots 0.14.0: + (fetchpatch { + url = "https://cgit.freebsd.org/ports/plain/x11-wm/hikari/files/patch-wlroots-0.14?id=f2820b6cc2170feef17989c422f2cf46644a5b57"; + sha256 = "1kpbcmgdm4clmf2ryrs5pv3ghycnq4glvs3d3ll6zr244ks5yf43"; + extraPrefix = ""; + }) + ]; + nativeBuildInputs = [ pkg-config bmake ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc7602b011c4..f2a78bbf6507 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24578,9 +24578,7 @@ in wbg = callPackage ../applications/misc/wbg { }; - hikari = callPackage ../applications/window-managers/hikari { - wlroots = wlroots_0_13; - }; + hikari = callPackage ../applications/window-managers/hikari { }; i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; From 5e90cb8800ef5fb24b3c2fccb4aecfcbc1926cb0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 2 Jun 2021 17:49:01 +0200 Subject: [PATCH 18/61] foot: install terminfo to separate output * See also https://codeberg.org/dnkl/foot/pulls/607 * propagated-user-env-packages is undocumented unfortunately, but ensure that if you add foot(.out) to your `systemPackages` or install it via `nix-env`, the terminfo output is also installed automatically. * Resolves #125390. --- .../terminal-emulators/foot/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 6667b309d1b3..f69625e16cd0 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -131,7 +131,11 @@ stdenv.mkDerivation rec { export AR="${ar}" ''; - mesonFlags = [ "--buildtype=release" "-Db_lto=true" ]; + mesonFlags = [ + "--buildtype=release" + "-Db_lto=true" + "-Dterminfo-install-location=${placeholder "terminfo"}/share/terminfo" + ]; # build and run binary generating PGO profiles, # then reconfigure to build the normal foot binary utilizing PGO @@ -148,6 +152,15 @@ stdenv.mkDerivation rec { llvm-profdata merge default_*profraw --output=default.profdata ''; + outputs = [ "out" "terminfo" ]; + + # make sure nix-env and buildEnv also include the + # terminfo output when the package is installed + postInstall = '' + mkdir -p "$out/nix-support" + echo "$terminfo" >> "$out/nix-support/propagated-user-env-packages" + ''; + passthru.tests = { clang-default-compilation = foot.override { inherit (llvmPackages) stdenv; From c0bf89fab0a46554c07cb889c802725472dd42c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 25 Jun 2021 15:17:36 -0300 Subject: [PATCH 19/61] qogir-theme: 2021-04-20 -> 2021-06-25 --- pkgs/data/themes/qogir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index a1011fa0a159..c4f97ebfbdad 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2021-04-20"; + version = "2021-06-25"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "17ajrg5safnb6b1jbwvnysc4rvl6gkpnqdf89bammlrpkj6fr3ip"; + sha256 = "178lk0zffm4nd8fc872rfpm2aii1nszq0k389gkiyxkqphmknn4n"; }; buildInputs = [ gdk-pixbuf librsvg ]; From c0b46c6b596dd25f32733ff01156d3d769640ab5 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Thu, 24 Jun 2021 23:54:59 +0200 Subject: [PATCH 20/61] salt: 3003 -> 3003.1 Need to patch out the contextvars dependency (which is included in python 3.7+). The same patch is discussed in arch: https://bugs.archlinux.org/task/71344 --- pkgs/tools/admin/salt/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 38ece95e3a47..0620bb285341 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -7,11 +7,11 @@ }: python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3003"; + version = "3003.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "xGiXM9/nOM8ofjHLP908uNFgYpUgKxjY5m1I03LVync="; + sha256 = "inGE095NFydhjw0/u6eeVDia7/hbcvTOuCALzBZ/br4="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -31,6 +31,8 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace "salt/utils/rsax931.py" \ --subst-var-by "libcrypto" "${openssl.out}/lib/libcrypto.so" + substituteInPlace requirements/base.txt \ + --replace contextvars "" ''; # The tests fail due to socket path length limits at the very least; From 16dc11399d0f418474b7246e9e52c8840e38ac52 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 25 Jun 2021 15:56:39 -0400 Subject: [PATCH 21/61] neofetch: add option for optional dependency --- pkgs/tools/misc/neofetch/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 68cebca4bc3d..3d4bf8500ba2 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenvNoCC, fetchFromGitHub, bash, makeWrapper, pciutils, ueberzug }: +{ lib, stdenvNoCC, fetchFromGitHub, bash, makeWrapper, pciutils +, x11Support ? true, ueberzug +}: stdenvNoCC.mkDerivation rec { pname = "neofetch"; @@ -20,7 +22,7 @@ stdenvNoCC.mkDerivation rec { postInstall = '' wrapProgram $out/bin/neofetch \ - --prefix PATH : ${lib.makeBinPath [ pciutils ueberzug ]} + --prefix PATH : ${lib.makeBinPath ([ pciutils ] ++ lib.optional x11Support ueberzug) } ''; makeFlags = [ From 54aa6dd328b10bfb609ca6c7fc35d416a6859d8c Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Fri, 25 Jun 2021 16:33:51 -0400 Subject: [PATCH 22/61] vscode-extensions.arrterian.nix-env-selector: init at 1.0.7 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index abaa3354e374..875dd8a61932 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -97,6 +97,18 @@ let }; }; + arrterian.nix-env-selector = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nix-env-selector"; + publisher = "arrterian"; + version = "1.0.7"; + sha256 = "0e76885c9dbb6dca4eac8a75866ec372b948cc64a3a3845327d7c3ef6ba42a57"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ms-python.vscode-pylance = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; From e56e8740897402a88af96c0be0dcd2971f2209b7 Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Fri, 25 Jun 2021 16:52:04 -0400 Subject: [PATCH 23/61] vscode-extensions.davidanson.vscode-markdownlint: 0.38.0 -> 0.42.1 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 875dd8a61932..e145543855aa 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -285,8 +285,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.38.0"; - sha256 = "0d6hbsjrx1j8wrmfnvdwsa7sci1brplgxwkmy6sp74va7zxfjnqv"; + version = "0.42.1"; + sha256 = "c8c0647e0dd786fe68becca6dc73eade5f4220a26ab9faff8dd813a14b25df51"; }; meta = with lib; { license = licenses.mit; From 8c7fb8564df4cbfb7db4b58f797bcdbe50217325 Mon Sep 17 00:00:00 2001 From: Daniel Hutzley Date: Fri, 25 Jun 2021 16:28:08 -0700 Subject: [PATCH 24/61] ckan: 1.30.0 -> 1.30.4 --- pkgs/games/ckan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index 9f25a1d50afa..3649369aeaad 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ckan"; - version = "1.30.0"; + version = "1.30.4"; src = fetchurl { url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe"; - sha256 = "sha256-wih5NRzeOy4WMXQ3yV9W/m2x7B2C5T0F78TbpsngigQ="; + sha256 = "sha256-IgPqUEDpaIuGoaGoH2GCEzh3KxF3pkJC3VjTYXwSiQE="; }; dontUnpack = true; From 55c0a6584f6b7f03ba335fa68ef67f2d20dc012c Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 26 Jun 2021 02:50:29 +0200 Subject: [PATCH 25/61] coreboot-utils: Fix typo Write `coreboot` lowercase. Signed-off-by: Felix Singer --- pkgs/tools/misc/coreboot-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index a8c0f7f8378f..95f9c74f5ade 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -43,7 +43,7 @@ let }; cbmem = generic { pname = "cbmem"; - meta.description = "Coreboot console log reader"; + meta.description = "coreboot console log reader"; }; ifdtool = generic { pname = "ifdtool"; From f93aa9b94b0c025c6f531f243a2a13723959168a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 26 Jun 2021 04:33:03 +0200 Subject: [PATCH 26/61] backporting action: Link to backporting criteria. Automation tools should instruct their users clearly what tasks are still on the user. Updates the bot's version to get the `pull_description` feature: https://github.com/zeebe-io/backport-action/pull/64 --- .github/workflows/backport.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 79af5835463d..5b38b94bd6dc 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -15,9 +15,15 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs # should be kept in sync with `version` - uses: zeebe-io/backport-action@9b8949dcd4295d364b0939f07d0c7593598d26cd + uses: zeebe-io/backport-action@2b994724142df0774855690db56bc6308fb99ffa with: + # Config README: https://github.com/zeebe-io/backport-action#backport-action github_token: ${{ secrets.GITHUB_TOKEN }} github_workspace: ${{ github.workspace }} # should be kept in sync with `uses` - version: 9b8949dcd4295d364b0939f07d0c7593598d26cd + version: 2b994724142df0774855690db56bc6308fb99ffa + pull_description: |- + Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}. + + * [ ] Before merging, ensure that this backport complies with the [Criteria for Backporting](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#criteria-for-backporting-changes). + * Even as a non-commiter, if you find that it does not comply, leave a comment. From 3c29ced243cc032806f680ae67845b9b3a879183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 26 Jun 2021 04:37:39 +0200 Subject: [PATCH 27/61] CONTRIBUTING.md: Move to repo root, where it is more visible. We found that many users found it difficult to locate this document. Github supports it in the root, see: https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- .github/workflows/backport.yml | 2 +- .github/CONTRIBUTING.md => CONTRIBUTING.md | 0 README.md | 2 +- doc/contributing/submitting-changes.chapter.md | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename .github/CONTRIBUTING.md => CONTRIBUTING.md (100%) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 51a9e8bb21f9..27d959410b61 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -23,8 +23,8 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing- - [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"` - [ ] Tested execution of all binary files (usually in `./result/bin/`) -- [21.11 Release Notes (or backporting 21.05 Relase notes)](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#generating-2111-release-notes) +- [21.11 Release Notes (or backporting 21.05 Relase notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module -- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). +- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 5b38b94bd6dc..bea970f02d40 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -25,5 +25,5 @@ jobs: pull_description: |- Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}. - * [ ] Before merging, ensure that this backport complies with the [Criteria for Backporting](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#criteria-for-backporting-changes). + * [ ] Before merging, ensure that this backport complies with the [Criteria for Backporting](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#criteria-for-backporting-changes). * Even as a non-commiter, if you find that it does not comply, leave a comment. diff --git a/.github/CONTRIBUTING.md b/CONTRIBUTING.md similarity index 100% rename from .github/CONTRIBUTING.md rename to CONTRIBUTING.md diff --git a/README.md b/README.md index 3a03be0d4496..4519e85b2a87 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ Most contributions are based on and merged into these branches: deemed of sufficiently high quality For more information about contributing to the project, please visit -the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). +the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). # Donations diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 29b8ec493e7f..221ba3006194 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -62,7 +62,7 @@ - Push your changes to your fork of nixpkgs. - Create the pull request -- Follow [the contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes). +- Follow [the contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#submitting-changes). ## Submitting security fixes {#submitting-changes-submitting-security-fixes} @@ -193,7 +193,7 @@ It’s important to test any executables generated by a build when you change or ### Meets Nixpkgs contribution standards {#submitting-changes-contribution-standards} -The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc\... Everyone should read and understand the standards the community has for contributing before submitting a pull request. +The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc\... Everyone should read and understand the standards the community has for contributing before submitting a pull request. ## Hotfixing pull requests {#submitting-changes-hotfixing-pull-requests} From bbea3741fc6ad8c26dc6e3689f7d1732e06d90e3 Mon Sep 17 00:00:00 2001 From: Tomas Antonio Lopez Date: Wed, 23 Jun 2021 12:44:20 +0900 Subject: [PATCH 28/61] jquake: discard debug messages by default JQuake outputs too frequent debug-like messages to stdout, filling system logs quickly. --- pkgs/applications/misc/jquake/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/jquake/default.nix b/pkgs/applications/misc/jquake/default.nix index eccd8b4c1896..2a3f1aec4136 100644 --- a/pkgs/applications/misc/jquake/default.nix +++ b/pkgs/applications/misc/jquake/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, copyDesktopItems, makeDesktopItem, unzip, jre8 }: +{ lib, stdenv, fetchurl, copyDesktopItems, makeDesktopItem, unzip, jre8 +, logOutput ? false +}: stdenv.mkDerivation rec { pname = "jquake"; @@ -14,10 +16,9 @@ stdenv.mkDerivation rec { sourceRoot = "."; postPatch = '' - # JQuake emits a lot of debug-like messages in console, but I - # don't think it's in our interest to void them by default. Log them at - # the appropriate level. - sed -i "/^java/ s/$/\ | logger -p user.debug/" JQuake.sh + # JQuake emits a lot of debug-like messages on stdout. Either drop the output + # stream entirely or log them at 'user.debug' level. + sed -i "/^java/ s/$/ ${if logOutput then "| logger -p user.debug" else "> \\/dev\\/null"}/" JQuake.sh # By default, an 'errors.log' file is created in the current directory. # cd into a temporary directory and let it be created there. From 94c53c7a3b82cda5e836b2eb460eca32bb6e3c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Sat, 26 Jun 2021 09:08:43 +0300 Subject: [PATCH 29/61] xfce.xfce4-power-manager: depends on xfce4-panel --- pkgs/desktops/xfce/core/xfce4-power-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix index 76672b660a17..9877027c4033 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix @@ -1,5 +1,5 @@ { mkXfceDerivation, automakeAddFlags, exo, gtk3, libnotify -, libxfce4ui, libxfce4util, upower, xfconf }: +, libxfce4ui, libxfce4util, upower, xfconf, xfce4-panel }: mkXfceDerivation { category = "xfce"; @@ -9,7 +9,7 @@ mkXfceDerivation { sha256 = "sha256-Qk++1db+agiU99p+QW8/WNnNqFVejV/BcnmgvfoB3OU="; nativeBuildInputs = [ automakeAddFlags exo ]; - buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ]; + buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf xfce4-panel ]; postPatch = '' substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0 From 645ad283721bd01f2fb50d8c6b9b90acda5cd177 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Sat, 26 Jun 2021 08:46:01 +0200 Subject: [PATCH 30/61] protoc-gen-go: 1.26.0 -> 1.27.0 --- pkgs/development/tools/protoc-gen-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/development/tools/protoc-gen-go/default.nix index 9f94e3c78f31..063da92a6ad3 100644 --- a/pkgs/development/tools/protoc-gen-go/default.nix +++ b/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - sha256 = "sha256-n2LHI8DXQFFWhTPOFCegBgwi/0tFvRE226AZfRW8Bnc="; + sha256 = "sha256-1L0GYXrtTYkk5eLXkfVxzbZMZKgyzSpkDaI8itb6NnA="; }; vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y="; From 41d225d471b3122407c3be396202b79fa4ebf26d Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sat, 26 Jun 2021 09:51:13 +0200 Subject: [PATCH 31/61] fancy-motd: unstable-2021-05-20 -> unstable-2021-06-26 --- pkgs/tools/system/fancy-motd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/fancy-motd/default.nix b/pkgs/tools/system/fancy-motd/default.nix index ebfab8aac6f7..7f3e425f23fd 100644 --- a/pkgs/tools/system/fancy-motd/default.nix +++ b/pkgs/tools/system/fancy-motd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fancy-motd"; - version = "unstable-2021-05-20"; + version = "unstable-2021-06-26"; src = fetchFromGitHub { owner = "bcyran"; repo = pname; - rev = "57978bdfa31179783c51c6f33e47063ec8641205"; - sha256 = "0bkgd86721jw81jvliw3rv4p52qpjynsxb6hn81divd068l56prg"; + rev = "dc3c8768affa6320050a141420b3ca80c687fce6"; + sha256 = "1zs0i1cpn6dky2hqmdr2phycmjdk30ipvvdhrxg6z3bgizd502x0"; }; buildInputs = [ bc curl figlet fortune gawk iproute2 ]; From a46fac3166f349913c5acaacfd38ac820121ed8b Mon Sep 17 00:00:00 2001 From: 239 <239@pm.me> Date: Sat, 26 Jun 2021 10:11:59 +0200 Subject: [PATCH 32/61] pcloud: 1.9.2 -> 1.9.3 --- pkgs/applications/networking/pcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index b3968ed86045..e1936bf06a7f 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -26,14 +26,14 @@ let pname = "pcloud"; - version = "1.9.2"; - code = "XZCBKnXZdbHEAu1ec7bMDQCb1oCztBc169Py"; + version = "1.9.3"; + code = "XZh0QTXZIYkI66plpzLAJ4G2mwDvJFvKvEzy"; name = "${pname}-${version}"; # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${name}.zip"; - hash = "sha256-9I4xl9cO1MDvdXaTv6ER/NPdqKoo0y7HNWxGl0Fn1O0="; + hash = "sha256-NFbSYZRysRIg6q0aaDocpK7xJbiCWc1S0McXKlCRGjU="; }; appimageContents = appimageTools.extractType2 { From ab1141d5f071bbc8c1e0d975613ab31576d7c1e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Jun 2021 11:18:02 +0200 Subject: [PATCH 33/61] ytfzf: 1.1.6 -> 1.2.0 https://github.com/pystardust/ytfzf/releases/tag/v1.2.0 --- pkgs/tools/misc/ytfzf/default.nix | 4 ++-- pkgs/tools/misc/ytfzf/no-update.patch | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index 302839a30387..a35e9200a71d 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "1.1.6"; + version = "1.2.0"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "sha256-HXn/8Lrt6tNZWW1AeKMArOiW9t1v7MzlynSLryNdI5Y="; + sha256 = "sha256-3wbjCtRmnd9tm8kqKaIF6VmMdKsWznhOvQkEsrAJpAE="; }; patches = [ diff --git a/pkgs/tools/misc/ytfzf/no-update.patch b/pkgs/tools/misc/ytfzf/no-update.patch index e023914083d8..e71582f6364f 100644 --- a/pkgs/tools/misc/ytfzf/no-update.patch +++ b/pkgs/tools/misc/ytfzf/no-update.patch @@ -1,8 +1,8 @@ diff --git a/ytfzf b/ytfzf -index d5ff8c9..96f9c8f 100755 +index f4d2e0d..7a3b4b6 100755 --- a/ytfzf +++ b/ytfzf -@@ -934,23 +934,8 @@ send_notify () { +@@ -1260,22 +1260,8 @@ EOF } update_ytfzf () { @@ -12,19 +12,18 @@ index d5ff8c9..96f9c8f 100755 - - if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh'; then - chmod 755 "$updatefile" -- if [ "$(uname)" = "Darwin" ]; then -- sudo cp "$updatefile" "/usr/local/bin/ytfzf" -- else -- sudo cp "$updatefile" "/usr/bin/ytfzf" -- fi +- [ "$(uname)" = "Darwin" ] && prefix="/usr/local/bin" || prefix="/usr/bin" +- function_exists "sudo" && doasroot="sudo" || doasroot="doas" +- $doasroot cp "$updatefile" "$prefix/ytfzf" +- unset prefix doasroot - else - printf "%bFailed to update ytfzf. Try again later.%b" "$c_red" "$c_reset" - fi - - rm "$updatefile" -- exit +- exit 0 + printf "%bUpdates have to be installed through Nix.%b\n" "$c_red" "$c_reset" + exit 1 } - sort_video_data_date () { + #gives a value to sort by (this will give the unix time the video was uploaded) From d237db4748b2516d489cae2390085eea4480a55f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Jun 2021 11:28:22 +0200 Subject: [PATCH 34/61] abcmidi: 2021.05.25 -> 2021.06.24 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 519a6ffabc6f..6038d1586e56 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.05.25"; + version = "2021.06.24"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-lgKrDR+2KRl6vvZJp2nmY493agQx+FoQ+/SNNV4lA/A="; + sha256 = "sha256-FaB1QTl4xCTz/sbgptXQHtD0wadXG3UCgdZoOPCOH0U="; }; meta = with lib; { From 06a8926444b2c531cd14c5c4db94b16d779f66fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Jun 2021 14:08:49 +0200 Subject: [PATCH 35/61] python3Packages.upb-lib: init at 0.4.12 --- .../python-modules/upb-lib/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/upb-lib/default.nix diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix new file mode 100644 index 000000000000..356a290241ed --- /dev/null +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pyserial-asyncio +, pytz +}: + +buildPythonPackage rec { + pname = "upb-lib"; + version = "0.4.12"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "e668055d9c389aefd09203afb96a950a320095f225ef0a1aa611e592db92a71b"; + }; + + propagatedBuildInputs = [ + pyserial-asyncio + pytz + ]; + + # no tests on PyPI, no tags on GitHub + doCheck = false; + + pythonImportsCheck = [ "upb_lib" ]; + + meta = with lib; { + description = "Library for interacting with UPB PIM"; + homepage = "https://github.com/gwww/upb-lib"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f97c847dac53..4fca99b8aaad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8837,6 +8837,8 @@ in { upass = callPackage ../development/python-modules/upass { }; + upb-lib = callPackage ../development/python-modules/upb-lib { }; + update_checker = callPackage ../development/python-modules/update_checker { }; update-copyright = callPackage ../development/python-modules/update-copyright { }; From 04d2b721ac9d37cc533272e8f71aa41629c1919d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Jun 2021 14:09:36 +0200 Subject: [PATCH 36/61] home-assistant: update component-packages.nix --- 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 a5f6d670f621..8fff6d0c3df2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -903,7 +903,7 @@ "unifi_direct" = ps: with ps; [ pexpect ]; "unifiled" = ps: with ps; [ unifiled ]; "universal" = ps: with ps; [ ]; - "upb" = ps: with ps; [ ]; # missing inputs: upb_lib + "upb" = ps: with ps; [ upb-lib ]; "upc_connect" = ps: with ps; [ connect-box ]; "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api "updater" = ps: with ps; [ distro ]; From 2551e8ad820701a075b66dd76a7ee1e9736f6106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Jun 2021 14:13:50 +0200 Subject: [PATCH 37/61] home-assistant: test upb component --- 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 985fb15bc3ec..f03e16a63536 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -697,6 +697,7 @@ in with py.pkgs; buildPythonApplication rec { "unifi" "unifi_direct" "universal" + "upb" "updater" "upnp" "uptime" From a62ca771983e1183263bd3068bba1459dc02017f Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 26 Jun 2021 20:24:54 +0800 Subject: [PATCH 38/61] linux_xanmod: make tickless --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index e56d3c878c93..4224255235a4 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -18,6 +18,7 @@ buildLinux (args // rec { structuredExtraConfig = with lib.kernel; { PREEMPT = lib.mkForce yes; PREEMPT_VOLUNTARY = lib.mkForce no; + NO_HZ_FULL = yes; }; extraMeta = { From 4788060b46c090184520dbb936ac6bf45f21acfd Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 26 Jun 2021 20:25:22 +0800 Subject: [PATCH 39/61] linux_xanmod: set to 500Hz --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 4224255235a4..17e440f5bc66 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -19,6 +19,7 @@ buildLinux (args // rec { PREEMPT = lib.mkForce yes; PREEMPT_VOLUNTARY = lib.mkForce no; NO_HZ_FULL = yes; + HZ_500 = yes; }; extraMeta = { From 07cd950ab1a4280607a4ab3366698c578b9a038e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 26 Jun 2021 15:16:59 +0200 Subject: [PATCH 40/61] nixos/system76: fix evaluation --- nixos/modules/hardware/system-76.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/system-76.nix b/nixos/modules/hardware/system-76.nix index 3a50c5aa0f0c..d4896541dbae 100644 --- a/nixos/modules/hardware/system-76.nix +++ b/nixos/modules/hardware/system-76.nix @@ -35,7 +35,7 @@ let }; }; - power-pkg = pkgs.system76-power; + power-pkg = config.boot.kernelPackages.system76-power; powerConfig = mkIf cfg.power-daemon.enable { # Make system76-power usable by root from the command line. environment.systemPackages = [ power-pkg ]; From 31257ffdc3c3fa52afc683c342f173e9bb03d085 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Jun 2021 13:21:59 +0000 Subject: [PATCH 41/61] dnsproxy: 0.37.7 -> 0.38.0 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index a16ebf792412..093863f21c15 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.37.7"; + version = "0.38.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5/ggeNBMNlwX6AzYO0haAU18xY0rYpELts6lqZmJxj4="; + sha256 = "sha256-dltCZ6g5Ta/M2N95TRkdLRr3T0YeKdkY88zE306AtDg="; }; vendorSha256 = null; From e76fa544609b1912e8b20f400d49772836844c10 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 24 Jun 2021 01:24:20 +0000 Subject: [PATCH 42/61] libhandy: 1.2.2 -> 1.2.3 --- pkgs/development/libraries/libhandy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 891bd04ea543..0d69a5b93e1e 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.2.2"; + version = "1.2.3"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-R//Shl0CvRyleVIt6t1+L5U2Lx8gJGL9XuriuBZosEg="; + sha256 = "sha256-kuxKWB7BtB3Qek6PqvXVKuN8q7fh+n+UTWyvvllrbWE="; }; nativeBuildInputs = [ From f84d5fb8df311bdb0618bd7a9683c70bfffffe0b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 26 Jun 2021 14:15:49 +0200 Subject: [PATCH 43/61] sd-switch: 0.2.2 -> 0.2.3 --- pkgs/os-specific/linux/sd-switch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/os-specific/linux/sd-switch/default.nix index d4b3d9116b9e..987f32664c11 100644 --- a/pkgs/os-specific/linux/sd-switch/default.nix +++ b/pkgs/os-specific/linux/sd-switch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sd-switch"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitLab { owner = "rycee"; repo = pname; rev = version; - sha256 = "0vqvwly1vidzl3d89s7jysd5lc29d6skd52pf5ibxfwhrir50sw0"; + sha256 = "12h2d7v7pdz7b0hrna64561kf35nbpwb2kzxa791xk8raxc2b72k"; }; - cargoSha256 = "1m08qrz2qhf71d1fxw08wc93gfyj0hrh2hp3s17g4g1cw0jvcmm5"; + cargoSha256 = "12ny3cir2nxzrmf4vwq6sgc35dbpq88hav53xqdp44rigdf4vzbs"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; From 75366bb6d8619250ad8a20b86e83a95f8ade5d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Jun 2021 15:18:38 +0200 Subject: [PATCH 44/61] spotdl: 3.6.1 -> 3.6.3 https://github.com/spotDL/spotify-downloader/releases/tag/v3.6.2 https://github.com/spotDL/spotify-downloader/releases/tag/v3.6.3 --- pkgs/tools/audio/spotdl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 38f69b4d2b77..71e8615a114f 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "3.6.1"; + version = "3.6.3"; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "v${version}"; - sha256 = "sha256-F3bP8f1LtcFZL7qahYkCUvhtc27fcL8WBnmyLcS9lCY="; + sha256 = "sha256-Ok8DOw+Joy35IqN7sNOQcUWYJS8tqBeQ5/I8fUSly7Q="; }; propagatedBuildInputs = with python3.pkgs; [ From a93194815b33380d7bcb9d7bed18b45c144a645f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Jun 2021 11:13:11 +0200 Subject: [PATCH 45/61] imagemagick6: 6.9.12-16 -> 6.9.12-17 --- pkgs/applications/graphics/ImageMagick/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index bab1d6cfab74..5fea254ce08d 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-16"; + version = "6.9.12-17"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "sha256-kg8vt88G6huRbJlVYztKxHiFPhGz/QHuNKtbhmai790="; + sha256 = "sha256-yZXvxl9Tbl3JRBmRcfsjbkaxywtD08SuUnJayKfwk9M="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 861f32cf0d6b92b508c540945afe5dd7f7faba86 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Sat, 26 Jun 2021 17:42:45 +0300 Subject: [PATCH 46/61] turbogit: 1.2.0 -> 2.0.0 --- pkgs/development/tools/turbogit/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/turbogit/default.nix b/pkgs/development/tools/turbogit/default.nix index 68bd10683547..7d3e88f6cb47 100644 --- a/pkgs/development/tools/turbogit/default.nix +++ b/pkgs/development/tools/turbogit/default.nix @@ -1,20 +1,21 @@ -{ fetchFromGitHub, buildGoModule, lib, installShellFiles }: +{ fetchFromGitHub, buildGoModule, lib, installShellFiles, libgit2, pkg-config }: buildGoModule rec { pname = "turbogit"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "b4nst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-alVgXnsoC2nmUe6i/l0ttUjoXpKLHr0n/7p6WbIIGBU="; + sha256 = "sha256-UIPI1r6BnfD5ukk5yGg3VJHMyaMp30MXhJfOkoNT6vs="; }; - vendorSha256 = "sha256-6fxbxpROYiNw5SYdQAIdy5NfqzOcFfAlJ+vTQyFtink="; + vendorSha256 = "sha256-SX0VPENcfw8ysL+dDGPSJ/FNdyecjENx4+UHXdu71O8="; subPackages = [ "." ]; - nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ libgit2 ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; postInstall = '' # Move turbogit binary to tug ln -s $out/bin/turbogit $out/bin/tug @@ -37,6 +38,7 @@ buildGoModule rec { ''; homepage = "https://b4nst.github.io/turbogit"; license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.yusdacra ]; }; } From b97213ddd723f55398619e57801783cb4ddceb16 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 26 Jun 2021 10:53:09 -0400 Subject: [PATCH 47/61] stylua: 0.9.2 -> 0.9.3 --- pkgs/development/tools/stylua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 48250297e496..7394b402cfe3 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "0idx4664p9ggv8p2pwgpch42li9ksiilszpwva19y4fa5xrmcyr2"; + sha256 = "1xpl3nxiln6hxxjd9nx99h4qijjym3afxm5nalw40p152h8zgig4"; }; - cargoSha256 = "1hc7zvrfiiijk4wr6i5jk6k32nz0lf64gqin3n8b8x5pp9d8fcfk"; + cargoSha256 = "012zv1myackwk0x73l6ri7zzrzwdkd970hh4p30b590bmsam6sb9"; cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] ++ lib.optionals luauSupport [ "--features" "luau" ]; From 97613b7a865605c8a6b60e6efaf0d3b4b1552eaa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 21 Jun 2021 21:02:22 +0200 Subject: [PATCH 48/61] ocamlPackages.torch: mark as broken Version 0.12 is only compatible with PyTorch 1.8 --- pkgs/development/ocaml-modules/torch/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index 5f59b4ae056e..4126e3304861 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -56,5 +56,6 @@ buildDunePackage rec { description = "Ocaml bindings to Pytorch"; maintainers = [ maintainers.bcdarwin ]; license = licenses.asl20; + broken = true; }; } From a29a3981efd43b0e58038151987cc8c09696d930 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 21 Jun 2021 17:59:07 +0200 Subject: [PATCH 49/61] =?UTF-8?q?ocamlPackages.ocaml-migrate-parsetree:=20?= =?UTF-8?q?2.1.0=20=E2=86=92=202.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-migrate-parsetree/{2.1.x.nix => 2.x.nix} | 6 +++--- pkgs/development/ocaml-modules/ppx_deriving/default.nix | 4 ++-- pkgs/development/ocaml-modules/ppxlib/default.nix | 4 ++-- pkgs/development/tools/analysis/flow/default.nix | 2 +- pkgs/development/tools/ocaml/ocamlformat/generic.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) rename pkgs/development/ocaml-modules/ocaml-migrate-parsetree/{2.1.x.nix => 2.x.nix} (80%) diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix similarity index 80% rename from pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix rename to pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix index ca88fe32416a..dab537df2219 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix @@ -2,15 +2,15 @@ buildDunePackage rec { pname = "ocaml-migrate-parsetree"; - version = "2.1.0"; + version = "2.2.0"; useDune2 = true; - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/ocaml-ppx/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "07x7lm45kny0mi0fjvzw51445brm0dgy099cw0gpyly0wj77hyrq"; + sha256 = "188v3z09bg4gyv80c138fa3a3j2w54w5gc4r1ajw7klr70yqz9mj"; }; meta = { diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 7d415bd894e0..5563e6113462 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -7,7 +7,7 @@ , result , ounit , ocaml-migrate-parsetree -, ocaml-migrate-parsetree-2-1 +, ocaml-migrate-parsetree-2 }: let params = @@ -40,7 +40,7 @@ buildDunePackage rec { buildInputs = [ ppxlib cppo ]; propagatedBuildInputs = [ (if params.useOMP2 - then ocaml-migrate-parsetree-2-1 + then ocaml-migrate-parsetree-2 else ocaml-migrate-parsetree) ppx_derivers result diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index c92992197d22..a19d8cce52fb 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -4,7 +4,7 @@ then if lib.versionAtLeast ocaml.version "4.08" then "0.22.0" else "0.15.0" else "0.13.0" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio -, stdlib-shims, ocaml-migrate-parsetree-2-1 +, stdlib-shims, ocaml-migrate-parsetree-2 }: let param = { @@ -57,7 +57,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ocaml-compiler-libs (if param.useOMP2 or true - then ocaml-migrate-parsetree-2-1 + then ocaml-migrate-parsetree-2 else ocaml-migrate-parsetree) ppx_derivers stdio diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index ab0696f14ed2..599908b49316 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow ''; - buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2-1 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ]) + buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ]) ++ lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with lib; { diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 6f3ce218713e..536fcd4acb16 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -83,7 +83,7 @@ buildDunePackage { ocaml-version # Changed since 0.16.0: (ppxlib.override { version = "0.22.0"; }) - ocaml-migrate-parsetree-2-1 + ocaml-migrate-parsetree-2 ] else if lib.versionAtLeast version "0.15.1" then [ diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index efe1808b9229..e040cef15759 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -611,7 +611,7 @@ let }; lwt = callPackage ../development/ocaml-modules/lwt { - ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2; }; ocaml_lwt = lwt; @@ -847,12 +847,12 @@ let ocaml-migrate-parsetree-1-8 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix { }; - ocaml-migrate-parsetree-2-1 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix { }; + ocaml-migrate-parsetree-2 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { - ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2; }; ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; From ea0c0603f5d0e7819120f5de24e40af831208e3e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 26 Jun 2021 16:13:58 +0200 Subject: [PATCH 50/61] tdesktop: Add an update script To make sure that all dependencies are updated as well. Last TODO: tg_owt_hash (requires nix-prefetch-git for the submodules). --- .../telegram/tdesktop/update.py | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100755 pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py new file mode 100755 index 000000000000..cf06bb103c1f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py @@ -0,0 +1,70 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 nix + +import fileinput +import json +import os +import re +import subprocess + +from datetime import datetime +from urllib.request import urlopen, Request + + +DIR = os.path.dirname(os.path.abspath(__file__)) +HEADERS = {'Accept': 'application/vnd.github.v3+json'} + + +def github_api_request(endpoint): + base_url = 'https://api.github.com/' + request = Request(base_url + endpoint, headers=HEADERS) + with urlopen(request) as http_response: + return json.loads(http_response.read().decode('utf-8')) + + +def get_commit_date(repo, sha): + url = f'https://api.github.com/repos/{repo}/commits/{sha}' + request = Request(url, headers=HEADERS) + with urlopen(request) as http_response: + commit = json.loads(http_response.read().decode()) + date = commit['commit']['committer']['date'].rstrip('Z') + date = datetime.fromisoformat(date).date().isoformat() + return 'unstable-' + date + + +def nix_prefetch_url(url, unpack=False): + """Prefetches the content of the given URL.""" + print(f'nix-prefetch-url {url}') + options = ['--type', 'sha256'] + if unpack: + options += ['--unpack'] + out = subprocess.check_output(['nix-prefetch-url'] + options + [url]) + return out.decode('utf-8').rstrip() + + +def update_file(relpath, version, sha256, rev=None): + file_path = os.path.join(DIR, relpath) + with fileinput.FileInput(file_path, inplace=True) as f: + for line in f: + result = line + result = re.sub(r'^ version = ".+";', f' version = "{version}";', result) + result = re.sub(r'^ sha256 = ".+";', f' sha256 = "{sha256}";', result) + if rev: + result = re.sub(r'^ rev = ".*";', f' rev = "{rev}";', result) + print(result, end='') + + +if __name__ == "__main__": + tdesktop_tag = github_api_request('repos/telegramdesktop/tdesktop/releases/latest')['tag_name'] + tdesktop_version = tdesktop_tag.lstrip('v') + tdesktop_hash = nix_prefetch_url(f'https://github.com/telegramdesktop/tdesktop/releases/download/{tdesktop_tag}/tdesktop-{tdesktop_version}-full.tar.gz') + update_file('default.nix', tdesktop_version, tdesktop_hash) + tg_owt_ref = github_api_request('repos/desktop-app/tg_owt/commits/master')['sha'] + tg_owt_version = get_commit_date('desktop-app/tg_owt', tg_owt_ref) + tg_owt_hash = 'TODO' + update_file('tg_owt.nix', tg_owt_version, tg_owt_hash, tg_owt_ref) + tg_owt_ref = github_api_request('repos/desktop-app/tg_owt/commits/master')['sha'] + libtgvoip_ref = github_api_request(f'repos/telegramdesktop/tdesktop/contents/Telegram/ThirdParty/libtgvoip?ref={tdesktop_tag}')['sha'] + libtgvoip_version = get_commit_date('telegramdesktop/libtgvoip', libtgvoip_ref) + libtgvoip_hash = nix_prefetch_url(f'https://github.com/telegramdesktop/libtgvoip/archive/{libtgvoip_ref}.tar.gz', unpack=True) + update_file('../../../../../development/libraries/libtgvoip/default.nix', libtgvoip_version, libtgvoip_hash, libtgvoip_ref) From 7031eb562755de8ca94512cac568055ca0266326 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Sat, 26 Jun 2021 17:42:27 +0200 Subject: [PATCH 51/61] teamspeak_server: 3.13.5 -> 3.13.6 --- .../networking/instant-messengers/teamspeak/server.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index daa97b682176..44430ef62e2d 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -4,13 +4,13 @@ let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.13.5"; + version = "3.13.6"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "sha256-2tSX/ET2lZsi0mVB3KnbnBXMSTRsneGUA8w6mZ6TmlY=" - else "sha256-RdxG4nGXTTSY+P5oZu4uP5l7gKcU9C6uIILyNldSK50="; + then "sha256-U3BNJ4Jjhd39gD7iMsHT8CGtm/GFQDE2kYQa2btyK+w=" + else "sha256-8UKiFedv6w5bmqNvo3AXwQnUROwbZnU0ZTh9V17zmxQ="; }; buildInputs = [ stdenv.cc.cc postgresql.lib ]; From f5bba23a7b0bd2a90bda8f2b9a5cf8674f893797 Mon Sep 17 00:00:00 2001 From: necessarily-equal <59283660+necessarily-equal@users.noreply.github.com> Date: Sat, 26 Jun 2021 17:48:49 +0200 Subject: [PATCH 52/61] unvanquished: 0.52.0 -> 0.52.1 (#127771) --- pkgs/games/unvanquished/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 6bbdc42d9f25..f3f8c1413dbc 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.52.0"; + version = "0.52.1"; binary-deps-version = "5"; src = fetchFromGitHub { @@ -14,7 +14,7 @@ let repo = "Unvanquished"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1acda1559q6zwmhg3x00nai88hy83i5hcfli2bqfab7slr95lm27"; + sha256 = "1fiqn9f6nsh4cfjy7gfsv950hphwi9ca0ddgsjvn77g7yc0arp6c"; }; unvanquished-binary-deps = stdenv.mkDerivation rec { @@ -77,15 +77,14 @@ let chmod +x $out/bin/${wrappername} ''; - unvanquished-assets = stdenv.mkDerivation { pname = "unvanquished-assets"; inherit version src; - outputHash = "sha256:1fy85cjnjk9rrqkhgx5701inff2yv14hnxglzx3209c553gn31n7"; + outputHash = "sha256:084jdisb48xyk9agjifn0nlnsdnjgg32si8zd1khsywd0kffplzx"; outputHashMode = "recursive"; nativeBuildInputs = [ aria2 cacert ]; - buildCommand = "bash $src/download-paks $out"; + buildCommand = "bash $src/download-paks --cache=$(pwd) --version=${version} $out"; }; # this really is the daemon game engine, the game itself is in the assets @@ -186,7 +185,8 @@ in stdenv.mkDerivation rec { # don't replace the following lib.licenses.zlib with just "zlib", # or you would end up with the package instead license = with lib.licenses; [ - mit gpl3Only lib.licenses.zlib cc-by-sa-25 + mit gpl3Plus lib.licenses.zlib bsd3 # engine + cc-by-sa-25 cc-by-sa-30 cc-by-30 cc-by-sa-40 cc0 # assets ]; }; } From 75c3a68e2269e869aea40942468d133c2336dd4d Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 26 Jun 2021 18:08:26 +0200 Subject: [PATCH 53/61] Update pkgs/development/tools/efm-langserver/default.nix --- pkgs/development/tools/efm-langserver/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/development/tools/efm-langserver/default.nix index 34de6d889448..f42ae929af18 100644 --- a/pkgs/development/tools/efm-langserver/default.nix +++ b/pkgs/development/tools/efm-langserver/default.nix @@ -19,6 +19,5 @@ buildGoModule rec { maintainers = with maintainers; [ Philipp-M ]; homepage = "https://github.com/mattn/efm-langserver"; license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; }; } From 85ff485ca9becc34b4fbee1e254f9c239771650b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 26 Jun 2021 18:12:04 +0200 Subject: [PATCH 54/61] libjxl: init at 2021-06-22-409efe02 (jpeg-xl reference implementation) (#103160) Co-authored-by: Sandro --- pkgs/development/libraries/libjxl/default.nix | 106 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 108 insertions(+) create mode 100644 pkgs/development/libraries/libjxl/default.nix diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix new file mode 100644 index 000000000000..d33b2bc3bb58 --- /dev/null +++ b/pkgs/development/libraries/libjxl/default.nix @@ -0,0 +1,106 @@ +{ stdenv, lib, fetchFromGitHub +, asciidoc +, brotli +, cmake +, graphviz +, doxygen +, giflib +, gperftools +, gtest +, libjpeg +, libpng +, libwebp +, openexr +, pkg-config +, python3 +, zlib +}: + +stdenv.mkDerivation rec { + pname = "libjxl"; + version = "unstable-2021-06-22"; + + src = fetchFromGitHub { + owner = "libjxl"; + repo = "libjxl"; + rev = "409efe027d6a4a4446b84abe8d7b2fa40409257d"; + sha256 = "1akb6yyp2h4h6mfcqd4bgr3ybcik5v5kdc1rxaqnyjs7fp2f6nvv"; + # There are various submodules in `third_party/`. + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + asciidoc # for docs + cmake + graphviz # for docs via doxygen component `dot` + doxygen # for docs + gtest + pkg-config + python3 # for docs + ]; + + # Functionality not currently provided by this package + # that the cmake build can apparently use: + # OpenGL/GLUT (for Examples -> comparison with sjpeg) + # viewer (see `cmakeFlags`) + # plugins like for GDK and GIMP (see `cmakeFlags`) + + # Vendored libraries: + # `libjxl` currently vendors many libraries as git submodules that they + # might patch often (e.g. test/gmock, see + # https://github.com/NixOS/nixpkgs/pull/103160#discussion_r519487734). + # When it has stabilised in the future, we may want to tell the build + # to use use nixpkgs system libraries. + + # As of writing, libjxl does not point out all its dependencies + # conclusively in its README or otherwise; they can best be determined + # by checking the CMake output for "Could NOT find". + buildInputs = [ + brotli + giflib + gperftools # provides `libtcmalloc` + libjpeg + libpng + libwebp + openexr + zlib + ]; + + cmakeFlags = [ + # For C dependencies like brotli, which are dynamically linked, + # we want to use the system libraries, so that we don't have to care about + # installing their .so files generated by this build. + # The other C++ dependencies are statically linked in, so there + # using the vendorered ones is easier. + "-DJPEGXL_FORCE_SYSTEM_BROTLI=ON" + + # TODO: Update this package to enable this (overridably via an option): + # Viewer tools for evaluation. + # "-DJPEGXL_ENABLE_VIEWERS=ON" + + # TODO: Update this package to enable this (overridably via an option): + # Enable plugins, such as: + # * the `gdk-pixbuf` one, which allows applications like `eog` to load jpeg-xl files + # * the `gimp` one, which allows GIMP to load jpeg-xl files + # "-DJPEGXL_ENABLE_PLUGINS=ON" + ]; + + doCheck = true; + + # The test driver runs a test `LibraryCLinkageTest` which without + # LD_LIBRARY_PATH setting errors with: + # /build/source/build/tools/tests/libjxl_test: error while loading shared libraries: libjxl.so.0 + # The required file is in the build directory (`$PWD`). + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD + ''; + + meta = with lib; { + homepage = "https://github.com/libjxl/libjxl"; + description = "JPEG XL image format reference implementation."; + license = licenses.bsd3; + maintainers = with maintainers; [ nh2 ]; + platforms = platforms.all; + broken = stdenv.hostPlatform.isAarch64; # `internal compiler error`, see https://github.com/NixOS/nixpkgs/pull/103160#issuecomment-866388610 + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f24f626394e4..aea5f7d3a57d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16645,6 +16645,8 @@ in libjwt = callPackage ../development/libraries/libjwt { }; + libjxl = callPackage ../development/libraries/libjxl { }; + libkate = callPackage ../development/libraries/libkate { }; libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; From 0d509d366d4fc692a9dc81366445e29da81202e6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 26 Jun 2021 16:17:07 +0200 Subject: [PATCH 55/61] tdesktop: 2.7.5 -> 2.8.0 --- .../telegram/tdesktop/default.nix | 24 ++++---------- .../telegram/tdesktop/tg_owt.nix | 32 +++++++++++++------ .../libraries/libtgvoip/default.nix | 25 ++++++++++++--- 3 files changed, 50 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index acdf4e660c7c..3075b0d01c78 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,8 +1,9 @@ -{ mkDerivation, lib, fetchurl, fetchpatch, callPackage +{ mkDerivation, lib, fetchurl, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 -, tl-expected, hunspell, glibmm, webkitgtk, libtgvoip +, tl-expected, hunspell, glibmm, webkitgtk +, libtgvoip, rnnoise, abseil-cpp, extra-cmake-modules # Transitive dependencies: , pcre, xorg, util-linux, libselinux, libsepol, epoxy , at-spi2-core, libXtst, libthai, libdatrie @@ -22,26 +23,14 @@ let tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "telegram-desktop"; - version = "2.7.5"; + version = "2.8.0"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "sha256-9GxBw5ii9Musjq7D3KMf/P5BA4h690EgXRbhynHwO98="; + sha256 = "0689bmdpsj8qmv9ih6ckay23mivhlps8c081qljb8wqplmf2c4ds"; }; - patches = [ - # fixes issue with ffmpeg>=4.4 crashes, hasn't been upstreamed yet - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/1c91884873968997be4b0c954169d04dc839f1db/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-crash.patch"; - sha256 = "sha256-inLXcP70yJlkkmdeXlc3HRL7Vt+Sf00LLJG33gwBKdY="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/1c91884873968997be4b0c954169d04dc839f1db/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-ffmpeg44.patch"; - sha256 = "sha256-p57LipNf7BDhVvNKRuicVqx0vU6IBL/Cvr5BAfLF4Hs="; - }) - ]; - postPatch = '' substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \ --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"' @@ -59,7 +48,8 @@ in mkDerivation rec { qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk - tg_owt libtgvoip + libtgvoip rnnoise abseil-cpp extra-cmake-modules + tg_owt # Transitive dependencies: pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy at-spi2-core libXtst libthai libdatrie libsysprof-capture libpsl brotli diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 614183b72d08..416ae6ff92c9 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,30 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm +{ lib, stdenv, fetchFromGitHub, fetchpatch +, pkg-config, cmake, ninja, yasm , libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf -, xorg, libXtst +, xorg, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr +, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire }: -let - rev = "2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3"; - sha256 = "0kz0i381iwsgcc3yzsq7njx3gkqja4bb9fsgc24vhg0md540qhyn"; - -in stdenv.mkDerivation { +stdenv.mkDerivation { pname = "tg_owt"; - version = "git-${rev}"; + version = "unstable-2021-06-17"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - inherit rev sha256; + rev = "f03ef05abf665437649a4f71886db1343590e862"; + sha256 = "0s6ajw52b95lcq4mn6lv8gj6lhv62bvwjh43w7az2k5pbm14v7vv"; fetchSubmodules = true; }; + patches = [ + # Our libXtst seems broken: + # /nix/store/rd3swxwmzjgjvwhz8svyc8ghc0brq293-libXtst-1.2.3/include/X11/extensions/XTest.h:32:10: fatal error: X11/extensions/XInput.h: No such file or directory + (fetchpatch { + # Copy updated source files. + url = "https://github.com/desktop-app/tg_owt/commit/2c0fbe4d3d1c33d0cc9ff7c112b4db1963bea535.patch"; + sha256 = "0apd6hfv3a1s3qy10kjwk4z8bg835cpk0ql9qxjnxf4gq183bhif"; + revert = true; + includes = [ "src/modules/desktop_capture/linux/shared_x_display.cc" ]; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf - xorg.libX11 libXtst + xorg.libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr + glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/libtgvoip/default.nix b/pkgs/development/libraries/libtgvoip/default.nix index dcf8990a879e..8ffd07731273 100644 --- a/pkgs/development/libraries/libtgvoip/default.nix +++ b/pkgs/development/libraries/libtgvoip/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, autoreconfHook +{ stdenv, lib, fetchFromGitHub, fetchpatch +, pkg-config, autoreconfHook , openssl, libopus, alsa-lib, libpulseaudio }: @@ -6,15 +7,31 @@ with lib; stdenv.mkDerivation rec { pname = "libtgvoip"; - version = "unstable-2020-03-02"; + version = "unstable-2021-01-01"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "libtgvoip"; - rev = "e422d2a80546a32ab7166a9b1058bacfc5daeefc"; - sha256 = "0n6f7215k74039j0zmicjzhj6f45mq6fvkrwzyzibcrv87ib17fc"; + rev = "13a5fcb16b04472d808ce122abd695dbf5d206cd"; + sha256 = "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd"; }; + # To fix the build without external webrtc: + patches = [ + (fetchpatch { + # Use methods from updated webrtc. + url = "https://github.com/telegramdesktop/libtgvoip/commit/13a5fcb16b04472d808ce122abd695dbf5d206cd.patch"; + sha256 = "0wapqvml3yyv5dlp2q8iih5rfvfnkngll69krhnw5xsdjy22sp7r"; + revert = true; + }) + (fetchpatch { + # Allow working with external webrtc. + url = "https://github.com/telegramdesktop/libtgvoip/commit/6e82b6e45664c1f80b9039256c99bebc76d34672.patch"; + sha256 = "0m87ixja70vnm80a9z4gxk0yl7n64y59smczxb88lxnj6kdgih7x"; + revert = true; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; From bb2745a49fb9c030c4d6dba95beac5b445333d67 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 25 Jun 2021 19:07:19 +0200 Subject: [PATCH 56/61] wio: Build with wlroots 0.14 Fetching that patch from yet another source (my fork) isn't ideal but I didn't get a response since I sent my patch to the other maintainer. IMO we should (eventually) drop this package as there isn't an official fork yet. --- pkgs/applications/window-managers/wio/default.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/wio/default.nix b/pkgs/applications/window-managers/wio/default.nix index 485fd0b8a623..0f7402b3710c 100644 --- a/pkgs/applications/window-managers/wio/default.nix +++ b/pkgs/applications/window-managers/wio/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromBitbucket +, fetchpatch , meson , ninja , pkg-config @@ -28,6 +29,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-mCggAscQ+Ej3SNwhA6QxecV1nH6Rw8RDf8yAsbadqjE="; }; + patches = [ + # Fix the build with wlroots 0.14: + (fetchpatch { + url = "https://git.sr.ht/~primeos/wio/commit/9d5093c019f6966b8ee0dba1da3361a761d04bcc.patch"; + sha256 = "08hfmcs1fbz8pdxwcaidrhvydf19482i6wics75a41ilrdh0dpi1"; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aea5f7d3a57d..6705c5b90e07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27653,9 +27653,7 @@ in weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; - wio = callPackage ../applications/window-managers/wio { - wlroots = wlroots_0_13; - }; + wio = callPackage ../applications/window-managers/wio { }; whitebox-tools = callPackage ../applications/gis/whitebox-tools { inherit (darwin.apple_sdk.frameworks) Security; From da5f8ac977b86bb5e12e3d98af6cf3c2337d524b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 26 Jun 2021 18:23:20 +0200 Subject: [PATCH 57/61] wlroots_0_13: drop We've now updated or patched all packages to use wlroots 0.14 (except phoc which still depends on wlroots 0.12). --- pkgs/development/libraries/wlroots/0.13.nix | 55 --------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 56 deletions(-) delete mode 100644 pkgs/development/libraries/wlroots/0.13.nix diff --git a/pkgs/development/libraries/wlroots/0.13.nix b/pkgs/development/libraries/wlroots/0.13.nix deleted file mode 100644 index f2343e73c589..000000000000 --- a/pkgs/development/libraries/wlroots/0.13.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner -, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman -, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg, libuuid, xcbutilrenderutil, xwayland -}: - -stdenv.mkDerivation rec { - pname = "wlroots"; - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "swaywm"; - repo = "wlroots"; - rev = version; - sha256 = "01plhbnsp5yg18arz0v8fr0pr9l4w4pdzwkg9px486qdvb3s1vgy"; - }; - - # $out for the library and $examples for the example programs (in examples): - outputs = [ "out" "examples" ]; - - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; - - buildInputs = [ - libGL wayland wayland-protocols libinput libxkbcommon pixman - xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg libuuid xcbutilrenderutil xwayland - ]; - - mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ]; - - postFixup = '' - # Install ALL example programs to $examples: - # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle - # screenshot output-layout multi-pointer rotation tablet touch pointer - # simple - mkdir -p $examples/bin - cd ./examples - for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do - cp "$binary" "$examples/bin/wlroots-$binary" - done - ''; - - meta = with lib; { - description = "A modular Wayland compositor library"; - longDescription = '' - Pluggable, composable, unopinionated modules for building a Wayland - compositor; or about 50,000 lines of code you were going to write anyway. - ''; - inherit (src.meta) homepage; - changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6705c5b90e07..438075f7f14a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24575,7 +24575,6 @@ in }; wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {}; - wlroots_0_13 = callPackage ../development/libraries/wlroots/0.13.nix {}; sway-unwrapped = callPackage ../applications/window-managers/sway { }; sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; From 6e289155b396623c775cf7890a9712b9a37c9655 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Jun 2021 18:44:56 +0200 Subject: [PATCH 58/61] authoscope: renamed from badtouch (#127953) --- .../security/{badtouch => authoscope}/default.nix | 12 ++++++------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) rename pkgs/tools/security/{badtouch => authoscope}/default.nix (70%) diff --git a/pkgs/tools/security/badtouch/default.nix b/pkgs/tools/security/authoscope/default.nix similarity index 70% rename from pkgs/tools/security/badtouch/default.nix rename to pkgs/tools/security/authoscope/default.nix index ea74bbb4fc35..eafd5ebb7d2f 100644 --- a/pkgs/tools/security/badtouch/default.nix +++ b/pkgs/tools/security/authoscope/default.nix @@ -11,17 +11,17 @@ }: rustPlatform.buildRustPackage rec { - pname = "badtouch"; - version = "0.7.3"; + pname = "authoscope"; + version = "0.8.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "05dzwx9y8zh0y9zd4mibp02255qphc6iqy916fkm3ahaw0rg84h3"; + sha256 = "11ci38m6d3lj4f0g7cl3dqf10kfk258k2k92phd2nav1my4i90pf"; }; - cargoSha256 = "0mmglgz037dk3g7qagf1dyss5hvvsdy0m5m1h6c3rk5bp5kjzg87"; + cargoSha256 = "13x7i52i3k88vkfvk2smy2aqfg3na4317scvw7ali1rv545nbxds"; nativeBuildInputs = [ installShellFiles @@ -43,8 +43,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Scriptable network authentication cracker"; - homepage = "https://github.com/kpcyrd/badtouch"; - license = with licenses; [ gpl3Only ]; + homepage = "https://github.com/kpcyrd/authoscope"; + license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f820eef45d04..5bfaed5ac459 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -70,6 +70,7 @@ mapAliases ({ aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # added 2020-12-26 avldrums-lv2 = x42-avldrums; # added 2020-03-29 avxsynth = throw "avxsynth was removed because it was broken"; # added 2021-05-18 + badtouch = authoscope; # Project was renamed, added 20210626 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4902fa68a272..5253b0f1398c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1777,6 +1777,10 @@ in atftp = callPackage ../tools/networking/atftp { }; + authoscope = callPackage ../tools/security/authoscope { + inherit (darwin.apple_sdk.frameworks) Security; + }; + autogen = callPackage ../development/tools/misc/autogen { }; autojump = callPackage ../tools/misc/autojump { }; @@ -1827,10 +1831,6 @@ in backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; - badtouch = callPackage ../tools/security/badtouch { - inherit (darwin.apple_sdk.frameworks) Security; - }; - bandwhich = callPackage ../tools/networking/bandwhich { inherit (darwin.apple_sdk.frameworks) Security; }; From f287805fafbf9f9b3ad024a35db6b81dad76f491 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 26 Jun 2021 18:44:59 +0200 Subject: [PATCH 59/61] kotatogram-desktop: Copy the old tg_owt.nix from tdesktop The current tg_owt version (since the update of tdesktop to version 2.8.0 in 0d509d366d4) isn't compatible with kotatogram-desktop anymore. --- .../telegram/kotatogram-desktop/default.nix | 2 +- .../telegram/kotatogram-desktop/tg_owt.nix | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 02330d110788..d9f9cd91a52d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -11,7 +11,7 @@ with lib; let - tg_owt = callPackage ../tdesktop/tg_owt.nix {}; + tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "kotatogram-desktop"; version = "1.4.1"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix new file mode 100644 index 000000000000..614183b72d08 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm +, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf +, xorg, libXtst +}: + +let + rev = "2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3"; + sha256 = "0kz0i381iwsgcc3yzsq7njx3gkqja4bb9fsgc24vhg0md540qhyn"; + +in stdenv.mkDerivation { + pname = "tg_owt"; + version = "git-${rev}"; + + src = fetchFromGitHub { + owner = "desktop-app"; + repo = "tg_owt"; + inherit rev sha256; + fetchSubmodules = true; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkg-config cmake ninja yasm ]; + + buildInputs = [ + libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf + xorg.libX11 libXtst + ]; + + cmakeFlags = [ + # Building as a shared library isn't officially supported and currently broken: + "-DBUILD_SHARED_LIBS=OFF" + ]; + + meta.license = lib.licenses.bsd3; +} From d4c85192dd85eff049ec8b12200657641f9cdbdc Mon Sep 17 00:00:00 2001 From: Ilan Joselevich <56614642+Kranzes@users.noreply.github.com> Date: Sat, 26 Jun 2021 19:50:01 +0300 Subject: [PATCH 60/61] nextcloud-client: 3.2.2 -> 3.2.3 (#128092) --- pkgs/applications/networking/nextcloud-client/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index db01ec014ee6..8635b882fc95 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -16,17 +16,18 @@ , qtquickcontrols2 , qtgraphicaleffects , sqlite +, inkscape }: mkDerivation rec { pname = "nextcloud-client"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-UPWr5P6oEBtDK/Cuz8nZlHqKFyGEf44vbMfrphxNkMU="; + sha256 = "sha256-NE0P6bG/msoP29c/1r/fTC5vDcqgkQuqfRK+IDftMqY="; }; patches = [ @@ -37,6 +38,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config cmake + inkscape ]; buildInputs = [ From fc232d16267b665a530f5cbd168954ef4b6ae8ca Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Sat, 26 Jun 2021 17:52:06 +0100 Subject: [PATCH 61/61] aws-workspaces: 3.1.5.1105 -> 3.1.8.1198 --- .../networking/remote/aws-workspaces/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/applications/networking/remote/aws-workspaces/default.nix index 3451cbb129f0..9efaa18e31f9 100644 --- a/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -5,15 +5,15 @@ stdenv.mkDerivation rec { pname = "aws-workspaces"; - version = "3.1.5.1105"; + version = "3.1.8.1198"; src = fetchurl { # ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/Packages urls = [ "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" - "https://web.archive.org/web/20210411145948/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" + "https://web.archive.org/web/20210626165043/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" ]; - sha256 = "08c8912502d27e61cc2399bf99947e26c1daa1f317d5aa8cc7348d7bf8734e1b"; + sha256 = "e784bc4401c2ffaf19f3cc42cb6c6f229c73adba36df49093a1d8cd30c86aaf0"; }; nativeBuildInputs = [