From 88b72c33d73a5fdc176cec6b50b3034fc3e7a4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Thu, 14 Jan 2021 10:08:13 +0100 Subject: [PATCH 01/69] maintainers: add eduardosm --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b48648dfd4e5..c9ef0460332f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2565,6 +2565,12 @@ githubId = 119483; name = "Matthew Brown"; }; + eduardosm = { + email = "esm@eduardosm.net"; + github = "eduardosm"; + githubId = 761151; + name = "Eduardo Sánchez Muñoz"; + }; eduarrrd = { email = "e.bachmakov@gmail.com"; github = "eduarrrd"; From fb7b08de3220cd383165fcf5a7ccf9b93b54e9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Thu, 31 Dec 2020 12:57:27 +0100 Subject: [PATCH 02/69] sip_5: init at 5.5.0 --- pkgs/development/python-modules/sip/5.x.nix | 26 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/sip/5.x.nix diff --git a/pkgs/development/python-modules/sip/5.x.nix b/pkgs/development/python-modules/sip/5.x.nix new file mode 100644 index 000000000000..cebffd5765bd --- /dev/null +++ b/pkgs/development/python-modules/sip/5.x.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, buildPythonPackage, packaging, toml }: + +buildPythonPackage rec { + pname = "sip"; + version = "5.5.0"; + + src = fetchPypi { + pname = "sip"; + inherit version; + sha256 = "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx"; + }; + + propagatedBuildInputs = [ packaging toml ]; + + # There aren't tests + doCheck = false; + + pythonImportsCheck = [ "sipbuild" ]; + + meta = with lib; { + description = "Creates C++ bindings for Python modules"; + homepage = "http://www.riverbankcomputing.co.uk/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ eduardosm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ae237047c96..a719d761a6ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6939,6 +6939,8 @@ in { sip = callPackage ../development/python-modules/sip { }; + sip_5 = callPackage ../development/python-modules/sip/5.x.nix { }; + sipsimple = callPackage ../development/python-modules/sipsimple { }; six = callPackage ../development/python-modules/six { }; From 6347fdf07101e636c4d79bb26f23b064b9d778d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Thu, 7 Jan 2021 16:56:39 +0100 Subject: [PATCH 03/69] pyqt5: use sip_5 for Python 3 --- pkgs/development/python-modules/pyqt/5.x.nix | 73 +++++++++++--------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 0c32985cfaae..8dab57949e29 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -15,18 +15,35 @@ let inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34; - sip = (pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: { - # If we install sip in another folder, then we need to create a __init__.py as well - # if we want to be able to import it with Python 2. - # Python 3 could rely on it being an implicit namespace package, however, - # PyQt5 we made an explicit namespace package so sip should be as well. - postInstall = '' - cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py - from pkgutil import extend_path - __path__ = extend_path(__path__, __name__) - EOF - ''; - }); + sip = if isPy3k then + pythonPackages.sip_5 + else + (pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: { + # If we install sip in another folder, then we need to create a __init__.py as well + # if we want to be able to import it with Python 2. + # Python 3 could rely on it being an implicit namespace package, however, + # PyQt5 we made an explicit namespace package so sip should be as well. + postInstall = '' + cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) + EOF + ''; + }); + + pyqt5_sip = buildPythonPackage rec { + pname = "PyQt5_sip"; + version = "12.8.1"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd"; + }; + + # There is no test code and the check phase fails with: + # > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory + doCheck = false; + }; in buildPythonPackage rec { pname = "PyQt5"; @@ -69,8 +86,7 @@ in buildPythonPackage rec { propagatedBuildInputs = [ dbus-python - sip - ] ++ lib.optional (!isPy3k) enum34; + ] ++ (if isPy3k then [ pyqt5_sip ] else [ sip enum34 ]); patches = [ # Fix some wrong assumptions by ./configure.py @@ -103,7 +119,7 @@ in buildPythonPackage rec { runHook postConfigure ''; - postInstall = '' + postInstall = lib.optionalString (!isPy3k) '' ln -s ${sip}/${python.sitePackages}/PyQt5/sip.* $out/${python.sitePackages}/PyQt5/ for i in $out/bin/*; do wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" @@ -116,26 +132,21 @@ in buildPythonPackage rec { EOF ''; - installCheckPhase = let - modules = [ - "PyQt5" - "PyQt5.QtCore" - "PyQt5.QtQml" - "PyQt5.QtWidgets" - "PyQt5.QtGui" - ] + # Checked using pythonImportsCheck + doCheck = false; + + pythonImportsCheck = [ + "PyQt5" + "PyQt5.QtCore" + "PyQt5.QtQml" + "PyQt5.QtWidgets" + "PyQt5.QtGui" + ] ++ lib.optional withWebSockets "PyQt5.QtWebSockets" ++ lib.optional withWebKit "PyQt5.QtWebKit" ++ lib.optional withMultimedia "PyQt5.QtMultimedia" ++ lib.optional withConnectivity "PyQt5.QtConnectivity" - ; - imports = lib.concatMapStrings (module: "import ${module};") modules; - in '' - echo "Checking whether modules can be imported..." - ${python.interpreter} -c "${imports}" - ''; - - doCheck = true; + ; enableParallelBuilding = true; From ae0ea7ed20b1cf7a9449e01a64ddbf1e6e56f062 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Jan 2021 19:04:43 +0100 Subject: [PATCH 04/69] python3Packages.binho-host-adapter: init at 0.1.6 --- .../binho-host-adapter/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/binho-host-adapter/default.nix diff --git a/pkgs/development/python-modules/binho-host-adapter/default.nix b/pkgs/development/python-modules/binho-host-adapter/default.nix new file mode 100644 index 000000000000..2249a28a5547 --- /dev/null +++ b/pkgs/development/python-modules/binho-host-adapter/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyserial +}: + +buildPythonPackage rec { + pname = "binho-host-adapter"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mp8xa1qwaww2k5g2nqg7mcivzsbfw2ny1l9yjsi73109slafv8y"; + }; + + propagatedBuildInputs = [ pyserial ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "binhoHostAdapter" ]; + + meta = with lib; { + description = "Python library for Binho Multi-Protocol USB Host Adapters"; + homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8105cfbe0da4..e69d1080ac33 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -913,6 +913,8 @@ in { binaryornot = callPackage ../development/python-modules/binaryornot { }; + binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { }; + binwalk = callPackage ../development/python-modules/binwalk { pyqtgraph = null; matplotlib = null; From 67c61e708afe754e6e66341868249be3097cbb55 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Thu, 21 Jan 2021 10:51:56 -0800 Subject: [PATCH 05/69] maintainers: add hoverbear Signed-off-by: Ana Hobden --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 99280c800c29..de66528e1ba5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3699,6 +3699,12 @@ githubId = 362833; name = "Hongchang Wu"; }; + hoverbear = { + email = "operator+nix@hoverbear.org"; + github = "hoverbear"; + githubId = 130903; + name = "Ana Hobden"; + }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; From d2cf178924186a01312296b3366bef6dfa3b8a38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 22 Jan 2021 20:17:27 +0000 Subject: [PATCH 06/69] qbec: 0.12.2 -> 0.13.4 --- pkgs/applications/networking/cluster/qbec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 18a753ca3cae..a4f15586ad0e 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.12.2"; + version = "0.13.4"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "10bf9ja44n1gzhb5znqbmr1xjc87akrsdyxfvrz4f5bd3p1fh6j0"; + sha256 = "sha256-jbGEkBBXb1dDv4E7vEPVyvDahz27Kpyo3taenCH/vfw="; }; - vendorSha256 = "0xkmccm6cyw1p5mah7psbpfsfaw8f09r1a2k4iksfggrn9mimaam"; + vendorSha256 = "sha256-rzxtLaGUl8hxcJ+GWlrkjN+f7mb0lXrtkHj/pBO8HzQ="; doCheck = false; From 3a77187c8a72fe0c9fcf566b853996d01220f1a9 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 19 Jan 2021 13:49:24 +0100 Subject: [PATCH 07/69] gnomeExtensions.unite-shell: rename to gnomeExtensions.unite --- .../gnome-3/extensions/{unite-shell => unite}/default.nix | 2 +- pkgs/top-level/aliases.nix | 3 +++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) rename pkgs/desktops/gnome-3/extensions/{unite-shell => unite}/default.nix (95%) diff --git a/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix b/pkgs/desktops/gnome-3/extensions/unite/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/extensions/unite-shell/default.nix rename to pkgs/desktops/gnome-3/extensions/unite/default.nix index 778743071d6f..9d58a923740e 100644 --- a/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/unite/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }: stdenv.mkDerivation rec { - pname = "gnome-shell-extension-unite-shell"; + pname = "gnome-shell-extension-unite"; version = "44"; src = fetchFromGitHub { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d5374158a106..532f42ef5ef4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -730,6 +730,9 @@ mapAliases ({ youtubeDL = youtube-dl; # added 2014-10-26 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; zdfmediathk = mediathekview; # added 2019-01-19 + gnomeExtensions = gnomeExtensions // { + unite-shell = gnomeExtensions.unite; # added 2021-01-19 + }; gnome_user_docs = gnome-user-docs; # added 2019-11-20 # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # added 2020-10-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 182c6f904545..73793ee675ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27283,7 +27283,7 @@ in tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { }; timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; - unite-shell = callPackage ../desktops/gnome-3/extensions/unite-shell { }; + unite = callPackage ../desktops/gnome-3/extensions/unite { }; window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { }; workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { }; From 6a6867342ffa51389f822d0351e75e08f5cfc0e3 Mon Sep 17 00:00:00 2001 From: nyanotech Date: Sat, 23 Jan 2021 13:57:42 +0000 Subject: [PATCH 08/69] maintainers: Add nyanotech --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 11162af66d8c..08d083f9e6ad 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6705,6 +6705,12 @@ githubId = 7677321; name = "Paul Trehiou"; }; + nyanotech = { + name = "nyanotech"; + email = "nyanotechnology@gmail.com"; + github = "nyanotech"; + githubId = 33802077; + }; nyarly = { email = "nyarly@gmail.com"; github = "nyarly"; From d935afe655831c56321d48a22b037ecaabaf5d06 Mon Sep 17 00:00:00 2001 From: nyanotech Date: Sat, 23 Jan 2021 13:58:20 +0000 Subject: [PATCH 09/69] proxmark3-rrg: Initial commit The rfidresearchgroup fork is a significant fork from the upstream, and the build steps are more than a bit different, which is why I did this in a new file. Also, add myself to the maintainers list --- .../security/proxmark3/proxmark3-rrg.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/security/proxmark3/proxmark3-rrg.nix diff --git a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix new file mode 100644 index 000000000000..bf1bcd67d11d --- /dev/null +++ b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -0,0 +1,38 @@ +{ stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 +, readline + +, hardwarePlatform ? "PM3RDV4" + +, hardwarePlatformExtras ? "" }: + +mkDerivation rec { + pname = "proxmark3-rrg"; + version = "4.9237"; + + src = fetchFromGitHub { + owner = "RfidResearchGroup"; + repo = "proxmark3"; + rev = "v${version}"; + sha256 = "13xrhvrsm73rfgqpgca6a37c3jixdkxvfggmacnnx5fdfb393bfx"; + }; + + nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; + buildInputs = [ bluez5 readline ]; + + makeFlags = [ + "PLATFORM=${hardwarePlatform}" + "PLATFORM_EXTRAS=${hardwarePlatformExtras}" + ]; + + installPhase = '' + install -Dt $out/bin client/proxmark3 + install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf + ''; + + meta = with stdenv.lib; { + description = "Client for proxmark3, powerful general purpose RFID tool"; + homepage = "https://rfidresearchgroup.com/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ nyanotech ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd86fed4cb29..a1d12f6f810b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7120,6 +7120,8 @@ in inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; }) proxmark3 proxmark3-unstable; + proxmark3-rrg = libsForQt5.callPackage ../tools/security/proxmark3/proxmark3-rrg.nix { }; + proxychains = callPackage ../tools/networking/proxychains { }; proxify = callPackage ../tools/networking/proxify { }; From 4702290465abc438e8f8e4ee6a5fa5be8d530741 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Jan 2021 02:19:52 +0100 Subject: [PATCH 10/69] home-assistant: 2021.1.4 -> 2021.1.5 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7f1df3049b4a..22aafbb86a66 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.1.4"; + version = "2021.1.5"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a54eca3952fb..3a6b5d353209 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -57,7 +57,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.1.4"; + hassVersion = "2021.1.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "03aa7kd216rnp8h80nv002ahafiy0031lxk1bkwcirrznphcw7sj"; + sha256 = "sha256-xi5rHZlhwgEHll3TFlRu7D963tdcQNMmWcoXVjEFLXo="; }; # leave this in, so users don't have to constantly update their downstream patch handling From fb1c27f9e9fe4e999b608c05438e40d3fe9dc2d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Jan 2021 02:37:01 +0100 Subject: [PATCH 11/69] python3Packages.pybotvac: 0.0.18 -> 0.0.20 --- .../python-modules/pybotvac/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 06ebf85ffe8c..ca093ba8e8bb 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -1,18 +1,33 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, requests_oauthlib +, voluptuous +}: buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.18"; + version = "0.0.20"; src = fetchPypi { inherit pname version; - sha256 = "e983c9ffc0734c2e5a7c2adf5d0d0dfe399d94157c590ef70fad765f882c341f"; + sha256 = "sha256-1NnTSO4vO3Ryt4vYD5ZTQGr241GqA2KsGRBVowSTCzM="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + requests_oauthlib + voluptuous + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "pybotvac" ]; meta = with lib; { - description = "Python package for controlling Neato pybotvac Connected vacuum robot"; + description = "Python module for interacting with Neato Botvac Connected vacuum robots"; homepage = "https://github.com/stianaske/pybotvac"; license = licenses.mit; maintainers = with maintainers; [ elseym ]; From c984bc100d6d64c638c075057f66eb6cbe96cf40 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Jan 2021 02:50:04 +0100 Subject: [PATCH 12/69] python3Packages.pyatmo: 4.2.1 -> 4.2.2 --- pkgs/development/python-modules/pyatmo/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 22acf8725260..6bea15df386f 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -12,20 +12,20 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "4.2.1"; + version = "4.2.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jabesq"; - repo = "netatmo-api-python"; + repo = "pyatmo"; rev = "v${version}"; - sha256 = "12lmjhqjn71a358nkpzl3dwgiwmmz4lcv9f0qf69ngznpiirk28m"; + sha256 = "sha256-3IxDDLa8KMHVkHAeTmdNVRPc5aKzF3VwL2kKnG8Fp7I="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace "oauthlib~=3.1.0" "oauthlib" \ - --replace "requests~=2.23.0" "requests" + --replace "oauthlib~=3.1" "oauthlib" \ + --replace "requests~=2.24" "requests" ''; propagatedBuildInputs = [ From bbc23a42dbd04e7ea1a17554cc7266ec408d82c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Jan 2021 03:34:45 +0100 Subject: [PATCH 13/69] python3Packages.asgi-csrf: 0.7.1 -> 0.8 --- .../python-modules/asgi-csrf/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index eabb3d525cae..4988a04e8e44 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -1,8 +1,17 @@ -{ lib, stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart -, pytestCheckHook, starlette, httpx, pytest-asyncio }: +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, itsdangerous +, python-multipart +, pytestCheckHook +, starlette +, httpx +, pytest-asyncio +}: buildPythonPackage rec { - version = "0.7.1"; + version = "0.8"; pname = "asgi-csrf"; disabled = isPy27; @@ -11,7 +20,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "1hhqrb9r46y6i3d3w6hc9zm6yyikdyd2k5pcbyw0r9fl959yi4hf"; + sha256 = "sha256-0I/p9SjVVZhJQeR7s1R3tooP9XMNLPlcxl0dBSzsVaw="; }; propagatedBuildInputs = [ @@ -26,10 +35,7 @@ buildPythonPackage rec { starlette ]; - # tests fail while importing a private module from httpx - # E ModuleNotFoundError: No module named 'httpx._content_streams' - # https://github.com/simonw/asgi-csrf/issues/18 - doCheck = false; + doCheck = false; # asgi-lifespan missing pythonImportsCheck = [ "asgi_csrf" ]; From f90209acd16abcac0350e2d0ea44da870cae3509 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 24 Jan 2021 04:20:00 +0000 Subject: [PATCH 14/69] gitAndTools.lab: 0.18.0 -> 0.19.0 https://github.com/zaquestion/lab/releases/tag/v0.19.0 --- .../version-management/git-and-tools/lab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index 437529cd73ad..284cbe758398 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lab"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "1vl5ylix4h6z1vrdslv9qphgb6yqpqd4r54jzk5kd6zgrnf9c2zc"; + sha256 = "1l6xsikd1113qd4y0mvjsl64gbi4327m9v4d593f27fxink39j8s"; }; subPackages = [ "." ]; From f66f47dd8c5fbbad28f7e336cb121ff3689cada6 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 24 Jan 2021 13:04:30 +0530 Subject: [PATCH 15/69] getmail6: init at 6.14 --- pkgs/tools/networking/getmail6/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/getmail6/default.nix diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix new file mode 100644 index 000000000000..40be3d2944a4 --- /dev/null +++ b/pkgs/tools/networking/getmail6/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, python3Packages, lib }: + +python3Packages.buildPythonApplication rec { + pname = "getmail6"; + version = "6.14"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1a3bw4wwdapd9n051dgwqldd8gwiipb5shaz08qwp1jndpvylm7d"; + }; + + doCheck = false; + + pythonImportsCheck = [ "getmailcore" ]; + + postPatch = '' + # getmail spends a lot of effort to build an absolute path for + # documentation installation; too bad it is counterproductive now + sed -e '/datadir or prefix,/d' -i setup.py + ''; + + meta = with lib; { + description = "A program for retrieving mail"; + homepage = "https://getmail6.org"; + updateWalker = true; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ abbe ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc49b02cc7ab..3177388f7d1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4335,6 +4335,8 @@ in getmail = callPackage ../tools/networking/getmail { }; + getmail6 = callPackage ../tools/networking/getmail6 { }; + getopt = callPackage ../tools/misc/getopt { }; gexiv2 = callPackage ../development/libraries/gexiv2 { }; From c784a01944c2ca134f8c49f21d1b57188adaab2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Jan 2021 08:36:35 +0100 Subject: [PATCH 16/69] ike-scan: init at 1.9.4 --- pkgs/tools/security/ike-scan/default.nix | 54 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/tools/security/ike-scan/default.nix diff --git a/pkgs/tools/security/ike-scan/default.nix b/pkgs/tools/security/ike-scan/default.nix new file mode 100644 index 000000000000..5d54e36585d0 --- /dev/null +++ b/pkgs/tools/security/ike-scan/default.nix @@ -0,0 +1,54 @@ +{ lib +, autoconf +, automake +, autoreconfHook +, fetchFromGitHub +, fetchpatch +, openssl +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "ike-scan"; + version = "1.9.4"; + + src = fetchFromGitHub { + owner = "royhills"; + repo = pname; + rev = version; + sha256 = "01a39bk9ma2lm59q320m9g11909if5gc3qynd8pzn6slqiq5r8kw"; + }; + + nativeBuildInputs = [ + autoreconfHook + openssl + ]; + + configureFlags = [ "--with-openssl=${openssl.dev}" ]; + + patches = [ + # Using the same patches as for the Fedora RPM + (fetchpatch { + # Memory leaks, https://github.com/royhills/ike-scan/pull/15 + url = "https://github.com/royhills/ike-scan/pull/15/commits/d864811de08dcddd65ac9b8d0f2acf5d7ddb9dea.patch"; + sha256 = "0wbrq89dl8js7cdivd0c45hckmflan33cpgc3qm5s3az6r4mjljm"; + }) + (fetchpatch { + # Unknown vendor IDs, https://github.com/royhills/ike-scan/pull/18, was merged but not released + url = "https://github.com/royhills/ike-scan/pull/18/commits/e065ddbe471880275dc7975e7da235e7a2097c22.patch"; + sha256 = "13ly01c96nnd5yh7rxrhv636csm264m5xf2a1inprrzxkkri5sls"; + }) + ]; + + meta = with lib; { + description = "Tool to discover, fingerprint and test IPsec VPN servers"; + longDescription = '' + ike-scan is a command-line tool that uses the IKE protocol to discover, + fingerprint and test IPsec VPN servers. + ''; + homepage = "https://github.com/royhills/ike-scan"; + license = with licenses; [ gpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25adca6946e4..9bdfc0846e7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4820,6 +4820,8 @@ in iruby = callPackage ../applications/editors/jupyter-kernels/iruby { }; + ike-scan = callPackage ../tools/security/ike-scan { }; + imapproxy = callPackage ../tools/networking/imapproxy { openssl = openssl_1_0_2; }; From d2f86643e329af58ed03957159dcb35815b74d2b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Jan 2021 09:35:46 +0100 Subject: [PATCH 17/69] python3Packages.adafruit-platformdetect: init at 2.27.1 --- .../adafruit-platformdetect/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/adafruit-platformdetect/default.nix diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix new file mode 100644 index 000000000000..f03d3fd64e7b --- /dev/null +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "Adafruit-PlatformDetect"; + version = "2.27.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rnmy74rjjcyni5sr8h1djffpj7wngn2wqckl5vknp2smaihp34l"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + # Project has not published tests yet + doCheck = false; + pythonImportsCheck = [ "adafruit_platformdetect" ]; + + meta = with lib; { + description = "Platform detection for use by Adafruit libraries"; + homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e69d1080ac33..f909ed34b9e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -162,6 +162,8 @@ in { actdiag = callPackage ../development/python-modules/actdiag { }; + adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { }; + adal = callPackage ../development/python-modules/adal { }; adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; From a2f253dec0b924d20dfe18c58f9d2b7482e386fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Jan 2021 09:36:47 +0100 Subject: [PATCH 18/69] python3Packages.adafruit-pureio: init at 1.1.8 --- .../adafruit-pureio/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/adafruit-pureio/default.nix diff --git a/pkgs/development/python-modules/adafruit-pureio/default.nix b/pkgs/development/python-modules/adafruit-pureio/default.nix new file mode 100644 index 000000000000..36bafb0f7a07 --- /dev/null +++ b/pkgs/development/python-modules/adafruit-pureio/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "Adafruit-PureIO"; + version = "1.1.8"; + + src = fetchPypi { + pname = "Adafruit_PureIO"; + inherit version; + sha256 = "1mfa6sfz7qwgajz3lqw0s69ivvwbwvblwkjzbrwdrxjbma4jaw66"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + # Physical SMBus is not present + doCheck = false; + pythonImportsCheck = [ "Adafruit_PureIO" ]; + + meta = with lib; { + description = "Python interface to Linux IO including I2C and SPI"; + homepage = "https://github.com/adafruit/Adafruit_Python_PureIO"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f909ed34b9e1..15f83f3ea05f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -164,6 +164,8 @@ in { adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { }; + adafruit-pureio = callPackage ../development/python-modules/adafruit-pureio { }; + adal = callPackage ../development/python-modules/adal { }; adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; From 02380d7d7c89f3577ebb26b95af8dff0ed93d577 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 06:31:48 +0000 Subject: [PATCH 19/69] maturin: 0.8.3 -> 0.9.0 --- pkgs/development/tools/rust/maturin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index ff52824ef9a4..d40145f163b2 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "08l5r7d75id6qzf8xhkjv4hkdr64cq4dbcmdjywmvf9szjbnr65z"; + sha256 = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs="; }; - cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n"; + cargoSha256 = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI="; nativeBuildInputs = [ pkg-config ]; From e645c169568b892da6633b6930697492d295e812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 23 Jan 2021 12:03:32 +0100 Subject: [PATCH 20/69] python3Packages.johnnycanencrypt: maturin 0.9.0 compatibility fix --- .../development/python-modules/johnnycanencrypt/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index f0ee4a6bd99c..77789fa44dbe 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -61,6 +61,12 @@ rustPlatform.buildRustPackage rec { numpy ]; + # Remove with the next release after 0.5.0. This change is required + # for compatibility with maturin 0.9.0. + postPatch = '' + sed '/project-url = /d' -i Cargo.toml + ''; + buildPhase = '' runHook preBuild maturin build --release --manylinux off --strip --cargo-extra-args="-j $NIX_BUILD_CORES --frozen" From c81a5d9abbe2b1ba3c5c192b8727763dafed454d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 24 Jan 2021 10:32:28 +0100 Subject: [PATCH 21/69] python3Packages.wasmer: 1.0.0-beta1 -> 1.0.0 --- pkgs/development/python-modules/wasmer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 0bb60d6b9e30..62c8a2a06b71 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -8,7 +8,7 @@ }: let pname = "wasmer"; - version = "1.0.0-beta1"; + version = "1.0.0"; wheel = rustPlatform.buildRustPackage rec { inherit pname version; @@ -17,10 +17,10 @@ let owner = "wasmerio"; repo = "wasmer-python"; rev = version; - sha256 = "0302lcfjlw7nz18nf86z6swhhpp1qnpwcsm2fj4avl22rsv0h78j"; + hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; }; - cargoHash = "sha256-Rq5m9Lu6kePvohfhODLMOpGPFtCh0woTsQY2TufoiNQ="; + cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; nativeBuildInputs = [ maturin python ]; From 3e51cd164d21da438c782eaf0c3cd41c5a3898df Mon Sep 17 00:00:00 2001 From: luc65r Date: Mon, 26 Oct 2020 22:38:28 +0100 Subject: [PATCH 22/69] libticonv: init at 1.1.5 --- .../libraries/libticonv/default.nix | 38 +++++++++++++++++++ pkgs/misc/emulators/tilem/default.nix | 15 ++------ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/libraries/libticonv/default.nix diff --git a/pkgs/development/libraries/libticonv/default.nix b/pkgs/development/libraries/libticonv/default.nix new file mode 100644 index 000000000000..0c075406dee2 --- /dev/null +++ b/pkgs/development/libraries/libticonv/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, autoreconfHook +, glib +}: + +stdenv.mkDerivation rec { + pname = "libticonv"; + version = "1.1.5"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + glib + ]; + + configureFlags = [ + "--enable-iconv" + ]; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "This library is part of the TiLP framework"; + homepage = "http://lpg.ticalc.org/prj_tilp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix index 2e96dc03d144..4948944191b2 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/misc/emulators/tilem/default.nix @@ -11,19 +11,9 @@ , lzma , bzip2 , gnome2 +, libticonv }: let - libticonv = stdenv.mkDerivation rec { - pname = "libticonv"; - version = "1.1.5"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i"; - }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib ]; - configureFlags = [ "--enable-iconv" ]; - }; libticables2 = stdenv.mkDerivation rec { pname = "libticables2"; version = "1.3.5"; @@ -58,6 +48,7 @@ let buildInputs = [ glib libticonv libarchive lzma bzip2 ]; }; in + stdenv.mkDerivation rec { pname = "tilem"; version = "2.0"; @@ -72,7 +63,7 @@ stdenv.mkDerivation rec { homepage = "http://lpg.ticalc.org/prj_tilem/"; description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ siraben ]; + maintainers = with maintainers; [ siraben luc65r ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c012242c38a..a0619bef6df8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15270,6 +15270,8 @@ in libthreadar = callPackage ../development/libraries/libthreadar { }; + libticonv = callPackage ../development/libraries/libticonv { }; + libtiff = callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { }; From eadb35d09891b6bd01f93d59e801a76c8b21007e Mon Sep 17 00:00:00 2001 From: luc65r Date: Mon, 26 Oct 2020 22:42:34 +0100 Subject: [PATCH 23/69] libtifiles2: init at 1.1.7 --- .../libraries/libtifiles2/default.nix | 38 +++++++++++++++++++ pkgs/misc/emulators/tilem/default.nix | 14 +------ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/libraries/libtifiles2/default.nix diff --git a/pkgs/development/libraries/libtifiles2/default.nix b/pkgs/development/libraries/libtifiles2/default.nix new file mode 100644 index 000000000000..874cbc87c875 --- /dev/null +++ b/pkgs/development/libraries/libtifiles2/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, autoreconfHook +, glib +, libarchive +, libticonv +}: + +stdenv.mkDerivation rec { + pname = "libtifiles2"; + version = "1.1.7"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + glib + libarchive + libticonv + ]; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "This library is part of the TiLP framework"; + homepage = "http://lpg.ticalc.org/prj_tilp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix index 4948944191b2..678919a0867a 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/misc/emulators/tilem/default.nix @@ -1,17 +1,15 @@ { stdenv , fetchurl , lib -, libarchive , autoreconfHook , pkg-config , glib , libusb1 , darwin , acl -, lzma -, bzip2 , gnome2 , libticonv +, libtifiles2 }: let libticables2 = stdenv.mkDerivation rec { @@ -37,16 +35,6 @@ let ++ lib.optionals stdenv.isLinux [ acl ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; }; - libtifiles2 = stdenv.mkDerivation rec { - pname = "libtifiles2"; - version = "1.1.7"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils"; - }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib libticonv libarchive lzma bzip2 ]; - }; in stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0619bef6df8..f21e7810eafb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15272,6 +15272,8 @@ in libticonv = callPackage ../development/libraries/libticonv { }; + libtifiles2 = callPackage ../development/libraries/libtifiles2 { }; + libtiff = callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { }; From 87d7a060c29638fdeb229c69091eb52ae3de9d43 Mon Sep 17 00:00:00 2001 From: luc65r Date: Mon, 26 Oct 2020 22:45:19 +0100 Subject: [PATCH 24/69] libticables2: init at 1.3.5 --- .../libraries/libticables2/default.nix | 64 +++++++++++++++++++ pkgs/misc/emulators/tilem/default.nix | 13 +--- pkgs/top-level/all-packages.nix | 2 + 3 files changed, 67 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/libraries/libticables2/default.nix diff --git a/pkgs/development/libraries/libticables2/default.nix b/pkgs/development/libraries/libticables2/default.nix new file mode 100644 index 000000000000..f22d7b796e15 --- /dev/null +++ b/pkgs/development/libraries/libticables2/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, autoreconfHook +, glib +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "libticables2"; + version = "1.3.5"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libusb1 + glib + ]; + + configureFlags = [ + "--enable-libusb10" + ]; + + postInstall = '' + mkdir -p $out/etc/udev/rules.d + cat > $out/etc/udev/rules.d/69-libsane.rules << EOF + ACTION!="add", GOTO="libticables_end" + + # serial device (assume TI calculator) + KERNEL=="ttyS[0-3]", ENV{ID_PDA}="1" + # parallel device (assume TI calculator) + SUBSYSTEM=="ppdev", ENV{ID_PDA}="1" + # SilverLink + SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e001", ENV{ID_PDA}="1" + # TI-84+ DirectLink + SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e003", ENV{ID_PDA}="1" + # TI-89 Titanium DirectLink + SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e004", ENV{ID_PDA}="1" + # TI-84+ SE DirectLink + SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e008", ENV{ID_PDA}="1" + # TI-Nspire DirectLink + SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e012", ENV{ID_PDA}="1" + + LABEL="libticables_end" + EOF + ''; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "This library is part of the TiLP framework"; + homepage = "http://lpg.ticalc.org/prj_tilp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix index 678919a0867a..fcd37ab24e39 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/misc/emulators/tilem/default.nix @@ -4,25 +4,14 @@ , autoreconfHook , pkg-config , glib -, libusb1 , darwin , acl , gnome2 , libticonv , libtifiles2 +, libticables2 }: let - libticables2 = stdenv.mkDerivation rec { - pname = "libticables2"; - version = "1.3.5"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc"; - }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib libusb1 ]; - configureFlags = [ "--enable-libusb10" ]; - }; libticalcs2 = stdenv.mkDerivation rec { pname = "libticalcs2"; version = "1.1.9"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f21e7810eafb..259bfd332847 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15270,6 +15270,8 @@ in libthreadar = callPackage ../development/libraries/libthreadar { }; + libticables2 = callPackage ../development/libraries/libticables2 { }; + libticonv = callPackage ../development/libraries/libticonv { }; libtifiles2 = callPackage ../development/libraries/libtifiles2 { }; From e69bd781e4a93255f164127a71e8238853881ca9 Mon Sep 17 00:00:00 2001 From: luc65r Date: Mon, 26 Oct 2020 22:46:21 +0100 Subject: [PATCH 25/69] libticalcs2: init at 1.1.9 --- .../libraries/libticalcs2/default.nix | 50 +++++++++++++++++++ pkgs/misc/emulators/tilem/default.nix | 18 +------ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 55 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/libraries/libticalcs2/default.nix diff --git a/pkgs/development/libraries/libticalcs2/default.nix b/pkgs/development/libraries/libticalcs2/default.nix new file mode 100644 index 000000000000..6eb013a7ffd7 --- /dev/null +++ b/pkgs/development/libraries/libticalcs2/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, autoreconfHook +, glib +, libticonv +, libtifiles2 +, libticables2 +, lzma +, bzip2 +, acl +, libobjc +}: + +stdenv.mkDerivation rec { + pname = "libticalcs2"; + version = "1.1.9"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + glib + libticonv + libtifiles2 + libticables2 + lzma + bzip2 + ] ++ lib.optionals stdenv.isLinux [ + acl + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + ]; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "This library is part of the TiLP framework"; + homepage = "http://lpg.ticalc.org/prj_tilp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix index fcd37ab24e39..d2252563d0a5 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/misc/emulators/tilem/default.nix @@ -1,30 +1,14 @@ { stdenv , fetchurl , lib -, autoreconfHook , pkg-config , glib -, darwin -, acl , gnome2 , libticonv , libtifiles2 , libticables2 +, libticalcs2 }: -let - libticalcs2 = stdenv.mkDerivation rec { - pname = "libticalcs2"; - version = "1.1.9"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n"; - }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib libticables2 libticonv libtifiles2 lzma bzip2 ] - ++ lib.optionals stdenv.isLinux [ acl ] - ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; - }; -in stdenv.mkDerivation rec { pname = "tilem"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 259bfd332847..fa622e4f7cdf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15272,6 +15272,10 @@ in libticables2 = callPackage ../development/libraries/libticables2 { }; + libticalcs2 = callPackage ../development/libraries/libticalcs2 { + inherit (darwin) libobjc; + }; + libticonv = callPackage ../development/libraries/libticonv { }; libtifiles2 = callPackage ../development/libraries/libtifiles2 { }; From 99d0610e03f03dfa9ec9798078da351de694565c Mon Sep 17 00:00:00 2001 From: luc65r Date: Mon, 26 Oct 2020 22:47:06 +0100 Subject: [PATCH 26/69] gfm: init at 1.08 --- .../applications/science/math/gfm/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/applications/science/math/gfm/default.nix diff --git a/pkgs/applications/science/math/gfm/default.nix b/pkgs/applications/science/math/gfm/default.nix new file mode 100644 index 000000000000..a8031b3e8a3d --- /dev/null +++ b/pkgs/applications/science/math/gfm/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, lib +, fetchurl +, fetchpatch +, pkg-config +, autoreconfHook +, gnome2 +, glib +, libtifiles2 +, libticables2 +, libticalcs2 +, libticonv +}: + +stdenv.mkDerivation rec { + pname = "gfm"; + version = "1.08"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "0zq1a9mm54zr18dz2mqh79w1a126xwqz6dcrpjlbd1pnmg01l0q9"; + }; + + patches = fetchpatch { + name = "remove-broken-kde-support.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=gfm"; + sha256 = "03yc8s2avicmv04f2ygg3r3q8l7kpsc94mhp6clp584kmjpjqag5"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + gnome2.gtk + gnome2.libglade + glib + libtifiles2 + libticables2 + libticalcs2 + libticonv + ]; + + NIX_CFLAGS_COMPILE = "-I${libticables2}/include/tilp2"; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "Group File Manager (GFM) allows manipulation of single/group/tigroup files"; + homepage = "http://lpg.ticalc.org/prj_gfm/index.html"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa622e4f7cdf..b774958397a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13791,6 +13791,8 @@ in gflags = callPackage ../development/libraries/gflags { }; + gfm = callPackage ../applications/science/math/gfm { }; + gperftools = callPackage ../development/libraries/gperftools { }; grab-site = callPackage ../tools/backup/grab-site { }; From 3c5f402e6e639dbce2cbff114782d2ea5335b7d4 Mon Sep 17 00:00:00 2001 From: luc65r Date: Mon, 26 Oct 2020 22:47:53 +0100 Subject: [PATCH 27/69] tilp2: init at 1.18 --- .../science/math/tilp2/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/science/math/tilp2/default.nix diff --git a/pkgs/applications/science/math/tilp2/default.nix b/pkgs/applications/science/math/tilp2/default.nix new file mode 100644 index 000000000000..1b46f982b419 --- /dev/null +++ b/pkgs/applications/science/math/tilp2/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchurl +, fetchpatch +, autoreconfHook +, pkg-config +, intltool +, glib +, gnome2 +, gfm +, libticables2 +, libticalcs2 +, libticonv +, libtifiles2 +}: + +stdenv.mkDerivation rec { + pname = "tilp2"; + version = "1.18"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "0isf73bjwk06baz2gm3vpdh600gqck9ca4aqxzb089dmxriv6fkv"; + }; + + patches = fetchpatch { + name = "remove-broken-kde-support.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=tilp"; + sha256 = "1fn6vh7r45spkwpmkvffkbn7zrcsdrs5mjmspd5rwi3jc12cy3ny"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + intltool + ]; + + buildInputs = [ + glib + gnome2.gtk + gnome2.libglade + gfm + libticables2 + libticalcs2 + libticonv + libtifiles2 + ]; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "Transfer data between Texas Instruments graphing calculators and a computer"; + homepage = "http://lpg.ticalc.org/prj_tilp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b774958397a1..87fd70259912 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8192,6 +8192,8 @@ in tilem = callPackage ../misc/emulators/tilem { }; + tilp2 = callPackage ../applications/science/math/tilp2 { }; + timemachine = callPackage ../applications/audio/timemachine { }; timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { }; From 1900b6e2d70545cd7f86254e486e2063e2b5644c Mon Sep 17 00:00:00 2001 From: luc65r Date: Mon, 2 Nov 2020 21:18:09 +0100 Subject: [PATCH 28/69] nixos/tilp2: init --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/tilp2.nix | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 nixos/modules/programs/tilp2.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1ccfba684536..0f8a7ba79044 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -169,6 +169,7 @@ ./programs/sway.nix ./programs/system-config-printer.nix ./programs/thefuck.nix + ./programs/tilp2.nix ./programs/tmux.nix ./programs/traceroute.nix ./programs/tsm-client.nix diff --git a/nixos/modules/programs/tilp2.nix b/nixos/modules/programs/tilp2.nix new file mode 100644 index 000000000000..da9e32e3e6c6 --- /dev/null +++ b/nixos/modules/programs/tilp2.nix @@ -0,0 +1,28 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.tilp2; + +in { + options.programs.tilp2 = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable tilp2 and udev rules for supported calculators. + ''; + }; + }; + + config = mkIf cfg.enable { + services.udev.packages = [ + pkgs.libticables2 + ]; + + environment.systemPackages = [ + pkgs.tilp2 + ]; + }; +} From 32fa8449ef849e11a947b346740971cb7133f32e Mon Sep 17 00:00:00 2001 From: Aamaruvi Yogamani <38222826+Technical27@users.noreply.github.com> Date: Sun, 24 Jan 2021 08:47:01 -0500 Subject: [PATCH 29/69] auto-cpufreq: 1.5.1 -> 1.5.3 The attribute is also changed from autocpu-freq to autocpu-freq --- .../default.nix | 13 +- .../prevent-install-and-copy.patch | 252 ++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 128 insertions(+), 139 deletions(-) rename pkgs/tools/system/{autocpu-freq => auto-cpufreq}/default.nix (64%) rename pkgs/tools/system/{autocpu-freq => auto-cpufreq}/prevent-install-and-copy.patch (69%) diff --git a/pkgs/tools/system/autocpu-freq/default.nix b/pkgs/tools/system/auto-cpufreq/default.nix similarity index 64% rename from pkgs/tools/system/autocpu-freq/default.nix rename to pkgs/tools/system/auto-cpufreq/default.nix index 7e23b8b5b0f7..5a94cff19e16 100644 --- a/pkgs/tools/system/autocpu-freq/default.nix +++ b/pkgs/tools/system/auto-cpufreq/default.nix @@ -2,26 +2,31 @@ python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "AdnanHodzic"; repo = pname; rev = "v${version}"; - sha256 = "uVhftO6AqFnZ0uaEYRAPvVskkouNOXPtNVYXx7WJKyw="; + sha256 = "sha256-NDIdQ4gUN2jG+VWXsv3fdUogZxOOiNtnbekD30+jx6M="; }; propagatedBuildInputs = with python3Packages; [ click distro psutil ]; doCheck = false; - pythonImportsCheck = [ "source" ]; + pythonImportsCheck = [ "auto_cpufreq" ]; # patch to prevent script copying and to disable install patches = [ ./prevent-install-and-copy.patch ]; postInstall = '' # copy script manually - cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl + cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl.auto-cpufreq + + # systemd service + mkdir -p $out/lib/systemd/system + cp ${src}/scripts/auto-cpufreq.service $out/lib/systemd/system + substituteInPlace $out/lib/systemd/system/auto-cpufreq.service --replace "/usr/local" $out ''; meta = with lib; { diff --git a/pkgs/tools/system/autocpu-freq/prevent-install-and-copy.patch b/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch similarity index 69% rename from pkgs/tools/system/autocpu-freq/prevent-install-and-copy.patch rename to pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch index 28c524e1497c..232ac780341a 100644 --- a/pkgs/tools/system/autocpu-freq/prevent-install-and-copy.patch +++ b/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch @@ -1,3 +1,121 @@ +diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py +index 482a544..d142013 100644 +--- a/auto_cpufreq/core.py ++++ b/auto_cpufreq/core.py +@@ -163,31 +163,13 @@ def get_current_gov(): + return print("Currently using:", getoutput("cpufreqctl.auto-cpufreq --governor").strip().split(" ")[0], "governor") + + def cpufreqctl(): +- """ +- deploy cpufreqctl script +- """ +- +- # detect if running on a SNAP +- if os.getenv('PKG_MARKER') == "SNAP": +- pass +- else: +- # deploy cpufreqctl.auto-cpufreq script +- if os.path.isfile("/usr/bin/cpufreqctl"): +- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl.auto-cpufreq") +- else: +- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl.auto-cpufreq") ++ # scripts are already in the correct place ++ pass + + + def cpufreqctl_restore(): +- """ +- remove cpufreqctl.auto-cpufreq script +- """ +- # detect if running on a SNAP +- if os.getenv('PKG_MARKER') == "SNAP": +- pass +- else: +- if os.path.isfile("/usr/bin/cpufreqctl.auto-cpufreq"): +- os.remove("/usr/bin/cpufreqctl.auto-cpufreq") ++ # no need to restore ++ pass + + def footer(l=79): + print("\n" + "-" * l + "\n") +@@ -212,74 +194,12 @@ def remove_complete_msg(): + + + def deploy_daemon(): +- print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n") +- +- # deploy cpufreqctl script func call +- cpufreqctl() +- +- print("* Turn off bluetooth on boot") +- btconf = Path("/etc/bluetooth/main.conf") +- try: +- orig_set = "AutoEnable=true" +- change_set = "AutoEnable=false" +- with btconf.open(mode="r+") as f: +- content = f.read() +- f.seek(0) +- f.truncate() +- f.write(content.replace(orig_set, change_set)) +- except: +- print("\nERROR:\nWas unable to turn off bluetooth on boot") +- +- auto_cpufreq_log_path.touch(exist_ok=True) +- +- print("\n* Deploy auto-cpufreq install script") +- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install") +- +- print("\n* Deploy auto-cpufreq remove script") +- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/bin/auto-cpufreq-remove") +- +- call("/usr/bin/auto-cpufreq-install", shell=True) +- ++ # prevent needless copying and system changes ++ pass + + # remove auto-cpufreq daemon + def remove(): +- +- # check if auto-cpufreq is installed +- if not os.path.exists("/usr/bin/auto-cpufreq-remove"): +- print("\nauto-cpufreq daemon is not installed.\n") +- sys.exit(1) +- +- print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n") +- +- print("* Turn on bluetooth on boot") +- btconf = "/etc/bluetooth/main.conf" +- try: +- orig_set = "AutoEnable=true" +- change_set = "AutoEnable=false" +- with open(btconf, "r+") as f: +- content = f.read() +- f.seek(0) +- f.truncate() +- f.write(content.replace(change_set, orig_set)) +- except: +- print("\nERROR:\nWas unable to turn on bluetooth on boot") +- +- # run auto-cpufreq daemon install script +- call("/usr/bin/auto-cpufreq-remove", shell=True) +- +- # remove auto-cpufreq-remove +- os.remove("/usr/bin/auto-cpufreq-remove") +- +- # delete log file +- if auto_cpufreq_log_path.exists(): +- if auto_cpufreq_log_file is not None: +- auto_cpufreq_log_file.close() +- +- auto_cpufreq_log_path.unlink() +- +- # restore original cpufrectl script +- cpufreqctl_restore() +- ++ pass + + def gov_check(): + for gov in get_avail_gov(): diff --git a/scripts/cpufreqctl.sh b/scripts/cpufreqctl.sh index 63a2b5b..e157efe 100755 --- a/scripts/cpufreqctl.sh @@ -42,137 +160,3 @@ index 63a2b5b..e157efe 100755 + echo "reset is disabled in the nix package" exit fi -diff --git a/source/core.py b/source/core.py -index 531c0c4..2e27e65 100644 ---- a/source/core.py -+++ b/source/core.py -@@ -24,8 +24,6 @@ warnings.filterwarnings("ignore") - # - re-enable CPU fan speed display and make more generic and not only for thinkpad - # - replace get system/CPU load from: psutil.getloadavg() | available in 5.6.2) - --SCRIPTS_DIR = Path("/usr/local/share/auto-cpufreq/scripts/") -- - # from the highest performance to the lowest - ALL_GOVERNORS = ("performance", "ondemand", "conservative", "schedutil", "userspace", "powersave") - CPUS = os.cpu_count() -@@ -156,34 +154,16 @@ def cpufreqctl(): - """ - deploy cpufreqctl script - """ -- -- # detect if running on a SNAP -- if os.getenv('PKG_MARKER') == "SNAP": -- pass -- else: -- # deploy cpufreqctl script (if missing) -- if os.path.isfile("/usr/bin/cpufreqctl"): -- shutil.copy("/usr/bin/cpufreqctl", "/usr/bin/cpufreqctl.auto-cpufreq.bak") -- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl") -- else: -- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl") -+ # scripts are already in the correct place -+ pass - - - def cpufreqctl_restore(): - """ - restore original cpufreqctl script - """ -- # detect if running on a SNAP -- if os.getenv('PKG_MARKER') == "SNAP": -- pass -- else: -- # restore original cpufreqctl script -- if os.path.isfile("/usr/bin/cpufreqctl.auto-cpufreq.bak"): -- os.system("cp /usr/bin/cpufreqctl.auto-cpufreq.bak /usr/bin/cpufreqctl") -- os.remove("/usr/bin/cpufreqctl.auto-cpufreq.bak") -- # ToDo: implement mechanism to make sure cpufreqctl (auto-cpufreq) file is -- # restored if overwritten by system. But during tool removal to also remove it -- # in def cpufreqctl -+ # no need to restore -+ pass - - - def footer(l=79): -@@ -209,71 +189,13 @@ def remove_complete_msg(): - - - def deploy_daemon(): -- print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n") -- -- # deploy cpufreqctl script func call -- cpufreqctl() -- -- print("* Turn off bluetooth on boot") -- btconf = Path("/etc/bluetooth/main.conf") -- try: -- orig_set = "AutoEnable=true" -- change_set = "AutoEnable=false" -- with btconf.open(mode="r+") as f: -- content = f.read() -- f.seek(0) -- f.truncate() -- f.write(content.replace(orig_set, change_set)) -- except: -- print("\nERROR:\nWas unable to turn off bluetooth on boot") -- -- auto_cpufreq_log_file.touch(exist_ok=True) -- -- print("\n* Deploy auto-cpufreq install script") -- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install") -- -- print("\n* Deploy auto-cpufreq remove script") -- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/bin/auto-cpufreq-remove") -- -- call("/usr/bin/auto-cpufreq-install", shell=True) -+ # prevent needless copying and system changes -+ pass - - - # remove auto-cpufreq daemon - def remove(): -- -- # check if auto-cpufreq is installed -- if not os.path.exists("/usr/bin/auto-cpufreq-remove"): -- print("\nauto-cpufreq daemon is not installed.\n") -- sys.exit(1) -- -- print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n") -- -- print("* Turn on bluetooth on boot") -- btconf = "/etc/bluetooth/main.conf" -- try: -- orig_set = "AutoEnable=true" -- change_set = "AutoEnable=false" -- with open(btconf, "r+") as f: -- content = f.read() -- f.seek(0) -- f.truncate() -- f.write(content.replace(change_set, orig_set)) -- except: -- print("\nERROR:\nWas unable to turn on bluetooth on boot") -- -- # run auto-cpufreq daemon install script -- call("/usr/bin/auto-cpufreq-remove", shell=True) -- -- # remove auto-cpufreq-remove -- os.remove("/usr/bin/auto-cpufreq-remove") -- -- # delete log file -- if auto_cpufreq_log_file.exists(): -- auto_cpufreq_log_file.unlink() -- -- # restore original cpufrectl script -- cpufreqctl_restore() -- -+ pass - - def gov_check(): - for gov in get_avail_gov(): -@@ -798,4 +720,4 @@ def running_daemon(): - exit(1) - elif os.getenv("PKG_MARKER") == "SNAP" and dcheck == "enabled": - deploy_complete_msg() -- exit(1) -\ No newline at end of file -+ exit(1) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71ec34213a3f..3dbb9e26bd00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29143,7 +29143,7 @@ in ssh-audit = callPackage ../tools/security/ssh-audit { }; - autocpu-freq = callPackage ../tools/system/autocpu-freq { }; + auto-cpufreq = callPackage ../tools/system/auto-cpufreq { }; thermald = callPackage ../tools/system/thermald { }; From 32989d49ce2ce70c6f8247bbfe28981d7845a9f6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 24 Jan 2021 16:05:40 +0100 Subject: [PATCH 30/69] mediaelch: 2.8.4 -> 2.8.6 --- pkgs/applications/misc/mediaelch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index d437cfda44fa..f19cbee8b79f 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "mediaelch"; - version = "2.8.4"; + version = "2.8.6"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "00jwmpdwbn6rgaha0iimcbwg9pwb8ilpjgxhv0p13j2c6dcisjzh"; + sha256 = "1134vw7hr0mpqcsxjq4bqmg5760dngz17bzj97ypfc5cvzcxjh43"; fetchSubmodules = true; }; From a098b61e119f01cb00fdd163dcbde074ae85c0eb Mon Sep 17 00:00:00 2001 From: ilian Date: Sun, 24 Jan 2021 17:04:26 +0100 Subject: [PATCH 31/69] reaper: 6.20 -> 6.21 --- pkgs/applications/audio/reaper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 8f3a17bf1b6e..4d3ac1d1f2df 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.20"; + version = "6.21"; src = fetchurl { url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "194xglhk74ks534r3d00v84s26s4yybxkhb4h8k5rqp76g0jv635"; + sha256 = "11nvfjfrri9y0k7n7psz3yk1l7mxp9f6yi69pq7hvn9d4n26p5vd"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; From 50ec7073abe981ba604a9f4f0de575c8c575bc83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 24 Jan 2021 13:49:18 -0300 Subject: [PATCH 32/69] theme-jade1: 1.10 -> 1.11 --- pkgs/data/themes/jade1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index 7b850c9049e2..122d0a4a6568 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "17s4r8yjhnz9wrnrma6m8qjp02r47xkjk062sdb8s91dxhh7l8q2"; + sha256 = "0jljmychbs2lsf6g1pck83x4acljdqqsllkdjgiwv3nnlwahzlvs"; }; sourceRoot = "."; From 65ea0f1482dc5c9bb95b6aa91f9a3e10fafc003b Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Thu, 21 Jan 2021 10:54:01 -0800 Subject: [PATCH 33/69] convco: init at 0.3.2 Signed-off-by: Ana Hobden --- pkgs/development/tools/convco/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/convco/default.nix diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix new file mode 100644 index 000000000000..d6be170bb8f6 --- /dev/null +++ b/pkgs/development/tools/convco/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub, stdenv, openssl, perl, pkg-config, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "convco"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "convco"; + repo = pname; + rev = "v${version}"; + sha256 = "0fqq6irbq1aikhhw08gc9kp0vbk2aminfbvwdlm58cvywyq91bn4"; + }; + + cargoSha256 = "073sfv42fbl8rjm3dih1ghs9vq75mjshp66zdzdan2dmmrnw5m9z"; + + nativeBuildInputs = [ openssl perl pkg-config ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + + meta = with lib; { + description = "A Conventional commit cli"; + homepage = "https://github.com/convco/convco"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ hoverbear ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd61a9eb7bfa..7756ce2f9150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10692,6 +10692,10 @@ in crate2nix = callPackage ../development/tools/rust/crate2nix { }; + convco = callPackage ../development/tools/convco { + inherit (darwin.apple_sdk.frameworks) Security; + }; + maturin = callPackage ../development/tools/rust/maturin { }; inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; From d2b51fd032d0b6b510994e9e6a4e14ef64efbc09 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 24 Jan 2021 14:47:31 -0300 Subject: [PATCH 34/69] vimPlugins.vim-autoswap: init at 2019-01-09 --- pkgs/misc/vim-plugins/generated.nix | 78 +++++++++++++++----------- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 46 insertions(+), 33 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 71cfd70356f5..192a1b92f710 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-01-23"; + version = "2021-01-24"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "9fd9435cd525b1d3c4470db0d514f72ed31cfece"; - sha256 = "0nbnq3wmwm5m4g2b8jknjvallq1pq7qdxmbz81nnjkdmf6sw75ji"; + rev = "471e20ed2bfb373068ccd54db5603bd3f4dcbae0"; + sha256 = "0gzl8vbbqpjr1pw328p2lq7xsp85wrg0sfa1hsj62vay4gw3m84q"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -377,12 +377,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-01-23"; + version = "2021-01-24"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "614af72a9b0afaac26e3e7fe2e1f30eb416bb96b"; - sha256 = "04mnhwk1sn174nrvr9jfvcfq4dff1c595y9i2r94xy6yag5cv61l"; + rev = "64e54cc9f39dc2084555522bec017cc35ccb8d9d"; + sha256 = "04fm2m2iiclbcijdmqa20a72af2vizx6bid8q348bsw2ppdh3r1a"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -473,12 +473,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2021-01-18"; + version = "2021-01-24"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "272d783f338107426cf75fa48b6f0a30860a8ac4"; - sha256 = "07dyy8v0j07w6gi89p08l0vcc0ba6d3qnz4wpsfj4hzf6cgifsw4"; + rev = "9b0687cdbe4b64c790f6022c605f1078430916d9"; + sha256 = "0n74sab6i8bq21zjrdd3vcv97bra9dg06dn6zpdc81n7pi13z6a5"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -1487,12 +1487,12 @@ let galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline-nvim"; - version = "2021-01-17"; + version = "2021-01-24"; src = fetchFromGitHub { owner = "glepnir"; repo = "galaxyline.nvim"; - rev = "64d6b8e31459057ba4f9b03a977fce0d2cc3d748"; - sha256 = "1w5cggvxvmnm3zparnsgb3iz1pkw7d8bwvflcxaxg4pilgsniqsa"; + rev = "22791e9aadfc2a24ccc22d21b4c50f6b52e12980"; + sha256 = "1dw9k5ql7h8mgj7ag34pxa2jr9b2k788csc2a0jmyp6qp0d0x5ad"; }; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; }; @@ -2868,12 +2868,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-01-20"; + version = "2021-01-24"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "50b578efc1514f6ba45e23cdc89d656a51929208"; - sha256 = "0qcnchf1mnq0bwgkg7las62i4l4hwyisycymcrs0ki9skqdw5swh"; + rev = "531a575d1768be4531246950e55a784739b5d0a7"; + sha256 = "03hd7bq09gz23619b19cz29hafhia5r28xm8bqnj03d2m6b2xlyh"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -2916,12 +2916,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-01-23"; + version = "2021-01-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "6a33e9ba757245a300531e370c6b2ebe6e5a7097"; - sha256 = "1grsh5186in83n0j28n8r0vw64kx8h1c5z8pm19adwdan0pcbs1r"; + rev = "9f91a07b38b6f66a56ca15161ffec83a5468b95a"; + sha256 = "01da135ffng6praixsnwgas0nm26ik9y8hm06jy394p2b2mk1g1g"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3024,12 +3024,12 @@ let nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-01-23"; + version = "2021-01-24"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "955f6d08e2e829f819d5f838e742761b43a263f5"; - sha256 = "19yy39sv1xv36aa9chrlkpf9xfw5l556s5sljcspynn66sdz8n5y"; + rev = "aca42922425e80582f7e3bb77c87f914119fb664"; + sha256 = "0d7h5fc5kyd4i17s0xjfq7ifg7h2xbrsnspilbraxppyfj0xhdrs"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3758,12 +3758,12 @@ let sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-01-22"; + version = "2021-01-24"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "af875daf178fe38c2186b14d55a6bbdb6fbb2e15"; - sha256 = "00qa9m6bij9y39xyf73a3gz0xx0l0mqc1byrk6xl3kdbcngig5il"; + rev = "f0958180a5648ed1fc1fbedb89b94d81a45216a6"; + sha256 = "1bi2j4j9vkjw8dnb73jb7la4s4b71wr2q5mwhc1iyd15gxaya7xw"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -4574,6 +4574,18 @@ let meta.homepage = "https://github.com/benizi/vim-automkdir/"; }; + vim-autoswap = buildVimPluginFrom2Nix { + pname = "vim-autoswap"; + version = "2019-01-09"; + src = fetchFromGitHub { + owner = "gioele"; + repo = "vim-autoswap"; + rev = "e587e4b14a605d8921942ba65a37583813289272"; + sha256 = "0l0ijbdl2s9p5i3cxfkq8jncncz38qprp51whbjcda485d1knk9n"; + }; + meta.homepage = "https://github.com/gioele/vim-autoswap/"; + }; + vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; version = "2020-08-22"; @@ -5777,12 +5789,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-01-23"; + version = "2021-01-24"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "d69a2787524a6973a187e67c978e1a92529fd910"; - sha256 = "013xnvxrma4jdv9a5i33qzjw65c0rrlvidsgdg4snrmwhdqw744q"; + rev = "a500e9fae73e433757c5d8a44da74e66373eb21e"; + sha256 = "1mxl0aziakvialk0qgm0mnpqdk9iwqnss9wqj7584nfxvz9zck20"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -6006,12 +6018,12 @@ let vim-LanguageTool = buildVimPluginFrom2Nix { pname = "vim-LanguageTool"; - version = "2020-10-29"; + version = "2021-01-24"; src = fetchFromGitHub { owner = "dpelle"; repo = "vim-LanguageTool"; - rev = "d1f94ef917dddfd8c82589957b7aa6a55f382964"; - sha256 = "1y2y3rkhnj6xhzkm0snfkb08h6jmyjiicmk4j8lw2vhszsfgz6ns"; + rev = "f92e2577ab937f437c06d91639100952b540365b"; + sha256 = "09jw26mmbyvjlz5fw1gj9q0dwmv0aqwbl288h4hcliyx56snijhl"; }; meta.homepage = "https://github.com/dpelle/vim-LanguageTool/"; }; @@ -8049,12 +8061,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-01-19"; + version = "2021-01-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "5d3d96dcdf0f87273978c482e9c1b39201f4516f"; - sha256 = "04rn9w17mmf2ka4wqdl8x4nzwg5imnb0q1mnsm1hx8bvlr8zs0h6"; + rev = "fb6ed9883ea48c93e419736777d5f2e86fa4009b"; + sha256 = "0zrf3l7rckidrhlx6jdndabdiwgdyjfnax0ax20g4ynzmzlbj24l"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a7e3ea1a3a75..e0babda29452 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -133,6 +133,7 @@ gentoo/gentoo-syntax GEverding/vim-hocon gfanto/fzf-lsp.nvim@main gibiansky/vim-textobj-haskell +gioele/vim-autoswap glepnir/galaxyline.nvim@main glts/vim-textobj-comment godlygeek/csapprox From 4f272164059cb1dc1bb2452c4b8d1030511f8a16 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Jan 2021 19:18:42 +0100 Subject: [PATCH 35/69] python3Packages.fortiosapi: init at 1.0.5 --- .../python-modules/fortiosapi/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/fortiosapi/default.nix diff --git a/pkgs/development/python-modules/fortiosapi/default.nix b/pkgs/development/python-modules/fortiosapi/default.nix new file mode 100644 index 000000000000..8b0425c38817 --- /dev/null +++ b/pkgs/development/python-modules/fortiosapi/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, oyaml +, packaging +, paramiko +, pexpect +, requests +}: + +buildPythonPackage rec { + pname = "fortiosapi"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "fortinet-solutions-cse"; + repo = pname; + rev = "v${version}"; + sha256 = "0679dizxcd4sk1b4h6ss8qsbjb3c8qyijlp4gzjqji91w6anzg9k"; + }; + + propagatedBuildInputs = [ + pexpect + requests + paramiko + packaging + oyaml + ]; + + # Tests require a local VM + doCheck = false; + pythonImportsCheck = [ "fortiosapi" ]; + + meta = with lib; { + description = "Python module to work with Fortigate/Fortios devices"; + homepage = "https://github.com/fortinet-solutions-cse/fortiosapi"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d37d837e4e12..c41eeb01e555 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2382,6 +2382,8 @@ in { forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { }; + fortiosapi = callPackage ../development/python-modules/fortiosapi { }; + FormEncode = callPackage ../development/python-modules/FormEncode { }; foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; }; From 56673903f29b94d5065eaed35fe2a0755a515b85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Jan 2021 19:19:50 +0100 Subject: [PATCH 36/69] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0f0737595af2..b480943894ee 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -270,7 +270,7 @@ "folder_watcher" = ps: with ps; [ watchdog ]; "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java - "fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi + "fortios" = ps: with ps; [ fortiosapi ]; "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam "foursquare" = ps: with ps; [ aiohttp-cors ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms From 9a7efb242219af31c1e6cd67278f0238347292f1 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Sun, 24 Jan 2021 10:23:16 -0800 Subject: [PATCH 37/69] rpm: add zstd support --- pkgs/tools/package-management/rpm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 18477e987a53..5c72dc071521 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchpatch , pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages -, sqlite +, sqlite, zstd }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ cpio zlib bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] + buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { "--enable-python" "--enable-ndb" "--enable-sqlite" + "--enable-zstd" "--localstatedir=/var" "--sharedstatedir=/com" ]; From 833371ffa710ba787dc7013a46c52f90f155e8c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 24 Jan 2021 15:37:20 -0300 Subject: [PATCH 38/69] theme-obsidian2: 2.17 -> 2.18 --- pkgs/data/themes/obsidian2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 3eb056e183e6..a965af53d421 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "1gff34xqypqjhh15lv4cc4ifsg07jx2znlsj9is4wmqf39a8h8n4"; + sha256 = "1w3grlkws4ih7333hys33z4bgm33jbc78bq2pyp8nzw4q9d2hz2r"; }; sourceRoot = "."; From ab757a382c3fb1461186ddf55d87923451a964ed Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 24 Jan 2021 20:44:51 +0100 Subject: [PATCH 39/69] lf: 18 -> 19 --- pkgs/tools/misc/lf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index c3cb3200e06f..0dde65e10817 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lf"; - version = "18"; + version = "19"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "1xzy85lz99kwzvpkkaqlylynn57nhn76dff3cxy304d23y3r26w6"; + sha256 = "096lb0kbiqchw8mfp1vbgn9p1bqnp3h5wn172s9q4jl55l5l0kn1"; }; vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg"; From 6a30c02ac3856f75be7c03721fe3cc950dc8f71d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 24 Jan 2021 21:00:19 +0100 Subject: [PATCH 40/69] beamPackages: add missing lib where needed (#110708) changes in 2f78ee7 missed some places where lib had to be added --- pkgs/development/beam-modules/hex/default.nix | 2 +- pkgs/development/beam-modules/pc/default.nix | 2 +- pkgs/development/beam-modules/pgsql/default.nix | 2 +- pkgs/development/beam-modules/webdriver/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index e12f0ba4b74d..794b9e5cf222 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeText, elixir }: +{ lib, stdenv, fetchFromGitHub, writeText, elixir }: let shell = drv: stdenv.mkDerivation { diff --git a/pkgs/development/beam-modules/pc/default.nix b/pkgs/development/beam-modules/pc/default.nix index 8b5836f4c621..a6d7c1c44de3 100644 --- a/pkgs/development/beam-modules/pc/default.nix +++ b/pkgs/development/beam-modules/pc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildHex }: +{ lib, buildHex }: buildHex { name = "pc"; diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix index e64476212dd1..df6561b7cf18 100644 --- a/pkgs/development/beam-modules/pgsql/default.nix +++ b/pkgs/development/beam-modules/pgsql/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, buildRebar3 }: +{ lib, stdenv, fetchFromGitHub, buildRebar3 }: let shell = drv: stdenv.mkDerivation { diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix index da6cb1273426..1255ec59c3a2 100644 --- a/pkgs/development/beam-modules/webdriver/default.nix +++ b/pkgs/development/beam-modules/webdriver/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, writeText, erlang }: +{ lib, stdenv, fetchFromGitHub, writeText, erlang }: let shell = drv: stdenv.mkDerivation { From 89cb93aefed79d51ed05d42a2caaadf2a18148e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 Jan 2021 18:20:34 +0100 Subject: [PATCH 41/69] brackets: drop Hasn't been updated since 2017 and suffers from CVE-2019-8255. --- .../applications/editors/brackets/default.nix | 58 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 pkgs/applications/editors/brackets/default.nix diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix deleted file mode 100644 index 95bf6f6d7aa3..000000000000 --- a/pkgs/applications/editors/brackets/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, lib, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf -, cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }: -with lib; - -let - bracketsLibs = makeLibraryPath [ - gtk2 glib gdk-pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd libXdamage expat - ]; -in -stdenv.mkDerivation rec { - pname = "brackets"; - version = "1.9"; - - src = fetchurl { - url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb"; - sha256 = "0c4l2rr0853xd21kw8hhxlmrx8mqwb7iqa2k24zvwyjp4nnwkgbp"; - name = "${pname}-${version}.deb"; - }; - - phases = [ "installPhase" "fixupPhase" ]; - - installPhase = '' - mkdir -p $out - ar p $src data.tar.xz | tar -C $out -xJ - - mv $out/usr/* $out/ - rmdir $out/usr - ln -sf $out/opt/brackets/brackets $out/bin/brackets - - ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 - - substituteInPlace $out/opt/brackets/brackets.desktop \ - --replace "Exec=/opt/brackets/brackets" "Exec=brackets" - mkdir -p $out/share/applications - ln -s $out/opt/brackets/brackets.desktop $out/share/applications/ - ''; - - postFixup = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${bracketsLibs}:$out/opt/brackets/lib" \ - $out/opt/brackets/Brackets - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${bracketsLibs}" \ - $out/opt/brackets/Brackets-node - - patchelf --set-rpath "${bracketsLibs}" \ - $out/opt/brackets/lib/libcef.so - ''; - - meta = { - description = "An open source code editor for the web, written in JavaScript, HTML and CSS"; - homepage = "http://brackets.io/"; - license = licenses.mit; - maintainers = [ maintainers.matejc ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7d3332c3a7c7..43bf489b0e54 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -70,6 +70,7 @@ mapAliases ({ bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 beegfs = throw "beegfs has been removed."; # added 2019-11-24 bluezFull = bluez; # Added 2019-12-03 + brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24 bridge_utils = bridge-utils; # added 2015-02-20 bro = zeek; # added 2019-09-29 bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71ec34213a3f..d1734467d564 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21119,8 +21119,6 @@ in bonzomatic = callPackage ../applications/editors/bonzomatic { }; - brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; }; - brave = callPackage ../applications/networking/browsers/brave { }; break-time = callPackage ../applications/misc/break-time { }; From fe111fc67937c22ffc84e4466f494366583124b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 24 Jan 2021 20:47:14 +0100 Subject: [PATCH 42/69] nixosTests.zfs.installer: fixup test after d44c6219b8 --- nixos/tests/installer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 7eaa1c3fbd90..5fa4704d02b6 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -326,8 +326,8 @@ let ] ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub ++ optionals (bootLoader == "grub" && grubVersion == 2) [ - pkgs.grub2 - pkgs.grub2_efi + (pkgs.grub2.override { zfsSupport = true; }) + (pkgs.grub2_efi.override { zfsSupport = true; }) ]; nix.binaryCaches = mkForce [ ]; From 7fee56ec59fd460fe0e4cff2f072a1457f23ba41 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 19 Jan 2021 10:27:15 +0100 Subject: [PATCH 43/69] ocamlPackages.either: init at 1.0.0 --- .../ocaml-modules/either/default.nix | 20 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/ocaml-modules/either/default.nix diff --git a/pkgs/development/ocaml-modules/either/default.nix b/pkgs/development/ocaml-modules/either/default.nix new file mode 100644 index 000000000000..71d16c9674c9 --- /dev/null +++ b/pkgs/development/ocaml-modules/either/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "either"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/mirage/either/releases/download/${version}/either-${version}.tbz"; + sha256 = "bf674de3312dee7b7215f07df1e8a96eb3d679164b8a918cdd95b8d97e505884"; + }; + + useDune2 = true; + + meta = with lib; { + description = "Compatibility Either module"; + license = licenses.mit; + homepage = "https://github.com/mirage/either"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 84a651e891ef..22c1dba5ae2b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -281,6 +281,8 @@ let eigen = callPackage ../development/ocaml-modules/eigen { }; + either = callPackage ../development/ocaml-modules/either { }; + elina = callPackage ../development/ocaml-modules/elina { }; eliom = callPackage ../development/ocaml-modules/eliom { }; From a7a61998e9a5da33c7540486cc0616271f5e5f73 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 12 Jan 2021 19:49:44 +0100 Subject: [PATCH 44/69] ocamlPackages.{repr,ppx_repr}: init at 0.2.1 --- .../ocaml-modules/repr/default.nix | 30 +++++++++++++++++++ pkgs/development/ocaml-modules/repr/ppx.nix | 23 ++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 +++ 3 files changed, 57 insertions(+) create mode 100644 pkgs/development/ocaml-modules/repr/default.nix create mode 100644 pkgs/development/ocaml-modules/repr/ppx.nix diff --git a/pkgs/development/ocaml-modules/repr/default.nix b/pkgs/development/ocaml-modules/repr/default.nix new file mode 100644 index 000000000000..de6877ddd68e --- /dev/null +++ b/pkgs/development/ocaml-modules/repr/default.nix @@ -0,0 +1,30 @@ +{ lib, buildDunePackage, fetchurl, fmt, uutf, jsonm, base64, either }: + +buildDunePackage rec { + pname = "repr"; + version = "0.2.1"; + + minimumOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-fuzz-${version}.tbz"; + sha256 = "1cbzbawbn71mmpw8y84s1p2pbhc055w1znz64jvr00c7fdr9p8hc"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + fmt + uutf + jsonm + base64 + either + ]; + + meta = with lib; { + description = "Dynamic type representations. Provides no stability guarantee"; + homepage = "https://github.com/mirage/repr"; + license = licenses.isc; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/repr/ppx.nix b/pkgs/development/ocaml-modules/repr/ppx.nix new file mode 100644 index 000000000000..a1112ef9ac74 --- /dev/null +++ b/pkgs/development/ocaml-modules/repr/ppx.nix @@ -0,0 +1,23 @@ +{ buildDunePackage, repr, ppxlib, ppx_deriving, alcotest, hex }: + +buildDunePackage { + pname = "ppx_repr"; + + inherit (repr) src version useDune2; + + propagatedBuildInputs = [ + repr + ppxlib + ppx_deriving + ]; + + doCheck = true; + checkInputs = [ + alcotest + hex + ]; + + meta = repr.meta // { + description = "PPX deriver for type representations"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 22c1dba5ae2b..e1fd3ccc8fc4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -885,6 +885,8 @@ let resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { }; + repr = callPackage ../development/ocaml-modules/repr { }; + result = callPackage ../development/ocaml-modules/ocaml-result { }; secp256k1 = callPackage ../development/ocaml-modules/secp256k1 { @@ -969,6 +971,8 @@ let ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { }; + ppx_repr = callPackage ../development/ocaml-modules/repr/ppx.nix { }; + ppx_tools = if lib.versionAtLeast ocaml.version "4.02" then callPackage ../development/ocaml-modules/ppx_tools {} From a35934f5d3d11ef0ee87f1ae62d7db2b27c5ad6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 24 Jan 2021 21:15:18 +0100 Subject: [PATCH 45/69] beamPackages: use callPackagesWith from nixpkgs lib 2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4 accidentally changed this from (nixpkgs) stdenv.lib to (beam-modules) lib', which broke things. This changes it back to (nixpkgs) lib. --- pkgs/development/beam-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 4c25522635ef..4f312129b387 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -6,7 +6,7 @@ let lib' = pkgs.callPackage ./lib.nix {}; # FIXME: add support for overrideScope - callPackageWithScope = scope: drv: args: lib'.callPackageWith scope drv args; + callPackageWithScope = scope: drv: args: lib.callPackageWith scope drv args; mkScope = scope: pkgs // scope; packages = self: From 071030840252273acf05c9902458d4db5bdd71ab Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 20 Jan 2021 18:45:52 -0500 Subject: [PATCH 46/69] clang, cc-wrapper: Move `--gcc-toolchain` logic into CC wrapper Take 2, after #94582 had to be reverted. This reverts commit ac03cfa3c57027e82073ea7db71248d4ab78af66. --- pkgs/build-support/cc-wrapper/default.nix | 11 +++++++++++ pkgs/development/compilers/llvm/10/default.nix | 2 -- pkgs/development/compilers/llvm/11/default.nix | 2 -- pkgs/development/compilers/llvm/5/default.nix | 2 -- pkgs/development/compilers/llvm/6/default.nix | 2 -- pkgs/development/compilers/llvm/7/default.nix | 2 -- pkgs/development/compilers/llvm/8/default.nix | 2 -- pkgs/development/compilers/llvm/9/default.nix | 2 -- pkgs/development/compilers/llvm/multi.nix | 16 ++++++++++------ pkgs/development/compilers/llvm/rocm/default.nix | 1 - pkgs/top-level/all-packages.nix | 2 -- 11 files changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index e0153ffc17fa..212fd6b570a4 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -290,6 +290,17 @@ stdenv.mkDerivation { echo "-L${gccForLibs.lib}/${targetPlatform.config}/lib" >> $out/nix-support/cc-ldflags '' + # TODO We would like to connect this to `useGccForLibs`, but we cannot yet + # because `libcxxStdenv` on linux still needs this. Maybe someday we'll + # always set `useLLVM` on Darwin, and maybe also break down `useLLVM` into + # fine-grained use flags (libgcc vs compiler-rt, ld.lld vs legacy, libc++ + # vs libstdc++, etc.) since Darwin isn't `useLLVM` on all counts. (See + # https://clang.llvm.org/docs/Toolchain.html for all the axes one might + # break `useLLVM` into.) + + optionalString (isClang && gccForLibs != null && targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' + echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags + '' + ## ## General libc support ## diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index f939eb52122e..978f28956664 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -26,8 +26,6 @@ let ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index 2ebde3d107ac..ca9ef4382b4b 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -28,8 +28,6 @@ let ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 80bb3af27867..f03325cd4270 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -25,8 +25,6 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index f39fb9b60dae..a98314d1181f 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -25,8 +25,6 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 393a1f594726..111ccbb9a38b 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -25,8 +25,6 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 4dc0b8dd3c42..313b97455e50 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -25,8 +25,6 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index e381b1927661..dfb4981a5b75 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -25,8 +25,6 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { diff --git a/pkgs/development/compilers/llvm/multi.nix b/pkgs/development/compilers/llvm/multi.nix index b4f2f8f9d6f6..60db622a73ab 100644 --- a/pkgs/development/compilers/llvm/multi.nix +++ b/pkgs/development/compilers/llvm/multi.nix @@ -13,7 +13,12 @@ let chmod u+rw -R $out/lib cp -r ${basegcc.libc}/lib/* $(ls -d $out/lib/gcc/*/*) ''; - gcc_multi_sysroot = runCommand "gcc-multi-sysroot" {} '' + gcc_multi_sysroot = runCommand "gcc-multi-sysroot" { + passthru = { + inherit (gcc64) version; + lib = gcc_multi_sysroot; + }; + } '' mkdir -p $out/lib/gcc ln -s ${combine gcc64}/lib/gcc/* $out/lib/gcc/ @@ -32,17 +37,16 @@ let ''; clangMulti = clang.override { - # Only used for providing expected structure re:dynamic linkers, AFAIK - # Most of the magic is done by setting the --gcc-toolchain option below + # Only used for providing expected structure re:dynamic linkers, AFAIK Most + # of the magic is done by setting the --gcc-toolchain option via + # `gccForLibs`. libc = gcc_multi_sysroot; bintools = clang.bintools.override { libc = gcc_multi_sysroot; }; - extraBuildCommands = '' - sed -e '$a --gcc-toolchain=${gcc_multi_sysroot}' -i $out/nix-support/libc-cflags - ''; + gccForLibs = gcc_multi_sysroot; }; in clangMulti diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index ffa1aff95373..94b6ee71032a 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -17,7 +17,6 @@ in rec { mkdir "$rsrc" ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags rm $out/nix-support/add-hardening.sh touch $out/nix-support/add-hardening.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 343531f71f22..8e1c18731934 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9498,8 +9498,6 @@ in mkdir -p "$rsrc/lib" ln -s "${cc}/lib" "$rsrc/include" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; }; From 480f0263caaaabd75211befd2e9c4b175cb191ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Jan 2021 21:54:49 +0100 Subject: [PATCH 47/69] python3Packages.haversine: init at 2.3.0 --- .../python-modules/haversine/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/haversine/default.nix diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix new file mode 100644 index 000000000000..7f5e462d1b3c --- /dev/null +++ b/pkgs/development/python-modules/haversine/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "haversine"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "mapado"; + repo = pname; + rev = "v${version}"; + sha256 = "1c3yf9162b2b7l1lsw3ffd1linnc542qvljpgwxp6y5arrmljqnv"; + }; + + checkInputs = [ + numpy + pytestCheckHook + ]; + + pythonImportsCheck = [ "haversine" ]; + + meta = with lib; { + description = "Python module the distance between 2 points on earth"; + homepage = "https://github.com/mapado/haversine"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d37d837e4e12..1cee8907aaba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2859,6 +2859,8 @@ in { hatasmota = callPackage ../development/python-modules/hatasmota { }; + haversine = callPackage ../development/python-modules/haversine { }; + hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; hbmqtt = callPackage ../development/python-modules/hbmqtt { }; From ce1dcb5a5098d6a81b8496d60133fb48ef144746 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Sun, 24 Jan 2021 14:59:28 -0600 Subject: [PATCH 48/69] resholve: 0.4.1 -> 0.4.2 --- pkgs/development/misc/resholve/resholve.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index a03c604e330a..e8b4ed2cfb25 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -11,12 +11,12 @@ , doCheck ? true }: let - version = "0.4.1"; + version = "0.4.2"; rSrc = fetchFromGitHub { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-VK7r+kdtWvS9d4B90Hq7fhLfWT/B/Y9zppvOX9tPt5g="; + hash = "sha256-ArUQjqh4LRvFLzHiTIcae0q/VFxFF/X9eOFeRnYmTO0="; }; deps = callPackage ./deps.nix { /* From c4081a163c5d5e329e710b8b0635af29349e7996 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Jan 2021 22:07:38 +0100 Subject: [PATCH 49/69] go-audit: init at 1.0.0 --- pkgs/tools/system/go-audit/default.nix | 29 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/system/go-audit/default.nix diff --git a/pkgs/tools/system/go-audit/default.nix b/pkgs/tools/system/go-audit/default.nix new file mode 100644 index 000000000000..9670a4d06848 --- /dev/null +++ b/pkgs/tools/system/go-audit/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "go-audit"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "slackhq"; + repo = pname; + rev = "v${version}"; + sha256 = "02iwjzaz2ks0zmwijaijwzc3gn9mhn7xpx369ylgaz68arlapfjg"; + }; + + vendorSha256 = "11kb7xm82s0d8d06b2jknwn3dfh4i0a1dv0740y47vk62sf6f05i"; + + # Tests need network access + doCheck = false; + + meta = with lib; { + description = "An alternative to the auditd daemon"; + homepage = "https://github.com/slackhq/go-audit"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e037089848fd..5431ff3f820c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1347,6 +1347,8 @@ in asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; + go-audit = callPackage ../tools/system/go-audit { }; + gopass = callPackage ../tools/security/gopass { }; gospider = callPackage ../tools/security/gospider { }; From 55f568bf56b90b27e5d3abfe859e065b18851428 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Jan 2021 22:29:05 +0100 Subject: [PATCH 50/69] python3Packages.geojson-client: init at 0.5 --- .../python-modules/geojson-client/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/geojson-client/default.nix diff --git a/pkgs/development/python-modules/geojson-client/default.nix b/pkgs/development/python-modules/geojson-client/default.nix new file mode 100644 index 000000000000..7e683e204834 --- /dev/null +++ b/pkgs/development/python-modules/geojson-client/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, geojson +, haversine +, pytz +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "geojson-client"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-geojson-client"; + rev = "v${version}"; + sha256 = "1cc6ymbn45dv7xdl1r8bbizlmsdbxjmsfza442yxmmm19nxnnqjv"; + }; + + propagatedBuildInputs = [ + geojson + haversine + pytz + requests + ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "geojson_client" ]; + + meta = with lib; { + description = "Python module for convenient access to GeoJSON feeds"; + homepage = "https://github.com/exxamalte/python-geojson-client"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1cee8907aaba..ad4be313e8f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2502,6 +2502,8 @@ in { geojson = callPackage ../development/python-modules/geojson { }; + geojson-client = callPackage ../development/python-modules/geojson-client { }; + geopandas = callPackage ../development/python-modules/geopandas { }; geopy = if isPy3k then From 39011226480bf7018feca534ff5e04205c7953c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Jan 2021 22:29:23 +0100 Subject: [PATCH 51/69] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0f0737595af2..4527394a1201 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -292,7 +292,7 @@ "generic" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ ]; "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client - "geo_json_events" = ps: with ps; [ ]; # missing inputs: geojson_client + "geo_json_events" = ps: with ps; [ geojson-client ]; "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ ]; # missing inputs: georss_generic_client "geofency" = ps: with ps; [ aiohttp-cors ]; @@ -885,7 +885,7 @@ "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus - "usgs_earthquakes_feed" = ps: with ps; [ ]; # missing inputs: geojson_client + "usgs_earthquakes_feed" = ps: with ps; [ geojson-client ]; "utility_meter" = ps: with ps; [ ]; "uvc" = ps: with ps; [ uvcclient ]; "vacuum" = ps: with ps; [ ]; From 31e833ede5d4b45f142cb35810978f4117750abf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 24 Jan 2021 14:58:22 -0800 Subject: [PATCH 52/69] gnomeExtensions.unite: move aliases from aliases.nix to set aliases.nix does not allow for nested attrs to exist, as it checks if the top-level attr exists before the alias overlay is applied --- pkgs/top-level/aliases.nix | 3 --- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8b79ea0f1c80..43bf489b0e54 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -737,9 +737,6 @@ mapAliases ({ youtubeDL = youtube-dl; # added 2014-10-26 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; zdfmediathk = mediathekview; # added 2019-01-19 - gnomeExtensions = gnomeExtensions // { - unite-shell = gnomeExtensions.unite; # added 2021-01-19 - }; gnome_user_docs = gnome-user-docs; # added 2019-11-20 # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # added 2020-10-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33dcaf37baf8..38663fbe95bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27202,6 +27202,8 @@ in nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; + } // lib.optionalAttrs (config.allowAliases or false) { + unite-shell = gnomeExtensions.unite; # added 2021-01-19 }; gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { }; From dece3e543e6292d962cae72692f822194b0c75b2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jan 2021 20:43:27 +0000 Subject: [PATCH 53/69] python37Packages.bitbox02: 5.1.0 -> 5.2.0 --- pkgs/development/python-modules/bitbox02/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index e9cf4b36a49c..ce62fd6dce04 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitbox02"; - version = "5.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0hnjjjarr4q22wh03zyyqfhsizzsvg46030kks3qkzbsv29vqqh5"; + sha256 = "52b0b617660601939b30c8b588c28910946448b1b6d69ca231d5e3e47a322b71"; }; propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ]; From e6292e372161852c453ea9859507a38cb35481d3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 12:21:57 -0500 Subject: [PATCH 54/69] linux: 4.14.216 -> 4.14.217 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index c8b90b69d372..d1d9e94e2a6b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.216"; + version = "4.14.217"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "19dvxmqvs1ysl127zqdcqq2pyf7370jj66fd73zdx6ya2pplz1mp"; + sha256 = "04adj8x7p1has4mh8ygxhqgwb1i08fz9izqw1y6xj5hh8cjnm8v2"; }; } // (args.argsOverride or {})) From 7001b6fd0c333b75d92ffcc7b57e4dd3c20ea4da Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 12:22:56 -0500 Subject: [PATCH 55/69] linux: 4.19.169 -> 4.19.170 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index bf072e478645..2bc5321ea7f6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.169"; + version = "4.19.170"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "156y4ly7qyy5z7sbp2vccrs7za72k3zi2hfjpskqqd6civdlvln7"; + sha256 = "0jjvwbxpfvmzj4z6gkd2mh3kz9vh8hsgsm0013866hzgz1j043fx"; }; } // (args.argsOverride or {})) From 59bd2632d0af64de7a6ee99f1307485f78923db7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 12:23:38 -0500 Subject: [PATCH 56/69] linux: 4.4.252 -> 4.4.253 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 1e3b353650a1..9c04ee72238f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.252"; + version = "4.4.253"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0lchvfvn0kvqh1yixwscz4wrzd965zsxjkpc7nqiw9rhmvma3paf"; + sha256 = "0nlqnfhrkaj2s582kc0wxqi0881hgp6l9z85qx4ckflc8jwrh7k6"; }; } // (args.argsOverride or {})) From 2bc54a5ab7695b0f5a2aca14362e2a891ff5996b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 12:24:37 -0500 Subject: [PATCH 57/69] linux: 4.9.252 -> 4.9.253 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 5e67d55dab00..df298ade0842 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.252"; + version = "4.9.253"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1shllgrmxi6darnyzwkzazzjhpwxhm19z1swv40hnm0pbvgxm7hw"; + sha256 = "065w35vb0qp4fvnwmcx7f92inmx64f9r04zzwcwbs0826nl52nws"; }; } // (args.argsOverride or {})) From 92a6788df30482c71210f51ec3c942dbc60d06be Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 12:26:03 -0500 Subject: [PATCH 58/69] linux: 5.10.9 -> 5.10.10 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index ca6f1eeaf49b..0eaa148a49c0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.9"; + version = "5.10.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz"; + sha256 = "06fvgkrn9127xw9kly6l4ws3yv80q8xfqdzaam92lljim5pqdvb0"; }; } // (args.argsOverride or {})) From d3cf0f85c532e1bf4159e0031da0e48ce6a16764 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 12:27:20 -0500 Subject: [PATCH 59/69] linux: 5.4.91 -> 5.4.92 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 28a481b2f8ae..0469b731b894 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.91"; + version = "5.4.92"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "05swzh4gb0mk6wzza0k6b0283cygkvj8a2d2b2gab6sb0fxn208f"; + sha256 = "1zcl4dadyfrgmx6rh0ncy403rsqb1qs092m6zr6b3i14i3wpz4y0"; }; } // (args.argsOverride or {})) From e80850fe42c61d915162403a32cf20601ba61034 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 13:02:00 -0500 Subject: [PATCH 60/69] linux-hardened: Fix update script --- pkgs/os-specific/linux/kernel/hardened/update.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/update.py b/pkgs/os-specific/linux/kernel/hardened/update.py index b831c6491095..e96ac9ca8554 100755 --- a/pkgs/os-specific/linux/kernel/hardened/update.py +++ b/pkgs/os-specific/linux/kernel/hardened/update.py @@ -101,7 +101,7 @@ def verify_openpgp_signature( def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]: release = release_info.release - extra = f'.{release_info.version[-1]}' + extra = f'-{release_info.version[-1]}' def find_asset(filename: str) -> str: try: @@ -138,7 +138,7 @@ def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]: def parse_version(version_str: str) -> Version: version: Version = [] - for component in version_str.split("."): + for component in re.split('\.|\-', version_str): try: version.append(int(component)) except ValueError: @@ -208,7 +208,7 @@ failures = False releases = {} for release in repo.get_releases(): version = parse_version(release.tag_name) - # needs to look like e.g. 5.6.3.a + # needs to look like e.g. 5.6.3-hardened1 if len(version) < 4: continue From 071750d412c5ccbbbc84606c2f871881d97f067e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 13:03:31 -0500 Subject: [PATCH 61/69] linux-hardened: Remove tag patch --- pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch | 7 ------- pkgs/os-specific/linux/kernel/patches.nix | 5 ----- pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch diff --git a/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch b/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch deleted file mode 100644 index ff8a3a127973..000000000000 --- a/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/localversion-hardened b/localversion-hardened -new file mode 100644 -index 0000000000..e578045860 ---- /dev/null -+++ b/localversion-hardened -@@ -0,0 +1 @@ -+-hardened diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6b1568013b92..e7667bf1bc29 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -33,11 +33,6 @@ cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; - tag_hardened = { - name = "tag-hardened"; - patch = ./hardened/tag-hardened.patch; - }; - hardened = let mkPatch = kernelVersion: src: { name = lib.removeSuffix ".patch" src.name; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38663fbe95bc..19f6c27b1e0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19265,10 +19265,9 @@ in inherit (kernel) version; }; kernelPatches = kernel.kernelPatches ++ [ - kernelPatches.tag_hardened kernelPatches.hardened.${kernel.meta.branch} ]; - modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra + "-hardened"; + modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra; isHardened = true; }); From 5772d38d690103927966ab01875ed6cb86e5be40 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 13:03:55 -0500 Subject: [PATCH 62/69] linux/hardened/patches/4.14: 4.14.216.a -> 4.14.217-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c75117769d1f..436965967dec 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { - "extra": ".a", - "name": "linux-hardened-4.14.216.a.patch", - "sha256": "1pv0akd1dmhm10r9b7xambn3ipl1niypsmb3ibfmxdj4zln0g7aq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.216.a/linux-hardened-4.14.216.a.patch" + "extra": "-hardened1", + "name": "linux-hardened-4.14.217-hardened1.patch", + "sha256": "1hb5fa06xw9rn0f77lklrlhb6vajr1hjv64qxv5y03l7zqfsi7lx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.217-hardened1/linux-hardened-4.14.217-hardened1.patch" }, "4.19": { "extra": ".a", From 93f2a3f1a5da9d1709caa7b72789d3bc873ab0a6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 13:03:58 -0500 Subject: [PATCH 63/69] linux/hardened/patches/4.19: 4.19.169.a -> 4.19.170-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 436965967dec..a28c5cf02820 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -6,10 +6,10 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.217-hardened1/linux-hardened-4.14.217-hardened1.patch" }, "4.19": { - "extra": ".a", - "name": "linux-hardened-4.19.169.a.patch", - "sha256": "0l3n1yjsa777pdxh4ib7phpfrw7c8vr1xwzgs8khnffllj9f16iq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.169.a/linux-hardened-4.19.169.a.patch" + "extra": "-hardened1", + "name": "linux-hardened-4.19.170-hardened1.patch", + "sha256": "0wx1bhkxyiqk6r51922dhv29jfkx6kfwk4w3z2rc8shpm6krdngv", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.170-hardened1/linux-hardened-4.19.170-hardened1.patch" }, "5.10": { "extra": ".a", From a7221d3c6c3ae5f25b789d60ff6a3abd345f5339 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 13:04:01 -0500 Subject: [PATCH 64/69] linux/hardened/patches/5.10: 5.10.9.a -> 5.10.10-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a28c5cf02820..cdb1f8ac1ee7 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,10 +12,10 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.170-hardened1/linux-hardened-4.19.170-hardened1.patch" }, "5.10": { - "extra": ".a", - "name": "linux-hardened-5.10.9.a.patch", - "sha256": "0mkwyknafdbc2hqv4j7jjc6wsrrx6a76d69hxh7x90gi0s3f5rfw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.9.a/linux-hardened-5.10.9.a.patch" + "extra": "-hardened1", + "name": "linux-hardened-5.10.10-hardened1.patch", + "sha256": "0hm8ng073lzqcj5khgpxvr775z0jns9y00qj8b0n63yq0klm2pqh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.10-hardened1/linux-hardened-5.10.10-hardened1.patch" }, "5.4": { "extra": ".a", From 944b6ea6e4aed16267f716fef55b2eaa6b90161e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 13:04:04 -0500 Subject: [PATCH 65/69] linux/hardened/patches/5.4: 5.4.91.a -> 5.4.92-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index cdb1f8ac1ee7..6994dd48615b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -18,10 +18,10 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.10-hardened1/linux-hardened-5.10.10-hardened1.patch" }, "5.4": { - "extra": ".a", - "name": "linux-hardened-5.4.91.a.patch", - "sha256": "0kqn9g6wh4rp9riwkjmzapmnwk0fd5z18z26j2rqfgq7x4r8d7rm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.91.a/linux-hardened-5.4.91.a.patch" + "extra": "-hardened1", + "name": "linux-hardened-5.4.92-hardened1.patch", + "sha256": "0qklpyrd20xsyrvw6ij8y337vjfnxlkyyvalzk96ngkvlfv5b7qh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.92-hardened1/linux-hardened-5.4.92-hardened1.patch" }, "5.9": { "extra": "", From 85879ac1e274bab3d696856733cef0dbde9d3aa9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 13:04:28 -0500 Subject: [PATCH 66/69] linux-hardened: Remove 5.9 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 6994dd48615b..695477417aa8 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,11 +22,5 @@ "name": "linux-hardened-5.4.92-hardened1.patch", "sha256": "0qklpyrd20xsyrvw6ij8y337vjfnxlkyyvalzk96ngkvlfv5b7qh", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.92-hardened1/linux-hardened-5.4.92-hardened1.patch" - }, - "5.9": { - "extra": "", - "name": "linux-hardened-5.9.16.a.patch", - "sha256": "024wdzc9bwgr4nd4z0l6bazcl35jczhsmdl2lb26bvffjwg207rw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.16.a/linux-hardened-5.9.16.a.patch" } } From c81f92751c6d7af89fb3fbe5282f1d1ef8b9b1d9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Jan 2021 13:12:41 -0500 Subject: [PATCH 67/69] linux: Remove 5.9 --- pkgs/os-specific/linux/kernel/linux-5.9.nix | 18 ------------------ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 9 --------- 3 files changed, 28 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-5.9.nix diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix deleted file mode 100644 index 5f7db41c9a97..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.9.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.9.16"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "11mbnjvb5d5gwbrwlkqvzpg1ij4m19l5wr3wca9iiyg5i2papmxh"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 43bf489b0e54..4179ccd39f4c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -322,7 +322,6 @@ mapAliases ({ libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 links = links2; # added 2016-01-31 - linux_mptcp_5_9 = linux_5_9; # added 2020-01-07 linux_rpi0 = linux_rpi1; linuxPackages_rpi0 = linuxPackages_rpi1; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19f6c27b1e0c..eae36ef2a49e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18918,14 +18918,6 @@ in ]; }; - linux_5_9 = callPackage ../os-specific/linux/kernel/linux-5.9.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" - ]; - }; - linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -19218,7 +19210,6 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); - linuxPackages_5_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_9); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); # When adding to the list above: From 057017ee8673a217da3b7530b298fbd0b974000f Mon Sep 17 00:00:00 2001 From: Vonfry <3413119+Vonfry@users.noreply.github.com> Date: Mon, 25 Jan 2021 08:17:21 +0800 Subject: [PATCH 68/69] zsh-fzf-tab: init at 2021-01-24 (#110694) * zsh-fzf-tab: init at 2021-01-24 * Update pkgs/shells/zsh/zsh-fzf-tab/default.nix Co-authored-by: Sandro --- pkgs/shells/zsh/zsh-fzf-tab/default.nix | 45 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/shells/zsh/zsh-fzf-tab/default.nix diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix new file mode 100644 index 000000000000..b48eda0a728a --- /dev/null +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchFromGitHub, ncurses }: + +let + INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; +in stdenv.mkDerivation rec { + pname = "zsh-fzf-tab"; + version = "unstable-2021-01-24"; + + src = fetchFromGitHub { + owner = "Aloxaf"; + repo = "fzf-tab"; + rev = "78b4cefb27dc2bef5e4c9ac3bf2bd28413620fcd"; + sha256 = "1f5m7vf7wxzczis2nzvhgqaqnphhp3a0wv8b612m7g4fnvk3lnkn"; + }; + + buildInputs = [ ncurses ]; + + postConfigure = '' + pushd modules + ./configure --disable-gdbm --without-tcsetpgrp + popd + ''; + + postBuild = '' + pushd modules + make -j$NIX_BUILD_CORES + popd + ''; + + installPhase = '' + mkdir -p ${INSTALL_PATH} + cp -r lib ${INSTALL_PATH}/lib + install -D fzf-tab.zsh ${INSTALL_PATH}/fzf-tab.zsh + install -D fzf-tab.plugin.zsh ${INSTALL_PATH}/fzf-tab.plugin.zsh + install -D modules/Src/aloxaf/fzftab.so ${INSTALL_PATH}/modules/Src/aloxaf/fzftab.so + ''; + + meta = with lib; { + homepage = "https://github.com/Aloxaf/fzf-tab"; + description = "Replace zsh's default completion selection menu with fzf!"; + license = licenses.mit; + maintainers = with maintainers; [ vonfry ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 270d6e80eb37..5e8c8c6ee4d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9161,6 +9161,8 @@ in zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { }; + zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { }; + zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { }; zsh-powerlevel10k = callPackage ../shells/zsh/zsh-powerlevel10k { }; From 8a7d28b9945526c0c090614598589ae5c025d4fd Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 24 Jan 2021 15:21:57 +0100 Subject: [PATCH 69/69] ipfs-cluster: unstable-2020-10 -> 0.13.1 https://github.com/ipfs/ipfs-cluster/releases/tag/v0.13.1 --- pkgs/applications/networking/ipfs-cluster/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 69b2d9ef3094..dcb25c736570 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "unstable-2020-10-20"; + version = "0.13.1"; - vendorSha256 = "0abfhl4v4yqy89aqn13ymj4rw5zhr92a9fh1abgpkr19adnyrs3d"; + vendorSha256 = "0ls6d5ijl8bbh48w0i30mwd4a4na93iw9xqpbw23lnb8pvskaggh"; patches = [ ./test.patch @@ -13,8 +13,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; - rev = "c78f7839a2d5645806e01bfbf7af862600f8fbc4"; - sha256 = "0fschpysma2piy2bfas56yapxm2cl6nj986ww3sp7ysldjzadmkk"; + rev = "v${version}"; + sha256 = "0kmsa7cnk88wrplsjysrpg6n0gd0risnhw0kh33jqx0fcg12b7h8"; }; meta = with lib; {