From fe42dee0300e6eb6564effdb0ff2ac9274afbb51 Mon Sep 17 00:00:00 2001 From: "Andy Chun @noneucat" Date: Mon, 18 Jan 2021 13:34:47 -0800 Subject: [PATCH 01/61] cudatoolkit: set CUDA_HOST_COMPILER cmake flag to supported gcc version --- pkgs/development/compilers/cudatoolkit/common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index c18eb9d534a2..747de25142e5 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -147,6 +147,10 @@ stdenv.mkDerivation rec { mkdir -p $out/nix-support echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook + # Set the host compiler to be used by nvcc for CMake-based projects: + # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables + echo "cmakeFlags+=' -DCUDA_HOST_COMPILER=${gcc}/bin'" >> $out/nix-support/setup-hook + # Move some libraries to the lib output so that programs that # depend on them don't pull in this entire monstrosity. mkdir -p $lib/lib From cf42508bbd301a4f360cdd7da6fa66879b42695d Mon Sep 17 00:00:00 2001 From: "Andy Chun @noneucat" Date: Mon, 18 Jan 2021 13:35:11 -0800 Subject: [PATCH 02/61] ethminer: do not propagate host flags to nvcc and remove clang stdenv dependency --- pkgs/tools/misc/ethminer/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 22278cb9a4d4..921cb684ddbc 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - clangStdenv, fetchFromGitHub, opencl-headers, cmake, @@ -17,13 +16,9 @@ openssl, pkg-config, cli11 -}@args: +}: -# Note that this requires clang < 9.0 to build, and currently -# clangStdenv provides clang 7.1 which satisfies the requirement. -let stdenv = if cudaSupport then clangStdenv else args.stdenv; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "ethminer"; version = "0.19.0"; @@ -43,9 +38,11 @@ in stdenv.mkDerivation rec { "-DAPICORE=ON" "-DETHDBUS=OFF" "-DCMAKE_BUILD_TYPE=Release" - ] ++ lib.optionals (!cudaSupport) [ + ] ++ (if cudaSupport then [ + "-DCUDA_PROPAGATE_HOST_FLAGS=off" + ] else [ "-DETHASHCUDA=OFF" # on by default - ]; + ]); nativeBuildInputs = [ cmake @@ -81,6 +78,5 @@ in stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p atemu ]; license = licenses.gpl3Only; - broken = cudaSupport; }; } From efe166726f6294663315cb914194d87f1b4acdbb Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 22 May 2021 14:02:31 +0200 Subject: [PATCH 03/61] faust2: unstable-2020-08-27 -> 2.30.5 --- pkgs/applications/audio/faust/faust2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 051caf120fa2..995618af4ce5 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,13 +20,13 @@ with lib.strings; let - version = "unstable-2020-08-27"; + version = "2.30.5"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = "c10f316fa90f338e248787ebf55e3795c3a0d70e"; - sha256 = "068pm04ddafbsj2r8akdpqyzb0m8mp9ql0rgi83hcqs4ndr8v7sb"; + rev = version; + sha256 = "0cs52w4rwaj5d8pjak4cxsg02sxvx4y07592nc3ck81clqjmszmm"; fetchSubmodules = true; }; From f8995c378353d09a970531b27abddfd303615895 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 May 2021 05:20:01 +0000 Subject: [PATCH 04/61] gwc: 0.22-04 -> 0.22-05 --- pkgs/applications/audio/gwc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/gwc/default.nix b/pkgs/applications/audio/gwc/default.nix index d6e7c0807a37..175d5e4cb51e 100644 --- a/pkgs/applications/audio/gwc/default.nix +++ b/pkgs/applications/audio/gwc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "gwc"; - version = "0.22-04"; + version = "0.22-05"; src = fetchFromGitHub { owner = "AlisterH"; repo = pname; rev = version; - sha256 = "0xvfra32dchnnyf9kj5s5xmqhln8jdrc9f0040hjr2dsb58y206p"; + sha256 = "sha256-FHKu5qAyRyMxXdWYTCeAc6Q4J+NOaU1SGgoTbe0PiFE="; }; nativeBuildInputs = [ From 766e933d9c776652e74559adab080a619ca5c0c1 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 10 Apr 2021 21:19:15 +0700 Subject: [PATCH 05/61] passerine: init at 0.9.2 --- .../compilers/passerine/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/compilers/passerine/default.nix diff --git a/pkgs/development/compilers/passerine/default.nix b/pkgs/development/compilers/passerine/default.nix new file mode 100644 index 000000000000..e9427f892e64 --- /dev/null +++ b/pkgs/development/compilers/passerine/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "passerine"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "vrtbl"; + repo = "passerine"; + rev = "dd8a6f5efc5dcb03d45b102f61cc8a50d46e8e98"; + sha256 = "sha256-/QzqKLkxAVqvTY4Uft1qk7nJat6nozykB/4X1YGqu/I="; + }; + + cargoSha256 = "sha256-8WiiDLIJ/abXELF8S+4s+BPA/Lr/rpKmC1NWPCLzQWA="; + + meta = with lib; { + description = "A small extensible programming language designed for concise expression with little code"; + homepage = "https://github.com/vrtbl/passerine"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3877b502a11d..b08bdc412582 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11584,6 +11584,8 @@ in open-watcom-bin = callPackage ../development/compilers/open-watcom-bin { }; + passerine = callPackage ../development/compilers/passerine { }; + pforth = callPackage ../development/compilers/pforth {}; picat = callPackage ../development/compilers/picat { }; From 7a2c561b0f9cd26dc322c8160f963bb7cee694bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 01:03:16 +0000 Subject: [PATCH 06/61] betterlockscreen: 3.1.1 -> 3.2.0 --- pkgs/misc/screensavers/betterlockscreen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index 127344193d84..facac2717c4c 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "betterlockscreen"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "pavanjadhaw"; repo = "betterlockscreen"; rev = version; - sha256 = "sha256-TA4YSd/elFuLU1ZMu+dqIOt6hK9pnzgoJudaMpIwh+U="; + sha256 = "sha256-UOMCTHtw1C+MiJL6AQ+8gqmmbqrs1QTzEi1Ar03PyMs="; }; nativeBuildInputs = [ makeWrapper ]; From 180d6d4de5cf6d4d2ba5b5cb111dcae6f6ee2109 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Mon, 24 May 2021 17:45:01 +0000 Subject: [PATCH 07/61] maintainers: add rkitover Signed-off-by: Rafael Kitover --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a0285a5e6e33..81b9e7c7f718 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8595,6 +8595,12 @@ githubId = 449990; name = "Cedric Cellier"; }; + rkitover = { + email = "rkitover@gmail.com"; + github = "rkitover"; + githubId = 77611; + name = "Rafael Kitover"; + }; rkoe = { email = "rk@simple-is-better.org"; github = "rkoe"; From d5d679948567bbefc77d4ea47787b6dd2719c482 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Mon, 24 May 2021 17:52:55 +0000 Subject: [PATCH 08/61] python3Packages.elevate: init at 0.1.3 Needed by some Python software to re-exec with super-user privileges. Add a patch to work correctly with NixOS shell script wrappers for python executables. Signed-off-by: Rafael Kitover --- .../python-modules/elevate/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/elevate/default.nix diff --git a/pkgs/development/python-modules/elevate/default.nix b/pkgs/development/python-modules/elevate/default.nix new file mode 100644 index 000000000000..cfb1dbf068dc --- /dev/null +++ b/pkgs/development/python-modules/elevate/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchPypi, buildPythonPackage, fetchpatch, setuptools-scm }: + +buildPythonPackage rec { + pname = "elevate"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "53ad19fa1de301fb1de3f8768fb3a5894215716fd96a475690c4d0ff3b1de209"; + }; + + patches = [ + (fetchpatch { + # This is for not calling shell wrappers through Python, which fails. + url = "https://github.com/rkitover/elevate/commit/148b2bf698203ea39c9fe5d635ecd03cd94051af.patch"; + sha256 = "1ky3z1jxl1g28wbwbx8qq8jgx8sa8pr8s3fdcpdhdx1blw28cv61"; + }) + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + + # No tests included + doCheck = false; + + pythonImportsCheck = [ "elevate" ]; + + meta = with lib; { + description = "Python module for re-launching the current process as super-user"; + homepage = "https://github.com/barneygale/elevate"; + license = licenses.mit; + maintainers = with maintainers; [ rkitover ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5be41683de84..b2166bb30600 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2193,6 +2193,8 @@ in { elementpath = callPackage ../development/python-modules/elementpath { }; + elevate = callPackage ../development/python-modules/elevate { }; + eliot = callPackage ../development/python-modules/eliot { }; elmax = callPackage ../development/python-modules/elmax { }; From ba6c23dcba12e98c8a0a22adef6ed367df03157f Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Mon, 24 May 2021 17:59:49 +0000 Subject: [PATCH 09/61] avell-unofficial-control-center: init at 1.0.4 Software for controlling RGB keyboard lights on some gaming laptops that use ITE Device(8291) Rev 0.03. Signed-off-by: Rafael Kitover --- .../default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/misc/avell-unofficial-control-center/default.nix diff --git a/pkgs/applications/misc/avell-unofficial-control-center/default.nix b/pkgs/applications/misc/avell-unofficial-control-center/default.nix new file mode 100644 index 000000000000..45d4f69075d2 --- /dev/null +++ b/pkgs/applications/misc/avell-unofficial-control-center/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "avell-unofficial-control-center"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "rodgomesc"; + repo = "avell-unofficial-control-center"; + # https://github.com/rodgomesc/avell-unofficial-control-center/issues/58 + rev = "e32e243e31223682a95a719bc58141990eef35e6"; + sha256 = "1qz1kv7p09nxffndzz9jlkzpfx26ppz66f8603zyamjq9dqdmdin"; + }; + + # No tests included + doCheck = false; + + propagatedBuildInputs = with python3Packages; [ pyusb elevate ]; + + meta = with lib; { + homepage = "https://github.com/rodgomesc/avell-unofficial-control-center"; + description = "Software for controlling RGB keyboard lights on some gaming laptops that use ITE Device(8291) Rev 0.03"; + license = licenses.mit; + maintainers = with maintainers; [ rkitover ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07af5632d9a7..eb0a1e5ef770 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30173,6 +30173,8 @@ in autotiling = python3Packages.callPackage ../misc/autotiling { }; + avell-unofficial-control-center = python3Packages.callPackage ../applications/misc/avell-unofficial-control-center { }; + beep = callPackage ../misc/beep { }; bees = callPackage ../tools/filesystems/bees { }; From 0ac0332ce878d7d0c3cf26a12288447edca7b0b6 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 1 Jun 2021 15:26:42 +0300 Subject: [PATCH 10/61] sfm: init at 0.1 --- pkgs/applications/misc/sfm/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/sfm/default.nix diff --git a/pkgs/applications/misc/sfm/default.nix b/pkgs/applications/misc/sfm/default.nix new file mode 100644 index 000000000000..3bbcc939d2fb --- /dev/null +++ b/pkgs/applications/misc/sfm/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, conf ? null }: + +stdenv.mkDerivation rec { + pname = "sfm"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "afify"; + repo = pname; + rev = "v${version}"; + hash = "sha256-i4WzYaJKityIt+LPWCbd6UsPBaYoaS397l5BInOXQQA="; + }; + + configFile = lib.optionalString (conf!=null) (lib.writeText "config.def.h" conf); + + postPatch = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Simple file manager"; + homepage = "https://github.com/afify/sfm"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07af5632d9a7..290acdece8d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7223,6 +7223,8 @@ in nnn = callPackage ../applications/misc/nnn { }; + sfm = callPackage ../applications/misc/sfm { }; + shfm = callPackage ../applications/misc/shfm { }; noise-repellent = callPackage ../applications/audio/noise-repellent { }; From 99e37419573318a1882ec5930c1dd6aec4512940 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 1 Jun 2021 14:00:26 -0400 Subject: [PATCH 11/61] zabbix.agent2: create a symlink which is compatible with the zabbixAgent module --- pkgs/servers/monitoring/zabbix/agent2.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index 1deada436374..98fafa4265d6 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -46,8 +46,13 @@ import ./versions.nix ({ version, sha256 }: ''; installPhase = '' + mkdir -p $out/sbin + install -Dm0644 src/go/conf/zabbix_agent2.conf $out/etc/zabbix_agent2.conf install -Dm0755 src/go/bin/zabbix_agent2 $out/bin/zabbix_agent2 + + # create a symlink which is compatible with the zabbixAgent module + ln -s $out/bin/zabbix_agent2 $out/sbin/zabbix_agentd ''; meta = with lib; { From 43031a05d2e2b08ed5f98b3f5255e7d76ef4e403 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Wed, 26 May 2021 00:52:49 +0200 Subject: [PATCH 12/61] charge-lnd: init at 0.1.2 --- .../blockchains/charge-lnd/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/blockchains/charge-lnd/default.nix diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/applications/blockchains/charge-lnd/default.nix new file mode 100644 index 000000000000..3707b0741b6f --- /dev/null +++ b/pkgs/applications/blockchains/charge-lnd/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "charge-lnd"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "accumulator"; + repo = pname; + rev = "v${version}"; + sha256 = "1m1ic69aj2vlnjlp4ckan8n67r01nfysvq4w6nny32wjkr0zvphr"; + }; + + propagatedBuildInputs = with python3Packages; [ + aiorpcx + colorama + googleapis-common-protos + grpcio + protobuf + six + termcolor + ]; + + postInstall = '' + install README.md charge.config.example -Dt $out/share/doc/charge-lnd + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/charge-lnd --help > /dev/null + ''; + + meta = with lib; { + description = "Simple policy-based fee manager for lightning network daemon"; + homepage = "https://github.com/accumulator/charge-lnd"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ mmilata ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7f04f175923..eaf90cb20565 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27831,6 +27831,8 @@ in btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; + charge-lnd = callPackage ../applications/blockchains/charge-lnd { }; + cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; dashpay = callPackage ../applications/blockchains/dashpay.nix { }; From dcfaa98677c123ce1a5d7fbe64d44693a2911a0c Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 25 Mar 2021 14:15:13 -0400 Subject: [PATCH 13/61] graphia: init at 2.2 Graphia is a relatively new tool for graph visualisation and analysis, in the same vain as gephi. --- .../science/misc/graphia/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/science/misc/graphia/default.nix diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix new file mode 100644 index 000000000000..4b45a3c06fe1 --- /dev/null +++ b/pkgs/applications/science/misc/graphia/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, cmake, fetchFromGitHub +, wrapQtAppsHook, qtbase, qtquickcontrols2, qtgraphicaleffects +}: + +stdenv.mkDerivation rec { + pname = "graphia"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "graphia-app"; + repo = "graphia"; + rev = version; + sha256 = "sha256:05givvvg743sawqy2vhljkfgn5v1s907sflsnsv11ddx6x51na1w"; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + buildInputs = [ + qtbase + qtquickcontrols2 + qtgraphicaleffects + ]; + + meta = with lib; { + description = "A visualisation tool for the creation and analysis of graphs."; + homepage = "https://graphia.app"; + license = licenses.gpl3Only; + maintainers = [ maintainers.bgamari ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43e114411b76..6cdef3d70709 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14757,6 +14757,8 @@ in ghcid = haskellPackages.ghcid.bin; + graphia = libsForQt5.callPackage ../applications/science/misc/graphia { }; + icon-lang = callPackage ../development/interpreters/icon-lang { }; libgit2 = callPackage ../development/libraries/git2 { From d2c9f816e3e8dd1bcb2069276206c19688b62baf Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 3 Jun 2021 19:50:15 +0700 Subject: [PATCH 14/61] stdenv: remove lib --- pkgs/stdenv/generic/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 4cfdb6e4c17d..88ca1b2c7903 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -159,13 +159,6 @@ let inherit lib config stdenv; }) mkDerivation; - # Slated for removal in 21.11 - lib = if config.allowAliases or true then builtins.trace - ( "Warning: `stdenv.lib` is deprecated and will be removed in the next release." - + " Please use `lib` instead." - + " For more information see https://github.com/NixOS/nixpkgs/issues/108938") - lib else throw "`stdenv.lib` is a deprecated alias for `lib`"; - inherit fetchurlBoot; inherit overrides; From 68b5b850d512676321de635dd6c272dad6d769db Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 3 Jun 2021 19:54:53 +0700 Subject: [PATCH 15/61] coding-conventions: remove reference to stdenv.lib --- doc/contributing/coding-conventions.chapter.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index 6516172adde9..1eaa06a659d5 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -183,9 +183,6 @@ - Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first. -- The top-level `lib` must be used in the master and 21.05 branch over its alias `stdenv.lib` as it now causes evaluation errors when aliases are disabled which is the case for ofborg. - `lib` is unrelated to `stdenv`, and so `stdenv.lib` should only be used as a convenience alias when developing locally to avoid having to modify the function inputs just to test something out. - ## Package naming {#sec-package-naming} The key words _must_, _must not_, _required_, _shall_, _shall not_, _should_, _should not_, _recommended_, _may_, and _optional_ in this section are to be interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). Only _emphasized_ words are to be interpreted in this way. From fc4848763761f022c272f9f4763be5d133e4e15a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jun 2021 13:45:06 +0000 Subject: [PATCH 16/61] astc-encoder: 2.5 -> 3.0 --- pkgs/tools/graphics/astc-encoder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index 859d6f1eee0d..8cf35b36c0c1 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -31,13 +31,13 @@ with rec { gccStdenv.mkDerivation rec { pname = "astc-encoder"; - version = "2.5"; + version = "3.0"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "0ff5jh40w942dz7hmgvznmpa9yhr1j4i9qqj5wy6icm2jb9j4pak"; + sha256 = "sha256-+vYEO2zS144ZuVN8b4/EpvTcakC9U0uc/eV4pB7lHiY="; }; nativeBuildInputs = [ cmake ]; From 059950a2d49cb7089c6a9a1155973323afe35bf6 Mon Sep 17 00:00:00 2001 From: Tomas Bravo Date: Tue, 1 Jun 2021 15:27:34 +0000 Subject: [PATCH 17/61] songrec: init at 0.1.8 --- pkgs/applications/audio/songrec/default.nix | 35 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/audio/songrec/default.nix diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/applications/audio/songrec/default.nix new file mode 100644 index 000000000000..81bd3c67d7dd --- /dev/null +++ b/pkgs/applications/audio/songrec/default.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, gtk3 +, openssl +, alsaLib +, pkg-config +, ffmpeg +}: + +rustPlatform.buildRustPackage rec { + pname = "songrec"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "marin-m"; + repo = pname; + rev = version; + sha256 = "sha256-6siGLegNgvLdP7engwpKmhzWYqBXcMsfaXhJJ1tIqJg="; + }; + + cargoSha256 = "sha256-H4qJYcFjip71EVTGw50goj0HjKN9fmjQZqQDhaSKlaQ="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ alsaLib gtk3 openssl ffmpeg ]; + + meta = with lib; { + description = "An open-source Shazam client for Linux, written in Rust"; + homepage = "https://github.com/marin-m/SongRec"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ tcbravo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 372daa630cc7..74fcc17fb933 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25486,6 +25486,8 @@ in softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {}; + songrec = callPackage ../applications/audio/songrec {}; + spacegun = callPackage ../applications/networking/cluster/spacegun {}; stride = callPackage ../applications/networking/instant-messengers/stride { }; From 6f60530fa681ac62e8305f1008465c45acf97dd9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 4 Jun 2021 04:20:00 +0000 Subject: [PATCH 18/61] python38Packages.pglast: 1.17 -> 3.0 --- .../python-modules/pglast/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 3240b0809922..6a0f8940788c 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -1,29 +1,33 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , isPy3k -, pythonOlder , setuptools -, aenum -, pytest , pytestcov +, pytest }: buildPythonPackage rec { pname = "pglast"; - version = "1.17"; + version = "3.0"; - src = fetchPypi { - inherit pname version; - sha256 = "2979b38ca5f72cfa0a5db78af2f62d04db6a7647ee7f03eac7a67f9e86e3f5f9"; + # PyPI tarball does not include all the required files + src = fetchFromGitHub { + owner = "lelit"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0yi24wj19rzw5dvppm8g3hnfskyzbrqw14q8x9f2q5zi8g6xnnrd"; }; disabled = !isPy3k; - propagatedBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.6") [ aenum ]; + propagatedBuildInputs = [ setuptools ]; checkInputs = [ pytest pytestcov ]; + pythonImportsCheck = [ "pglast" ]; + checkPhase = '' pytest ''; @@ -31,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/lelit/pglast"; description = "PostgreSQL Languages AST and statements prettifier"; + changelog = "https://github.com/lelit/pglast/raw/v${version}/CHANGES.rst"; license = licenses.gpl3Plus; maintainers = [ maintainers.marsam ]; }; From 1245d3b6a7ea746c937bc29589e86c6824133525 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 31 May 2021 16:04:36 +0800 Subject: [PATCH 19/61] clifm: init at 1.1 --- pkgs/applications/misc/clifm/default.nix | 34 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/misc/clifm/default.nix diff --git a/pkgs/applications/misc/clifm/default.nix b/pkgs/applications/misc/clifm/default.nix new file mode 100644 index 000000000000..7fc130700aa9 --- /dev/null +++ b/pkgs/applications/misc/clifm/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline }: + +stdenv.mkDerivation rec { + pname = "clifm"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "leo-arch"; + repo = pname; + rev = "v${version}"; + sha256 = "0mf9lrq0l532vyf4ycsikrw8imn4gkavyn3cr42nhjsr1drygrp8"; + }; + + buildInputs = [ libcap acl file readline ]; + + makeFlags = [ + "INSTALLPREFIX=${placeholder "out"}/bin" + "DESKTOPPREFIX=${placeholder "out"}/share" + ]; + + preInstall = '' + mkdir -p $out/bin $out/share + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/leo-arch/clifm"; + description = "CliFM is a CLI-based, shell-like, and non-curses terminal file manager written in C: simple, fast, extensible, and lightweight as hell"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ vonfry ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f060afa922b..3f900083ffe8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -241,6 +241,8 @@ in chrysalis = callPackage ../applications/misc/chrysalis { }; + clifm = callPackage ../applications/misc/clifm { }; + clj-kondo = callPackage ../development/tools/clj-kondo { }; cmark = callPackage ../development/libraries/cmark { }; From 517e76b5c26b9f4cef4c5c1aa3f0dc6800052562 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Jun 2021 17:10:57 +0200 Subject: [PATCH 20/61] python3Packages.influxdb-client: 1.15.0 -> 1.17.0 --- .../python-modules/influxdb-client/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 82153f4b3d9b..38f6f58910db 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,22 +14,16 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.15.0"; - - disabled = pythonOlder "3.6"; # requires python version >=3.6 + version = "1.17.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "1b2xh78v965rgafyj7cdbjm2p96d74f7ifsqllc7242n9wv3k53q"; + sha256 = "1xxg8z9zambbhr7nmxhmvmiwkd4578zxr6rl2vhdh2w77idsw29z"; }; - # makes test not reproducible - postPatch = '' - sed -i -e '/randomize/d' test-requirements.txt - ''; - propagatedBuildInputs = [ rx certifi @@ -44,6 +38,8 @@ buildPythonPackage rec { # requires influxdb server doCheck = false; + pythonImportsCheck = [ "influxdb_client" ]; + meta = with lib; { description = "InfluxDB 2.0 Python client library"; homepage = "https://github.com/influxdata/influxdb-client-python"; From a5bf3427fbd1faeb979fca80da54c51bfbb2948c Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 3 Jun 2021 19:31:57 +0300 Subject: [PATCH 21/61] earthly: add missing buildFlags and tags --- pkgs/development/tools/earthly/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 588716b9f30c..f73de077acbb 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -13,6 +13,19 @@ buildGoModule rec { vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g="; + buildFlagsArray = '' + -ldflags= + -s -w + -X main.Version=v${version} + -X main.DefaultBuildkitdImage=earthly/buildkitd:v${version} + -extldflags -static + ''; + + BUILDTAGS = "dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork"; + preBuild = '' + makeFlagsArray+=(BUILD_TAGS="${BUILDTAGS}") + ''; + postInstall = '' mv $out/bin/debugger $out/bin/earthly-debugger mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater From 45288e9fec39b2c0ae6650c0eaf414ded3ee00d5 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Fri, 4 Jun 2021 10:48:19 -0500 Subject: [PATCH 22/61] verilator: 4.110 -> 4.202 --- pkgs/applications/science/electronics/verilator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 5871ad01d91c..5039b842f416 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.110"; + version = "4.202"; src = fetchurl { - url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "sha256-Rxb+AFhmGinWtZyvjnRxsu3b3tbtRO3njcHGUJTs/sw="; + url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; + sha256 = "0ydn4304pminzq8zc1hsrb2fjrfqnb6akr45ky43jd29c4jgznnq"; }; enableParallelBuilding = true; From c4b3aa62608d592d8a983be685f7e82000f4de30 Mon Sep 17 00:00:00 2001 From: Antoine Fontaine Date: Wed, 14 Apr 2021 20:59:10 +0200 Subject: [PATCH 23/61] build-support/make-desktopitem: add some missing fields --- pkgs/build-support/make-desktopitem/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index 329286bd3628..1491a3ad9119 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -12,6 +12,8 @@ , mimeType ? null , categories ? null , startupNotify ? null +, noDisplay ? null +, prefersNonDefaultGPU ? null , extraDesktopEntries ? { } # Extra key-value pairs to add to the [Desktop Entry] section. This may override other values , extraEntries ? "" # Extra configuration. Will be appended to the end of the file and may thus contain extra sections , fileValidation ? true # whether to validate resulting desktop file. @@ -35,6 +37,8 @@ let "MimeType" = nullableToString mimeType; "Categories" = nullableToString categories; "StartupNotify" = nullableToString startupNotify; + "NoDisplay" = nullableToString noDisplay; + "PrefersNonDefaultGPU" = nullableToString prefersNonDefaultGPU; } // extraDesktopEntries; # Map all entries to a list of lines From 758c87007c9770223b796d0732e109ded609658f Mon Sep 17 00:00:00 2001 From: Antoine Fontaine Date: Fri, 9 Apr 2021 14:30:45 +0200 Subject: [PATCH 24/61] unvanquished: init at 0.52.0 --- maintainers/maintainer-list.nix | 6 + pkgs/games/unvanquished/default.nix | 191 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 199 insertions(+) create mode 100644 pkgs/games/unvanquished/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6572d6b9914e..9974ef980194 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -300,6 +300,12 @@ githubId = 335271; name = "James Alexander Feldman-Crough"; }; + afontain = { + email = "antoine.fontaine@epfl.ch"; + github = "necessarily-equal"; + githubId = 59283660; + name = "Antoine Fontaine"; + }; aforemny = { email = "aforemny@posteo.de"; github = "aforemny"; diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix new file mode 100644 index 000000000000..35db4625db90 --- /dev/null +++ b/pkgs/games/unvanquished/default.nix @@ -0,0 +1,191 @@ +{ lib, stdenv, fetchzip, fetchurl, fetchFromGitHub, buildFHSUserEnv +, runCommandNoCC, makeDesktopItem, copyDesktopItems, gcc, cmake, gmp +, libGL, zlib, ncurses, geoip, lua5, nettle, curl, SDL2, freetype, glew +, openal, libopus, opusfile, libogg, libvorbis, libjpeg, libwebp, libpng +, cacert, aria2 # to download assets +}: + +let + version = "0.52.0"; + binary-deps-version = "5"; + + src = fetchFromGitHub { + owner = "Unvanquished"; + repo = "Unvanquished"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "1acda1559q6zwmhg3x00nai88hy83i5hcfli2bqfab7slr95lm27"; + }; + + unvanquished-binary-deps = stdenv.mkDerivation rec { + # DISCLAIMER: this is selected binary crap from the NaCl SDK + name = "unvanquished-binary-deps"; + version = binary-deps-version; + src = fetchzip { + url = "https://dl.unvanquished.net/deps/linux64-${version}.tar.bz2"; + sha256 = "08bpyavbh5lmyprvqqi59gnm8s1fjmlk9f1785wlv7f52d9f9z1p"; + }; + dontPatchELF = true; + preFixup = '' + # We are not using the autoPatchelfHook, because it would make + # nacl_bootstrap_helper unable to load nacl_loader: + # "nacl_loader: ELF file has unreasonable e_phnum=13" + interpreter="$(< "$NIX_CC/nix-support/dynamic-linker")" + for f in pnacl/bin/*; do + if [ -f "$f" && -x "$f" ]; then + echo "Patching $f" + patchelf --set-interpreter "$interpreter" "$f" + fi + done + ''; + preCheck = "pnacl/bin/clang -v"; # check it links correctly + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -R ./* $out/ + + runHook postInstall + ''; + }; + + libstdcpp-preload-for-unvanquished-nacl = stdenv.mkDerivation { + name = "libstdcpp-preload-for-unvanquished-nacl"; + buildCommand = '' + mkdir $out/etc -p + echo ${gcc.cc.lib}/lib/libstdc++.so.6 > $out/etc/ld-nix.so.preload + ''; + propagatedBuildInputs = [ gcc.cc.lib ]; + }; + + fhsEnv = buildFHSUserEnv { + name = "unvanquished-fhs-wrapper"; + targetPkgs = pkgs: [ libstdcpp-preload-for-unvanquished-nacl ]; + }; + + wrapBinary = binary: wrappername: '' + cat > $out/lib/${binary}-wrapper <<-EOT + #!/bin/sh + exec $out/lib/${binary} -pakpath ${unvanquished-assets} "\$@" + EOT + chmod +x $out/lib/${binary}-wrapper + + cat > $out/bin/${wrappername} <<-EOT + #!/bin/sh + exec ${fhsEnv}/bin/unvanquished-fhs-wrapper $out/lib/${binary}-wrapper "\$@" + EOT + chmod +x $out/bin/${wrappername} + ''; + + + unvanquished-assets = stdenv.mkDerivation { + pname = "unvanquished-assets"; + inherit version src; + + outputHash = "sha256:1fy85cjnjk9rrqkhgx5701inff2yv14hnxglzx3209c553gn31n7"; + outputHashMode = "recursive"; + nativeBuildInputs = [ aria2 cacert ]; + buildCommand = "bash $src/download-paks $out"; + }; + +# this really is the daemon game engine, the game itself is in the assets +in stdenv.mkDerivation rec { + pname = "unvanquished"; + inherit version src binary-deps-version; + + preConfigure = '' + mkdir daemon/external_deps/linux64-${binary-deps-version}/ + cp -r ${unvanquished-binary-deps}/* daemon/external_deps/linux64-${binary-deps-version}/ + chmod +w -R daemon/external_deps/linux64-${binary-deps-version}/ + ''; + + nativeBuildInputs = [ cmake unvanquished-binary-deps copyDesktopItems ]; + buildInputs = [ + gmp + libGL + zlib + ncurses + geoip + lua5 + nettle + curl + SDL2 + freetype + glew + openal + libopus + opusfile + libogg + libvorbis + libjpeg + libwebp + libpng + ]; + + cmakeFlags = [ + "-DBUILD_CGAME=NO" + "-DBUILD_SGAME=NO" + "-DUSE_HARDENING=TRUE" + "-DUSE_LTO=TRUE" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "net.unvanquished.Unvanquished.desktop"; + desktopName = "Unvanquished"; + comment = "FPS/RTS Game - Aliens vs. Humans"; + icon = "unvanquished"; + terminal = false; + exec = "unvanquished"; + categories = "Game;ActionGame;StrategyGame;"; + # May or may not work + prefersNonDefaultGPU = true; + fileValidation = false; # it doesn't like PrefersNonDefaultGPU + # yes, PrefersNonDefaultGPU is standard: + # https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html + }) + (makeDesktopItem { + name = "net.unvanquished.UnvanquishedProtocolHandler.desktop"; + desktopName = "Unvanquished (protocol handler)"; + noDisplay = true; + terminal = false; + exec = "unvanquished -connect %u"; + mimeType = "x-scheme-handler/unv"; + # May or may not work + prefersNonDefaultGPU = true; + fileValidation = false; # it doesn't like PrefersNonDefaultGPU + }) + ]; + + installPhase = '' + runHook preInstall + + for f in daemon daemon-tty daemonded nacl_loader nacl_helper_bootstrap; do + install -Dm0755 -t $out/lib/ $f + done + install -Dm0644 -t $out/lib/ irt_core-x86_64.nexe + + mkdir $out/bin/ + ${wrapBinary "daemon" "unvanquished"} + ${wrapBinary "daemon-tty" "unvanquished-tty"} + ${wrapBinary "daemonded" "unvanquished-server"} + + for d in ${src}/dist/icons/*; do + install -Dm0644 -t $out/share/icons/hicolor/$(basename $d)/apps/ $d/unvanquished.png + done + + runHook postInstall + ''; + meta = { + platforms = [ "x86_64-linux" ]; + homepage = "https://unvanquished.net/"; + downloadPage = "https://unvanquished.net/download/"; + description = "A fast paced, first person strategy game"; + maintainers = with lib.maintainers; [ afontain ]; + # 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 + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22baaa0c71f8..0e0751f21324 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9382,6 +9382,8 @@ in untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { }; + unvanquished = callPackage ../games/unvanquished { }; + up = callPackage ../tools/misc/up { }; upterm = callPackage ../tools/misc/upterm { }; From dc74193de6cb3335ab369cb3cf7bbee1850f7fe3 Mon Sep 17 00:00:00 2001 From: Calum MacRae Date: Fri, 4 Jun 2021 17:51:46 +0100 Subject: [PATCH 25/61] seaweedfs: 2.36 -> 2.50 --- pkgs/applications/networking/seaweedfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 86a3e48ae8ff..522cef2b8a79 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.36"; + version = "2.50"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-BVn+mV5SjyODcT+O8LXfGA42/Si5+GrdkjP0tAPiuTM="; + sha256 = "sha256-ai8/XryFw/7GYuWAmLkqHzK97QgTBPyE6m3dflck94w="; }; - vendorSha256 = "sha256-qdgnoh+53o3idCfpkEFGK88aUVb2F6oHlSRZncs2hyY="; + vendorSha256 = "sha256-gJQDcACMWZWS4CgS2NDALoBzxu7Hh4ZW3f0gUFUALCM="; subPackages = [ "weed" ]; @@ -26,7 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Simple and highly scalable distributed file system"; homepage = "https://github.com/chrislusf/seaweedfs"; - maintainers = [ maintainers.raboof ]; + maintainers = with maintainers; [ cmacrae raboof ]; license = licenses.asl20; }; } From f9dbd6c68b7c46d4c01a7a63d1f7b221ea90beee Mon Sep 17 00:00:00 2001 From: imlonghao Date: Fri, 4 Jun 2021 17:25:50 +0000 Subject: [PATCH 26/61] borgmatic: 1.5.12 -> 1.5.13 --- pkgs/tools/backup/borgmatic/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 4913ca29cb84..b27ee0508e19 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -2,23 +2,19 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.5.12"; + version = "1.5.13"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-XLbBJvNRmH8W9SnOjF7zUbazRYFCMW6SEO2wKN/2VTY="; + sha256 = "12390ffdg30ncc5k92pvagwbvnsh42xl35a3nagbskznyfd23mw3"; }; checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; # - test_borgmatic_version_matches_news_version # The file NEWS not available on the pypi source, and this test is useless - # - test_collect_configuration_run_summary_logs_outputs_merged_json_results - # Upstream fixed in the next version, see - # https://github.com/witten/borgmatic/commit/ea6cd53067435365a96786b006aec391714501c4 disabledTests = [ "test_borgmatic_version_matches_news_version" - "test_collect_configuration_run_summary_logs_outputs_merged_json_results" ]; propagatedBuildInputs = with python3Packages; [ From 289df23403c03afd6847d313caaeff287453220c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Fri, 4 Jun 2021 20:47:56 +0300 Subject: [PATCH 27/61] bootiso: init at 4.2.0 --- pkgs/tools/cd-dvd/bootiso/default.nix | 48 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/tools/cd-dvd/bootiso/default.nix diff --git a/pkgs/tools/cd-dvd/bootiso/default.nix b/pkgs/tools/cd-dvd/bootiso/default.nix new file mode 100644 index 000000000000..e6a902488599 --- /dev/null +++ b/pkgs/tools/cd-dvd/bootiso/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, bash +, makeWrapper +, bc +, jq +, wimlib +, file +, syslinux +, busybox +, gnugrep # We can't use busybox's 'grep' as it doesn't support perl '-P' expressions. +}: + +stdenvNoCC.mkDerivation rec { + pname = "bootiso"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "jsamr"; + repo = pname; + rev = "v${version}"; + sha256 = "1l09d543b73r0wbpsj5m6kski8nq48lbraq1myxhidkgl3mm3d5i"; + }; + + strictDeps = true; + buildInputs = [ bash ]; + nativeBuildInputs = [ makeWrapper ]; + postPatch = '' + patchShebangs --host bootiso + ''; + + makeFlags = [ "prefix=${placeholder "out"}" ]; + + postInstall = '' + wrapProgram $out/bin/bootiso \ + --prefix PATH : ${lib.makeBinPath [ bc jq wimlib file syslinux gnugrep busybox ]} \ + --prefix BOOTISO_SYSLINUX_LIB_ROOT : ${syslinux}/share/syslinux + ''; + + meta = with lib; { + description = "Script for securely creating a bootable USB device from one image file"; + homepage = "https://github.com/jsamr/bootiso"; + license = licenses.gpl3; + maintainers = with maintainers; [ musfay ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b39120e921d8..2f76de8eb1fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1896,6 +1896,8 @@ in blur-effect = callPackage ../tools/graphics/blur-effect { }; + bootiso = callPackage ../tools/cd-dvd/bootiso { }; + butane = callPackage ../development/tools/butane { }; charles = charles4; From f3dac01a71b08ae6f9f533b5096f742db54f56f4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 4 Jun 2021 21:23:34 +0300 Subject: [PATCH 28/61] discord-canary: 0.0.123 -> 0.0.124 --- .../networking/instant-messengers/discord/base.nix | 3 ++- .../networking/instant-messengers/discord/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index a61ab254348b..110d3ffb00ee 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -3,7 +3,7 @@ , alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext -, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb +, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence , mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu }: @@ -23,6 +23,7 @@ in stdenv.mkDerivation rec { libXScrnSaver libXtst libxcb + libxshmfence mesa nss wrapGAppsHook diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 0d75b3747922..e486cd9de62a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.123"; + version = "0.0.124"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0bijwfsd9s4awqkgxd9c2cxh7y5r06vix98qjp0dkv63r6jig8ch"; + sha256 = "060ypr9rn5yl8iwh4v3ax1v6501yaq72sx50q47sm0wyxn7gpv91"; }; }; }.${branch} From ce5e8c343bcf5bd06cba3aa5deefb392304bfcf7 Mon Sep 17 00:00:00 2001 From: kk-boop <56920559+kk-boop@users.noreply.github.com> Date: Fri, 4 Jun 2021 21:43:43 +0300 Subject: [PATCH 29/61] qdigidoc: 4.2.3 -> 4.2.8 --- pkgs/tools/security/qdigidoc/default.nix | 9 ++++-- pkgs/tools/security/qdigidoc/qt5.15.patch | 39 +++++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/security/qdigidoc/qt5.15.patch diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 8ba6937c4486..86dc3dfff335 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -3,20 +3,23 @@ mkDerivation rec { pname = "qdigidoc"; - version = "4.2.3"; + version = "4.2.8"; src = fetchgit { url = "https://github.com/open-eid/DigiDoc4-Client"; rev = "v${version}"; - sha256 = "1hj49vvg8vrayr9kpz73fafa7k298hmiamkyd8c3ipy6s51xh6q4"; + sha256 = "02k2s6l79ssvrksa0midm7bq856llrmq0n40yxwm3j011nvc8vsm"; fetchSubmodules = true; }; tsl = fetchurl { url = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml"; - sha256 = "0llr2fj8vd097hcr1d0xmzdy4jydv0b5j5qlksbjffs22rqgal14"; + sha256 = "0klz9blrp0jjhlr9k1i266afp44pqmii1x0y8prk0417ia3fxpli"; }; + # Adds explicit imports for QPainterPath, fixed in upstream (https://github.com/open-eid/DigiDoc4-Client/pull/914) + patches = [ ./qt5.15.patch ]; + nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ]; postPatch = '' diff --git a/pkgs/tools/security/qdigidoc/qt5.15.patch b/pkgs/tools/security/qdigidoc/qt5.15.patch new file mode 100644 index 000000000000..6f390702348b --- /dev/null +++ b/pkgs/tools/security/qdigidoc/qt5.15.patch @@ -0,0 +1,39 @@ +From 1aa314f5433b9b3e89a1c05b5c465fb477435e23 Mon Sep 17 00:00:00 2001 +From: Dmitri Smirnov +Date: Mon, 8 Mar 2021 14:15:27 +0100 +Subject: [PATCH] =?UTF-8?q?Added=20explicit=20imports=20for=20QPainterPath?= + =?UTF-8?q?=20to=20fix=20builds=20with=20Qt=20=E2=89=A5=205.15?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Dmitri Smirnov +--- + client/widgets/CheckBox.cpp | 1 + + client/widgets/MainAction.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/client/widgets/CheckBox.cpp b/client/widgets/CheckBox.cpp +index a03b56e5d..725d585b7 100644 +--- a/client/widgets/CheckBox.cpp ++++ b/client/widgets/CheckBox.cpp +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + + CheckBox::CheckBox(QWidget *parent) +diff --git a/client/widgets/MainAction.cpp b/client/widgets/MainAction.cpp +index 4cf4bb1cf..a46c193e3 100644 +--- a/client/widgets/MainAction.cpp ++++ b/client/widgets/MainAction.cpp +@@ -24,6 +24,7 @@ + + #include + #include ++#include + #include + + using namespace ria::qdigidoc4; From c24962b17aefe5ba24497ce3a769f7f6de372aef Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Fri, 4 Jun 2021 11:51:57 -0500 Subject: [PATCH 30/61] ryzenadj: init at 0.8.2 --- pkgs/os-specific/linux/ryzenadj/default.nix | 27 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/os-specific/linux/ryzenadj/default.nix diff --git a/pkgs/os-specific/linux/ryzenadj/default.nix b/pkgs/os-specific/linux/ryzenadj/default.nix new file mode 100644 index 000000000000..e50cb7e8d53a --- /dev/null +++ b/pkgs/os-specific/linux/ryzenadj/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, pciutils, cmake }: +stdenv.mkDerivation rec { + pname = "ryzenadj"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "FlyGoat"; + repo = "RyzenAdj"; + rev = "v${version}"; + sha256 = "182l9nchlpl4yr568n86086glkr607rif92wnwc7v3aym62ch6ld"; + }; + + nativeBuildInputs = [ pciutils cmake ]; + + installPhase = '' + install -D libryzenadj.so $out/lib/libryzenadj.so + install -D ryzenadj $out/bin/ryzenadj + ''; + + meta = with lib; { + description = "Adjust power management settings for Ryzen Mobile Processors."; + homepage = "https://github.com/FlyGoat/RyzenAdj"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ asbachb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8294ff9ad8a8..3252759c8afa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31748,6 +31748,8 @@ in zenstates = callPackage ../os-specific/linux/zenstates {}; + ryzenadj = callPackage ../os-specific/linux/ryzenadj {}; + vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {}; gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; From dbfd999f4f6adea7ed31f25f82b21ae31ce876b5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 1 Jun 2021 21:03:08 +0200 Subject: [PATCH 31/61] ddclient: update source & homepage --- pkgs/tools/networking/ddclient/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 77aad6fa7b31..72daa0608a67 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,12 +1,14 @@ -{ lib, fetchurl, perlPackages, iproute2, perl }: +{ lib, fetchFromGitHub, perlPackages, iproute2, perl }: perlPackages.buildPerlPackage rec { pname = "ddclient"; version = "3.9.1"; - src = fetchurl { - url = "mirror://sourceforge/ddclient/${pname}-${version}.tar.gz"; - sha256 = "0w14qnn72j333i3j7flxkw6bzcg4n31d8jfnvhmwa7s9rharx5p4"; + src = fetchFromGitHub { + owner = "ddclient"; + repo = "ddclient"; + rev = "v${version}"; + sha256 = "0hf377g4j9r9sac75xp17nk2h58mazswz4vkg4g2gl2yyhvzq91w"; }; # perl packages by default get devdoc which isn't present @@ -38,9 +40,10 @@ perlPackages.buildPerlPackage rec { meta = with lib; { description = "Client for updating dynamic DNS service entries"; - homepage = "https://sourceforge.net/p/ddclient/wiki/Home/"; - license = licenses.gpl2Plus; + homepage = "https://ddclient.net/"; + license = licenses.gpl2Plus; # Mostly since `iproute` is Linux only. - platforms = platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 59e0120aa5c1241d48048afa615e25c65d7e366d Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 4 Jun 2021 16:08:41 +0200 Subject: [PATCH 32/61] treewide: Fix mysql alias deprecation breakage 62733b37b4a866cabafe1fc8bb7415240126eb0b broke evaluation in all places `pkgs.mysql` was used. Fix this by changing all occurrences to `pkgs.mariadb`. --- nixos/modules/services/backup/mysql-backup.nix | 4 ++-- nixos/modules/services/databases/mysql.nix | 2 +- nixos/modules/services/video/epgstation/default.nix | 4 ++-- nixos/modules/services/web-apps/keycloak.nix | 2 +- nixos/modules/services/web-apps/tt-rss.nix | 2 +- nixos/tests/bitwarden.nix | 2 +- nixos/tests/matomo.nix | 2 +- nixos/tests/mysql/mysql-autobackup.nix | 2 +- nixos/tests/mysql/mysql-backup.nix | 2 +- nixos/tests/mysql/mysql-replication.nix | 6 +++--- nixos/tests/sogo.nix | 2 +- pkgs/development/lua-modules/overrides.nix | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 506ded5e9e8c..9fca21002733 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -4,7 +4,7 @@ with lib; let - inherit (pkgs) mysql gzip; + inherit (pkgs) mariadb gzip; cfg = config.services.mysqlBackup; defaultUser = "mysqlbackup"; @@ -20,7 +20,7 @@ let ''; backupDatabaseScript = db: '' dest="${cfg.location}/${db}.gz" - if ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then + if ${mariadb}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then mv $dest.tmp $dest echo "Backed up to $dest" else diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index cf105daeb04e..2d8d613ed88e 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -34,7 +34,7 @@ in package = mkOption { type = types.package; - example = literalExample "pkgs.mysql"; + example = literalExample "pkgs.mariadb"; description = " Which MySQL derivation to use. MariaDB packages are supported too. "; diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix index 8d6d431fa55a..b13393c8983a 100644 --- a/nixos/modules/services/video/epgstation/default.nix +++ b/nixos/modules/services/video/epgstation/default.nix @@ -27,7 +27,7 @@ let # NOTE: Use password authentication, since mysqljs does not yet support auth_socket if [ ! -e /var/lib/epgstation/db-created ]; then - ${pkgs.mysql}/bin/mysql -e \ + ${pkgs.mariadb}/bin/mysql -e \ "GRANT ALL ON \`${cfg.database.name}\`.* TO '${username}'@'localhost' IDENTIFIED by '$DB_PASSWORD';" touch /var/lib/epgstation/db-created fi @@ -224,7 +224,7 @@ in services.mysql = { enable = mkDefault true; - package = mkDefault pkgs.mysql; + package = mkDefault pkgs.mariadb; ensureDatabases = [ cfg.database.name ]; # FIXME: enable once mysqljs supports auth_socket # ensureUsers = [ { diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index f0b9e60116dd..dc66c2966564 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -728,7 +728,7 @@ in services.postgresql.enable = lib.mkDefault createLocalPostgreSQL; services.mysql.enable = lib.mkDefault createLocalMySQL; - services.mysql.package = lib.mkIf createLocalMySQL pkgs.mysql; + services.mysql.package = lib.mkIf createLocalMySQL pkgs.mariadb; }; meta.doc = ./keycloak.xml; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 6a29f10d1195..b78487cc9281 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -644,7 +644,7 @@ let services.mysql = mkIf mysqlLocal { enable = true; - package = mkDefault pkgs.mysql; + package = mkDefault pkgs.mariadb; ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { diff --git a/nixos/tests/bitwarden.nix b/nixos/tests/bitwarden.nix index 3813a1f70f96..f64cf171f01f 100644 --- a/nixos/tests/bitwarden.nix +++ b/nixos/tests/bitwarden.nix @@ -42,7 +42,7 @@ let GRANT ALL ON `bitwarden`.* TO 'bitwardenuser'@'localhost'; FLUSH PRIVILEGES; ''; - package = pkgs.mysql; + package = pkgs.mariadb; }; services.bitwarden_rs.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden"; diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix index 2bea237c8bdd..f6b0845749cd 100644 --- a/nixos/tests/matomo.nix +++ b/nixos/tests/matomo.nix @@ -18,7 +18,7 @@ let }; services.mysql = { enable = true; - package = pkgs.mysql; + package = pkgs.mariadb; }; services.nginx.enable = true; }; diff --git a/nixos/tests/mysql/mysql-autobackup.nix b/nixos/tests/mysql/mysql-autobackup.nix index 65576e52a537..b0ec7daaf054 100644 --- a/nixos/tests/mysql/mysql-autobackup.nix +++ b/nixos/tests/mysql/mysql-autobackup.nix @@ -8,7 +8,7 @@ import ./../make-test-python.nix ({ pkgs, lib, ... }: { pkgs, ... }: { services.mysql.enable = true; - services.mysql.package = pkgs.mysql; + services.mysql.package = pkgs.mariadb; services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; services.automysqlbackup.enable = true; diff --git a/nixos/tests/mysql/mysql-backup.nix b/nixos/tests/mysql/mysql-backup.nix index d428fb6c16e6..269fddc66e1d 100644 --- a/nixos/tests/mysql/mysql-backup.nix +++ b/nixos/tests/mysql/mysql-backup.nix @@ -10,7 +10,7 @@ import ./../make-test-python.nix ({ pkgs, ... } : { services.mysql = { enable = true; initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; - package = pkgs.mysql; + package = pkgs.mariadb; }; services.mysqlBackup = { diff --git a/nixos/tests/mysql/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix index ad84c801ea10..a52372ca47ce 100644 --- a/nixos/tests/mysql/mysql-replication.nix +++ b/nixos/tests/mysql/mysql-replication.nix @@ -17,7 +17,7 @@ in { services.mysql.enable = true; - services.mysql.package = pkgs.mysql; + services.mysql.package = pkgs.mariadb; services.mysql.replication.role = "master"; services.mysql.replication.slaveHost = "%"; services.mysql.replication.masterUser = replicateUser; @@ -31,7 +31,7 @@ in { services.mysql.enable = true; - services.mysql.package = pkgs.mysql; + services.mysql.package = pkgs.mariadb; services.mysql.replication.role = "slave"; services.mysql.replication.serverId = 2; services.mysql.replication.masterHost = nodes.master.config.networking.hostName; @@ -44,7 +44,7 @@ in { services.mysql.enable = true; - services.mysql.package = pkgs.mysql; + services.mysql.package = pkgs.mariadb; services.mysql.replication.role = "slave"; services.mysql.replication.serverId = 3; services.mysql.replication.masterHost = nodes.master.config.networking.hostName; diff --git a/nixos/tests/sogo.nix b/nixos/tests/sogo.nix index 3f600b4cd555..acdad8d0f473 100644 --- a/nixos/tests/sogo.nix +++ b/nixos/tests/sogo.nix @@ -10,7 +10,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { services.mysql = { enable = true; - package = pkgs.mysql; + package = pkgs.mariadb; ensureDatabases = [ "sogo" ]; ensureUsers = [{ name = "sogo"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index eec969f99caf..288f4fc078ba 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -173,7 +173,7 @@ with super; MYSQL_LIBDIR="${pkgs.libmysqlclient}/lib/mysql"; }; buildInputs = [ - pkgs.mysql.client + pkgs.mariadb.client pkgs.libmysqlclient ]; }); From 9da90bfa87efaaf84c57ecfd25d8a5ea5f29a0f9 Mon Sep 17 00:00:00 2001 From: schnusch Date: Sun, 2 May 2021 12:38:18 +0200 Subject: [PATCH 33/61] oathToolkit: 2.6.6 -> 2.6.7 add update script --- pkgs/tools/security/oath-toolkit/default.nix | 6 ++- pkgs/tools/security/oath-toolkit/update.sh | 50 ++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100755 pkgs/tools/security/oath-toolkit/update.sh diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index b1a493f30913..a925d07cb7c8 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -7,15 +7,17 @@ let in stdenv.mkDerivation rec { pname = "oath-toolkit"; - version = "2.6.6"; + version = "2.6.7"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0v4lrgip08b8xlivsfn3mwql3nv8hmcpzrn6pi3xp88vqwav6s7x"; + sha256 = "1aa620k05lsw3l3slkp2mzma40q3p9wginspn9zk8digiz7dzv9n"; }; buildInputs = [ securityDependency ]; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Components for building one-time password authentication systems"; homepage = "https://www.nongnu.org/oath-toolkit/"; diff --git a/pkgs/tools/security/oath-toolkit/update.sh b/pkgs/tools/security/oath-toolkit/update.sh new file mode 100755 index 000000000000..3502a541fa8c --- /dev/null +++ b/pkgs/tools/security/oath-toolkit/update.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl git gnugrep nix + +set -euo pipefail + +nixfile='default.nix' +release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/' +attr='oathToolkit' +command='oathtool --version' + +color() { + printf '%s: \033[%sm%s\033[39m\n' "$0" "$1" "$2" >&2 || true +} + +color 32 "downloading $release_url..." +if ! release_page=$(curl -Lf "$release_url"); then + color 31 "cannot download release page" + exit 1 +fi + +tarball_name=$(printf '%s\n' "$release_page" \ + | grep -Po '(?<=href=").*?\.tar\.gz(?=")' \ + | sort -n | tail -n1) +tarball_version="${tarball_name%.tar.*}" +tarball_version="${tarball_version##*-}" +tarball_url="mirror://savannah${release_url#https://*/releases}$tarball_name" + +color 32 "nix-prefetch-url $tarball_url..." +if ! tarball_sha256=$(nix-prefetch-url --type sha256 "$tarball_url"); then + color 31 "cannot prefetch $tarball_url" + exit 1 +fi + +old_version=$(grep -Pom1 '(?<=version = ").*?(?=";)' "$nixfile") + +version=$(printf 'version = "%s";\n' "$tarball_version") +sha256=$(printf 'sha256 = "%s";\n' "$tarball_sha256") +sed -e "s,version = .*,$version," -e "s,sha256 = .*,$sha256," -i "$nixfile" + +if git diff --exit-code "$nixfile" > /dev/stderr; then + printf '\n' >&2 || true + color 32 "$tarball_version is up to date" +else + color 32 "running '$command' with nix-shell..." + nix-shell -p "callPackage ./$nixfile {}" --run "$command" + msg="$attr: $old_version -> $tarball_version" + printf '\n' >&2 || true + color 31 "$msg" + git commit -m "$msg" "$nixfile" +fi From 63dd3bfd04fc97e97c777e887dccea5c3509a97f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 22 May 2021 14:03:27 +0200 Subject: [PATCH 34/61] FaustLive: unstable-dev-2020-08-03 -> 2.5.5 --- pkgs/applications/audio/faust/faustlive.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 20afb6fd7617..2b4602f78cfd 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -1,22 +1,24 @@ { lib, stdenv, fetchFromGitHub -, llvm, qt48Full, qrencode, libmicrohttpd_0_9_70, libjack2, alsaLib, faust, curl -, bc, coreutils, which, libsndfile, pkg-config +, llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl +, bc, coreutils, which, libsndfile, pkg-config, libxcb }: stdenv.mkDerivation rec { pname = "faustlive"; - version = "unstable-dev-2020-08-03"; + version = "2.5.5"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; - rev = "c16565dc1b616ac0aad7c303c1997fa9e57177ab"; - sha256 = "1ys661lp1xwz21vy12kwkg248jvjq1z9w433knkh0ldyy2igvmd5"; + rev = version; + sha256 = "0qbn05nq170ckycwalkk5fppklc4g457mapr7p7ryrhc1hwzffm9"; fetchSubmodules = true; }; + nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook ]; + buildInputs = [ - llvm qt48Full qrencode libmicrohttpd_0_9_70 libjack2 alsaLib faust curl - bc coreutils which libsndfile pkg-config + llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsaLib faust curl + bc coreutils which libsndfile libxcb ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -39,5 +41,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://faust.grame.fr/"; license = licenses.gpl3; + maintainers = with maintainers; [ magnetophon ]; }; } From 0edb6e335811dcd7497bdcf2d376a3b1be152cba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Jun 2021 21:49:10 +0000 Subject: [PATCH 35/61] jackett: 0.18.225 -> 0.18.231 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 600a5f67eb80..116fd9bae927 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.225"; + version = "0.18.231"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-EvFu+v1Ltot5zuDWcuG8Z00NHjWjZTrI0JKv+rgVB7U="; + sha256 = "sha256-fl0M4Emstp21CrrE4Znzwi1XvTzx6TpPnNKYM65aoN4="; }; nativeBuildInputs = [ makeWrapper ]; From 8ae4e61907f4c7bbc2c92a1b784acbe8f8b7755b Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 21 May 2021 23:11:59 +0200 Subject: [PATCH 36/61] diopser: init at unstable-2021-5-13 --- pkgs/applications/audio/diopser/default.nix | 76 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/applications/audio/diopser/default.nix diff --git a/pkgs/applications/audio/diopser/default.nix b/pkgs/applications/audio/diopser/default.nix new file mode 100644 index 000000000000..0c97d64945ba --- /dev/null +++ b/pkgs/applications/audio/diopser/default.nix @@ -0,0 +1,76 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +, libjack2, alsaLib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor +}: + +let + + # Derived from subprojects/function2.wrap + function2 = rec { + version = "4.1.0"; + src = fetchFromGitHub { + owner = "Naios"; + repo = "function2"; + rev = version; + hash = "sha256-JceZU8ZvtYhFheh8BjMvjjZty4hcYxHEK+IIo5X4eSk="; + }; + }; + + juce = rec { + version = "unstable-2021-04-07"; + src = fetchFromGitHub { + owner = "juce-framework"; + repo = "JUCE"; + rev = "1a5fb5992a1a4e28e998708ed8dce2cc864a30d7"; + sha256= "1ri7w4sz3sy5xilibg53ls9526fx7jwbv8rc54ccrqfhxqyin308"; + }; + }; + + +in stdenv.mkDerivation rec { + pname = "diopser"; + version = "unstable-2021-5-13"; + + src = fetchFromGitHub { + owner = "robbert-vdh"; + repo = pname; + fetchSubmodules = true; + rev = "d5fdc92f1caf5a828e071dac99e106e58f06d84d"; + sha256 = "06y1h895yxh44gp4vxzrna59lf7nlfw7aacd3kk4l1g56jhy9pdx"; + }; + + postUnpack = '' + ( + cd "$sourceRoot" + cp -R --no-preserve=mode,ownership ${function2.src} function2 + cp -R --no-preserve=mode,ownership ${juce.src} JUCE + sed -i 's@CPMAddPackage("gh:juce-framework/JUCE.*@add_subdirectory(JUCE)@g' CMakeLists.txt + sed -i 's@CPMAddPackage("gh:Naios/function2.*@add_subdirectory(function2)@g' CMakeLists.txt + patchShebangs . + ) + ''; + + installPhase = '' + mkdir -p $out/lib/vst3 + cp -r Diopser_artefacts/Release/VST3/Diopser.vst3 $out/lib/vst3 + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext + libXcursor + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar" + "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib" + ]; + + meta = with lib; { + description = "A totally original phase rotation plugin"; + homepage = "https://github.com/robbert-vdh/diopser"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec1fefce9c22..3008c27e7914 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1355,6 +1355,8 @@ in dfmt = callPackage ../tools/text/dfmt { }; + diopser = callPackage ../applications/audio/diopser { }; + diskonaut = callPackage ../tools/misc/diskonaut { }; diskus = callPackage ../tools/misc/diskus { From 126469c1c995a405c3b28135fc86e432266469e7 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 22 May 2021 14:18:34 +0200 Subject: [PATCH 37/61] uhhyou.lv2: unstable-2020-07-31 -> unstable-2021-02-08 --- pkgs/applications/audio/uhhyou.lv2/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/uhhyou.lv2/default.nix b/pkgs/applications/audio/uhhyou.lv2/default.nix index 9c748929d625..eb590c22bbfc 100644 --- a/pkgs/applications/audio/uhhyou.lv2/default.nix +++ b/pkgs/applications/audio/uhhyou.lv2/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { # this is what upstream calls the package, see: # https://github.com/ryukau/LV2Plugins#uhhyou-plugins-lv2 pname = "uhhyou.lv2"; - version = "unstable-2020-07-31"; + version = "unstable-2021-02-08"; src = fetchFromGitHub { owner = "ryukau"; repo = "LV2Plugins"; - rev = "6189be67acaeb95452f8adab73a731d94a7b6f47"; + rev = "df67460fc344f94db4306d4ee21e4207e657bbee"; fetchSubmodules = true; - sha256 = "049gigx2s89z8vf17gscs00c150lmcdwya311nbrwa18fz4bx242"; + sha256 = "1a23av35cw26zgq93yzmmw35084hsj29cb7sb04j2silv5qisila"; }; nativeBuildInputs = [ pkg-config python3 ]; @@ -31,8 +31,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; prePatch = '' - patchShebangs generate-ttl.sh - cp patch/NanoVG.cpp lib/DPF/dgl/src/NanoVG.cpp + patchShebangs generate-ttl.sh patch.sh patch/apply.sh ''; enableParallelBuilding = true; @@ -41,6 +40,7 @@ stdenv.mkDerivation rec { description = "Audio plugins for Linux"; longDescription = '' Plugin List: + - CollidingCombSynth - CubicPadSynth - EnvelopedSine - EsPhaser From 98b9a36f9a2100e56dbf04c9d12a5e8708638987 Mon Sep 17 00:00:00 2001 From: Kimat Boven Date: Sat, 5 Jun 2021 00:11:08 +0200 Subject: [PATCH 38/61] plantuml-server 1.2021.6 -> 1.2021.7 --- pkgs/tools/misc/plantuml-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index f0176afa4b9e..eef6cdc11d5f 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, maven, jdk8_headless }: let - version = "1.2021.6"; + version = "1.2021.7"; src = fetchFromGitHub { owner = "plantuml"; repo = "plantuml-server"; rev = "v${version}"; - sha256 = "sha256:1v69vabdq9pv75wzb6n5s198iy5ijfcx6lgjqwxz7n5ns3blf6sz"; + sha256 = "sha256-kY7b3ocm1zudGIf72MNMZDUG2t2FFqucRr3kRaFv7mo="; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central @@ -28,7 +28,7 @@ let installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256:1fvir7yvg4a4dc4kiv2d5q081cygj7s2lmxj90j8zzkggyq7v8zh"; + outputHash = "sha256-HzT5rBycrd48KskWKAGtkMKdCDQ8NPYADVWZh8K0ll4="; }; in From 195b26b95e2ae8a0c9ee7cb9c1e3d9faf6222d03 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Wed, 2 Jun 2021 07:50:11 +0800 Subject: [PATCH 39/61] nixos/fcitx5: autostart with xserver --- nixos/modules/i18n/input-method/fcitx5.nix | 45 ++++++++++++---------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix index 44962d202fe1..eecbe32fea49 100644 --- a/nixos/modules/i18n/input-method/fcitx5.nix +++ b/nixos/modules/i18n/input-method/fcitx5.nix @@ -6,28 +6,33 @@ let im = config.i18n.inputMethod; cfg = im.fcitx5; fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; }; -in - { - options = { - i18n.inputMethod.fcitx5 = { - addons = mkOption { - type = with types; listOf package; - default = []; - example = with pkgs; [ fcitx5-rime ]; - description = '' - Enabled Fcitx5 addons. - ''; - }; +in { + options = { + i18n.inputMethod.fcitx5 = { + addons = mkOption { + type = with types; listOf package; + default = []; + example = with pkgs; [ fcitx5-rime ]; + description = '' + Enabled Fcitx5 addons. + ''; }; }; + }; - config = mkIf (im.enabled == "fcitx5") { - i18n.inputMethod.package = fcitx5Package; + config = mkIf (im.enabled == "fcitx5") { + i18n.inputMethod.package = fcitx5Package; - environment.variables = { - GTK_IM_MODULE = "fcitx"; - QT_IM_MODULE = "fcitx"; - XMODIFIERS = "@im=fcitx"; - }; + environment.variables = { + GTK_IM_MODULE = "fcitx"; + QT_IM_MODULE = "fcitx"; + XMODIFIERS = "@im=fcitx"; }; - } + + systemd.user.services.fcitx5-daemon = { + enable = true; + script = "${fcitx5Package}/bin/fcitx5"; + wantedBy = [ "graphical-session.target" ]; + }; + }; +} From 9314f5d0d5b30983a8f0b473e72bdd9e466576e0 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Fri, 4 Jun 2021 22:38:30 -0300 Subject: [PATCH 40/61] dotnetPackages.Fantomas: 1.6.0 -> 4.4.0 --- pkgs/top-level/dotnet-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 53af113eb307..6fb0582202dd 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -33,8 +33,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { Fantomas = fetchNuGet { baseName = "Fantomas"; - version = "1.6.0"; - sha256 = "1b9rd3i76b5xzv0j62dvfr1ksdwvb59vxw6jhzpi018axjn6757q"; + version = "4.4.0"; + sha256 = "cYz0ewJdK9nRlMKmigk3IENfOXvJRhXJfLXshaqgZ6o="; outputFiles = [ "lib/*" ]; dllFiles = [ "Fantomas*.dll" ]; }; From d7530914e8a331189a0ada66a752d7d3f633784d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 5 Jun 2021 04:20:00 +0000 Subject: [PATCH 41/61] tflint: 0.28.1 -> 0.29.0 https://github.com/terraform-linters/tflint/releases/tag/v0.29.0 --- pkgs/development/tools/analysis/tflint/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 7a9206af0938..137b3c2c1a1a 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.28.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "0bx6y1y6cfqz77m23w4ab1j2i7s83kv301razv9rkkyxpnpb16hi"; + sha256 = "1ciwr2bwbxnw8366wvgl5ga3y2qj46i0h3yp3av1x9n2r8rddrlh"; }; - vendorSha256 = "0rfbjhi78qcaghn9xw658xcxl2x4ln4gnnyi9hsf3wz4cbybird7"; + vendorSha256 = "0k8v49sr0jmljfl4fa5pnvzd5k3pg865h201114l6cs257sdkczk"; doCheck = false; @@ -20,7 +20,7 @@ buildGoModule rec { meta = with lib; { description = "Terraform linter focused on possible errors, best practices, and so on"; homepage = "https://github.com/terraform-linters/tflint"; - changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/terraform-linters/tflint/raw/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = [ maintainers.marsam ]; }; From 841ae9708ea7b33436d41ef7d4d41ba071f7c06d Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Sat, 5 Jun 2021 01:11:42 -0300 Subject: [PATCH 42/61] maintainers: add ratsclub --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/top-level/dotnet-packages.nix | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6572d6b9914e..1ac795aab59c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8425,6 +8425,12 @@ githubId = 1891350; name = "Michael Raskin"; }; + ratsclub = { + email = "victor@freire.dev.br"; + github = "ratsclub"; + githubId = 25647735; + name = "Victor Freire"; + }; ravloony = { email = "ravloony@gmail.com"; name = "Tom Macdonald"; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 6fb0582202dd..7b25818dcef9 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -37,6 +37,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { sha256 = "cYz0ewJdK9nRlMKmigk3IENfOXvJRhXJfLXshaqgZ6o="; outputFiles = [ "lib/*" ]; dllFiles = [ "Fantomas*.dll" ]; + + meta = with lib; { + description = "FSharp source code formatter"; + homepage = "https://github.com/fsprojects/fantomas"; + license = licenses.asl20; + maintainers = [ maintainers.ratsclub ]; + }; }; FSharpCompilerCodeDom = fetchNuGet { From 6ceed3e9c6740b991a12bc046bb9433f8d0e9c09 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 22 May 2021 00:41:00 +0200 Subject: [PATCH 43/61] boops: init at 1.4.0 --- pkgs/applications/audio/boops/default.nix | 28 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/audio/boops/default.nix diff --git a/pkgs/applications/audio/boops/default.nix b/pkgs/applications/audio/boops/default.nix new file mode 100644 index 000000000000..ce6c4d1723fc --- /dev/null +++ b/pkgs/applications/audio/boops/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, xorg, cairo, lv2, libsndfile, pkg-config }: + +stdenv.mkDerivation rec { + pname = "boops"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "sjaehn"; + repo = "BOops"; + rev = version; + sha256 = "1kkp6s431pjb1qrg1dq8ak3lj0ksqnxsij9jg6biscpfgbmaqdcq"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + xorg.libX11 cairo lv2 libsndfile + ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + homepage = "https://github.com/sjaehn/BOops"; + description = "Sound glitch effect sequencer LV2 plugin"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec1fefce9c22..5f39e468fbb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22673,6 +22673,8 @@ in bookworm = callPackage ../applications/office/bookworm { }; + boops = callPackage ../applications/audio/boops { }; + CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { }; chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); From 795021ada5e70447f4c5fddb71532b0f9594c0f7 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Fri, 4 Jun 2021 16:26:37 -0700 Subject: [PATCH 44/61] gnome-boxes: add qemu as dependency --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 605275be7ded..5972843ab314 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -49,6 +49,7 @@ , webkitgtk , vte , glib-networking +, qemu-utils }: stdenv.mkDerivation rec { @@ -120,7 +121,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio ]}") + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils ]}") ''; postPatch = '' From 50017ae35dbf6dd7abbc97be411180465d44db48 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 5 Jun 2021 15:20:27 +0700 Subject: [PATCH 45/61] mmv: 2.0 -> 2.1 --- pkgs/tools/misc/mmv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index 8c242a5c83e6..2c58381100a4 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "mmv"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "rrthomas"; repo = "mmv"; rev = "v${version}"; - sha256 = "sha256-MmxDk3PBtvK/thrh6x67M+nMdCDlOQQHkREqLmzF2Mk="; + sha256 = "sha256-3XWXOp30P/bOd+c7PC8duidewX8h0hk9VsEUw05dAE4="; fetchSubmodules = true; }; From 201cc75bcb41cde2581a994c3162014d85cead82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Sat, 5 Jun 2021 10:32:59 +0200 Subject: [PATCH 46/61] lightworks: fix audio playback --- pkgs/applications/video/lightworks/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 9d940cd29b41..81b5be75f3bc 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv , gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU -, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev +, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev, libjack2 }: let fullPath = lib.makeLibraryPath [ @@ -18,6 +18,7 @@ let openssl libuuid alsaLib + libjack2 udev ]; From ca96bed8c3ad8910b85baa6e9786a3beb464cea4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Jun 2021 10:33:07 +0200 Subject: [PATCH 47/61] metasploit: 6.0.46 -> 6.0.47 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 24 ++++++------ pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 42 ++++++++++----------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index cad1502a130c..3119eeabade1 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.46" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.47" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 1b0c0732783c..760b9fe62c6e 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 7be6da5afc39bb736c0fb5c6c6ba245e98c0efe0 - ref: refs/tags/6.0.46 + revision: 6416bc1a2867938dd39705a3daef25bc5dedfd16 + ref: refs/tags/6.0.47 specs: - metasploit-framework (6.0.46) + metasploit-framework (6.0.47) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -125,22 +125,22 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.464.0) - aws-sdk-core (3.114.0) + aws-partitions (1.465.0) + aws-sdk-core (3.114.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.239.0) + aws-sdk-ec2 (1.240.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.54.0) + aws-sdk-iam (1.55.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.43.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.95.1) + aws-sdk-s3 (1.96.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -149,7 +149,7 @@ GEM bcrypt (3.1.16) bcrypt_pbkdf (1.1.0) bindata (2.4.10) - bson (4.12.0) + bson (4.12.1) builder (3.2.4) concurrent-ruby (1.0.5) cookiejar (0.3.3) @@ -239,7 +239,7 @@ GEM webrick metasploit_payloads-mettle (1.0.9) method_source (1.0.0) - mini_portile2 (2.5.1) + mini_portile2 (2.5.3) minitest (5.14.4) mqtt (0.5.0) msgpack (1.4.2) @@ -252,7 +252,7 @@ GEM network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.7) - nokogiri (1.11.6) + nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) octokit (4.21.0) @@ -352,7 +352,7 @@ GEM ruby-macho (2.5.1) ruby-rc4 (0.1.5) ruby2_keywords (0.0.4) - ruby_smb (2.0.9) + ruby_smb (2.0.10) bindata openssl-ccm openssl-cmac diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 06a012eae289..fe435a5be452 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.46"; + version = "6.0.47"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-NZksDvlcSts1u66yhJ4BpZu5lvzp5eQxV4MscU7wQ/8="; + sha256 = "sha256-lK8FtHc4VLvp6bEYAw7cqHgbjQP2RS5+XxtjaVMiVWg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 8c1ab823265a..0f6b54632e46 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,40 +114,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mh8kpwwlc0s5k8yjjn6bvrrv0sqxnwpqsjsfljkjszbv1vcwksc"; + sha256 = "0fs3fy6k4wmzh0z6c4rl313f5px81pj0viqxj1prksza4j7iymmi"; type = "gem"; }; - version = "1.464.0"; + version = "1.465.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09asbdcg96l165kq4hrks0hsk4hwr16h1qx22az4m7ld0ylvz3jc"; + sha256 = "09ksnsj7jqb339fy4nh6v8zn9gy77vbyjpsiv33r35q82ivi32z2"; type = "gem"; }; - version = "3.114.0"; + version = "3.114.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0995qsi717fdvv2wkpbm0iaz666q370q1a37vn3bn6g66v20m6cy"; + sha256 = "0wqrvs49nzr2n9ilbjz61ac61d4d8wwpmzfaawhhq7l4hmwm4pdr"; type = "gem"; }; - version = "1.239.0"; + version = "1.240.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mfs2vsiml42xskgslp4iissna5fmjacpvi6sbmlr1b5jh390f3m"; + sha256 = "03vs5wf96qpjl309vnrnr4d8hy4l8bvnflgc806bm9n130cyvs9m"; type = "gem"; }; - version = "1.54.0"; + version = "1.55.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mm96blh0515lymkwamcnv5jih36v0yykcqx4fr0wwvwmyh637zv"; + sha256 = "1g46v19n6pxa60x7fih2y9zc18q23kdjkb1p2qr33zmi6cz76cc4"; type = "gem"; }; - version = "1.95.1"; + version = "1.96.0"; }; aws-sigv4 = { groups = ["default"]; @@ -214,10 +214,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gny4n34gwfc6x04x7vli5my6cdl90n4i0wsxm758q81hfmkqxd7"; + sha256 = "0pnr0b7phdzhkw9xqhmqnw5673ndi13ks3dqwqmbxq6v0rsxiapc"; type = "gem"; }; - version = "4.12.0"; + version = "4.12.1"; }; builder = { groups = ["default"]; @@ -574,12 +574,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "7be6da5afc39bb736c0fb5c6c6ba245e98c0efe0"; - sha256 = "1zs3y1772b43awqy9rg9zjbbk6x506g89cmfpcsxnjjwz472r69m"; + rev = "6416bc1a2867938dd39705a3daef25bc5dedfd16"; + sha256 = "0s2m499njqqvbxz2wign0f6iny58vh70665ix7lvnm1qfys0bbwl"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.46"; + version = "6.0.47"; }; metasploit-model = { groups = ["default"]; @@ -636,10 +636,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2"; + sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.3"; }; minitest = { groups = ["default"]; @@ -756,10 +756,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z"; + sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; type = "gem"; }; - version = "1.11.6"; + version = "1.11.7"; }; octokit = { groups = ["default"]; @@ -1226,10 +1226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nvvy2kq26r313ybj5sjr9mpwc1sy535kmmbi8r80kvqfkmd43nv"; + sha256 = "1h8p6ksfr9xhpj9p38b4mjj76zm4d0dg06hhp00ii9hh7vy6mryd"; type = "gem"; }; - version = "2.0.9"; + version = "2.0.10"; }; rubyntlm = { groups = ["default"]; From 359fcac855fba4a36adf710fe10ddfb608f6cbd2 Mon Sep 17 00:00:00 2001 From: Victor Roest Date: Sat, 5 Jun 2021 09:51:32 +0000 Subject: [PATCH 48/61] unpackerr: 0.9.4 -> 0.9.6 --- pkgs/servers/unpackerr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix index 2e024010d416..d9cde6b7ab5f 100644 --- a/pkgs/servers/unpackerr/default.nix +++ b/pkgs/servers/unpackerr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unpackerr"; - version = "0.9.4"; + version = "0.9.6"; src = fetchFromGitHub { owner = "davidnewhall"; repo = "unpackerr"; rev = "v${version}"; - sha256 = "0ss12i8bclz1q9jgr54shvs8zgcs6jrwdm1vj9gvycyd5sx4717s"; + sha256 = "1jyqrfik6fy7d4lr1y0ryp4iz8yn898ksyxwaryvrhykznqivp0y"; }; - vendorSha256 = "1j79vmf0mkwkqrg5j6fm2b8y3a23y039kbiqkiwb56724bmd27dd"; + vendorSha256 = "0ilpg7xfll0c5lsv8zf4h3i72yabddkddih4d292hczyz9wi3j4z"; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; From 287e0f248a7db3294df1c00c3022f696650fc137 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 5 Jun 2021 13:59:50 +0200 Subject: [PATCH 49/61] trilium: 0.47.3 -> 0.47.4 --- ...se-console-logger-instead-of-rolling-files.patch | 13 ++++++++----- pkgs/applications/office/trilium/default.nix | 6 +++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch index 21b6b1c579cd..5bda63b58451 100644 --- a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch +++ b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch @@ -1,5 +1,5 @@ diff --git a/src/services/log.js b/src/services/log.js -index b4c39e99..4c249154 100644 +index 1345ce39..a9770516 100644 --- a/src/services/log.js +++ b/src/services/log.js @@ -1,14 +1,5 @@ @@ -17,7 +17,7 @@ index b4c39e99..4c249154 100644 const SECOND = 1000; const MINUTE = 60 * SECOND; const HOUR = 60 * MINUTE; -@@ -16,41 +7,7 @@ const DAY = 24 * HOUR; +@@ -16,45 +7,7 @@ const DAY = 24 * HOUR; const NEW_LINE = process.platform === "win32" ? '\r\n' : '\n'; @@ -46,16 +46,19 @@ index b4c39e99..4c249154 100644 -function checkDate(millisSinceMidnight) { - if (millisSinceMidnight >= DAY) { - initLogFile(); +- +- millisSinceMidnight =- DAY; - } +- +- return millisSinceMidnight; -} - function log(str) { -- const millisSinceMidnight = Date.now() - todaysMidnight.getTime(); +- let millisSinceMidnight = Date.now() - todaysMidnight.getTime(); - -- checkDate(millisSinceMidnight); +- millisSinceMidnight = checkDate(millisSinceMidnight); - - logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE); - console.log(str); } - diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 51a12ea40dbf..d6b7e08b4be9 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.47.3"; + version = "0.47.4"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "05l8yiqbqh2yr4cfbivpmj5q3jyzqz86wni36wcjlcg3rccms0hc"; + sha256 = "0hvp6rpvgda12ficzqkj7kllgmpzc8n4rvpgv0zi6fa5alkr944x"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "03nsvalaa0rch9i1kh6p5ynnsdmidm5zrw42klj70bamviklzsnh"; + sha256 = "01bbg7ssszrq27zk7xzil2mawk1659h1hw68yvk8lbgc4n9phkqk"; }; in { From 7600c5621707f87af4973e93f465f22695b280a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Jun 2021 14:19:15 +0200 Subject: [PATCH 50/61] subfinder: 2.3.0 -> 2.4.8 --- pkgs/tools/networking/subfinder/default.nix | 21 ++- pkgs/tools/networking/subfinder/deps.nix | 165 -------------------- 2 files changed, 14 insertions(+), 172 deletions(-) delete mode 100644 pkgs/tools/networking/subfinder/deps.nix diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 2844cc2dac08..ae87d02fe236 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -1,19 +1,26 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "subfinder"; - version = "2.3.0"; - - goPackagePath = "github.com/projectdiscovery/subfinder"; + version = "2.4.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "1vjxi2h4njakyqkfzwwaacy37kqx66j2y3k5l752z9va73gv7xv1"; + sha256 = "1g1j3il1a595g7z8blhvyd5l03h6kccl7mzrx51c33jz74cms5kn"; }; - goDeps = ./deps.nix; + vendorSha256 = "1jmik0zmfy1n3g4yjkskiqzd28dpywf0hw6adgz2jshlhka58iw0"; + + modRoot = "./v2"; + + subPackages = [ + "cmd/subfinder/" + ]; meta = with lib; { description = "Subdomain discovery tool"; diff --git a/pkgs/tools/networking/subfinder/deps.nix b/pkgs/tools/networking/subfinder/deps.nix deleted file mode 100644 index 16427eddcf6d..000000000000 --- a/pkgs/tools/networking/subfinder/deps.nix +++ /dev/null @@ -1,165 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "03217c3e97663914aec3faafde50d081f197a0a2"; - sha256 = "1kbp9fj6fxfql0ir59zb6v68l4bpwlmk76xm8vaikw1hp6y9bcss"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - }; - } - { - goPackagePath = "github.com/logrusorgru/aurora"; - fetch = { - type = "git"; - url = "https://github.com/logrusorgru/aurora"; - rev = "21d75270181e0436fee7bd58b991c212cf309068"; - sha256 = "0vc9qdl6jzq7vazfqgz628gcgsvir56bdi2bkhl54pi92cz9cw0p"; - }; - } - { - goPackagePath = "github.com/m-mizutani/urlscan-go"; - fetch = { - type = "git"; - url = "https://github.com/m-mizutani/urlscan-go"; - rev = "21d37c8d3d34d514f2ef49db9b59cc94f335e9c3"; - sha256 = "1hpymd4ncp78hgpksnw8k27rp0lh832x1pyk3bhj5dm6xmh79g4c"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "1e224ff5dead8366ed6fcdcb832794be42e73f0e"; - sha256 = "1iv9jznakz8f5swiir0z4zilr9ypavnsc0g4zi1r0vad6npy7zfl"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; - sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/rs/xid"; - fetch = { - type = "git"; - url = "https://github.com/rs/xid"; - rev = "15d26544def341f036c5f8dca987a4cbe575032c"; - sha256 = "1vgw1dikqw273awcci6pzifs7shkl5ah4l88j1zjbnpgbiwzlx9j"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "839c75faf7f98a33d445d181f3018b5c3409a45e"; - sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "221dbe5ed46703ee255b1da0dec05086f5035f62"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "86a70503ff7e82ffc18c7b0de83db35da4791e6a"; - sha256 = "0w7ih86lmll9gs2j0z3nmmy148i2yism9z53yp58zwa6d5pjahfn"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "5ee1b9f4859acd2e99987ef94ec7a58427c53bef"; - sha256 = "0jvzqv6phv64rw4pj86x3j9kp5yx9p34fd38r46rb9464h69ba29"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "ce4227a45e2eb77e5c847278dcc6a626742e2945"; - sha256 = "1s43wvqfml6ml5ks7iv2bis9d664g77mq86v7mfmjhn56x856g35"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "1f64d6156d11335c3f22d9330b0ad14fc1e789ce"; - sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v3"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "4206685974f28e3178b35fa198a59899aa4dee3a"; - sha256 = "1ff5fd8x45cay9100ds63hxd32s7czsrric0ql6a1jrxczsgqk1g"; - }; - } -] From 37eb8094b640fa9e6e7f7e93cbf65c11762ebf3c Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 3 Jun 2021 14:37:44 +0800 Subject: [PATCH 51/61] libimobiledevice: 1.3.0 -> unstable-2021-06-02 --- .../libraries/libimobiledevice/default.nix | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index b805be1257bd..94fce176127c 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -1,25 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config, gnutls -, libgcrypt, libtasn1, glib, libplist, libusbmuxd }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libtool +, pkg-config +, gnutls +, libgcrypt +, libtasn1 +, glib +, libplist +, libusbmuxd +}: stdenv.mkDerivation rec { pname = "libimobiledevice"; - version = "1.3.0"; + version = "unstable-2021-06-02"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "1jkq3hpg4n5a6s1k618ib0s80pwf00nlfcby7xckysq8mnd2pp39"; + rev = "ca324155f8b33babf907704828c7903608db0aa2"; + sha256 = "sha256-Q7THwld1+elMJQ14kRnlIJDohFt7MW7JeyIUGC0k52I="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ - autoconf - automake + autoreconfHook libtool pkg-config ]; + propagatedBuildInputs = [ glib gnutls @@ -29,12 +40,7 @@ stdenv.mkDerivation rec { libusbmuxd ]; - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; - - configureFlags = [ - "--disable-openssl" - "--without-cython" - ]; + configureFlags = [ "--disable-openssl" "--without-cython" ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/libimobiledevice"; From 35e85f28727b9ea61b4f0a8b50a59b626532af41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Jun 2021 15:12:02 +0200 Subject: [PATCH 52/61] python3Packages.haversine: 2.3.0 -> 2.3.1 --- pkgs/development/python-modules/haversine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix index 7f5e462d1b3c..9d12be3aa198 100644 --- a/pkgs/development/python-modules/haversine/default.nix +++ b/pkgs/development/python-modules/haversine/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "haversine"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "mapado"; repo = pname; rev = "v${version}"; - sha256 = "1c3yf9162b2b7l1lsw3ffd1linnc542qvljpgwxp6y5arrmljqnv"; + sha256 = "sha256-1PXPsZd/4pN42TU0lhXWsmyX7uGP1n/xna2cVZPczB4="; }; checkInputs = [ From f41f456422352d941be25a4154f5bf75377e145a Mon Sep 17 00:00:00 2001 From: Malte Voos Date: Sat, 5 Jun 2021 15:28:29 +0200 Subject: [PATCH 53/61] nixos/roundcube: Use php74 --- nixos/modules/services/mail/roundcube.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index ee7aa7e22fb9..f9b63000473c 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -7,7 +7,7 @@ let fpm = config.services.phpfpm.pools.roundcube; localDB = cfg.database.host == "localhost"; user = cfg.database.username; - phpWithPspell = pkgs.php.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled); + phpWithPspell = pkgs.php74.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled); in { options.services.roundcube = { From 13e7b38ac14dd86ebadf37a1c2c4dde94a5a3ce6 Mon Sep 17 00:00:00 2001 From: lunik1 <13547699+lunik1@users.noreply.github.com> Date: Sat, 5 Jun 2021 15:44:12 +0100 Subject: [PATCH 54/61] mpvScripts.youtube-quality: init at unstable-2020-02-11 (#125284) Co-authored-by: Sandro --- .../video/mpv/scripts/youtube-quality.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/video/mpv/scripts/youtube-quality.nix diff --git a/pkgs/applications/video/mpv/scripts/youtube-quality.nix b/pkgs/applications/video/mpv/scripts/youtube-quality.nix new file mode 100644 index 000000000000..3c55a36d0a79 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/youtube-quality.nix @@ -0,0 +1,39 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, oscSupport ? false +}: + +stdenvNoCC.mkDerivation rec { + pname = "mpv-playlistmanager"; + version = "unstable-2020-02-11"; + + src = fetchFromGitHub { + owner = "jgreco"; + repo = "mpv-youtube-quality"; + rev = "1f8c31457459ffc28cd1c3f3c2235a53efad7148"; + sha256 = "voNP8tCwCv8QnAZOPC9gqHRV/7jgCAE63VKBd/1s5ic="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/mpv/scripts + cp youtube-quality.lua $out/share/mpv/scripts + '' + lib.optionalString oscSupport '' + cp youtube-quality-osc.lua $out/share/mpv/scripts + '' + '' + runHook postInstall + ''; + + passthru.scriptName = "youtube-quality.lua"; + + meta = with lib; { + description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly"; + homepage = "https://github.com/jgreco/mpv-youtube-quality"; + license = licenses.unfree; + platforms = platforms.all; + maintainers = with maintainers; [ lunik1 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c64f2a9fb941..a355e777074f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25322,6 +25322,7 @@ in simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { }; + youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { }; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; From 43908f4c1d8489ca284c47fb835ec3fa348016b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 5 Jun 2021 16:45:10 +0200 Subject: [PATCH 55/61] buildFhsUserenv: don't leak mounts to other processes If run as root we were leaking mounts to the parent namespace, which lead to an error when removing the temporary mountroot. To fix this we remount the whole tree as private as soon as we created the new mountenamespace. --- pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c index a438b80e1829..27e70e3fe5c4 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c @@ -43,7 +43,6 @@ const gchar *create_tmpdir() { void pivot_host(const gchar *guest) { g_autofree gchar *point = g_build_filename(guest, "host", NULL); fail_if(g_mkdir(point, 0755)); - fail_if(mount(0, "/", 0, MS_PRIVATE | MS_REC, 0)); fail_if(pivot_root(guest, point)); } @@ -122,6 +121,9 @@ int main(gint argc, gchar **argv) { fail("unshare", unshare_errno); } + // hide all mounts we do from the parent + fail_if(mount(0, "/", 0, MS_PRIVATE | MS_REC, 0)); + if (uid != 0) { spit("/proc/self/setgroups", "deny"); spit("/proc/self/uid_map", "%d %d 1", uid, uid); From e4a0b101904e3d24b60e7f79069a9fe967b54363 Mon Sep 17 00:00:00 2001 From: kat Date: Sat, 5 Jun 2021 16:17:37 +0100 Subject: [PATCH 56/61] wezterm: Add terminfo output (#125320) * wezterm: Add terminfo output * Update pkgs/applications/terminal-emulators/wezterm/default.nix Co-authored-by: Sandro --- .../terminal-emulators/wezterm/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index b6d7dd763ed0..d214d6fabc3d 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -2,6 +2,7 @@ , rustPlatform , lib , fetchFromGitHub +, ncurses , pkg-config , fontconfig , python3 @@ -68,6 +69,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + outputs = [ "out" "terminfo" ]; + postPatch = '' echo ${version} > .tag ''; @@ -78,10 +81,17 @@ rustPlatform.buildRustPackage rec { pkg-config python3 perl + ncurses ]; buildInputs = runtimeDeps; + postInstall = '' + mkdir -p $terminfo/share/terminfo/w $out/nix-support + tic -x -o $terminfo/share/terminfo termwiz/data/wezterm.terminfo + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + preFixup = lib.optionalString stdenv.isLinux '' for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $out/bin/$artifact From 25e46dda3d99050daab3208b00932744dab9a173 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 5 Jun 2021 13:04:26 +0200 Subject: [PATCH 57/61] openrgb: Fix udev rules with hardcoded /bin/chmod New rules introduced in openrgb 0.6. openrgb: Implement nixpkgs-review suggestions * warning: missing-phase-hooks * warning: unclear-gpl * warning: unnecessary-parallel-building --- pkgs/applications/misc/openrgb/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index 728a2048bc3d..eeff215679ad 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config }: +{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils }: mkDerivation rec { pname = "openrgb"; @@ -15,11 +15,18 @@ mkDerivation rec { buildInputs = [ libusb1 hidapi ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp openrgb $out/bin + substituteInPlace 60-openrgb.rules \ + --replace /bin/chmod "${coreutils}/bin/chmod" + mkdir -p $out/etc/udev/rules.d cp 60-openrgb.rules $out/etc/udev/rules.d + + runHook postInstall ''; doInstallCheck = true; @@ -27,13 +34,11 @@ mkDerivation rec { HOME=$TMPDIR $out/bin/openrgb --help > /dev/null ''; - enableParallelBuilding = true; - meta = with lib; { description = "Open source RGB lighting control"; homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB"; maintainers = with maintainers; [ jonringer ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } From 576c2f555e5dee3694c484967f92315902882bf4 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 5 Jun 2021 09:31:38 +0200 Subject: [PATCH 58/61] pull_request_template: fix link to CONTRIBUTING.md --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 027ac76df466..1c4d7aa0668e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -23,7 +23,7 @@ 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](./CONTRIBUTING.md#generating-2111-release-notes) +- [21.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/.github/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 From 5d223f2695183df3618a4b3b9b9dea59bdfda253 Mon Sep 17 00:00:00 2001 From: Yevhen Shymotiuk Date: Sat, 5 Jun 2021 18:50:09 +0300 Subject: [PATCH 59/61] python3Packages.userpath: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/userpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/userpath/default.nix b/pkgs/development/python-modules/userpath/default.nix index 237293370aac..d619cba0649d 100644 --- a/pkgs/development/python-modules/userpath/default.nix +++ b/pkgs/development/python-modules/userpath/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "userpath"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256="0fj2lj9vcns5sxv72v3ggrszcl7j1jd9a6ycnsl00218nycliy31"; + sha256="1xpgdmdvhmmmdlivsqlzx1xvyj0gcnfp0j2ba5izmv3q2k5abfdj"; }; propagatedBuildInputs = [ click ]; From fb801bb48122567f7367c99fe28ac407069960f7 Mon Sep 17 00:00:00 2001 From: malte-v <34393802+malte-v@users.noreply.github.com> Date: Sat, 5 Jun 2021 18:09:29 +0200 Subject: [PATCH 60/61] senpai: init at 2021-05-27 (#125794) Co-authored-by: Sandro --- .../networking/irc/senpai/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/networking/irc/senpai/default.nix diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix new file mode 100644 index 000000000000..81a984c84cd9 --- /dev/null +++ b/pkgs/applications/networking/irc/senpai/default.nix @@ -0,0 +1,37 @@ +{ lib, buildGoModule, fetchFromSourcehut, installShellFiles, scdoc }: + +buildGoModule rec { + pname = "senpai"; + version = "unstable-2021-05-27"; + + src = fetchFromSourcehut { + owner = "~taiite"; + repo = "senpai"; + rev = "6be718329175c6d11e359f1a366ab6ab22b101d2"; + sha256 = "sha256-hW6DHJlDBYEqK8zj5PvGKU54sbeXjx1tdqwKXPXlKHc="; + }; + + vendorSha256 = "sha256-OLi5y1hrYK6+l5WB1SX85QU4y3KjFyGaEzgbE6lnW2k="; + + subPackages = [ + "cmd/senpai" + ]; + + nativeBuildInputs = [ + scdoc + installShellFiles + ]; + + postInstall = '' + scdoc < doc/senpai.1.scd > doc/senpai.1 + scdoc < doc/senpai.5.scd > doc/senpai.5 + installManPage doc/senpai.* + ''; + + meta = with lib; { + description = "Your everyday IRC student"; + homepage = "https://ellidri.org/senpai"; + license = licenses.isc; + maintainers = with maintainers; [ malvo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88a4d48bc07f..240cf4e45473 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8502,6 +8502,8 @@ in sdl-jstest = callPackage ../tools/misc/sdl-jstest { }; + senpai = callPackage ../applications/networking/irc/senpai { }; + skim = callPackage ../tools/misc/skim { }; seaweedfs = callPackage ../applications/networking/seaweedfs { }; From 163f88aff8911ee81f2038bc409c2e41d9e35823 Mon Sep 17 00:00:00 2001 From: seb314 Date: Sat, 5 Jun 2021 19:40:16 +0200 Subject: [PATCH 61/61] matrix-commander: gpl3Only => gpl3Plus & unstable-2021-04-18 -> unstable-2021-05-26 (#125700) --- .../instant-messengers/matrix-commander/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 71f98bc08a6e..2ebf762c418b 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "matrix-commander"; - version = "unstable-2021-04-18"; + version = "unstable-2021-05-26"; src = fetchFromGitHub { owner = "8go"; repo = "matrix-commander"; - rev = "3e89a5f4c98dd191880ae371cc63eb9282d7d91f"; - sha256 = "08nwwszp1kv5b7bgf6mmfn42slxkyhy98x18xbn4pglc4bj32iql"; + rev = "06b4738bc74ee86fb3ac88c04b8230abf82e7421"; + sha256 = "1skpq3xfnz11m298qnsw68xv391p5qg47flagzsk86pnzi841vc1"; }; buildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Simple but convenient CLI-based Matrix client app for sending and receiving"; homepage = "https://github.com/8go/matrix-commander"; - license = licenses.gpl3Only; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.seb314 ]; };