From 657baec0384031e014a62cc283f170bf56ca1fdd Mon Sep 17 00:00:00 2001 From: larsr Date: Fri, 4 Feb 2022 13:48:32 +0100 Subject: [PATCH 001/231] cudatoolkit: added 11.6.0 --- pkgs/development/compilers/cudatoolkit/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 33a386cfb926..a284caffa5d1 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -79,5 +79,12 @@ rec { gcc = gcc10; # can bump to 11 along with stdenv.cc }; + cudatoolkit_11_6 = common { + version = "11.6.0"; + url = "https://developer.download.nvidia.com/compute/cuda/11.6.0/local_installers/cuda_11.6.0_510.39.01_linux.run"; + sha256 = "10wcv42ljp7hz1k0wzgwb4hi8834rfipzdc01428c1wpcdnxm0qp"; + gcc = gcc10; # can bump to 11 along with stdenv.cc + }; + cudatoolkit_11 = cudatoolkit_11_4; } From 8d2078af5a8c817edc255f3e0a87371d208a773a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 19:15:58 +0000 Subject: [PATCH 002/231] python310Packages.monty: 2022.1.12.1 -> 2022.1.19 --- pkgs/development/python-modules/monty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 16205286c003..ea95e2b2d85d 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "monty"; - version = "2022.1.12.1"; + version = "2022.1.19"; disabled = pythonOlder "3.5"; # uses type annotations src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "11bp3zkmqffc6rqw93qfk8d905mzc10nqbjmvj2bay8h197q0dg2"; + sha256 = "sha256-CGYYPpXRBvqf6GJYYZUARpzt4XFc5uAw91n21UInYpU="; }; postPatch = '' From 802f6ce59509f1a997576315f5ebfad61797493a Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 11 Feb 2022 18:10:37 +0100 Subject: [PATCH 003/231] python3Packages.tappy: update supported Python version --- pkgs/development/python-modules/tappy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tappy/default.nix b/pkgs/development/python-modules/tappy/default.nix index abbf70df62fb..4652ea99f6d8 100644 --- a/pkgs/development/python-modules/tappy/default.nix +++ b/pkgs/development/python-modules/tappy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tap.py"; version = "3.1"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; From 1aac6d80cf861ac8da96235302f8248d3516dbb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Feb 2022 11:07:56 +0000 Subject: [PATCH 004/231] interactsh: 0.0.7 -> 1.0.1 --- pkgs/tools/misc/interactsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix index 39511f567fd3..979569dc3329 100644 --- a/pkgs/tools/misc/interactsh/default.nix +++ b/pkgs/tools/misc/interactsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "interactsh"; - version = "0.0.7"; + version = "1.0.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TP2U2gQHmpAFHr5uh7MCNXZ22k8+U4h0bBxkMiMzof0="; + sha256 = "sha256-czXcncEm2Wm0ezGjNOpcCin5KOZKuimnnMPUWfGE0FY="; }; - vendorSha256 = "sha256-9ehliyOCrWSDHVtmuUFBdw4BY6ygOvr2JxxJ3TvmSFU="; + vendorSha256 = "sha256-YfHsl0AFNQNCg4HEP9FyrHUMMz0SFn5aDRrOruseE5k="; modRoot = "."; subPackages = [ From 197b285e4212e33a48169bcac716a59e8bcd13b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Feb 2022 11:53:52 +0000 Subject: [PATCH 005/231] mob: 2.2.1 -> 2.3.0 --- pkgs/applications/misc/mob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 15a7275bd80d..ef3f5c58853d 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoPackage rec { pname = "mob"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "sha256-1yE3KFGY51m6OL4LYrz+BSCHQSnbQRSpB3EUqAzSr+M="; + sha256 = "sha256-vrs8PHKZMQO9AAvvbs8Hfg9Mq3j9LgAwocnaPEPddw8="; }; nativeBuildInputs = [ From ae8be5d959ab9ec30c09787117270947fbc9af38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Feb 2022 14:59:05 +0000 Subject: [PATCH 006/231] mark: 6.7 -> 8.0 --- pkgs/tools/text/mark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index 5e4bd7becc52..9c7f4e2b385d 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "6.7"; + version = "8.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-ZPKYZbWrR69V4SkXTiAK59Q2xpxkOC6KyAuspjzERwQ="; + sha256 = "sha256-1cJt/+OClc7YxSy9kGLQrREckjDvMIBdzet9SJGPb84="; }; - vendorSha256 = "sha256-Yp47FBS8JN/idBfZG0z0f2A1bzob8KTPtZ7u0cNCrM8="; + vendorSha256 = "sha256-a+pWSt24+aNABcLhiiFy+g/imBQtiqliAAWWkjPolxU="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From 4c00fb958873a25144504b90b2952d3081b33ab4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Feb 2022 22:45:04 +0000 Subject: [PATCH 007/231] piping-server-rust: 0.10.2 -> 0.12.0 --- pkgs/servers/piping-server-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix index 1108116af1d3..7cf9442f13bf 100644 --- a/pkgs/servers/piping-server-rust/default.nix +++ b/pkgs/servers/piping-server-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "piping-server-rust"; - version = "0.10.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "nwtgck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3EDUG9W4WzYk/bjUFIQ7Ho0KR6aMykhyTnWR/+VNxz8="; + sha256 = "sha256-eDO2y/4660IAcD9vf1Vt6t3nv3Rc+zCRRFBbW/FeKIw="; }; - cargoSha256 = "sha256-8xUhYyjc4560PowCRwYeZMUJLhZFTHcMRLe/iQAwaWE="; + cargoSha256 = "sha256-U68R543l28osPe0DjuERqB/G6ur/BZDpWMZIO9RObaM="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; From 5f6dad75cb765c2f4305d205663089fd69729c7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Feb 2022 06:53:29 +0000 Subject: [PATCH 008/231] python310Packages.atlassian-python-api: 3.19.0 -> 3.20.0 --- .../python-modules/atlassian-python-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 399926c5e05f..468dac556614 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.19.0"; + version = "3.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = version; - sha256 = "sha256-SJsqk8TM+5UztN1ZDyYrOjNIWDLhm5XtLxPflIGPxKQ="; + sha256 = "sha256-yTRJz5zLt5eV+IHrVVLmVZnkbf0FBLM7CiCQ28X1cgc="; }; propagatedBuildInputs = [ From 25fde0a83b61af9043c7b60535444a3edd2853cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Feb 2022 08:19:48 +0000 Subject: [PATCH 009/231] python310Packages.qiskit-optimization: 0.3.0 -> 0.3.1 --- .../python-modules/qiskit-optimization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix index b1ce0561dc4b..d2b87d9cfeaf 100644 --- a/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qiskit-optimization"; - version = "0.3.0"; + version = "0.3.1"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "18qs0m21j73fjawq3pxz5q5c0g2wgqgicy7p4a57lialpv6vrmc0"; + sha256 = "sha256-6oqhM5sEu0id0qYrhdVyx0xXUvwxBgZSPvrlAnmtY5A="; }; postPatch = '' From 19f7856b391b77d72c56fa8a2400fd6caf42e9e9 Mon Sep 17 00:00:00 2001 From: illustris Date: Tue, 15 Feb 2022 23:44:26 +0530 Subject: [PATCH 010/231] nixos/proxmox-lxc: init --- nixos/modules/virtualisation/proxmox-lxc.nix | 64 ++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 nixos/modules/virtualisation/proxmox-lxc.nix diff --git a/nixos/modules/virtualisation/proxmox-lxc.nix b/nixos/modules/virtualisation/proxmox-lxc.nix new file mode 100644 index 000000000000..3913b474afbe --- /dev/null +++ b/nixos/modules/virtualisation/proxmox-lxc.nix @@ -0,0 +1,64 @@ +{ config, pkgs, lib, ... }: + +with lib; + +{ + options.proxmoxLXC = { + privileged = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable privileged mounts + ''; + }; + manageNetwork = mkOption { + type = types.bool; + default = false; + description = '' + Whether to manage network interfaces through nix options + When false, systemd-networkd is enabled to accept network + configuration from proxmox. + ''; + }; + }; + + config = + let + cfg = config.proxmoxLXC; + in + { + system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix { + storeContents = [{ + object = config.system.build.toplevel; + symlink = "none"; + }]; + + contents = [{ + source = config.system.build.toplevel + "/init"; + target = "/sbin/init"; + }]; + + extraCommands = "mkdir -p root etc/systemd/network"; + }; + + boot = { + isContainer = true; + loader.initScript.enable = true; + }; + + networking = mkIf (!cfg.manageNetwork) { + useDHCP = false; + useHostResolvConf = false; + useNetworkd = true; + }; + + services.openssh = { + enable = mkDefault true; + startWhenNeeded = mkDefault true; + }; + + systemd.mounts = mkIf (!cfg.privileged) + [{ where = "/sys/kernel/debug"; enable = false; }]; + + }; +} From 4c54ad0f3c39ff667906e310a44af1d9b0d3af66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Feb 2022 08:45:44 +0000 Subject: [PATCH 011/231] geoipupdate: 4.8.0 -> 4.9.0 --- pkgs/applications/misc/geoipupdate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index d92c4d049135..4ac2fdc44a3a 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "geoipupdate"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "sha256-fcz1g17JR6jOpq5zOpCmnI00hyXSYYGHfoFRE8/c8dk="; + sha256 = "sha256-AqA0hzZGn5XU2Pyoj1vaP+ht7r3dpDhuang4KCXaSgs="; }; - vendorSha256 = "sha256-YawWlPZV4bBOsOFDo2nIXKWwcxb5hWy5OiB99MG0HcY="; + vendorSha256 = "sha256-S+CnIPoyGM7dEQICOIlAWBIC24Fyt7q+OY382evDgQc="; doCheck = false; From 524071fda751efc5b82fc5f1f5798c6a74bbe989 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Feb 2022 17:34:50 +0000 Subject: [PATCH 012/231] openimagedenoise: 1.4.2 -> 1.4.3 --- pkgs/development/libraries/openimagedenoise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index f1bbb01653f2..8d02b976c91f 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "openimagedenoise"; - version = "1.4.2"; + version = "1.4.3"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; - sha256 = "sha256-+7o7b64ORCLn8z0KbnUKhlgPs9mlyDCUiNKJEbusGxw="; + sha256 = "sha256-i73w/Vkr5TPLB1ulPbPU4OVGwdNlky1brfarueD7akE="; }; nativeBuildInputs = [ cmake python3 ispc ]; From f02774bce8f4328ef77a4d082adf3c92473a1f3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Feb 2022 04:35:01 +0000 Subject: [PATCH 013/231] python310Packages.azure-mgmt-datafactory: 2.2.0 -> 2.2.1 --- .../python-modules/azure-mgmt-datafactory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index bfd0b6196954..9c6e9e2d80f7 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.2.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bc2560b4de1528292883b53a337b89f04a5ceab7c3500b6bc388e3a77ff093cc"; + sha256 = "sha256-/YmFlK5xl3HjaKGAhQu0JUVeujzPkAb8gNik4Lzp470="; }; propagatedBuildInputs = [ From 83fe39311845333f10feef01afdc98cc30caefab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Feb 2022 10:43:38 +0000 Subject: [PATCH 014/231] python310Packages.azure-mgmt-storage: 19.0.0 -> 19.1.0 --- .../development/python-modules/azure-mgmt-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index ed5b19bd80d6..cd7e96049d1f 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { - version = "19.0.0"; + version = "19.1.0"; pname = "azure-mgmt-storage"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f05963e5a8696d0fd4dcadda4feecb9b382a380d2e461b3647704ac787d79876"; + sha256 = "sha256-Seoi8A4JZaNVCvNKQcGh06SBaQ9lAMeOhUCIAvVtdBY="; }; propagatedBuildInputs = [ From 71a8819e3d80db1869c311388185d406230e6f77 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 14 Feb 2022 18:37:26 +0100 Subject: [PATCH 015/231] wallabag: 2.4.2 -> 2.4.3 https://github.com/wallabag/wallabag/releases/tag/2.4.3 --- pkgs/servers/web-apps/wallabag/default.nix | 39 +++++++++++++--------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index c3c0eb507855..6730608f7074 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -1,18 +1,28 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: -stdenv.mkDerivation rec { +# Point the environment variable $WALLABAG_DATA to a data directory +# that contains the folder `app/config` which must be a clone of +# wallabag's configuration files with your customized `parameters.yml`. +# These need to be updated every package upgrade. +# +# After a package upgrade, empty the `var/cache` folder or unexpected +# error will occur. + +let pname = "wallabag"; - version = "2.4.2"; - - # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur + version = "2.4.3"; +in +stdenv.mkDerivation { + inherit pname version; src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "1n39flqqqjih0lc86vxdzbp44x4rqj5292if2fsa8y1xxlvyqmns"; + hash = "sha256-u6TflAzxoaxjLhNMv5ua+NPBv4kxGycgz2QXnhtDHTo="; }; - outputs = [ "out" ]; - patches = [ ./wallabag-data.patch # exposes $WALLABAG_DATA ]; @@ -20,22 +30,21 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - mkdir $out/ + mkdir $out cp -R * $out/ ''; meta = with lib; { - description = "Web page archiver"; + description = "wallabag is a self hostable application for saving web pages"; longDescription = '' - wallabag is a self hostable application for saving web pages. - - Point the environment variable $WALLABAG_DATA to a data directory that contains the folder `app/config` which must be a clone of wallabag's configuration files with your customized `parameters.yml`. These need to be updated every package upgrade. - After a package upgrade, empty the `var/cache` folder. + wallabag is a self-hostable PHP application allowing you to not + miss any content anymore. Click, save and read it when you can. + It extracts content so that you can read it when you have time. ''; license = licenses.mit; homepage = "http://wallabag.org"; + changelog = "https://github.com/wallabag/wallabag/releases/tag/${version}"; maintainers = with maintainers; [ schneefux ]; platforms = platforms.all; }; } - From b394e3c6f78849d3351b91cad69599552621ee18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Feb 2022 00:30:01 +0000 Subject: [PATCH 016/231] python310Packages.datamodeldict: 0.9.8 -> 0.9.9 --- pkgs/development/python-modules/datamodeldict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix index b87ce1803c0d..f09435693e1c 100644 --- a/pkgs/development/python-modules/datamodeldict/default.nix +++ b/pkgs/development/python-modules/datamodeldict/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.9.8"; + version = "0.9.9"; pname = "DataModelDict"; src = fetchPypi { inherit pname version; - sha256 = "65c36954efa17449c69a4d8cb11c9273593ef01428cd77a609ee134eba771550"; + sha256 = "sha256-DadBRsc8qEu9PWgMNllGS2ESKL7kgBLDhg4yDr87WRk="; }; propagatedBuildInputs = [ xmltodict ]; From 676f30ed2914c2507fe6c50eeea75f05e3d47ec9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Feb 2022 13:23:30 +0000 Subject: [PATCH 017/231] timetagger: 22.2.2 -> 22.2.3 --- pkgs/development/python-modules/timetagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 29f2ffbc49b9..1da2887a12f1 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonPackage rec { pname = "timetagger"; - version = "22.2.2"; + version = "22.2.3"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U2OvvS61t4RnWAA/mv84TWRj+/8SRRXrBR+fX3bakqw="; + sha256 = "sha256-tQel+IVqP+MngAvFgr7Yh+XCSIPWpzCBXHOj9b0Os98="; }; propagatedBuildInputs = with python3Packages; [ From 8615084478e8412e7742fea7511db3d16e98f07e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Feb 2022 22:22:56 +0000 Subject: [PATCH 018/231] pugixml: 1.12 -> 1.12.1 --- pkgs/development/libraries/pugixml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 6a8baae5c9a2..c976db882257 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.12"; + version = "1.12.1"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "sha256-FLemG9T17n6l7vgb01OmO22BK59jv5uozVHeUnILEEQ="; + sha256 = "sha256-Udjx84mhLPJ1bU5WYDo73PAeeufS+vBLXZP0YbBvqLE="; }; outputs = if shared then [ "out" "dev" ] else [ "out" ]; From d3f07498cd422a4af4ddab9694ac88ccc3f9dac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81tila=20Saraiva?= Date: Tue, 15 Feb 2022 14:32:23 -0300 Subject: [PATCH 019/231] oil-buku: init at 0.3.2 --- pkgs/applications/misc/oil/default.nix | 45 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/misc/oil/default.nix diff --git a/pkgs/applications/misc/oil/default.nix b/pkgs/applications/misc/oil/default.nix new file mode 100644 index 000000000000..173cea2ee1cb --- /dev/null +++ b/pkgs/applications/misc/oil/default.nix @@ -0,0 +1,45 @@ +{ stdenvNoCC, lib, fetchFromGitHub, jq, gawk, peco, makeWrapper }: + +stdenvNoCC.mkDerivation rec { + pname = "oil-buku"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "AndreiUlmeyda"; + repo = "oil"; + rev = version; + sha256 = "12g0fd7h11hh94b2pyg3pqwbf8bc7gcnrnm1qqbf18s6z02b6ixr"; + }; + + postPatch = '' + substituteInPlace src/oil --replace \ + "LIBDIR=/usr/local/lib/oil" "LIBDIR=${placeholder "out"}/lib" + + substituteInPlace Makefile --replace \ + "LIBDIR ?= /usr/local/lib/oil" "LIBDIR ?= ${placeholder "out"}/lib" \ + + substituteInPlace Makefile --replace \ + "BINDIR ?= /usr/local/bin" "BINDIR ?= ${placeholder "out"}/bin" + + substituteInPlace src/json-to-line.jq --replace \ + "/usr/bin/env -S jq" "${jq}/bin/jq" + + substituteInPlace src/format-columns.awk --replace \ + "/usr/bin/env -S awk" "${gawk}/bin/awk" + ''; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/oil \ + --prefix PATH : ${lib.makeBinPath [ peco ]} + ''; + + meta = with lib; { + description = "Search-as-you-type cli frontend for the buku bookmarks manager using peco"; + homepage = "https://github.com/AndreiUlmeyda/oil"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d37a6e8efb03..4dae24b3270b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3580,6 +3580,8 @@ with pkgs; odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; + oil-buku = callPackage ../applications/misc/oil { }; + ossutil = callPackage ../tools/admin/ossutil {}; pastel = callPackage ../applications/misc/pastel { From b20eba3135c2763c4c71dd85efaf28358e81d8ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 11:56:36 +0000 Subject: [PATCH 020/231] nsd: 4.3.9 -> 4.4.0 --- pkgs/servers/dns/nsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index e9f030dac785..251e4424578c 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.9"; + version = "4.4.0"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-UxVJ8JKJ7L0Fgp4UuzRWMpTYW57d4sYToA9ZevITXo0="; + sha256 = "sha256-z81v3Zk0TKWn73wpQMJBvO9HH8MlK6PcvUxX4GOOiDY="; }; prePatch = '' From 9bd4ed39357f42aaa3bf3a74524975123b29b670 Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Sat, 19 Feb 2022 07:10:41 -0500 Subject: [PATCH 021/231] maintainers: add DieracDelta --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9101690bd0f3..30f850f7abdf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2975,6 +2975,12 @@ githubId = 8404455; name = "Diego Lelis"; }; + DieracDelta = { + email = "justin@restivo.me"; + github = "DieracDelta"; + githubId = 13730968; + name = "Justin Restivo"; + }; diffumist = { email = "git@diffumist.me"; github = "diffumist"; From c4032926fb4cbf05f78c6c5045cc0887eaf9d0a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 13:36:03 +0000 Subject: [PATCH 022/231] python310Packages.influxdb-client: 1.25.0 -> 1.26.0 --- pkgs/development/python-modules/influxdb-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 9eb9bd48d47e..eb38013d75f4 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.25.0"; + version = "1.26.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "0anziqlczzc9qmz1mrk8yapn0pc18wz2pknyghyj5qpym3w2azas"; + sha256 = "sha256-9MI6AgFTEw9dnBWdry3FnPERXnXZJhbYX4tXj9sGMkg="; }; propagatedBuildInputs = [ From 4d2e4cc273dd613f50c762bb296166bbc7de02cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Feb 2022 02:55:48 +0000 Subject: [PATCH 023/231] skate: 0.1.3 -> 0.1.4 --- pkgs/applications/misc/skate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/applications/misc/skate/default.nix index 1c5dcc7be546..bb2315e7cff6 100644 --- a/pkgs/applications/misc/skate/default.nix +++ b/pkgs/applications/misc/skate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "skate"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "skate"; rev = "v${version}"; - sha256 = "sha256-rUOFx0ebZs3xmsSz9oFvjINaHp9gIe7E/5UoJJ47aZc="; + sha256 = "sha256-vZps/VXNK+17quPyE1b56YXE2GsW3oB4vPi7sA8EPGE="; }; - vendorSha256 = "sha256-2jyhDSPO/Xg3xBCA93SMSlm7D+ze0MGbNtRpL82IAsk="; + vendorSha256 = "sha256-7cf/ldBli/q7aNiCO7qIw8o09hVpwDxF2h/UelP86V4="; doCheck = false; From 4e64bd5e4ca225e9aeababa9ed84c4bd6be430d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Feb 2022 23:43:22 +0100 Subject: [PATCH 024/231] yara: 4.1.3 -> 4.2.0-rc1 --- pkgs/tools/security/yara/default.nix | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index a0a06e2906c4..082f163437cf 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -14,23 +14,31 @@ }: stdenv.mkDerivation rec { - version = "4.1.3"; pname = "yara"; + version = "4.2.0-rc1"; src = fetchFromGitHub { owner = "VirusTotal"; - repo = "yara"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-7t2KksI3l+wFHqUSw2L4FXepMTJfTow/cTFYA47YBqY="; + hash = "sha256-WcN6ClYO2d+/MdG06RHx3kN0o0WVAY876dJiG7CwJ8w="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; - buildInputs = [ pcre protobufc ] - ++ lib.optionals withCrypto [ openssl ] - ++ lib.optionals enableMagic [ file ] - ++ lib.optionals enableCuckoo [ jansson ] - ; + buildInputs = [ + pcre + protobufc + ] ++ lib.optionals withCrypto [ + openssl + ] ++ lib.optionals enableMagic [ + file + ] ++ lib.optionals enableCuckoo [ + jansson + ]; preConfigure = "./bootstrap.sh"; From e0feb90507d5dc91bc24a88fd64f33136ae9f35a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Feb 2022 23:03:52 +0000 Subject: [PATCH 025/231] thrift: 0.15.0 -> 0.16.0 --- pkgs/development/libraries/thrift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index c5795df55c01..f85e56578bbe 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "thrift"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-1Yg1ZtFh+Pbd1OIfOp4+a4JyeZ0FSCDxwlsR6GcY+Gs="; + sha256 = "sha256-9GC1wcow2JGP+V6j62KRs5Uc9RhVNWYIjz8r6JgfYgk="; }; # Workaround to make the python wrapper not drop this package: From 303168630bf54044d2d2543d3c8970d069fcafd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 03:12:10 +0000 Subject: [PATCH 026/231] python310Packages.trimesh: 3.10.0 -> 3.10.1 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index d4da6ee6928a..c479f1e2c1ca 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.10.0"; + version = "3.10.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mPsV25oD8FlPSDOGHOX+nLCN/I6RS83l3efUCgavmHY="; + sha256 = "sha256-4i1pSpCydU/SzoMSkW5NN5rOVd9J09/cBOLE6WQCUE0="; }; propagatedBuildInputs = [ numpy ]; From 7568527108066c0f58ff9703bf8d3d1ac8f1e03a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 04:15:48 +0000 Subject: [PATCH 027/231] asciigraph: 0.5.2 -> 0.5.3 --- pkgs/tools/text/asciigraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/tools/text/asciigraph/default.nix index 27c2a1ff28ec..5cfa00d5326f 100644 --- a/pkgs/tools/text/asciigraph/default.nix +++ b/pkgs/tools/text/asciigraph/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "asciigraph"; - version = "0.5.2"; + version = "0.5.3"; goPackagePath = "github.com/guptarohit/asciigraph"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "guptarohit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iVgJtxt0B6nMA3bieZ1CmZucwLMb5av6Wn5BMDRWfcI="; + sha256 = "sha256-GzFJT4LI1QZzghs9g2A+pqkTg68XC+m9F14rYpMxEXM="; }; meta = with lib; { From 798468570779b3d9c4a349e02e50e80e34e6421f Mon Sep 17 00:00:00 2001 From: Etienne JEAN Date: Mon, 14 Feb 2022 15:53:30 +0100 Subject: [PATCH 028/231] python3Packages.logical-unification: init at 0.4.5 --- .../logical-unification/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/logical-unification/default.nix diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix new file mode 100644 index 000000000000..b89fcb25339e --- /dev/null +++ b/pkgs/development/python-modules/logical-unification/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, toolz +, multipledispatch +, pytestCheckHook +, pytest-html +, pytest-benchmark +}: + +buildPythonPackage rec { + pname = "logical-unification"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "unification"; + rev = "707cf4a39e27a4a8bf06b7e7dce7223085574e65"; + sha256 = "sha256-3wqO0pWWFRQeoGNvbSDdLNYFyjNnv+O++F7+vTBUJoI="; + }; + + propagatedBuildInputs = [ + toolz + multipledispatch + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + pytest-benchmark # Needed for the `--benchmark-skip` flag + ]; + + pytestFlagsArray = [ + "--benchmark-skip" + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "unification" ]; + + meta = with lib; { + description = "Straightforward unification in Python that's extensible via generic functions"; + homepage = "https://github.com/pythological/unification"; + changelog = "https://github.com/pythological/unification/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index defea641afa5..5e0f19028a8e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4759,6 +4759,8 @@ in { logfury = callPackage ../development/python-modules/logfury { }; + logical-unification = callPackage ../development/python-modules/logical-unification { }; + logilab_astng = callPackage ../development/python-modules/logilab_astng { }; logilab_common = callPackage ../development/python-modules/logilab/common.nix { }; From b5ce29f490b5c9c4b195ee8df6d0aceceb11971f Mon Sep 17 00:00:00 2001 From: Etienne JEAN Date: Mon, 14 Feb 2022 15:55:13 +0100 Subject: [PATCH 029/231] python3Packages.cons: init at 0.4.5 --- .../python-modules/cons/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/cons/default.nix diff --git a/pkgs/development/python-modules/cons/default.nix b/pkgs/development/python-modules/cons/default.nix new file mode 100644 index 000000000000..2977051d87b2 --- /dev/null +++ b/pkgs/development/python-modules/cons/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, logical-unification +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "cons"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "python-cons"; + rev = "fbeedfc8a3d1bff4ba179d492155cdd55538365e"; + sha256 = "sha256-ivHFep9iYPvyiBIZKMAzqrLGnQkeuxd0meYMZwZFFH0="; + }; + + propagatedBuildInputs = [ + logical-unification + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "cons" ]; + + meta = with lib; { + description = "An implementation of Lisp/Scheme-like cons in Python"; + homepage = "https://github.com/pythological/python-cons"; + changelog = "https://github.com/pythological/python-cons/releases"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e0f19028a8e..d83860f5273a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1807,6 +1807,8 @@ in { connexion = callPackage ../development/python-modules/connexion { }; + cons = callPackage ../development/python-modules/cons { }; + consonance = callPackage ../development/python-modules/consonance { }; constantly = callPackage ../development/python-modules/constantly { }; From 0f4273b87a37c048de8db942de0f415d8a6b5833 Mon Sep 17 00:00:00 2001 From: Etienne JEAN Date: Mon, 14 Feb 2022 15:57:00 +0100 Subject: [PATCH 030/231] python3Packages.etuples: init at 0.3.4 --- .../python-modules/etuples/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/etuples/default.nix diff --git a/pkgs/development/python-modules/etuples/default.nix b/pkgs/development/python-modules/etuples/default.nix new file mode 100644 index 000000000000..bfb4552732b2 --- /dev/null +++ b/pkgs/development/python-modules/etuples/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cons +, multipledispatch +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "etuples"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "etuples"; + rev = "35d760ceb64ec318f302a6e4d3a4a80feda97a9e"; + sha256 = "sha256-CXD8MhsdWYAcG5WDVTT/A2HDtiO1xfQbrwlYVnxXpBU="; + }; + + propagatedBuildInputs = [ + cons + multipledispatch + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "etuples" ]; + + meta = with lib; { + description = "Python S-expression emulation using tuple-like objects"; + homepage = "https://github.com/pythological/etuples"; + changelog = "https://github.com/pythological/etuples/releases"; + license = licenses.asl20; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d83860f5273a..7e3b55efeac0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2655,6 +2655,8 @@ in { eth-utils = callPackage ../development/python-modules/eth-utils { }; + etuples = callPackage ../development/python-modules/etuples { }; + et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; ev3dev2 = callPackage ../development/python-modules/ev3dev2 { }; From 4ff8eccf820e6e17f839c3cc735a437eb18db5d2 Mon Sep 17 00:00:00 2001 From: Etienne JEAN Date: Mon, 14 Feb 2022 15:58:46 +0100 Subject: [PATCH 031/231] python3Packages.minikanren: init at 1.0.3 --- .../python-modules/minikanren/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/minikanren/default.nix diff --git a/pkgs/development/python-modules/minikanren/default.nix b/pkgs/development/python-modules/minikanren/default.nix new file mode 100644 index 000000000000..7452148e8e47 --- /dev/null +++ b/pkgs/development/python-modules/minikanren/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, toolz +, cons +, multipledispatch +, etuples +, logical-unification +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "minikanren"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "kanren"; + rev = "5aa9b1734cbb3fe072a7c72b46e1b72a174d28ac"; + sha256 = "sha256-daAtREgm91634Q0mc0/WZivDiyZHC7TIRoGRo8hMnGE="; + }; + + propagatedBuildInputs = [ + toolz + cons + multipledispatch + etuples + logical-unification + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "kanren" ]; + + meta = with lib; { + description = "Relational programming in Python"; + homepage = "https://github.com/pythological/kanren"; + changelog = "https://github.com/pythological/kanren/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e3b55efeac0..6a7218ed8377 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5060,6 +5060,8 @@ in { minidump = callPackage ../development/python-modules/minidump { }; + minikanren = callPackage ../development/python-modules/minikanren { }; + minikerberos = callPackage ../development/python-modules/minikerberos { }; minimock = callPackage ../development/python-modules/minimock { }; From 31268215848522d81eee25a7771966c79d9c3b89 Mon Sep 17 00:00:00 2001 From: Etienne JEAN Date: Tue, 15 Feb 2022 12:55:05 +0100 Subject: [PATCH 032/231] python3Packages.numba-scipy: init at 0.3.0 --- .../python-modules/numba-scipy/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/numba-scipy/default.nix diff --git a/pkgs/development/python-modules/numba-scipy/default.nix b/pkgs/development/python-modules/numba-scipy/default.nix new file mode 100644 index 000000000000..c8f84cbf43f5 --- /dev/null +++ b/pkgs/development/python-modules/numba-scipy/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, scipy +, numba +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "numba-scipy"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-qJeoWiG1LdtFB9cME1d8xVaC0BXGDJEYjCOEdHvSkmQ="; + }; + + propagatedBuildInputs = [ + scipy + numba + ]; + + postPatch = '' + substituteInPlace setup.py --replace "scipy>=0.16,<=1.6.2" "scipy>=0.16,<=1.7.3" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "numba" ]; + + meta = with lib; { + description = "Extends Numba to make it aware of SciPy"; + homepage = "https://github.com/numba/numba-scipy"; + changelog = "https://github.com/numba/numba-scipy/blob/master/CHANGE_LOG"; + license = licenses.bsd2; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a7218ed8377..64550f510c0c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5554,6 +5554,8 @@ in { numba = callPackage ../development/python-modules/numba { }; + numba-scipy = callPackage ../development/python-modules/numba-scipy { }; + numcodecs = callPackage ../development/python-modules/numcodecs { }; numericalunits = callPackage ../development/python-modules/numericalunits { }; From d769fc6185c3935f0115813c496a68c6280e2103 Mon Sep 17 00:00:00 2001 From: devhell Date: Mon, 21 Feb 2022 15:25:02 +0000 Subject: [PATCH 033/231] zettlr: 2.2.2 -> 2.2.3 --- pkgs/applications/misc/zettlr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 794967609152..0d4c21dbfead 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.2.2"; + version = "2.2.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-gCnIEwnwlX7Wy9sjJVtKx8HhtPAoPMUOKvl71TQn6Ew="; + sha256 = "sha256-BXStGhCEXpQRyLjcS00CM/NI/NVRKpLTlW8Xh51fV8w="; }; appimageContents = appimageTools.extractType2 { inherit name src; From 41f41057d7bf54260d3d9a243f05ee9f6ca24f3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 09:39:15 +0000 Subject: [PATCH 034/231] python310Packages.tldextract: 3.1.2 -> 3.2.0 --- pkgs/development/python-modules/tldextract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index d39b4fa82c81..7c580aa676bd 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.1.2"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0gNMNVhlH32P2t6oP7aBBQstZi3GegDZUDJtyQIClEQ="; + sha256 = "sha256-PUtqIQVgC30CkOoje/MLaw3HY+UPy+QOhJoBm9bby/8="; }; nativeBuildInputs = [ setuptools-scm ]; From 826c21549169faf268cba920dda90860e7618496 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 21 Feb 2022 22:17:57 +0100 Subject: [PATCH 035/231] treewide: rename name to pname&version --- .../libraries/libsmartcols/default.nix | 6 ++-- .../libraries/libsnark/default.nix | 10 +++--- pkgs/development/libraries/libui/default.nix | 21 ++++++------ .../development/libraries/pdf2xml/default.nix | 1 + .../libraries/physics/geant4/datasets.nix | 34 +++++++++---------- pkgs/development/libraries/prison/default.nix | 7 ++-- .../libraries/proj-datumgrid/default.nix | 2 +- .../libraries/qimageblitz/default.nix | 14 +++----- .../libraries/qt-4.x/4.8/default.nix | 23 +++++-------- .../science/math/clmagma/default.nix | 10 +++--- .../science/math/suitesparse/4.4.nix | 10 +++--- pkgs/development/libraries/soil/default.nix | 3 +- .../libraries/speech-tools/default.nix | 6 ++-- pkgs/development/libraries/tclx/default.nix | 13 +++---- pkgs/development/libraries/uri/default.nix | 2 +- pkgs/development/libraries/vte/2.90.nix | 9 ++--- 16 files changed, 77 insertions(+), 94 deletions(-) diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix index bcd1573e2038..077055cbb9a4 100644 --- a/pkgs/development/libraries/libsmartcols/default.nix +++ b/pkgs/development/libraries/libsmartcols/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, gtk-doc}: stdenv.mkDerivation rec { - name = "libsmartcols"; - version = "v2.36.1"; + pname = "libsmartcols"; + version = "2.36.1"; nativeBuildInputs = [ autoreconfHook pkg-config python3 gtk-doc ]; src = fetchFromGitHub { owner = "karelzak"; repo = "util-linux"; - rev = version; + rev = "v${version}"; sha256 = "0z7nv054pqhlihqiw0vk3h40j0cxk1yxf8zzh0ddmvk6834cnyxs"; }; diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index c3e6d0e049e4..37352bf5e3c4 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: -let - rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; -in stdenv.mkDerivation rec { - name = "libsnark-pre${version}"; - version = lib.substring 0 8 rev; +stdenv.mkDerivation rec { + pname = "libsnark"; + version = "unstable-2018-01-15"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; @@ -12,7 +10,7 @@ in stdenv.mkDerivation rec { cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ]; src = fetchFromGitHub { - inherit rev; + rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; owner = "scipr-lab"; repo = "libsnark"; sha256 = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca"; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 7002f75cc45e..14fb004187d8 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }: let - shortName = "libui"; - version = "4.1a"; backend = if stdenv.isDarwin then "darwin" else "unix"; in -stdenv.mkDerivation { - name = "${shortName}-${version}"; +stdenv.mkDerivation rec { + pname = "libui"; + version = "4.1a"; src = fetchFromGitHub { owner = "andlabs"; repo = "libui"; @@ -27,22 +26,22 @@ stdenv.mkDerivation { mkdir -p $out/{include,lib} mkdir -p $out/lib/pkgconfig '' + lib.optionalString stdenv.isLinux '' - mv ./out/${shortName}.so.0 $out/lib/ - ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so + mv ./out/libui.so.0 $out/lib/ + ln -s $out/lib/libui.so.0 $out/lib/libui.so '' + lib.optionalString stdenv.isDarwin '' - mv ./out/${shortName}.A.dylib $out/lib/ - ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib + mv ./out/libui.A.dylib $out/lib/ + ln -s $out/lib/lubui.A.dylib $out/lib/libui.dylib '' + '' cp $src/ui.h $out/include cp $src/ui_${backend}.h $out/include - cp ${./libui.pc} $out/lib/pkgconfig/${shortName}.pc - substituteInPlace $out/lib/pkgconfig/${shortName}.pc \ + cp ${./libui.pc} $out/lib/pkgconfig/libui.pc + substituteInPlace $out/lib/pkgconfig/libui.pc \ --subst-var-by out $out \ --subst-var-by version "${version}" ''; postInstall = lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib + install_name_tool -id $out/lib/libui.A.dylib $out/lib/libui.A.dylib ''; meta = with lib; { diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index 2dfd35466858..c45a8e03fd16 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { meta = with lib; { description = "PDF to XML converter"; + homepage = "https://sourceforge.net/projects/pdf2xml/"; platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index e9b7f54e2a48..80de299793a4 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, geant_version }: let - mkDataset = { name, version, sha256, envvar }: + mkDataset = { pname, version, sha256, envvar }: stdenv.mkDerivation { - inherit name version; + inherit pname version; inherit geant_version; src = fetchurl { - url = "https://cern.ch/geant4-data/datasets/${name}.${version}.tar.gz"; + url = "https://cern.ch/geant4-data/datasets/${pname}.${version}.tar.gz"; inherit sha256; }; @@ -15,7 +15,7 @@ let dontBuild = true; dontConfigure = true; - datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${name}${version}"; + datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${pname}${version}"; installPhase = '' mkdir -p $datadir mv ./* $datadir @@ -32,86 +32,86 @@ let }; }; in - builtins.listToAttrs (map (a: { inherit (a) name; value = mkDataset a; }) [ + builtins.listToAttrs (map (a: { inherit (a) pname; value = mkDataset a; }) [ { - name = "G4NDL"; + pname = "G4NDL"; version = "4.6"; sha256 = "sha256-nSh88q4PuIeirc6AHudPub4hsNFm2rSby+6UCKUUVAg="; envvar = "NEUTRONHP"; } { - name = "G4EMLOW"; + pname = "G4EMLOW"; version = "8.0"; sha256 = "sha256-2Rmo5YOGiCV7kkimE5EOsqdjMFngMMi1DAosKtn9Kzs="; envvar = "LE"; } { - name = "G4PhotonEvaporation"; + pname = "G4PhotonEvaporation"; version = "5.7"; sha256 = "sha256-dh5C5W/93j2YOfn52BAmB8a0wDKRUe5Rggb07p535+U="; envvar = "LEVELGAMMA"; } { - name = "G4RadioactiveDecay"; + pname = "G4RadioactiveDecay"; version = "5.6"; sha256 = "sha256-OIYHfJyOWph4PmcY4cMlZ4me6y27M+QC1Edrwv5PDfE="; envvar = "RADIOACTIVE"; } { - name = "G4SAIDDATA"; + pname = "G4SAIDDATA"; version = "2.0"; sha256 = "sha256-HSao55uqceRNV1m59Vpn6Lft4xdRMWqekDfYAJDHLpE="; envvar = "SAIDXS"; } { - name = "G4PARTICLEXS"; + pname = "G4PARTICLEXS"; version = "4.0"; sha256 = "sha256-k4EDlwPD8rD9NqtJmTYqLItP+QgMMi+QtOMZKBEzypU="; envvar = "PARTICLEXS"; } { - name = "G4ABLA"; + pname = "G4ABLA"; version = "3.1"; sha256 = "sha256-dpiwUrWL8bmIa+rNvWr2B63B4Jn8cwq2shz38JDAJ+0="; envvar = "ABLA"; } { - name = "G4INCL"; + pname = "G4INCL"; version = "1.0"; sha256 = "sha256-cWFhghrp89BWX788LPNPTgLj5RnrQZqCI27vIsLENn0="; envvar = "INCL"; } { - name = "G4PII"; + pname = "G4PII"; version = "1.3"; sha256 = "sha256-YiWtkCZ19DgcmMa6JfxaBs6HVJqpeWNNPQNJHWYW6SY="; envvar = "PII"; } { - name = "G4ENSDFSTATE"; + pname = "G4ENSDFSTATE"; version = "2.3"; sha256 = "sha256-lETF4IIHkavTzKrOEFsOR3kPrc4obhEUmDTnnEqOkgM="; envvar = "ENSDFSTATE"; } { - name = "G4RealSurface"; + pname = "G4RealSurface"; version = "2.2"; sha256 = "sha256-mVTe4AEvUzEmf3g2kOkS5y21v1Lqm6vs0S6iIoIXaCA="; envvar = "REALSURFACE"; } { - name = "G4TENDL"; + pname = "G4TENDL"; version = "1.4"; sha256 = "sha256-S3J0AgzItO1Wm4ku8YwuCI7c22tm850lWFzO4l2XIeA="; envvar = "PARTICLEHP"; diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix index 4275622c24f4..71f8596c646b 100644 --- a/pkgs/development/libraries/prison/default.nix +++ b/pkgs/development/libraries/prison/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }: -let v = "1.0"; in - stdenv.mkDerivation rec { - name = "prison-${v}"; + pname = "prison"; + version = "1.0"; src = fetchurl { - url = "mirror://kde/stable/prison/${v}/src/${name}.tar.gz"; + url = "mirror://kde/stable/prison/${version}/src/prison-${version}.tar.gz"; sha256 = "08hkzzda36jpdywjqlyzcvli7cx17h4l9yffzsdnhdd788n28krr"; }; diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix index 93e415f62699..8251a17a83c6 100644 --- a/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/pkgs/development/libraries/proj-datumgrid/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "proj-datumgrid"; + pname = "proj-datumgrid"; version = "world-1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 709a3fb1533d..e838eb07201f 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -1,15 +1,11 @@ {lib, stdenv, fetchurl, cmake, qt4}: -let - pn = "qimageblitz"; - v = "0.0.4"; -in - -stdenv.mkDerivation { - name = "${pn}-${v}"; +stdenv.mkDerivation rec { + pname = "qimageblitz"; + version = "0.0.4"; src = fetchurl { - url = "mirror://sourceforge/${pn}/${pn}-${v}.tar.bz2"; + url = "mirror://sourceforge/qimageblitz/qimageblitz-${version}.tar.bz2"; sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; }; @@ -21,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Graphical effect and filter library for KDE4"; license = lib.licenses.bsd2; - homepage = "http://${pn}.sourceforge.net"; + homepage = "http://qimageblitz.sourceforge.net"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 96d2abe5a6ea..e81f3c186d63 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -15,22 +15,17 @@ , libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx }: -let - v_maj = "4.8"; - v_min = "7"; - vers = "${v_maj}.${v_min}"; -in - # TODO: # * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid # false build-time dependencies stdenv.mkDerivation rec { - name = "qt-${vers}"; + pname = "qt"; + version = "4.8.7"; src = fetchurl { url = "http://download.qt-project.org/official_releases/qt/" - + "${v_maj}/${vers}/qt-everywhere-opensource-src-${vers}.tar.gz"; + + "${lib.versions.majorMinor version}/${version}/qt-everywhere-opensource-src-${version}.tar.gz"; sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272"; }; @@ -40,8 +35,6 @@ stdenv.mkDerivation rec { setOutputFlags = false; - # The version property must be kept because it will be included into the QtSDK package name - version = vers; prePatch = '' substituteInPlace configure --replace /bin/pwd pwd @@ -131,13 +124,13 @@ stdenv.mkDerivation rec { preConfigure = '' export LD_LIBRARY_PATH="`pwd`/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" configureFlags+=" - -docdir $out/share/doc/${name} + -docdir $out/share/doc/qt-${version} -plugindir $out/lib/qt4/plugins -importdir $out/lib/qt4/imports - -examplesdir $TMPDIR/share/doc/${name}/examples - -demosdir $TMPDIR/share/doc/${name}/demos - -datadir $out/share/${name} - -translationdir $out/share/${name}/translations + -examplesdir $TMPDIR/share/doc/qt-${version}/examples + -demosdir $TMPDIR/share/doc/qt-${version}/demos + -datadir $out/share/qt-${version} + -translationdir $out/share/qt-${version}/translations --jobs=$NIX_BUILD_CORES " unset LD # Makefile uses gcc for linking; setting LD interferes diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/development/libraries/science/math/clmagma/default.nix index 3905e70d3401..fe9fc540902d 100644 --- a/pkgs/development/libraries/science/math/clmagma/default.nix +++ b/pkgs/development/libraries/science/math/clmagma/default.nix @@ -3,7 +3,6 @@ with lib; let - version = "1.3.0"; incfile = builtins.toFile "make.inc.custom" '' CC = g++ FORT = gfortran @@ -32,10 +31,11 @@ let INC = -I$(clBLAS)/include #-I$(AMDAPP)/include ''; -in stdenv.mkDerivation { - name = "clmagma-${version}"; +in stdenv.mkDerivation rec { + pname = "clmagma"; + version = "1.3.0"; src = fetchurl { - url = "http://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz"; + url = "https://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz"; sha256 = "1n27ny0xhwirw2ydn46pfcwy53gzia9zbam4irx44fd4d7f9ydv7"; name = "clmagma-${version}.tar.gz"; }; @@ -68,7 +68,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port"; license = licenses.bsd3; - homepage = "http://icl.cs.utk.edu/magma/index.html"; + homepage = "https://icl.cs.utk.edu/magma/index.html"; platforms = platforms.linux; maintainers = with maintainers; [ volhovm ]; }; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index 1ebac6ac445d..e734ed8ff35a 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -3,14 +3,12 @@ }: let - version = "4.4.4"; - name = "suitesparse-${version}"; - int_t = if blas.isILP64 then "int64_t" else "int32_t"; SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + version = "4.4.4"; + pname = "suitesparse"; src = fetchurl { url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz"; @@ -71,7 +69,7 @@ stdenv.mkDerivation { done # Install documentation - outdoc=$out/share/doc/${name} + outdoc=$out/share/doc/suitesparse-${version} mkdir -p $outdoc cp -r AMD/Doc $outdoc/amd cp -r BTF/Doc $outdoc/bft diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix index dcec1c897b3b..39a64c84ddcd 100644 --- a/pkgs/development/libraries/soil/default.nix +++ b/pkgs/development/libraries/soil/default.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation { - name = "soil"; + pname = "soil"; + version = "unstable-2020-01-04"; src = fetchzip { url = "https://web.archive.org/web/20200104042737id_/http://www.lonesock.net/files/soil.zip"; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 8706b8789227..c69345193c77 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, alsa-lib, ncurses }: stdenv.mkDerivation rec { - name = "speech_tools-${version}.0"; - version = "2.5"; + pname = "speech_tools"; + version = "2.5.0"; src = fetchurl { - url = "http://www.festvox.org/packed/festival/${version}/${name}-release.tar.gz"; + url = "http://www.festvox.org/packed/festival/${lib.versions.majorMinor version}/speech_tools-${version}-release.tar.gz"; sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4"; }; diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index a8cf2a44fab6..3c814e17207c 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -1,18 +1,19 @@ { lib, fetchurl, tcl }: tcl.mkTclDerivation rec { - name = "tclx-${version}.${patch}"; - version = "8.4"; - patch = "1"; + pname = "tclx"; + version = "8.4.1"; src = fetchurl { - url = "mirror://sourceforge/tclx/tclx${version}.${patch}.tar.bz2"; + url = "mirror://sourceforge/tclx/tclx${version}.tar.bz2"; sha256 = "1v2qwzzidz0is58fd1p7wfdbscxm3ip2wlbqkj5jdhf6drh1zd59"; }; # required in order for tclx to properly detect tclx.tcl at runtime - postInstall = '' - ln -s $prefix/lib/tclx${version} $prefix/lib/tclx${version}/tclx${version} + postInstall = let + majorMinorVersion = lib.versions.majorMinor version; + in '' + ln -s $prefix/lib/tclx${majorMinorVersion} $prefix/lib/tclx${majorMinorVersion}/tclx${majorMinorVersion} ''; meta = { diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index 48a80aacdf59..980d073f1281 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, doxygen }: stdenv.mkDerivation rec { - name = "uri-${version}"; + pname = "uri"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index 55ef86c88a0e..dfb76069c3b2 100644 --- a/pkgs/development/libraries/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }: stdenv.mkDerivation rec { - versionMajor = "0.36"; - versionMinor = "3"; - moduleName = "vte"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; + pname = "vte"; + version = "0.36.3"; src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + url = "mirror://gnome/sources/vte/${lib.versions.majorMinor version}/vte-${version}.tar.xz"; sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; }; From c551b7822053506b312be9d057e07b53aba2da2c Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 23 Feb 2022 06:10:07 +0200 Subject: [PATCH 036/231] python3Packages.pyamg: fix build --- .../python-modules/pyamg/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index bf46734df514..59e807f11fcb 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -5,6 +5,7 @@ , scipy , pytest , pybind11 +, setuptools-scm }: buildPythonPackage rec { @@ -16,6 +17,10 @@ buildPythonPackage rec { sha256 = "48d9be622049d8363cda84125c45d18b89e0ab7d99be5a93c0246f375ebad344"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ numpy scipy @@ -23,9 +28,17 @@ buildPythonPackage rec { pybind11 ]; - preBuild = '' - export HOME=$(mktemp -d) - ''; + # failed with "ModuleNotFoundError: No module named 'pyamg.amg_core.evolution_strength'" + doCheck = false; + # taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=python-pyamg#n27 + # checkPhase = '' + # PYTHONPATH="$PWD/build/lib.linux-*:$PYTHONPATH" ${python3.interpreter} -c "import pyamg; pyamg.test()" + # ''; + + pythonImportsCheck = [ + "pyamg" + "pyamg.amg_core.evolution_strength" + ]; meta = with lib; { description = "Algebraic Multigrid Solvers in Python"; From 4a40987ba5cfac078a364923289a53e2a8589902 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Wed, 23 Feb 2022 15:53:05 +1000 Subject: [PATCH 037/231] vgmstream: r1050-3448-g77cc431b -> unstable-2022-02-21 * Enable Speex support * Disable the new FSB CELT support - It always attempts to download it, there's no option to use the system version. --- pkgs/applications/audio/vgmstream/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/vgmstream/default.nix b/pkgs/applications/audio/vgmstream/default.nix index a3518f23984b..221b5b3d4b8c 100644 --- a/pkgs/applications/audio/vgmstream/default.nix +++ b/pkgs/applications/audio/vgmstream/default.nix @@ -1,26 +1,33 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config -, mpg123, ffmpeg, libvorbis, libao, jansson +, mpg123, ffmpeg, libvorbis, libao, jansson, speex }: +let + vgmstreamVersion = "r1702-5596-00bdb165b"; +in stdenv.mkDerivation rec { - pname = "vgmstream"; - version = "r1050-3448-g77cc431b"; + pname = "vgmstream"; + version = "unstable-2022-02-21"; src = fetchFromGitHub { - owner = "vgmstream"; - repo = "vgmstream"; - rev = version; - sha256 = "030q02c9li14by7vm00gn6v3m4dxxmfwiy9iyz3xsgzq1i7pqc1d"; + owner = "vgmstream"; + repo = "vgmstream"; + rev = "00bdb165ba6b55420bbd5b21f54c4f7a825d15a0"; + sha256 = "18g1yqlnf48hi2xn2z2wajnjljpdbfdqmcmi7y8hi1r964ypmfcr"; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ mpg123 ffmpeg libvorbis libao jansson ]; + buildInputs = [ mpg123 ffmpeg libvorbis libao jansson speex ]; - # There's no nice way to build the audacious plugin without a circular dependency - cmakeFlags = [ "-DBUILD_AUDACIOUS=OFF" ]; + cmakeFlags = [ + # There's no nice way to build the audacious plugin without a circular dependency + "-DBUILD_AUDACIOUS=OFF" + # It always tries to download it, no option to use the system one + "-DUSE_CELT=OFF" + ]; - preConfigure = '' - echo "#define VERSION \"${version}\"" > cli/version.h + postConfigure = '' + echo "#define VGMSTREAM_VERSION \"${vgmstreamVersion}\"" > ../version.h ''; meta = with lib; { From 6432e8c08a7b50e1a568d65482fd17b82a9fc57e Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Wed, 23 Feb 2022 15:53:35 +1000 Subject: [PATCH 038/231] vgmstream: add update script --- pkgs/applications/audio/vgmstream/default.nix | 2 + pkgs/applications/audio/vgmstream/update.sh | 77 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100755 pkgs/applications/audio/vgmstream/update.sh diff --git a/pkgs/applications/audio/vgmstream/default.nix b/pkgs/applications/audio/vgmstream/default.nix index 221b5b3d4b8c..f696c5061864 100644 --- a/pkgs/applications/audio/vgmstream/default.nix +++ b/pkgs/applications/audio/vgmstream/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "18g1yqlnf48hi2xn2z2wajnjljpdbfdqmcmi7y8hi1r964ypmfcr"; }; + passthru.updateScript = ./update.sh; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ mpg123 ffmpeg libvorbis libao jansson speex ]; diff --git a/pkgs/applications/audio/vgmstream/update.sh b/pkgs/applications/audio/vgmstream/update.sh new file mode 100755 index 000000000000..5353480dd335 --- /dev/null +++ b/pkgs/applications/audio/vgmstream/update.sh @@ -0,0 +1,77 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p gnused jq nix-prefetch-git curl cacert + +set -euo pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +if [[ ! "$(basename $ROOT)" == "vgmstream" || ! -f "$ROOT/default.nix" ]]; then + echo "ERROR: Not in the vgmstream folder" + exit 1 +fi + +if [[ ! -v GITHUB_TOKEN ]]; then + echo "ERROR: \$GITHUB_TOKEN not set" + exit 1 +fi + + +payload=$(jq -cn --rawfile query /dev/stdin '{"query": $query}' < Date: Wed, 23 Feb 2022 09:20:31 +0100 Subject: [PATCH 039/231] python3Packages.pyoverkiz: 1.3.6 -> 1.3.8 --- pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 823f54b82c43..c4e80575801f 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.3.6"; + version = "1.3.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "v${version}"; - hash = "sha256-wH7mb2qagnPZ4ZEya9P34DKS2vJ5oDSXyiuCwP84mTQ="; + hash = "sha256-U/Yf+PZdggqfd9b/fuPoLKOACooobjSaqhsXcIcOKSU="; }; nativeBuildInputs = [ From a7ca974dbd0cb2420b13b4a34491c3dc157d0b07 Mon Sep 17 00:00:00 2001 From: Etienne JEAN Date: Mon, 14 Feb 2022 16:00:11 +0100 Subject: [PATCH 040/231] python3Packages.aesara: init at 2.4.0 --- .../python-modules/aesara/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/aesara/default.nix diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix new file mode 100644 index 000000000000..06836fba5812 --- /dev/null +++ b/pkgs/development/python-modules/aesara/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, filelock +, etuples +, logical-unification +, minikanren +, cons +, numba +, numba-scipy +, libgpuarray +, sympy +, cython +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aesara"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "aesara-devs"; + repo = "aesara"; + rev = "38d7a813646c1e350170c46bafade0e7d0e2427c"; + sha256 = "sha256-933bM15BZi4sTjnIOGAg5dc5tXVWQ9lFzktOtzj5DNQ="; + }; + + buildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + scipy + filelock + etuples + logical-unification + minikanren + cons + numba + numba-scipy + libgpuarray + sympy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "aesara" ]; + + meta = with lib; { + description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays"; + homepage = "https://github.com/aesara-devs/aesara"; + changelog = "https://github.com/aesara-devs/aesara/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64550f510c0c..f4b86ca44111 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -222,6 +222,8 @@ in { aenum = callPackage ../development/python-modules/aenum { }; + aesara = callPackage ../development/python-modules/aesara { }; + afdko = callPackage ../development/python-modules/afdko { }; affine = callPackage ../development/python-modules/affine { }; From 3df56ed3e442d21aec6660775eacb7cb223dda25 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 14 Feb 2022 23:08:24 +0100 Subject: [PATCH 041/231] idris-modules: rename name to pname --- pkgs/development/idris-modules/array.nix | 2 +- pkgs/development/idris-modules/bi.nix | 2 +- pkgs/development/idris-modules/bifunctors.nix | 2 +- .../idris-modules/build-builtin-package.nix | 10 +++++----- pkgs/development/idris-modules/build-idris-package.nix | 9 +++++---- pkgs/development/idris-modules/bytes.nix | 2 +- pkgs/development/idris-modules/canvas.nix | 2 +- pkgs/development/idris-modules/categories.nix | 2 +- pkgs/development/idris-modules/coda.nix | 2 +- pkgs/development/idris-modules/comonad.nix | 2 +- pkgs/development/idris-modules/composition.nix | 2 +- pkgs/development/idris-modules/config.nix | 2 +- pkgs/development/idris-modules/console.nix | 2 +- pkgs/development/idris-modules/containers.nix | 2 +- pkgs/development/idris-modules/cube.nix | 2 +- pkgs/development/idris-modules/derive.nix | 2 +- pkgs/development/idris-modules/descncrunch.nix | 2 +- pkgs/development/idris-modules/dict.nix | 2 +- pkgs/development/idris-modules/dom.nix | 2 +- pkgs/development/idris-modules/electron.nix | 2 +- pkgs/development/idris-modules/eternal.nix | 2 +- pkgs/development/idris-modules/farrp.nix | 2 +- pkgs/development/idris-modules/free.nix | 2 +- pkgs/development/idris-modules/fsm.nix | 2 +- pkgs/development/idris-modules/glfw.nix | 2 +- pkgs/development/idris-modules/graphviz.nix | 2 +- pkgs/development/idris-modules/hamt.nix | 2 +- pkgs/development/idris-modules/hezarfen.nix | 2 +- pkgs/development/idris-modules/hrtime.nix | 2 +- pkgs/development/idris-modules/html.nix | 2 +- pkgs/development/idris-modules/http.nix | 2 +- pkgs/development/idris-modules/http4idris.nix | 2 +- pkgs/development/idris-modules/iaia.nix | 2 +- pkgs/development/idris-modules/idrishighlighter.nix | 2 +- pkgs/development/idris-modules/idrisscript.nix | 2 +- pkgs/development/idris-modules/ipkgparser.nix | 2 +- pkgs/development/idris-modules/jheiling-extras.nix | 2 +- pkgs/development/idris-modules/jheiling-js.nix | 2 +- pkgs/development/idris-modules/js.nix | 2 +- pkgs/development/idris-modules/lens.nix | 2 +- pkgs/development/idris-modules/lightyear.nix | 2 +- pkgs/development/idris-modules/logic.nix | 2 +- pkgs/development/idris-modules/mapping.nix | 2 +- pkgs/development/idris-modules/mhd.nix | 2 +- pkgs/development/idris-modules/pacman.nix | 2 +- pkgs/development/idris-modules/patricia.nix | 2 +- pkgs/development/idris-modules/permutations.nix | 2 +- pkgs/development/idris-modules/pfds.nix | 2 +- pkgs/development/idris-modules/pipes.nix | 2 +- pkgs/development/idris-modules/posix.nix | 2 +- pkgs/development/idris-modules/quantities.nix | 2 +- pkgs/development/idris-modules/rationals.nix | 2 +- pkgs/development/idris-modules/recursion_schemes.nix | 2 +- pkgs/development/idris-modules/refined.nix | 2 +- pkgs/development/idris-modules/sdl.nix | 2 +- pkgs/development/idris-modules/sdl2.nix | 2 +- pkgs/development/idris-modules/semidirect.nix | 2 +- pkgs/development/idris-modules/setoids.nix | 2 +- pkgs/development/idris-modules/smproc.nix | 2 +- pkgs/development/idris-modules/snippets.nix | 2 +- .../development/idris-modules/software_foundations.nix | 2 +- pkgs/development/idris-modules/specdris.nix | 2 +- pkgs/development/idris-modules/tap.nix | 2 +- pkgs/development/idris-modules/test.nix | 2 +- pkgs/development/idris-modules/tfrandom.nix | 2 +- pkgs/development/idris-modules/tlhydra.nix | 2 +- pkgs/development/idris-modules/tomladris.nix | 2 +- pkgs/development/idris-modules/tp.nix | 2 +- pkgs/development/idris-modules/tparsec.nix | 2 +- pkgs/development/idris-modules/transducers.nix | 2 +- pkgs/development/idris-modules/trees.nix | 2 +- pkgs/development/idris-modules/union_type.nix | 2 +- pkgs/development/idris-modules/vdom.nix | 2 +- pkgs/development/idris-modules/vecspace.nix | 2 +- pkgs/development/idris-modules/webgl.nix | 2 +- pkgs/development/idris-modules/wl-pprint.nix | 2 +- pkgs/development/idris-modules/wyvern.nix | 2 +- pkgs/development/idris-modules/xhr.nix | 2 +- pkgs/development/idris-modules/yaml.nix | 2 +- pkgs/development/idris-modules/yampa.nix | 2 +- 80 files changed, 88 insertions(+), 87 deletions(-) diff --git a/pkgs/development/idris-modules/array.nix b/pkgs/development/idris-modules/array.nix index faed6443c48c..ef8159e9a873 100644 --- a/pkgs/development/idris-modules/array.nix +++ b/pkgs/development/idris-modules/array.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "array"; + pname = "array"; version = "2016-10-14"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix index 51f6497e1821..ec1f9a13bcdd 100644 --- a/pkgs/development/idris-modules/bi.nix +++ b/pkgs/development/idris-modules/bi.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "bi"; + pname = "bi"; version = "2018-06-25"; ipkgName = "Bi"; diff --git a/pkgs/development/idris-modules/bifunctors.nix b/pkgs/development/idris-modules/bifunctors.nix index 15c7a6dd013f..3461bb37fddb 100644 --- a/pkgs/development/idris-modules/bifunctors.nix +++ b/pkgs/development/idris-modules/bifunctors.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "bifunctors"; + pname = "bifunctors"; version = "2017-02-07"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index ff19e52135c8..fe23728e0848 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -1,13 +1,13 @@ # Build one of the packages that comes with idris -# name: The name of the package +# pname: The pname of the package # deps: The dependencies of the package -{ idris, build-idris-package }: name: deps: +{ idris, build-idris-package }: pname: deps: let inherit (builtins.parseDrvName idris.name) version; in build-idris-package { - inherit name version; + inherit pname version; inherit (idris) src; noPrelude = true; @@ -16,10 +16,10 @@ build-idris-package { idrisDeps = deps; postUnpack = '' - sourceRoot=$sourceRoot/libs/${name} + sourceRoot=$sourceRoot/libs/${pname} ''; meta = idris.meta // { - description = "${name} builtin Idris library"; + description = "${pname} builtin Idris library"; }; } diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 7869c2706999..b21826eac384 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -3,9 +3,9 @@ { idrisDeps ? [] , noPrelude ? false , noBase ? false - , name + , pname , version - , ipkgName ? name + , ipkgName ? pname , extraBuildInputs ? [] , idrisBuildOptions ? [] , idrisTestOptions ? [] @@ -20,7 +20,7 @@ let idris-with-packages = with-packages allIdrisDeps; newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "noPrelude" "noBase" - "name" "version" "ipkgName" "extraBuildInputs" + "pname" "version" "ipkgName" "extraBuildInputs" ] // { meta = attrs.meta // { platforms = attrs.meta.platforms or idris.meta.platforms; @@ -28,7 +28,8 @@ let }; in stdenv.mkDerivation ({ - name = "idris-${name}-${version}"; + pname = "idris-${pname}"; + inherit version; buildInputs = [ idris-with-packages gmp ] ++ extraBuildInputs; propagatedBuildInputs = allIdrisDeps; diff --git a/pkgs/development/idris-modules/bytes.nix b/pkgs/development/idris-modules/bytes.nix index eaff512d5d39..0fd9b05f88d4 100644 --- a/pkgs/development/idris-modules/bytes.nix +++ b/pkgs/development/idris-modules/bytes.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "bytes"; + pname = "bytes"; version = "2018-02-10"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/canvas.nix b/pkgs/development/idris-modules/canvas.nix index 77851c87179b..3c74879eab6c 100644 --- a/pkgs/development/idris-modules/canvas.nix +++ b/pkgs/development/idris-modules/canvas.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "canvas"; + pname = "canvas"; version = "2017-11-09"; ipkgName = "idriscanvas"; diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix index adbe6d4f8ad4..0c64218bcd82 100644 --- a/pkgs/development/idris-modules/categories.nix +++ b/pkgs/development/idris-modules/categories.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "categories"; + pname = "categories"; version = "2018-07-02"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/coda.nix b/pkgs/development/idris-modules/coda.nix index ecd7af443689..d1529ceb994e 100644 --- a/pkgs/development/idris-modules/coda.nix +++ b/pkgs/development/idris-modules/coda.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "coda"; + pname = "coda"; version = "2018-01-25"; ipkgName = "Coda"; diff --git a/pkgs/development/idris-modules/comonad.nix b/pkgs/development/idris-modules/comonad.nix index 31fd8dbc9aa8..d7bf499ea22d 100644 --- a/pkgs/development/idris-modules/comonad.nix +++ b/pkgs/development/idris-modules/comonad.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "comonad"; + pname = "comonad"; version = "2018-02-26"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/composition.nix b/pkgs/development/idris-modules/composition.nix index 5d6d2f891a63..831a1f32655c 100644 --- a/pkgs/development/idris-modules/composition.nix +++ b/pkgs/development/idris-modules/composition.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "composition"; + pname = "composition"; version = "2017-11-12"; idrisDeps = [ hezarfen ]; diff --git a/pkgs/development/idris-modules/config.nix b/pkgs/development/idris-modules/config.nix index 3771313d1784..49c6efdd737e 100644 --- a/pkgs/development/idris-modules/config.nix +++ b/pkgs/development/idris-modules/config.nix @@ -7,7 +7,7 @@ , lib }: build-idris-package { - name = "config"; + pname = "config"; version = "2017-11-06"; idrisDeps = [ effects containers lightyear test ]; diff --git a/pkgs/development/idris-modules/console.nix b/pkgs/development/idris-modules/console.nix index e60ac20f4d40..30cefa45810d 100644 --- a/pkgs/development/idris-modules/console.nix +++ b/pkgs/development/idris-modules/console.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "console"; + pname = "console"; version = "2017-04-20"; idrisDeps = [ idrisscript hrtime webgl ]; diff --git a/pkgs/development/idris-modules/containers.nix b/pkgs/development/idris-modules/containers.nix index e98285ca9306..dfe85aa7b8af 100644 --- a/pkgs/development/idris-modules/containers.nix +++ b/pkgs/development/idris-modules/containers.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "containers"; + pname = "containers"; version = "2017-09-10"; idrisDeps = [ effects test ]; diff --git a/pkgs/development/idris-modules/cube.nix b/pkgs/development/idris-modules/cube.nix index 8a0f66829d85..eac71fb8797c 100644 --- a/pkgs/development/idris-modules/cube.nix +++ b/pkgs/development/idris-modules/cube.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "cube"; + pname = "cube"; version = "2017-07-05"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix index 7ab87d71d063..1ceca662e8a3 100644 --- a/pkgs/development/idris-modules/derive.nix +++ b/pkgs/development/idris-modules/derive.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "derive"; + pname = "derive"; version = "2018-07-02"; idrisDeps = [ contrib pruviloj ]; diff --git a/pkgs/development/idris-modules/descncrunch.nix b/pkgs/development/idris-modules/descncrunch.nix index 95f49a524bc0..3c82e23ec7ec 100644 --- a/pkgs/development/idris-modules/descncrunch.nix +++ b/pkgs/development/idris-modules/descncrunch.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "descncrunch"; + pname = "descncrunch"; version = "2017-11-15"; idrisDeps = [ pruviloj ]; diff --git a/pkgs/development/idris-modules/dict.nix b/pkgs/development/idris-modules/dict.nix index 24cc7c0359d1..3aa15287bd8d 100644 --- a/pkgs/development/idris-modules/dict.nix +++ b/pkgs/development/idris-modules/dict.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "dict"; + pname = "dict"; version = "2016-12-26"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/dom.nix b/pkgs/development/idris-modules/dom.nix index f88827fb2654..2698cbab4847 100644 --- a/pkgs/development/idris-modules/dom.nix +++ b/pkgs/development/idris-modules/dom.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "dom"; + pname = "dom"; version = "2017-04-22"; idrisDeps = [ idrisscript html xhr ]; diff --git a/pkgs/development/idris-modules/electron.nix b/pkgs/development/idris-modules/electron.nix index 172f1980a90b..769b0b3fe8c0 100644 --- a/pkgs/development/idris-modules/electron.nix +++ b/pkgs/development/idris-modules/electron.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "electron"; + pname = "electron"; version = "2016-03-07"; idrisDeps = [ contrib jheiling-extras jheiling-js ]; diff --git a/pkgs/development/idris-modules/eternal.nix b/pkgs/development/idris-modules/eternal.nix index 673df485a380..9ca38907fe74 100644 --- a/pkgs/development/idris-modules/eternal.nix +++ b/pkgs/development/idris-modules/eternal.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "eternal"; + pname = "eternal"; version = "2018-07-02"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/farrp.nix b/pkgs/development/idris-modules/farrp.nix index 88f852ba20c0..4326aeeadb6a 100644 --- a/pkgs/development/idris-modules/farrp.nix +++ b/pkgs/development/idris-modules/farrp.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "farrp"; + pname = "farrp"; version = "2018-02-13"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/free.nix b/pkgs/development/idris-modules/free.nix index 6f7a5f56d4f9..557dc30ff96a 100644 --- a/pkgs/development/idris-modules/free.nix +++ b/pkgs/development/idris-modules/free.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "free"; + pname = "free"; version = "2017-07-03"; ipkgName = "idris-free"; diff --git a/pkgs/development/idris-modules/fsm.nix b/pkgs/development/idris-modules/fsm.nix index 5da5f01da348..1342e90f29bb 100644 --- a/pkgs/development/idris-modules/fsm.nix +++ b/pkgs/development/idris-modules/fsm.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "fsm"; + pname = "fsm"; version = "2017-04-16"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix index c63cf8acb0f3..f67b65bb71f7 100644 --- a/pkgs/development/idris-modules/glfw.nix +++ b/pkgs/development/idris-modules/glfw.nix @@ -5,7 +5,7 @@ , pkgs }: build-idris-package { - name = "glfw"; + pname = "glfw"; version = "2016-12-05"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/graphviz.nix b/pkgs/development/idris-modules/graphviz.nix index 650f0e0b99bc..28ab24a2ada6 100644 --- a/pkgs/development/idris-modules/graphviz.nix +++ b/pkgs/development/idris-modules/graphviz.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "graphviz"; + pname = "graphviz"; version = "2017-01-16"; idrisDeps = [ lightyear ]; diff --git a/pkgs/development/idris-modules/hamt.nix b/pkgs/development/idris-modules/hamt.nix index 3c6868fcc592..97a72e8c9059 100644 --- a/pkgs/development/idris-modules/hamt.nix +++ b/pkgs/development/idris-modules/hamt.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "hamt"; + pname = "hamt"; version = "2016-11-15"; idrisDeps = [ contrib effects ]; diff --git a/pkgs/development/idris-modules/hezarfen.nix b/pkgs/development/idris-modules/hezarfen.nix index acbc2770ea52..881b65b2b8b4 100644 --- a/pkgs/development/idris-modules/hezarfen.nix +++ b/pkgs/development/idris-modules/hezarfen.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "hezarfen"; + pname = "hezarfen"; version = "2018-02-03"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/hrtime.nix b/pkgs/development/idris-modules/hrtime.nix index 7f4d0769cc41..3d1c0f4abf91 100644 --- a/pkgs/development/idris-modules/hrtime.nix +++ b/pkgs/development/idris-modules/hrtime.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "hrtime"; + pname = "hrtime"; version = "2017-04-16"; ipkgName = "hrTime"; diff --git a/pkgs/development/idris-modules/html.nix b/pkgs/development/idris-modules/html.nix index 2ab7534936aa..8eb2f7f12d75 100644 --- a/pkgs/development/idris-modules/html.nix +++ b/pkgs/development/idris-modules/html.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "html"; + pname = "html"; version = "2017-04-23"; idrisDeps = [ idrisscript hrtime webgl ]; diff --git a/pkgs/development/idris-modules/http.nix b/pkgs/development/idris-modules/http.nix index 45e505be056b..d952dca54a3d 100644 --- a/pkgs/development/idris-modules/http.nix +++ b/pkgs/development/idris-modules/http.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "http"; + pname = "http"; version = "2018-02-25"; idrisDeps = [ contrib lightyear bytes ]; diff --git a/pkgs/development/idris-modules/http4idris.nix b/pkgs/development/idris-modules/http4idris.nix index 11e9d62c051e..6959e33f48a8 100644 --- a/pkgs/development/idris-modules/http4idris.nix +++ b/pkgs/development/idris-modules/http4idris.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "http4idris"; + pname = "http4idris"; version = "2018-01-16"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/iaia.nix b/pkgs/development/idris-modules/iaia.nix index 865d533750f9..1c631280eac9 100644 --- a/pkgs/development/idris-modules/iaia.nix +++ b/pkgs/development/idris-modules/iaia.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "iaia"; + pname = "iaia"; version = "2017-11-10"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/pkgs/development/idris-modules/idrishighlighter.nix index 6b1ae30ad403..759ea354747f 100644 --- a/pkgs/development/idris-modules/idrishighlighter.nix +++ b/pkgs/development/idris-modules/idrishighlighter.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "idrishighlighter"; + pname = "idrishighlighter"; version = "2018-02-22"; ipkgName = "idris-code-highlighter"; diff --git a/pkgs/development/idris-modules/idrisscript.nix b/pkgs/development/idris-modules/idrisscript.nix index 805facda84c6..2a2693c623e0 100644 --- a/pkgs/development/idris-modules/idrisscript.nix +++ b/pkgs/development/idris-modules/idrisscript.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "idrisscript"; + pname = "idrisscript"; version = "2017-07-01"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/ipkgparser.nix b/pkgs/development/idris-modules/ipkgparser.nix index 6bdcd9e9f557..4cd966d8b851 100644 --- a/pkgs/development/idris-modules/ipkgparser.nix +++ b/pkgs/development/idris-modules/ipkgparser.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "ipkgparser"; + pname = "ipkgparser"; version = "2017-11-14"; idrisDeps = [ contrib effects lightyear ]; diff --git a/pkgs/development/idris-modules/jheiling-extras.nix b/pkgs/development/idris-modules/jheiling-extras.nix index ae933b264ae4..da84ea268009 100644 --- a/pkgs/development/idris-modules/jheiling-extras.nix +++ b/pkgs/development/idris-modules/jheiling-extras.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "extras"; + pname = "extras"; version = "2018-03-06"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/pkgs/development/idris-modules/jheiling-js.nix index b192e8ff1c0b..425acceb4e6c 100644 --- a/pkgs/development/idris-modules/jheiling-js.nix +++ b/pkgs/development/idris-modules/jheiling-js.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "jheiling-js"; + pname = "jheiling-js"; version = "2016-03-09"; ipkgName = "js"; diff --git a/pkgs/development/idris-modules/js.nix b/pkgs/development/idris-modules/js.nix index 61ce415e6056..4b96ca1a4862 100644 --- a/pkgs/development/idris-modules/js.nix +++ b/pkgs/development/idris-modules/js.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "js"; + pname = "js"; version = "2018-11-27"; idrisDeps = [ contrib pruviloj ]; diff --git a/pkgs/development/idris-modules/lens.nix b/pkgs/development/idris-modules/lens.nix index e829309fbc01..c9a8c2aa257d 100644 --- a/pkgs/development/idris-modules/lens.nix +++ b/pkgs/development/idris-modules/lens.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "lens"; + pname = "lens"; version = "2017-09-25"; idrisDeps = [ bifunctors ]; diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix index 34c19eea4ac4..e8f94a82d2f1 100644 --- a/pkgs/development/idris-modules/lightyear.nix +++ b/pkgs/development/idris-modules/lightyear.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "lightyear"; + pname = "lightyear"; version = "2017-09-10"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/logic.nix b/pkgs/development/idris-modules/logic.nix index 35670462dcf3..f20d16e9a190 100644 --- a/pkgs/development/idris-modules/logic.nix +++ b/pkgs/development/idris-modules/logic.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "logic"; + pname = "logic"; version = "2016-12-02"; idrisDeps = [ bifunctors ]; diff --git a/pkgs/development/idris-modules/mapping.nix b/pkgs/development/idris-modules/mapping.nix index 6f978fccd5e0..fbfb34ddbf9d 100644 --- a/pkgs/development/idris-modules/mapping.nix +++ b/pkgs/development/idris-modules/mapping.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "mapping"; + pname = "mapping"; version = "2018-02-27"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/mhd.nix b/pkgs/development/idris-modules/mhd.nix index 1ef304bbf1c8..dc3a05f2b5a1 100644 --- a/pkgs/development/idris-modules/mhd.nix +++ b/pkgs/development/idris-modules/mhd.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "mhd"; + pname = "mhd"; version = "2016-04-22"; ipkgName = "MHD"; diff --git a/pkgs/development/idris-modules/pacman.nix b/pkgs/development/idris-modules/pacman.nix index cda3662dce27..dbc3c9ced72d 100644 --- a/pkgs/development/idris-modules/pacman.nix +++ b/pkgs/development/idris-modules/pacman.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "pacman"; + pname = "pacman"; version = "2017-11-10"; idrisDeps = [ contrib sdl2 ]; diff --git a/pkgs/development/idris-modules/patricia.nix b/pkgs/development/idris-modules/patricia.nix index 586c33837d65..a5cb0c6af00e 100644 --- a/pkgs/development/idris-modules/patricia.nix +++ b/pkgs/development/idris-modules/patricia.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "patricia"; + pname = "patricia"; version = "2017-10-27"; idrisDeps = [ specdris ]; diff --git a/pkgs/development/idris-modules/permutations.nix b/pkgs/development/idris-modules/permutations.nix index b11bce39e1ee..6f4e299d223b 100644 --- a/pkgs/development/idris-modules/permutations.nix +++ b/pkgs/development/idris-modules/permutations.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "permutations"; + pname = "permutations"; version = "2018-01-19"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/pfds.nix b/pkgs/development/idris-modules/pfds.nix index d82ec4901856..db3004a72be0 100644 --- a/pkgs/development/idris-modules/pfds.nix +++ b/pkgs/development/idris-modules/pfds.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "pfds"; + pname = "pfds"; version = "2017-09-25"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/pipes.nix b/pkgs/development/idris-modules/pipes.nix index 69b8d721705a..1402a2facee1 100644 --- a/pkgs/development/idris-modules/pipes.nix +++ b/pkgs/development/idris-modules/pipes.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "pipes"; + pname = "pipes"; version = "2017-12-02"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/posix.nix b/pkgs/development/idris-modules/posix.nix index 30bff9eb7e7a..13588155989a 100644 --- a/pkgs/development/idris-modules/posix.nix +++ b/pkgs/development/idris-modules/posix.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "posix"; + pname = "posix"; version = "2017-11-18"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/quantities.nix b/pkgs/development/idris-modules/quantities.nix index 8141465d751b..76242c5d2299 100644 --- a/pkgs/development/idris-modules/quantities.nix +++ b/pkgs/development/idris-modules/quantities.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "quantities"; + pname = "quantities"; version = "2018-04-17"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/rationals.nix b/pkgs/development/idris-modules/rationals.nix index 91aa294d1c55..9513b79e1aa7 100644 --- a/pkgs/development/idris-modules/rationals.nix +++ b/pkgs/development/idris-modules/rationals.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "rationals"; + pname = "rationals"; version = "2017-04-29"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/pkgs/development/idris-modules/recursion_schemes.nix index b326113c6351..3e9510563eee 100644 --- a/pkgs/development/idris-modules/recursion_schemes.nix +++ b/pkgs/development/idris-modules/recursion_schemes.nix @@ -8,7 +8,7 @@ , lib }: build-idris-package { - name = "recursion_schemes"; + pname = "recursion_schemes"; version = "2018-01-19"; idrisDeps = [ free composition comonad bifunctors hezarfen ]; diff --git a/pkgs/development/idris-modules/refined.nix b/pkgs/development/idris-modules/refined.nix index 11fd6b782818..c841f633b41f 100644 --- a/pkgs/development/idris-modules/refined.nix +++ b/pkgs/development/idris-modules/refined.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "refined"; + pname = "refined"; version = "2017-12-28"; ipkgName = "idris-refined"; diff --git a/pkgs/development/idris-modules/sdl.nix b/pkgs/development/idris-modules/sdl.nix index 105cfdce65b7..59e3ac916e4f 100644 --- a/pkgs/development/idris-modules/sdl.nix +++ b/pkgs/development/idris-modules/sdl.nix @@ -6,7 +6,7 @@ , SDL_gfx }: build-idris-package { - name = "sdl"; + pname = "sdl"; version = "2017-03-24"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix index 2e06b0368255..36eb7395dde1 100644 --- a/pkgs/development/idris-modules/sdl2.nix +++ b/pkgs/development/idris-modules/sdl2.nix @@ -7,7 +7,7 @@ , SDL2_gfx }: build-idris-package rec { - name = "sdl2"; + pname = "sdl2"; version = "0.1.1"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/semidirect.nix b/pkgs/development/idris-modules/semidirect.nix index 30cc144003ee..e3ca18fd2a26 100644 --- a/pkgs/development/idris-modules/semidirect.nix +++ b/pkgs/development/idris-modules/semidirect.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "semidirect"; + pname = "semidirect"; version = "2018-07-02"; idrisDeps = [ contrib patricia ]; diff --git a/pkgs/development/idris-modules/setoids.nix b/pkgs/development/idris-modules/setoids.nix index aa66d8475959..49e7bc5e8a0e 100644 --- a/pkgs/development/idris-modules/setoids.nix +++ b/pkgs/development/idris-modules/setoids.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "setoids"; + pname = "setoids"; version = "2018-06-18"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/smproc.nix b/pkgs/development/idris-modules/smproc.nix index 4917f7628555..b3780c9af3b8 100644 --- a/pkgs/development/idris-modules/smproc.nix +++ b/pkgs/development/idris-modules/smproc.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "smproc"; + pname = "smproc"; version = "2018-02-08"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/snippets.nix b/pkgs/development/idris-modules/snippets.nix index 2d5473545c54..fa4f3226dcca 100644 --- a/pkgs/development/idris-modules/snippets.nix +++ b/pkgs/development/idris-modules/snippets.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "snippets"; + pname = "snippets"; version = "2018-03-17"; ipkgName = "idris-snippets"; diff --git a/pkgs/development/idris-modules/software_foundations.nix b/pkgs/development/idris-modules/software_foundations.nix index 0f45da3ed67b..cbbf959576f3 100644 --- a/pkgs/development/idris-modules/software_foundations.nix +++ b/pkgs/development/idris-modules/software_foundations.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "software_foundations"; + pname = "software_foundations"; version = "2017-11-04"; idrisDeps = [ pruviloj ]; diff --git a/pkgs/development/idris-modules/specdris.nix b/pkgs/development/idris-modules/specdris.nix index b20902d74328..172a46b65a55 100644 --- a/pkgs/development/idris-modules/specdris.nix +++ b/pkgs/development/idris-modules/specdris.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "specdris"; + pname = "specdris"; version = "2018-01-23"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/tap.nix b/pkgs/development/idris-modules/tap.nix index 9edbbaea359c..8db71b9cb0ab 100644 --- a/pkgs/development/idris-modules/tap.nix +++ b/pkgs/development/idris-modules/tap.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "tap"; + pname = "tap"; version = "2017-04-08"; ipkgName = "TAP"; diff --git a/pkgs/development/idris-modules/test.nix b/pkgs/development/idris-modules/test.nix index 073b4e20b850..9c14422cc8d2 100644 --- a/pkgs/development/idris-modules/test.nix +++ b/pkgs/development/idris-modules/test.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "test"; + pname = "test"; version = "2017-03-30"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/tfrandom.nix b/pkgs/development/idris-modules/tfrandom.nix index 8249259075c0..b07f5253005e 100644 --- a/pkgs/development/idris-modules/tfrandom.nix +++ b/pkgs/development/idris-modules/tfrandom.nix @@ -4,7 +4,7 @@ }: build-idris-package { - name = "tf-random"; + pname = "tf-random"; version = "2020-01-15"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/tlhydra.nix b/pkgs/development/idris-modules/tlhydra.nix index e2c07ac5fb71..3b33367c8890 100644 --- a/pkgs/development/idris-modules/tlhydra.nix +++ b/pkgs/development/idris-modules/tlhydra.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "tlhydra"; + pname = "tlhydra"; version = "2017-13-26"; idrisDeps = [ effects contrib lightyear ]; diff --git a/pkgs/development/idris-modules/tomladris.nix b/pkgs/development/idris-modules/tomladris.nix index 64728ab305ec..8a0e7847f507 100644 --- a/pkgs/development/idris-modules/tomladris.nix +++ b/pkgs/development/idris-modules/tomladris.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "tomladris"; + pname = "tomladris"; version = "2017-11-14"; idrisDeps = [ lightyear contrib ]; diff --git a/pkgs/development/idris-modules/tp.nix b/pkgs/development/idris-modules/tp.nix index 0cfdc78f6673..0aedc3f48596 100644 --- a/pkgs/development/idris-modules/tp.nix +++ b/pkgs/development/idris-modules/tp.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "tp"; + pname = "tp"; version = "2017-08-15"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index ce040bebe355..ddf24f7c9d9f 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "tparsec"; + pname = "tparsec"; version = "2020-02-11"; ipkgName = "TParsec"; diff --git a/pkgs/development/idris-modules/transducers.nix b/pkgs/development/idris-modules/transducers.nix index 39a4cdf0cc7b..455e5c72a644 100644 --- a/pkgs/development/idris-modules/transducers.nix +++ b/pkgs/development/idris-modules/transducers.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "transducers"; + pname = "transducers"; version = "2017-07-28"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/trees.nix b/pkgs/development/idris-modules/trees.nix index 8fda8d138ad1..5c6e69471c78 100644 --- a/pkgs/development/idris-modules/trees.nix +++ b/pkgs/development/idris-modules/trees.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "trees"; + pname = "trees"; version = "2018-03-19"; idrisDeps = [ contrib bi ]; diff --git a/pkgs/development/idris-modules/union_type.nix b/pkgs/development/idris-modules/union_type.nix index 2ad8f280fce5..99f160a72d86 100644 --- a/pkgs/development/idris-modules/union_type.nix +++ b/pkgs/development/idris-modules/union_type.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "union_type"; + pname = "union_type"; version = "2018-01-30"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix index 3ece0056a3f1..9e3f151ee891 100644 --- a/pkgs/development/idris-modules/vdom.nix +++ b/pkgs/development/idris-modules/vdom.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "vdom"; + pname = "vdom"; version = "0.6.0"; ipkgName = "idris-vdom"; diff --git a/pkgs/development/idris-modules/vecspace.nix b/pkgs/development/idris-modules/vecspace.nix index 2336291338b3..dea3c9b18dd0 100644 --- a/pkgs/development/idris-modules/vecspace.nix +++ b/pkgs/development/idris-modules/vecspace.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "vecspace"; + pname = "vecspace"; version = "2018-01-12"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/webgl.nix b/pkgs/development/idris-modules/webgl.nix index 271501aa5298..849cad2590c1 100644 --- a/pkgs/development/idris-modules/webgl.nix +++ b/pkgs/development/idris-modules/webgl.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "webgl"; + pname = "webgl"; version = "2017-05-08"; idrisDeps = [ idrisscript ]; diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix index a368e0582d82..a6c7b78f5527 100644 --- a/pkgs/development/idris-modules/wl-pprint.nix +++ b/pkgs/development/idris-modules/wl-pprint.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "wl-pprint"; + pname = "wl-pprint"; version = "2017-03-13"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/wyvern.nix b/pkgs/development/idris-modules/wyvern.nix index 750b5dd2fd07..3a8742d9fe5d 100644 --- a/pkgs/development/idris-modules/wyvern.nix +++ b/pkgs/development/idris-modules/wyvern.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "wyvern"; + pname = "wyvern"; version = "2017-06-26"; idrisDeps = [ contrib effects ]; diff --git a/pkgs/development/idris-modules/xhr.nix b/pkgs/development/idris-modules/xhr.nix index 9c198e289389..e8dc37d43989 100644 --- a/pkgs/development/idris-modules/xhr.nix +++ b/pkgs/development/idris-modules/xhr.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "xhr"; + pname = "xhr"; version = "2017-04-22"; idrisDeps = [ idrisscript ]; diff --git a/pkgs/development/idris-modules/yaml.nix b/pkgs/development/idris-modules/yaml.nix index b7fffd3953d6..2c8b8087576e 100644 --- a/pkgs/development/idris-modules/yaml.nix +++ b/pkgs/development/idris-modules/yaml.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "yaml"; + pname = "yaml"; version = "2018-01-25"; ipkgName = "Yaml"; diff --git a/pkgs/development/idris-modules/yampa.nix b/pkgs/development/idris-modules/yampa.nix index 33ebacc6d55b..ae790aa4bdaa 100644 --- a/pkgs/development/idris-modules/yampa.nix +++ b/pkgs/development/idris-modules/yampa.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "yampa"; + pname = "yampa"; version = "2016-07-05"; ipkgName = "idris-yampa"; From c3ebb0fb50cbcbcf29ea67bc9d3e416cc0f69491 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Wed, 23 Feb 2022 19:00:41 +0100 Subject: [PATCH 042/231] appflowy: fix error xdg-user-dir not found --- pkgs/applications/office/appflowy/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 6d3b9183f446..08d5d9ce3613 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -46,13 +46,14 @@ stdenv.mkDerivation rec { ''; preFixup = let - libPath = lib.makeLibraryPath [ + binPath = lib.makeBinPath [ xdg-user-dirs ]; in '' # Add missing libraries to appflowy using the ones it comes with makeWrapper $out/opt/app_flowy $out/bin/appflowy \ - --set LD_LIBRARY_PATH "$out/opt/lib/:${libPath}" + --set LD_LIBRARY_PATH "$out/opt/lib/" \ + --prefix PATH : "${binPath}" ''; desktopItems = [ From a91e85efa3d9b39b9b9930fd7a961192b9a1c754 Mon Sep 17 00:00:00 2001 From: zseri Date: Thu, 2 Dec 2021 09:28:21 +0100 Subject: [PATCH 043/231] cups-filters: run nixpkgs-fmt --- pkgs/misc/cups/filters.nix | 50 ++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index a20e3b71b093..a4cb617a22aa 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,13 +1,36 @@ -{ lib, stdenv, fetchurl, pkg-config, cups, poppler, poppler_utils, fontconfig -, libjpeg, libpng, perl, ijs, qpdf, dbus, avahi -, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript -, mupdf, dejavu_fonts, liblouis +{ lib +, avahi +, bc +, coreutils +, cups +, dbus +, dejavu_fonts +, fetchurl +, fontconfig +, gawk +, ghostscript +, gnugrep +, gnused +, ijs +, libjpeg +, liblouis +, libpng +, makeWrapper +, mupdf +, perl +, pkg-config +, poppler +, poppler_utils +, qpdf +, stdenv +, which }: let - binPath = lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ]; + binPath = lib.makeBinPath [ bc coreutils gawk gnused gnugrep which ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "cups-filters"; version = "1.28.11"; @@ -19,9 +42,20 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ - cups poppler poppler_utils fontconfig libjpeg libpng perl - ijs qpdf dbus avahi ghostscript mupdf + avahi + cups + dbus + fontconfig + ghostscript + ijs + libjpeg liblouis # braille embosser support + libpng + mupdf + perl + poppler + poppler_utils + qpdf ]; configureFlags = [ From 9a93279738708df0801185a35fb31671b4616b70 Mon Sep 17 00:00:00 2001 From: zseri Date: Thu, 2 Dec 2021 09:30:27 +0100 Subject: [PATCH 044/231] cups-filters: make it easier to disable avahi : previous override code to do this was : cups-filters = prev.lib.pipe prev.cups-filters [ (x: x.overrideAttrs (old: { configureFlags = old.configureFlags ++ ["--disable-avahi"]; })) (x: x.override { avahi = null; }) ]; : new override code to do this is : cups-filters = prev.cups-filters.override { withAvahi = false; }; --- pkgs/misc/cups/filters.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index a4cb617a22aa..5efa78edcd9a 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -24,6 +24,7 @@ , qpdf , stdenv , which +, withAvahi ? true }: let @@ -42,7 +43,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ - avahi cups dbus fontconfig @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { poppler poppler_utils qpdf - ]; + ] ++ lib.optionals withAvahi [ avahi ]; configureFlags = [ "--with-mutool-path=${mupdf}/bin/mutool" @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" "--localstatedir=/var" "--sysconfdir=/etc" - ]; + ] ++ lib.optionals (!withAvahi) [ "--disable-avahi" ]; makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ]; From bed1ee054887e0d23f75a55afc5d497c71a6a09c Mon Sep 17 00:00:00 2001 From: zseri Date: Thu, 2 Dec 2021 09:38:13 +0100 Subject: [PATCH 045/231] webkitgtk: make it easier to disable avahi globally by fixing enableGeoLocation option The problem with enableGeoLocation was that it didn't compose well with .overrideAttrs and setting geoclue2=null at the overlay level because of the assert statement. Thus, when combined with disabling libsecret, the resulting override code was: avahi = null; geoclue2 = { outPath = throw "geoclue is disabled"; }; webkitgtk = prev.lib.pipe prev.webkitgtk [ (x: x.override { enableGeoLocation = false; geoclue2 = prev.geoclue2; }) (x: x.overrideAttrs (old: { cmakeFlags = old.cmakeFlags ++ [ "-DUSE_LIBSECRET=OFF" ]; })) (x: x.override { enableGeoLocation = false; geoclue2 = null; libsecret = null; }) ]; It works, but is unnecessarily complex. : detailed motviation libsecret and geoclue2 are actually completely independent, the real conflict is between assert and override/overrideAttrs which don't work as expected; e.g. you can pass an updated parameter, but the original parameter at callPackage "calltime" after recusion through overlays gets used, so when globally setting "geoclue2=null;" in an overlay, the assert is always hit without any way to work around that --- .../libraries/webkitgtk/default.nix | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index b5a16df21add..92405b35de29 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , runCommand , fetchurl , perl @@ -44,7 +45,6 @@ , lcms2 , libmanette , openjpeg -, enableGeoLocation ? true , geoclue2 , sqlite , enableGLES ? true @@ -58,10 +58,10 @@ , substituteAll , glib , addOpenGLRunpath +, enableGeoLocation ? true +, withLibsecret ? true }: -assert enableGeoLocation -> geoclue2 != null; - stdenv.mkDerivation rec { pname = "webkitgtk"; version = "2.34.6"; @@ -125,12 +125,8 @@ stdenv.mkDerivation rec { libidn libintl lcms2 - ] ++ lib.optionals stdenv.isLinux [ - libmanette - ] ++ [ libnotify libpthreadstubs - libsecret libtasn1 libwebp libxkbcommon @@ -155,28 +151,36 @@ stdenv.mkDerivation rec { # (We pick just that one because using the other headers from `sdk` is not # compatible with our C++ standard library. This header is already in # the standard library on aarch64) - runCommand "${pname}_headers" {} '' + runCommand "${pname}_headers" { } '' install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h '' ) ++ lib.optionals stdenv.isLinux [ bubblewrap libseccomp + libmanette systemd wayland xdg-dbus-proxy - ] ++ lib.optional enableGeoLocation geoclue2; + ] ++ lib.optionals enableGeoLocation [ + geoclue2 + ] ++ lib.optionals withLibsecret [ + libsecret + ]; propagatedBuildInputs = [ gtk3 libsoup ]; - cmakeFlags = [ + cmakeFlags = let + cmakeBool = x: if x then "ON" else "OFF"; + in [ "-DENABLE_INTROSPECTION=ON" "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" "-DUSE_WPE_RENDERER=OFF" - "-DUSE_SOUP2=${if lib.versions.major libsoup.version == "2" then "ON" else "OFF"}" + "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" + "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" ] ++ lib.optionals stdenv.isDarwin [ "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" @@ -191,7 +195,9 @@ stdenv.mkDerivation rec { "-DUSE_SYSTEM_MALLOC=ON" ] ++ lib.optionals (!stdenv.isLinux) [ "-DUSE_SYSTEMD=OFF" - ] ++ lib.optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; + ] ++ lib.optionals (stdenv.isLinux && enableGLES) [ + "-DENABLE_GLES2=ON" + ]; postPatch = '' patchShebangs . From 2bd4a5d10deee4f1fb341bbe2d817a612536df97 Mon Sep 17 00:00:00 2001 From: zseri Date: Thu, 2 Dec 2021 15:28:26 +0100 Subject: [PATCH 046/231] evince: make libsecret optional --- pkgs/desktops/gnome/core/evince/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 74987c07a5b9..28406e412844 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -44,6 +44,7 @@ , libgxps , supportXPS ? true # Open XML Paper Specification via libgxps , withPantheon ? false +, withLibsecret ? true }: stdenv.mkDerivation rec { @@ -103,13 +104,14 @@ stdenv.mkDerivation rec { libarchive libhandy librsvg - libsecret libspectre libxml2 pango poppler t1lib texlive.bin.core # kpathsea for DVI support + ] ++ lib.optionals withLibsecret [ + libsecret ] ++ lib.optionals supportXPS [ libgxps ] ++ lib.optionals supportMultimedia (with gst_all_1; [ @@ -126,6 +128,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dnautilus=false" "-Dps=enabled" + ] ++ lib.optionals (!withLibsecret) [ + "-Dkeyring=disabled" ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; From 9bc2cd9866e9a2679f3dfb44e0e7599ace654b56 Mon Sep 17 00:00:00 2001 From: zseri Date: Sat, 4 Dec 2021 01:50:40 +0100 Subject: [PATCH 047/231] remmina: make it easier to disable libsecret --- pkgs/applications/networking/remote/remmina/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 58ce130a7305..efce24a06f9a 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -7,6 +7,7 @@ , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz # The themes here are soft dependencies; only icons are missing without them. , gnome +, withLibsecret ? true }: with lib; @@ -29,15 +30,16 @@ stdenv.mkDerivation rec { freerdp libssh libgcrypt gnutls pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsecret libsoup spice-protocol spice-gtk libepoxy at-spi2-core + libsoup spice-protocol spice-gtk libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz - ]; + ] ++ optionals withLibsecret [ libsecret ]; cmakeFlags = [ "-DWITH_VTE=OFF" "-DWITH_TELEPATHY=OFF" "-DWITH_AVAHI=OFF" + "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2.so" "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2.so" "-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2.so" From bf664d85b490e7ca652b3f8e27bf3a9459a84ccc Mon Sep 17 00:00:00 2001 From: zseri Date: Thu, 2 Dec 2021 09:46:18 +0100 Subject: [PATCH 048/231] xdg-desktop-portal: sort argument/package lists --- .../libraries/xdg-desktop-portal/default.nix | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 16ede7f511f2..fa3bc91c9f68 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,21 +1,22 @@ -{ stdenv -, lib -, fetchFromGitHub -, nixosTests -, substituteAll -, autoreconfHook -, pkg-config -, libxml2 -, glib -, pipewire -, flatpak -, gsettings-desktop-schemas +{ lib , acl +, autoreconfHook , dbus +, fetchFromGitHub +, fetchpatch +, flatpak , fuse -, libportal , geoclue2 +, glib +, gsettings-desktop-schemas , json-glib +, libportal +, libxml2 +, nixosTests +, pipewire +, pkg-config +, stdenv +, substituteAll , wrapGAppsHook }: @@ -42,22 +43,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkg-config libxml2 + pkg-config wrapGAppsHook ]; buildInputs = [ - glib - pipewire - flatpak acl dbus - geoclue2 + flatpak fuse - libportal + geoclue2 + glib gsettings-desktop-schemas json-glib + libportal + pipewire ]; configureFlags = [ From 48c3c219bda0e8e99394667df43e81a8a06190a6 Mon Sep 17 00:00:00 2001 From: zseri Date: Fri, 11 Feb 2022 14:25:36 +0100 Subject: [PATCH 049/231] xdg-desktop-portal: make geoclue2 optional --- pkgs/development/libraries/xdg-desktop-portal/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index fa3bc91c9f68..19a671e7e0b0 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -18,6 +18,7 @@ , stdenv , substituteAll , wrapGAppsHook +, enableGeoLocation ? true }: stdenv.mkDerivation rec { @@ -53,16 +54,19 @@ stdenv.mkDerivation rec { dbus flatpak fuse - geoclue2 glib gsettings-desktop-schemas json-glib libportal pipewire + ] ++ lib.optionals enableGeoLocation [ + geoclue2 ]; configureFlags = [ "--enable-installed-tests" + ] ++ lib.optionals (!enableGeoLocation) [ + "--disable-geoclue" ]; makeFlags = [ From 72957a2dc0c0307c3dc0e9c13457d9fa15c60bcc Mon Sep 17 00:00:00 2001 From: zseri Date: Fri, 11 Feb 2022 14:26:07 +0100 Subject: [PATCH 050/231] element-desktop: make keytar optional --- .../from_md/release-notes/rl-2205.section.xml | 10 +++++++ .../manual/release-notes/rl-2205.section.md | 4 +++ .../element/element-desktop.nix | 27 ++++++++++++++++--- .../element/keytar/default.nix | 4 +++ .../element/seshat/default.nix | 7 +++-- 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 612846122a70..a2a38da2b733 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -917,6 +917,16 @@ true. + + + The element-desktop package now has an + useKeytar option (defaults to + true), which allows disabling + keytar and in turn + libsecret usage (which binds to native + credential managers / keychain libraries). + + The option services.thelounge.plugins has diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index a8017f26708a..aed8f1b1dd55 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -307,6 +307,10 @@ In addition to numerous new and upgraded packages, this release has the followin using `fetchgit` or `fetchhg` if the argument `fetchSubmodules` is set to `true`. +- The `element-desktop` package now has an `useKeytar` option (defaults to `true`), + which allows disabling `keytar` and in turn `libsecret` usage + (which binds to native credential managers / keychain libraries). + - The option `services.thelounge.plugins` has been added to allow installing plugins for The Lounge. Plugins can be found in `pkgs.theLoungePlugins.plugins` and `pkgs.theLoungePlugins.themes`. - The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`. diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index d9683740667c..c9b45b2f8b68 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -13,12 +13,15 @@ , AppKit , CoreServices , desktopToDarwinBundle +, useKeytar ? true }: let pinData = lib.importJSON ./pin.json; executableName = "element-desktop"; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; + keytar = callPackage ./keytar { inherit Security AppKit; }; + seshat = callPackage ./seshat { inherit CoreServices; }; in mkYarnPackage rec { pname = "element-desktop"; @@ -39,8 +42,7 @@ mkYarnPackage rec { nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; - seshat = callPackage ./seshat { inherit CoreServices; }; - keytar = callPackage ./keytar { inherit Security AppKit; }; + inherit seshat; buildPhase = '' runHook preBuild @@ -51,12 +53,14 @@ mkYarnPackage rec { node ./scripts/copy-res.js popd rm -rf node_modules/matrix-seshat node_modules/keytar - ln -s $keytar node_modules/keytar + ${lib.optionalString useKeytar "ln -s ${keytar} node_modules/keytar"} ln -s $seshat node_modules/matrix-seshat runHook postBuild ''; installPhase = '' + runHook preInstall + # resources mkdir -p "$out/share/element" ln -s '${element-web}' "$out/share/element/webapp" @@ -83,6 +87,8 @@ mkYarnPackage rec { --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ --add-flags "$out/share/element/electron" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + + runHook postInstall ''; # Do not attempt generating a tarball for element-web again. @@ -107,7 +113,20 @@ mkYarnPackage rec { ''; }; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + + # TL;DR: keytar is optional while seshat isn't. + # + # This prevents building keytar when `useKeytar` is set to `false`, because + # if libsecret is unavailable (e.g. set to `null` or fails to build), then + # this package wouldn't even considered for building because + # "one of the dependencies failed to build", + # although the dependency wouldn't even be used. + # + # It needs to be `passthru` anyways because other packages do depend on it. + inherit keytar; + }; meta = with lib; { description = "A feature-rich client for Matrix.org"; diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index ae9627afe30d..292b0dfa075d 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { }; buildPhase = '' + runHook preBuild cp ${./yarn.lock} ./yarn.lock chmod u+w . ./yarn.lock export HOME=$PWD/tmp @@ -37,16 +38,19 @@ in stdenv.mkDerivation rec { yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ node_modules/.bin/node-gyp rebuild + runHook postBuild ''; doCheck = false; installPhase = '' + runHook preInstall shopt -s extglob rm -rf node_modules rm -rf $HOME mkdir -p $out cp -r ./!(build) $out install -D -t $out/build/Release build/Release/keytar.node + runHook postInstall ''; } diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index de38c7a90bad..5017f8531179 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -27,6 +27,7 @@ in rustPlatform.buildRustPackage rec { }; buildPhase = '' + runHook preBuild cd .. chmod u+w . ./yarn.lock export HOME=$PWD/tmp @@ -36,16 +37,18 @@ in rustPlatform.buildRustPackage rec { yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ node_modules/.bin/neon build --release + runHook postBuild ''; doCheck = false; installPhase = '' + runHook preInstall shopt -s extglob rm -rf native/!(index.node) - rm -rf node_modules - rm -rf $HOME + rm -rf node_modules $HOME cp -r . $out + runHook postInstall ''; cargoSha256 = pinData.cargoHash; From a7dade7b3113b4cade391a39ee373b55e4c1d9bf Mon Sep 17 00:00:00 2001 From: zseri Date: Tue, 21 Dec 2021 23:29:24 +0100 Subject: [PATCH 051/231] gvfs: allow building without avahi --- pkgs/development/libraries/gvfs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 547c35e66eca..c79f849d22f1 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -108,6 +108,8 @@ stdenv.mkDerivation rec { "-Dkeyring=false" "-Dhttp=false" "-Dgoogle=false" + ] ++ lib.optionals (avahi == null) [ + "-Ddnssd=false" ] ++ lib.optionals (samba == null) [ # Xfce don't want samba "-Dsmb=false" From 949f04eb543d8e2c9e9e8e232db377146a09e3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Feb 2022 00:21:39 +0000 Subject: [PATCH 052/231] python3Packages.fiona: skip fewer tests --- pkgs/development/python-modules/fiona/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index f8fc454e05ee..3cd8eef93277 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -49,14 +49,6 @@ buildPythonPackage rec { disabledTests = [ # Some tests access network, others test packaging "http" "https" "wheel" - # Assert not true - "test_no_append_driver_cannot_append" - ] ++ lib.optionals stdenv.isAarch64 [ - # https://github.com/Toblerity/Fiona/issues/1012 the existence of this - # as a bug hasn't been challenged and other distributors seem to also - # be skipping these tests on aarch64, so this is not unique to nixpkgs. - "test_write_or_driver_error" - "test_append_or_driver_error" ]; meta = with lib; { From 777d408f7bf654547b6e15bde153ace2aece3b0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 00:38:55 +0000 Subject: [PATCH 053/231] python310Packages.pytest-console-scripts: 1.2.2 -> 1.3 --- .../python-modules/pytest-console-scripts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix index 609ed9cc343e..76323a3498a9 100644 --- a/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-console-scripts"; - version = "1.2.2"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "caeaaaf57f3a99e4482127e8a18467a1cfd49c92f4b37e5578d0bc40bf1b3394"; + sha256 = "sha256-w8rb9nz7MKHrHMHp5py23kTDpkhCbxub9j6F2XNX/H8="; }; postPatch = '' # setuptools-scm is pinned to <6 because it dropped Python 3.5 From 61d3eaa66dded75776047dca0f2408112fc56f28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 02:45:39 +0000 Subject: [PATCH 054/231] python310Packages.google-cloud-videointelligence: 2.5.1 -> 2.6.0 --- .../python-modules/google-cloud-videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index db6027f3a1ff..629220fe37a2 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "7b735f623d6c3c80d1d40fa491bfe1776a5369d7b240dddab522fd0076d97b1d"; + sha256 = "sha256-blkNMdh9ehRM9sidgGajIkrHgrJCT96hzG3nVU0DBo4="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; From 05f6cdcdaaffe1e5abc2e5524a1b9efad44ea5c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 02:58:25 +0000 Subject: [PATCH 055/231] python310Packages.b2sdk: 1.14.0 -> 1.14.1 --- pkgs/development/python-modules/b2sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 5f9eb41bf821..c36435b22975 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.14.0"; + version = "1.14.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "900da60f9e569e02405b85db35541a79e1cac776ace5d054498b107982ea443c"; + sha256 = "sha256-fYOeyhKm9mRT61NcQVaXFKeRC8AS9lfIZMO/s6iFaeg="; }; nativeBuildInputs = [ From 8b491fdf13a4dd68a62a8c20100a35ca6756ab30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 03:59:59 +0000 Subject: [PATCH 056/231] python310Packages.striprtf: 0.0.19 -> 0.0.20 --- pkgs/development/python-modules/striprtf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix index 0e884a09b440..52fe3769e224 100644 --- a/pkgs/development/python-modules/striprtf/default.nix +++ b/pkgs/development/python-modules/striprtf/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "striprtf"; - version = "0.0.19"; + version = "0.0.20"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "b7f15e11306e466dbe91665409233a06d9fdb4ee156489a3d879579891b04c25"; + sha256 = "sha256-8eMeMrazl1o9XcIyWICDg6ycRMtFMfgTUNz51w9hAmc="; }; pythonImportsCheck = [ From 4f8ce5cbe78a19f80ce71f7f6bc47e755a2cd826 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 04:03:58 +0000 Subject: [PATCH 057/231] python310Packages.furo: 2022.2.14.1 -> 2022.2.23 --- pkgs/development/python-modules/furo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index dd517a2f547e..ab196d23c2d6 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2022.2.14.1"; + version = "2022.2.23"; format = "wheel"; disable = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - sha256 = "sha256-18uBJgNGNyEjMjUOyEkMuVcy02UGsCQxiljO4ufeD9o="; + sha256 = "sha256-v+1OagURq3uvIRsxlbhRkUvxGnLlkH4HOx3pKW3jkfY="; }; propagatedBuildInputs = [ From bcd79018dc70c63f2be24d3442fe6e38474fa94b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 04:17:36 +0000 Subject: [PATCH 058/231] certipy: 2.0 -> 2.0.7 --- pkgs/tools/security/certipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/certipy/default.nix b/pkgs/tools/security/certipy/default.nix index 536a1a502adb..c6b0efe28a2c 100644 --- a/pkgs/tools/security/certipy/default.nix +++ b/pkgs/tools/security/certipy/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "certipy"; - version = "2.0"; + version = "2.0.7"; src = fetchFromGitHub { owner = "ly4k"; repo = "Certipy"; rev = version; - hash = "sha256-xN0DrLrxWNCEy3HodA1pOJHYhDyA1sMRVIfefbXq45E="; + hash = "sha256-/89TO/Dzj53bxndLgMIPCaL3axXJUEpX07+25xtnmws="; }; propagatedBuildInputs = with python3.pkgs; [ From fe19b4f795f780223fc475c94e1ac75dd7fc5e5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 07:29:13 +0000 Subject: [PATCH 059/231] python310Packages.google-cloud-redis: 2.5.1 -> 2.6.0 --- .../development/python-modules/google-cloud-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index aa49340f24a3..25ff1dd984d4 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "ad81fed19af6af68426e76891e4acc8a021a8bc475e2ce4be51bf28a610a9713"; + sha256 = "sha256-CaD/pMQeEdQtcQKBCW1/e42oof9KTpA0IFvCsOaD5zU="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 1b8518caddbf547d107735c00710c087e80e757f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 08:42:12 +0000 Subject: [PATCH 060/231] jmol: 14.32.21 -> 14.32.24 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index d1d6b436992c..65b1f92943dc 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.21"; + version = "14.32.24"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-jJw/y6lQ0bvzOmwOhedufxK0Tuq9Pq6lIPZ97o03Zec="; + sha256 = "sha256-YxYNb2fS7KiUkZDSRx4FN+ZeMMNpfTaElitRE4RtD0g="; }; patchPhase = '' From 8c657a61817efcd28b2e36b6a830132d11f18a8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 10:16:54 +0000 Subject: [PATCH 061/231] python310Packages.aws-lambda-builders: 1.12.0 -> 1.13.0 --- .../python-modules/aws-lambda-builders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index c5565500a321..b7186f580b0d 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.12.0"; + version = "1.13.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "sha256-3Of3E32+Txe2844pl0sWxj46EgaTG2aEfbAELlxIT/E="; + sha256 = "sha256-t04g65TPeOYgEQw6kPJrlJN1ssQrsN9kl7g69J4pPwo="; }; # Package is not compatible with Python 3.5 From fe7c9ae161c78073fc2c11e3641ad850e7e362bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 10:40:02 +0000 Subject: [PATCH 062/231] python310Packages.xml2rfc: 3.12.2 -> 3.12.3 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 49693353204f..c9cf286b6cce 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.12.2"; + version = "3.12.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CsxelHZbg25oBRM3P5UYlbWgsnR/L/w8vSFgHK1FKKI="; + sha256 = "sha256-YUrcD3Q1fkDW+nwf6k2T/aBL8+W9iWkPYW/TqdTiuA0="; }; propagatedBuildInputs = [ From d7d6b02c919138b98bf95678ad11f9dc105205cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 12:00:31 +0000 Subject: [PATCH 063/231] kubeconform: 0.4.12 -> 0.4.13 --- pkgs/applications/networking/cluster/kubeconform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index 29a8388bd5cc..07d15feddda5 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.4.12"; + version = "0.4.13"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-03eGWuDV/GS2YgDQ7LaqonU7K/ohI8sQD4dXbJGXeXw="; + sha256 = "sha256-hKsGti04pUZj02uzah7ccImmg/qn31ceVfk11aTa9rk="; }; vendorSha256 = null; From 27db523fe72ed027231eb4a61057f247dc27e25c Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Thu, 24 Feb 2022 10:07:34 -0300 Subject: [PATCH 064/231] clojure-lsp: 2022.02.01-16.53.14 -> 2022.02.23-12.12.12 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 4841c48d0ee2..6a372fb40f19 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.02.01-16.53.14"; + version = "2022.02.23-12.12.12"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-VyDnDlK40Sj/0cethclnRlKc5tOentAEUzjDOqbItpo="; + sha256 = "sha256-PfO1G66Z3zQ+Hyjb6J0bomsT8juQURwF2mPKJY5auMw="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "sha256-gIG8sjf55aRo4xI/RFrxhzLSD6RHzn/YGG9+gWrXcgE="; + sha256 = "sha256-f8bEALl9j0aDkKZtThLTseqibeYIUeOx4ulelPWQkoo="; }; extraNativeImageBuildArgs = [ From 748ed246804013ae9360bbc89556a5a06b50710a Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Thu, 24 Feb 2022 15:23:35 +0000 Subject: [PATCH 065/231] exploitdb: 2022-02-23 -> 2022-02-24 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index d758d33db88b..dac4247a4464 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-02-23"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-5jxcx16CS35U8MVWR8Ea4hUTweQfsLSceVaQN5T5XiU="; + sha256 = "sha256-aRhprR8UyPh7bok5ONy0I1YvK94c+yXvmCye2QlBU9A="; }; nativeBuildInputs = [ makeWrapper ]; From d941033be34b64e872af1c01fcbc6668b585c1ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Feb 2022 15:55:23 +0000 Subject: [PATCH 066/231] python3Packages.transitions: 0.8.10 -> 0.8.11 https://github.com/pytransitions/transitions/releases/tag/0.8.11 --- .../development/python-modules/transitions/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index 76a82e7c6213..e50dec28ef50 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "transitions"; - version = "0.8.10"; + version = "0.8.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "b0385975a842e885c1a55c719d2f90164471665794d39d51f9eb3f11e1d9c8ac"; + sha256 = "sha256-eyDTKQbqTWDub2wfXcnJ8XiAJCXFsVUhPrDyXCd/BOQ="; }; propagatedBuildInputs = [ @@ -38,12 +38,6 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/pytransitions/transitions/issues/563 - "test_multiple_models" - "test_timeout" - ]; - pythonImportsCheck = [ "transitions" ]; From 5531b1ec05a4b206fa03ee8dff393e9d83472dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Feb 2022 16:13:48 +0000 Subject: [PATCH 067/231] python3Packages.yowsup: fix build --- .../python-modules/yowsup/default.nix | 33 ++++++++++++++----- .../yowsup/dependency-fixes.patch | 13 -------- 2 files changed, 25 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/python-modules/yowsup/dependency-fixes.patch diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index 91c58192b8a2..30c056db9340 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -1,5 +1,13 @@ -{ buildPythonPackage, lib, fetchFromGitHub, six, python-axolotl, pytest -, isPy3k, consonance, appdirs +{ lib +, buildPythonPackage +, isPy3k +, fetchFromGitHub +, appdirs +, consonance +, protobuf +, python-axolotl +, six +, pytestCheckHook }: buildPythonPackage rec { @@ -17,19 +25,28 @@ buildPythonPackage rec { sha256 = "1pz0r1gif15lhzdsam8gg3jm6zsskiv2yiwlhaif5rl7lv3p0v7q"; }; - checkInputs = [ pytest ]; - checkPhase = '' - HOME=$(mktemp -d) py.test yowsup + postPatch = '' + substituteInPlace setup.py \ + --replace "argparse" "" \ + --replace "==" ">=" \ ''; - patches = [ ./dependency-fixes.patch ]; + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = [ six python-axolotl consonance appdirs ]; + propagatedBuildInputs = [ + appdirs + consonance + protobuf + python-axolotl + six + ]; meta = with lib; { homepage = "https://github.com/tgalal/yowsup"; description = "The python WhatsApp library"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/yowsup/dependency-fixes.patch b/pkgs/development/python-modules/yowsup/dependency-fixes.patch deleted file mode 100644 index eab56332d492..000000000000 --- a/pkgs/development/python-modules/yowsup/dependency-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index e3871a7..930bd6a 100755 ---- a/setup.py -+++ b/setup.py -@@ -5,7 +5,7 @@ import yowsup - import platform - import sys - --deps = ['consonance==0.1.2', 'argparse', 'python-axolotl==0.2.2', 'six==1.10', 'appdirs', 'protobuf>=3.6.0'] -+deps = ['consonance>=0.1', 'python-axolotl>=0.2', 'six>=1.10', 'appdirs', 'protobuf>=3.6.0'] - - if sys.version_info < (2, 7): - deps.append('importlib') From 1f414bd194572e93ddd9dd8da44f5cb55df95854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Feb 2022 16:17:57 +0000 Subject: [PATCH 068/231] python3Packages.ciscoconfparse: 1.6.21 -> 1.6.36 --- .../python-modules/ciscoconfparse/default.nix | 44 +++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index 8831999e9923..e6db689a45c5 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -1,26 +1,54 @@ -{ lib, buildPythonPackage, fetchFromGitHub, passlib, dnspython, loguru, toml -, ipaddr, poetry, poetry-core, black, Fabric, pytest, sphinx }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, passlib +, dnspython +, loguru +, toml +, pytestCheckHook +}: buildPythonPackage rec { pname = "ciscoconfparse"; - version = "1.6.21"; + version = "1.6.36"; format = "pyproject"; src = fetchFromGitHub { owner = "mpenning"; repo = pname; rev = version; - sha256 = "1d6nzhmdg7zlg1h3lm4v7j4hsb2aqd475r5q5vcqxfdxszc92w21"; + sha256 = "sha256-nIuuqAxz8eHEQRuH8nfYVQ+vGMmcDcARJLizoI5Mty8="; }; - patchPhase = '' + postPatch = '' patchShebangs tests ''; - propagatedBuildInputs = - [ passlib dnspython loguru toml ipaddr poetry black Fabric sphinx ]; + nativeBuildInputs = [ + poetry-core + ]; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ + passlib + dnspython + loguru + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + "tests/parse_test.py" + ]; + + disabledTests = [ + "test_dns_lookup" + "test_reverse_dns_lookup" + ]; + + pythonImportsCheck = [ "ciscoconfparse" ]; meta = with lib; { description = From 2d229cad7da3d1e8b8c8476404c7e7c23862fa13 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Feb 2022 19:04:35 +0100 Subject: [PATCH 069/231] checkov: 2.0.885 -> 2.0.900 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 392c05de37d3..d7cc9bd49cf0 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.885"; + version = "2.0.900"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-jhZ2LdCb7+4SMXcoWw9hKT77Qdiw+HWff0jkkvaci28="; + hash = "sha256-uhc09UiEe987pgs+6XPBKcERW5pL2PG3U1LEju4jWaM="; }; nativeBuildInputs = with py.pkgs; [ From 5ef18e63431f209bc844427b558d63e636d823c6 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 9 Jan 2022 10:15:09 +0300 Subject: [PATCH 070/231] peertube: 3.4.1 -> 4.0.0 --- pkgs/servers/peertube/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 67f7fd76606c..2572711c81e9 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -7,28 +7,28 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then "linux-x64" else throw "Unsupported architecture: ${stdenv.hostPlatform.system}"; - version = "3.4.1"; + version = "4.0.0"; source = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - sha256 = "0l1ibqmliy4aq60a16v383v4ijv1c9sf2a35k9q365mkl42jbzx1"; + sha256 = "sha256-nSbB5hRAMDPeKH48eviBS0xrNYab53BohWLKqRD02BI="; }; yarnOfflineCacheServer = fetchYarnDeps { yarnLock = "${source}/yarn.lock"; - sha256 = "0zyxf1km79w6329jay4bcpw5bgvhnvmvl11r9hka5c6s46d3ms7n"; + sha256 = "sha256-GTBHZMjnIi5xqEQG4tNkX0RvnVGgxnxhX/3vsA/GOLU="; }; yarnOfflineCacheTools = fetchYarnDeps { yarnLock = "${source}/server/tools/yarn.lock"; - sha256 = "12xmwc8lnalcpx3nww457avn5zw04ly4pp4kjxkvhsqs69arfl2m"; + sha256 = "sha256-BGr5095F4FQ5ii+2xEmPMAATrqKkZiQ74FJYYo1weKc="; }; yarnOfflineCacheClient = fetchYarnDeps { yarnLock = "${source}/client/yarn.lock"; - sha256 = "1glnip6mpizif36vil61sw8i8lnn0jg5hrqgqw6k4cc7hkd2qkpc"; + sha256 = "sha256-Cyoo/85DVehuWcgPfLkk3S1sZE3WXOr79HZs5ULF8pg="; }; bcrypt_version = "5.0.1"; @@ -100,7 +100,6 @@ in stdenv.mkDerivation rec { cat > ./bin/details < Date: Sun, 9 Jan 2022 10:15:09 +0300 Subject: [PATCH 071/231] peertube: remove unused packages and modules --- pkgs/servers/peertube/default.nix | 44 +++---------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 2572711c81e9..7ef8e885bac3 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, callPackage, fetchurl, fetchFromGitHub, buildGoModule, fetchYarnDeps, nixosTests -, esbuild, fixup_yarn_lock, jq, nodejs, yarn -, nodePackages, youtube-dl +, fixup_yarn_lock, jq, nodejs, yarn }: let arch = @@ -37,33 +36,12 @@ let sha256 = "3R3dBZyPansTuM77Nmm3f7BbTDkDdiT2HQIrti2Ottc="; }; - wrtc_version = "0.4.7"; - wrtc_lib = fetchurl { - url = "https://node-webrtc.s3.amazonaws.com/wrtc/v${wrtc_version}/Release/${arch}.tar.gz"; - sha256 = "1zd3jlwq3lc2vhmr3bs1h6mrzyswdp3y20vb4d9s67ir9q7jn1zf"; - }; - - esbuild_locked = buildGoModule rec { - pname = "esbuild"; - version = "0.12.17"; - - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - sha256 = "16xxscha2y69mgm20rpjdxykyqiy0qy8gayh8046q6m0sf6834y1"; - }; - vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; - }; - in stdenv.mkDerivation rec { inherit version; pname = "peertube"; src = source; - nativeBuildInputs = [ esbuild fixup_yarn_lock jq nodejs yarn ]; - - buildInputs = [ nodePackages.node-gyp-build youtube-dl ]; + nativeBuildInputs = [ fixup_yarn_lock jq nodejs yarn ]; buildPhase = '' # Build node modules @@ -93,30 +71,16 @@ in stdenv.mkDerivation rec { fi mkdir -p ./lib/binding && tar -C ./lib/binding -xf ${bcrypt_lib} - # Fix youtube-dl node module - cd ~/node_modules/youtube-dl - mkdir ./bin - ln -s ${youtube-dl}/bin/youtube-dl ./bin/youtube-dl - cat > ./bin/details < Date: Thu, 13 Jan 2022 21:21:06 +0300 Subject: [PATCH 072/231] nixos/peertube: fix youtube-dl import --- nixos/modules/services/web-apps/peertube.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index a65428018260..7be11496e474 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -320,6 +320,7 @@ in { }; storage = { tmp = lib.mkDefault "/var/lib/peertube/storage/tmp/"; + bin = lib.mkDefault "/var/lib/peertube/storage/bin/"; avatars = lib.mkDefault "/var/lib/peertube/storage/avatars/"; videos = lib.mkDefault "/var/lib/peertube/storage/videos/"; streaming_playlists = lib.mkDefault "/var/lib/peertube/storage/streaming-playlists/"; @@ -380,7 +381,7 @@ in { environment = env; - path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn youtube-dl ]; + path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn python3 ]; script = '' #!/bin/sh From fd00aa150c2fe6edccab73f992c771b985a28540 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 24 Feb 2022 21:41:04 +0300 Subject: [PATCH 073/231] peertube: 4.0.0 -> 4.1.0 --- pkgs/servers/peertube/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 7ef8e885bac3..9961e9d581aa 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -6,28 +6,28 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then "linux-x64" else throw "Unsupported architecture: ${stdenv.hostPlatform.system}"; - version = "4.0.0"; + version = "4.1.0"; source = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - sha256 = "sha256-nSbB5hRAMDPeKH48eviBS0xrNYab53BohWLKqRD02BI="; + sha256 = "sha256-gW/dzWns6wK3zzNjbW19HrV2jqzjdXR5uMMNXL4Xfdw="; }; yarnOfflineCacheServer = fetchYarnDeps { yarnLock = "${source}/yarn.lock"; - sha256 = "sha256-GTBHZMjnIi5xqEQG4tNkX0RvnVGgxnxhX/3vsA/GOLU="; + sha256 = "sha256-L1Nr6sGjYVm42OyeFOQeQ6WEXjmNkngWilBtfQJ6bPE="; }; yarnOfflineCacheTools = fetchYarnDeps { yarnLock = "${source}/server/tools/yarn.lock"; - sha256 = "sha256-BGr5095F4FQ5ii+2xEmPMAATrqKkZiQ74FJYYo1weKc="; + sha256 = "sha256-maPR8OCiuNlle0JQIkZSgAqW+BrSxPwVm6CkxIrIg5k="; }; yarnOfflineCacheClient = fetchYarnDeps { yarnLock = "${source}/client/yarn.lock"; - sha256 = "sha256-Cyoo/85DVehuWcgPfLkk3S1sZE3WXOr79HZs5ULF8pg="; + sha256 = "sha256-wniMvtz7i3I4pn9xyzfNi1k7gQuzDl1GmEO8LqPBMKg="; }; bcrypt_version = "5.0.1"; From e0616741d1ea8d5cfdf368bf1ad6e99349284498 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 24 Feb 2022 21:50:26 +0300 Subject: [PATCH 074/231] nixos/peertube: add python path --- nixos/modules/services/web-apps/peertube.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index 7be11496e474..e195e6e6e824 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -334,6 +334,15 @@ in { plugins = lib.mkDefault "/var/lib/peertube/storage/plugins/"; client_overrides = lib.mkDefault "/var/lib/peertube/storage/client-overrides/"; }; + import = { + videos = { + http = { + youtube_dl_release = { + python_path = "${pkgs.python3}/bin/python"; + }; + }; + }; + }; } (lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis/redis.sock"; }; }) ]; From cb0275d013f7e812985b027fe3291222710e4785 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 19:38:50 +0000 Subject: [PATCH 075/231] parallel: 20220122 -> 20220222 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index a52ad6920bb1..2eca9f6891a5 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20220122"; + version = "20220222"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-uCIaIUErylcq2ERbeYHf1iWjxtSHcs2kaN+1uIYzfgA="; + sha256 = "sha256-+BaCuGPq1/uaEUdUAB6ShvlUVQpXo882yQA6gEempEU="; }; outputs = [ "out" "man" "doc" ]; From 9fe6e0e4680a09016111ec4395c3a8872a35d965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Feb 2022 19:39:12 +0000 Subject: [PATCH 076/231] python3Packages.pyeapi: does not support Python 3.10 --- .../python-modules/pyeapi/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index 101f41c5ca01..a31123492d42 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -1,11 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub, netaddr, pytestCheckHook, coverage -, mock }: +{ lib +, buildPythonPackage +, pythonAtLeast +, fetchFromGitHub +, netaddr +, pytestCheckHook +, mock +}: buildPythonPackage rec { pname = "pyeapi"; version = "0.8.4"; format = "pyproject"; + # https://github.com/arista-eosplus/pyeapi/issues/189 + disabled = pythonAtLeast "3.10"; + src = fetchFromGitHub { owner = "arista-eosplus"; repo = pname; @@ -15,10 +24,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ netaddr ]; - checkInputs = [ coverage mock ]; - checkPhase = '' - make unittest - ''; + checkInputs = [ + mock + pytestCheckHook + ]; + + pytestFlagsArray = [ "test/unit" ]; + + pythonImportsCheck = [ "pyeapi" ]; meta = with lib; { description = "Client for Arista eAPI"; From 7ef8df8767914249192d09d9056f13e04e54a7e6 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 24 Feb 2022 20:23:40 +0100 Subject: [PATCH 077/231] nixosTests.nano: replace with script using GNU expect --- nixos/tests/all-tests.nix | 1 - nixos/tests/nano.nix | 44 ------------------- pkgs/applications/editors/nano/default.nix | 6 ++- .../editors/nano/test-with-expect.nix | 35 +++++++++++++++ 4 files changed, 39 insertions(+), 47 deletions(-) delete mode 100644 nixos/tests/nano.nix create mode 100644 pkgs/applications/editors/nano/test-with-expect.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c9c39e792514..53637861febf 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -322,7 +322,6 @@ in mysql-replication = handleTest ./mysql/mysql-replication.nix {}; n8n = handleTest ./n8n.nix {}; nagios = handleTest ./nagios.nix {}; - nano = handleTest ./nano.nix {}; nar-serve = handleTest ./nar-serve.nix {}; nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; diff --git a/nixos/tests/nano.nix b/nixos/tests/nano.nix deleted file mode 100644 index 6585a6842e85..000000000000 --- a/nixos/tests/nano.nix +++ /dev/null @@ -1,44 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ...} : { - name = "nano"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - machine = { lib, ... }: { - environment.systemPackages = [ pkgs.nano ]; - }; - - testScript = { ... }: '' - start_all() - - with subtest("Create user and log in"): - machine.wait_for_unit("multi-user.target") - machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'") - machine.succeed("useradd -m alice") - machine.succeed("(echo foobar; echo foobar) | passwd alice") - machine.wait_until_tty_matches(1, "login: ") - machine.send_chars("alice\n") - machine.wait_until_tty_matches(1, "login: alice") - machine.wait_until_succeeds("pgrep login") - machine.wait_until_tty_matches(1, "Password: ") - machine.send_chars("foobar\n") - machine.wait_until_succeeds("pgrep -u alice bash") - machine.screenshot("prompt") - - with subtest("Use nano"): - machine.send_chars("nano /tmp/foo") - machine.send_key("ret") - machine.sleep(2) - machine.send_chars("42") - machine.sleep(1) - machine.send_key("ctrl-x") - machine.sleep(1) - machine.send_key("y") - machine.sleep(1) - machine.screenshot("nano") - machine.sleep(1) - machine.send_key("ret") - machine.wait_for_file("/tmp/foo") - assert "42" in machine.succeed("cat /tmp/foo") - ''; -}) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index f7d6004b5816..658c18e5cb5c 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript -, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, nixosTests +, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, callPackage , gettext ? null, enableNls ? true, enableTiny ? false }: assert enableNls -> (gettext != null); @@ -41,7 +41,9 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - tests = { inherit (nixosTests) nano; }; + tests = { + expect = callPackage ./test-with-expect.nix {}; + }; updateScript = writeScript "update.sh" '' #!${stdenv.shell} diff --git a/pkgs/applications/editors/nano/test-with-expect.nix b/pkgs/applications/editors/nano/test-with-expect.nix new file mode 100644 index 000000000000..bd48eba4324b --- /dev/null +++ b/pkgs/applications/editors/nano/test-with-expect.nix @@ -0,0 +1,35 @@ +{ nano, expect, runCommand, writeScriptBin, runtimeShell }: + +let expect-script = writeScriptBin "expect-script" '' + #!${expect}/bin/expect -f + + # Load nano + spawn nano file.txt + expect "GNU nano ${nano.version}" + + # Add some text to the buffer + send "Hello world!" + expect "Hello world!" + + # Send ctrl-x (exit) + send "\030" + expect "Save modified buffer?" + + # Answer "yes" + send "y" + expect "File Name to Write" + + # Send "return" to accept the file path. + send "\r" + sleep 1 + exit +''; in +runCommand "nano-test-expect" +{ + nativeBuildInputs = [ nano expect ]; + passthru = { inherit expect-script; }; +} '' + expect -f ${expect-script}/bin/expect-script + grep "Hello world!" file.txt + touch $out +'' From 50b3a3c3818bd2480c925a1d30d8c7294db09665 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 24 Feb 2022 12:56:12 -0800 Subject: [PATCH 078/231] rust-analyzer: 2022-01-31 -> 2022-02-22 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 53e74bf16394..9711ef871c0d 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-01-31"; - cargoSha256 = "sha256-BWCLzyCcLWwmh7Os7NjN2o89KD+VB0EHyZfTyYoYM08="; + version = "2022-02-22"; + cargoSha256 = "sha256-5PhmDiYC566KM0PfAaRdMpc0CAzDdez4uuLqBNBrma8="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-6+d/x7ZIyvkPLdn7ziXuPyKfxt/7z5PCWs7B960DFqk="; + sha256 = "sha256-O9onJrAJY0TWxEZZcTWuF7SGPypRtSo0ZbpzDLC5+os="; }; patches = [ From 8b9fc0e6abd6901e68ad12142442fd6f6e4dc2fe Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 24 Feb 2022 22:15:00 +0100 Subject: [PATCH 079/231] grafana: 8.4.1 -> 8.4.2 ChangeLog: https://github.com/grafana/grafana/releases/v8.4.2 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index fdb6ea0efa99..425dcdfa56c4 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.4.1"; + version = "8.4.2"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-RVEgqFEwvXTHE8Kvc1q+0o+V3mEHtURQR/7x3Qcmtpg="; + sha256 = "sha256-ZRVX7nqBsjTODRtfdL4l/azC3ZH2WJCBOXjldkNvweE="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-RTupkQ9LlppJeyfmgGMztMW2m+sJXkJuDAdtpcyRGe0="; + sha256 = "sha256-4k+6KMoSzoEffPFl/y2paheeY1F35jRPsHtH05Zxr/Y="; }; vendorSha256 = "sha256-RugV5cHlpR739CA1C/7FkXasvkv18m7pPsK6mxfSkC0="; From 9887158bced2935efde4ef52953e5763b1cab563 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 21:55:07 +0000 Subject: [PATCH 080/231] tauon: 7.1.1 -> 7.1.2 --- pkgs/applications/audio/tauon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 444443cd10c4..7223812e57d3 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.1.1"; + version = "7.1.2"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-eVliTSFTBG56mU1Crt3syoYxKclz/6W15y/30C+Tf1g="; + sha256 = "sha256-0/xWSae5TD5qI+HgoJ2DAHxqv/Z0E4DGiQhfTA03xkM="; }; postPatch = '' From 60225c6bbd5c5043b7f188bd8cf25d320030c84d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Feb 2022 23:08:00 +0100 Subject: [PATCH 081/231] nixos/tests/networking: Fix link test The test was looking at the wrong interface and relying on silly behaviour by the dummy driver, which autocreated a `dummy0` interface on modprobe. Fix this by making it look at the actual `foo` interface that the test creates. --- nixos/tests/networking.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 2d68bc859df5..8c9df19f2d58 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -868,7 +868,7 @@ let print(client.succeed("ip l add name foo type dummy")) print(client.succeed("stat /etc/systemd/network/50-foo.link")) client.succeed("udevadm settle") - assert "mtu 1442" in client.succeed("ip l show dummy0") + assert "mtu 1442" in client.succeed("ip l show dev foo") ''; }; wlanInterface = let From ec10d9a836079d181ad2acb191b9d1a40a498024 Mon Sep 17 00:00:00 2001 From: Dustin Frisch Date: Thu, 24 Feb 2022 23:06:13 +0100 Subject: [PATCH 082/231] nixos/snapserver: fix argument handling. The argument parser used by snapserver behaves differntly for optional arguments with existing defaults. In such cases, the standalone argument name is a valid input and a following value is interpreted as a positional argument. Therefore the argument and the value must be provided as a single argument seperated by equals sign. --- nixos/modules/services/audio/snapserver.nix | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix index b82aca3976f0..6d5ce98df895 100644 --- a/nixos/modules/services/audio/snapserver.nix +++ b/nixos/modules/services/audio/snapserver.nix @@ -44,24 +44,24 @@ let optionString = concatStringsSep " " (mapAttrsToList streamToOption cfg.streams # global options - ++ [ "--stream.bind_to_address ${cfg.listenAddress}" ] - ++ [ "--stream.port ${toString cfg.port}" ] - ++ optionalNull cfg.sampleFormat "--stream.sampleformat ${cfg.sampleFormat}" - ++ optionalNull cfg.codec "--stream.codec ${cfg.codec}" - ++ optionalNull cfg.streamBuffer "--stream.stream_buffer ${toString cfg.streamBuffer}" - ++ optionalNull cfg.buffer "--stream.buffer ${toString cfg.buffer}" + ++ [ "--stream.bind_to_address=${cfg.listenAddress}" ] + ++ [ "--stream.port=${toString cfg.port}" ] + ++ optionalNull cfg.sampleFormat "--stream.sampleformat=${cfg.sampleFormat}" + ++ optionalNull cfg.codec "--stream.codec=${cfg.codec}" + ++ optionalNull cfg.streamBuffer "--stream.stream_buffer=${toString cfg.streamBuffer}" + ++ optionalNull cfg.buffer "--stream.buffer=${toString cfg.buffer}" ++ optional cfg.sendToMuted "--stream.send_to_muted" # tcp json rpc - ++ [ "--tcp.enabled ${toString cfg.tcp.enable}" ] + ++ [ "--tcp.enabled=${toString cfg.tcp.enable}" ] ++ optionals cfg.tcp.enable [ - "--tcp.bind_to_address ${cfg.tcp.listenAddress}" - "--tcp.port ${toString cfg.tcp.port}" ] + "--tcp.bind_to_address=${cfg.tcp.listenAddress}" + "--tcp.port=${toString cfg.tcp.port}" ] # http json rpc - ++ [ "--http.enabled ${toString cfg.http.enable}" ] + ++ [ "--http.enabled=${toString cfg.http.enable}" ] ++ optionals cfg.http.enable [ - "--http.bind_to_address ${cfg.http.listenAddress}" - "--http.port ${toString cfg.http.port}" - ] ++ optional (cfg.http.docRoot != null) "--http.doc_root \"${toString cfg.http.docRoot}\""); + "--http.bind_to_address=${cfg.http.listenAddress}" + "--http.port=${toString cfg.http.port}" + ] ++ optional (cfg.http.docRoot != null) "--http.doc_root=\"${toString cfg.http.docRoot}\""); in { imports = [ From 3f19fc37a3557d31b242b220b52c7a1358572f57 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 16 Feb 2022 11:55:43 -0300 Subject: [PATCH 083/231] Move misc/vim-plugins to applications/editors/vim/plugins --- doc/contributing/submitting-changes.chapter.md | 2 +- doc/languages-frameworks/vim.section.md | 8 ++++---- maintainers/scripts/pluginupdate.py | 2 +- .../editors/vim/plugins}/aliases.nix | 0 .../editors/vim/plugins}/build-vim-plugin.nix | 0 .../editors/vim/plugins}/default.nix | 0 .../editors/vim/plugins}/deprecated.json | 0 .../editors/vim/plugins}/generated.nix | 2 +- .../plugins}/markdown-preview-nvim/fix-node-paths.patch | 0 .../vim/plugins}/markdown-preview-nvim/package.json | 0 .../editors/vim/plugins}/overrides.nix | 2 +- .../editors/vim/plugins}/patches/fruzzy/get_version.patch | 0 .../lens-vim/remove_duplicate_g_lens_animate.patch | 0 .../editors/vim/plugins}/patches/sniprun/fix-paths.patch | 0 .../patches/vim-grammarous/set_default_languagetool.patch | 0 .../editors/vim/plugins}/readme.md | 0 .../editors/vim/plugins}/update-shell.nix | 0 .../editors/vim/plugins}/update.py | 2 +- .../editors/vim/plugins}/vim-gen-doc-hook.sh | 0 .../editors/vim/plugins}/vim-plugin-names | 0 .../editors/vim/plugins}/vim-utils.nix | 3 ++- .../editors/vim/plugins}/vim2nix/README.txt | 0 .../editors/vim/plugins}/vim2nix/addon-info.json | 0 .../editors/vim/plugins}/vim2nix/autoload/nix.vim | 0 pkgs/development/node-packages/node-packages.json | 2 +- pkgs/development/node-packages/node-packages.nix | 4 ++-- pkgs/tools/nix/statix/default.nix | 3 ++- pkgs/tools/text/rosie/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 5 ++--- 29 files changed, 21 insertions(+), 19 deletions(-) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/aliases.nix (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/build-vim-plugin.nix (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/default.nix (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/deprecated.json (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/generated.nix (99%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/markdown-preview-nvim/fix-node-paths.patch (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/markdown-preview-nvim/package.json (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/overrides.nix (99%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/patches/fruzzy/get_version.patch (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/patches/lens-vim/remove_duplicate_g_lens_animate.patch (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/patches/sniprun/fix-paths.patch (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/patches/vim-grammarous/set_default_languagetool.patch (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/readme.md (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/update-shell.nix (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/update.py (96%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim-gen-doc-hook.sh (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim-plugin-names (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim-utils.nix (99%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim2nix/README.txt (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim2nix/addon-info.json (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim2nix/autoload/nix.vim (100%) diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index d5b5f5a60175..109d051c016f 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -98,7 +98,7 @@ We use jbidwatcher as an example for a discontinued project here. 1. Create a new branch for your change, e.g. `git checkout -b jbidwatcher` 1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher` 1. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`). -1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/misc/vim-plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.) +1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/applications/editors/vim/plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.) For example in this case: diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 4ffd6736e238..a615d585b151 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -309,9 +309,9 @@ Sample output2: ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs} -Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. +Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. -Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: +Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: ```nix deoplete-fish = super.deoplete-fish.overrideAttrs(old: { @@ -330,13 +330,13 @@ Finally, there are some plugins that are also packaged in nodePackages because t Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token). ```sh -GITHUB_API_TOKEN=my_token ./pkgs/misc/vim-plugins/update.py +GITHUB_API_TOKEN=my_token ./pkgs/applications/editors/vim/plugins/update.py ``` Alternatively, set the number of processes to a lower count to avoid rate-limiting. ```sh -./pkgs/misc/vim-plugins/update.py --proc 1 +./pkgs/applications/editors/vim/plugins/update.py --proc 1 ``` ## Important repositories {#important-repositories} diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 0fad92481bba..877e66440320 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -1,4 +1,4 @@ -# Used by pkgs/misc/vim-plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py +# Used by pkgs/applications/editors/vim/plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py # format: # $ nix run nixpkgs.python3Packages.black -c black update.py diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix similarity index 100% rename from pkgs/misc/vim-plugins/aliases.nix rename to pkgs/applications/editors/vim/plugins/aliases.nix diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix similarity index 100% rename from pkgs/misc/vim-plugins/build-vim-plugin.nix rename to pkgs/applications/editors/vim/plugins/build-vim-plugin.nix diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix similarity index 100% rename from pkgs/misc/vim-plugins/default.nix rename to pkgs/applications/editors/vim/plugins/default.nix diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json similarity index 100% rename from pkgs/misc/vim-plugins/deprecated.json rename to pkgs/applications/editors/vim/plugins/deprecated.json diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix similarity index 99% rename from pkgs/misc/vim-plugins/generated.nix rename to pkgs/applications/editors/vim/plugins/generated.nix index b6869ba872c9..7b9fb616d1c5 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1,4 +1,4 @@ -# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit! +# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit! { lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }: final: prev: diff --git a/pkgs/misc/vim-plugins/markdown-preview-nvim/fix-node-paths.patch b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch similarity index 100% rename from pkgs/misc/vim-plugins/markdown-preview-nvim/fix-node-paths.patch rename to pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch diff --git a/pkgs/misc/vim-plugins/markdown-preview-nvim/package.json b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json similarity index 100% rename from pkgs/misc/vim-plugins/markdown-preview-nvim/package.json rename to pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix similarity index 99% rename from pkgs/misc/vim-plugins/overrides.nix rename to pkgs/applications/editors/vim/plugins/overrides.nix index da04fee9c95f..059622495731 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -414,7 +414,7 @@ self: super: { markdown-preview-nvim = super.markdown-preview-nvim.overrideAttrs (old: let # We only need its dependencies `node-modules`. - nodeDep = nodePackages."markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim".overrideAttrs (old: { + nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs (old: { dontNpmInstall = true; }); in { diff --git a/pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch b/pkgs/applications/editors/vim/plugins/patches/fruzzy/get_version.patch similarity index 100% rename from pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch rename to pkgs/applications/editors/vim/plugins/patches/fruzzy/get_version.patch diff --git a/pkgs/misc/vim-plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch b/pkgs/applications/editors/vim/plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch similarity index 100% rename from pkgs/misc/vim-plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch rename to pkgs/applications/editors/vim/plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch diff --git a/pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch similarity index 100% rename from pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch rename to pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch diff --git a/pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch b/pkgs/applications/editors/vim/plugins/patches/vim-grammarous/set_default_languagetool.patch similarity index 100% rename from pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch rename to pkgs/applications/editors/vim/plugins/patches/vim-grammarous/set_default_languagetool.patch diff --git a/pkgs/misc/vim-plugins/readme.md b/pkgs/applications/editors/vim/plugins/readme.md similarity index 100% rename from pkgs/misc/vim-plugins/readme.md rename to pkgs/applications/editors/vim/plugins/readme.md diff --git a/pkgs/misc/vim-plugins/update-shell.nix b/pkgs/applications/editors/vim/plugins/update-shell.nix similarity index 100% rename from pkgs/misc/vim-plugins/update-shell.nix rename to pkgs/applications/editors/vim/plugins/update-shell.nix diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py similarity index 96% rename from pkgs/misc/vim-plugins/update.py rename to pkgs/applications/editors/vim/plugins/update.py index d9adc6667482..7a631c1c7dc5 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -47,7 +47,7 @@ let in lib.filterAttrs (n: v: v != null) checksums)""" HEADER = ( - "# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!" + "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!" ) diff --git a/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh b/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh similarity index 100% rename from pkgs/misc/vim-plugins/vim-gen-doc-hook.sh rename to pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names similarity index 100% rename from pkgs/misc/vim-plugins/vim-plugin-names rename to pkgs/applications/editors/vim/plugins/vim-plugin-names diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix similarity index 99% rename from pkgs/misc/vim-plugins/vim-utils.nix rename to pkgs/applications/editors/vim/plugins/vim-utils.nix index 128b969c3575..4183b6214351 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -82,7 +82,8 @@ See vimHelpTags sample code below. CONTRIBUTING AND CUSTOMIZING ============================ -The example file pkgs/misc/vim-plugins/default.nix provides both: +The example file pkgs/applications/editors/vim/plugins/default.nix provides +both: * manually mantained plugins * plugins created by VAM's nix#ExportPluginsForNix implementation diff --git a/pkgs/misc/vim-plugins/vim2nix/README.txt b/pkgs/applications/editors/vim/plugins/vim2nix/README.txt similarity index 100% rename from pkgs/misc/vim-plugins/vim2nix/README.txt rename to pkgs/applications/editors/vim/plugins/vim2nix/README.txt diff --git a/pkgs/misc/vim-plugins/vim2nix/addon-info.json b/pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json similarity index 100% rename from pkgs/misc/vim-plugins/vim2nix/addon-info.json rename to pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json diff --git a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim b/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim similarity index 100% rename from pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim rename to pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 9fa420975af1..280343108931 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -198,7 +198,7 @@ , "markdownlint-cli" , "markdownlint-cli2" , "markdown-link-check" -, {"markdown-preview-nvim": "../../misc/vim-plugins/markdown-preview-nvim"} +, {"markdown-preview-nvim": "../../applications/editors/vim/plugins/markdown-preview-nvim"} , "mastodon-bot" , "mathjax" , "meat" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3adfd4becd37..54fa82135c54 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -107807,11 +107807,11 @@ in bypassCache = true; reconstructLock = true; }; - "markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage { + "markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage { name = "markdown-preview-vim"; packageName = "markdown-preview-vim"; version = "0.0.1"; - src = ../../misc/vim-plugins/markdown-preview-nvim; + src = ../../applications/editors/vim/plugins/markdown-preview-nvim; dependencies = [ sources."accepts-1.3.8" sources."after-0.8.2" diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix index 0f3a1c10e355..d25f51ae5aa2 100644 --- a/pkgs/tools/nix/statix/default.nix +++ b/pkgs/tools/nix/statix/default.nix @@ -2,7 +2,8 @@ rustPlatform.buildRustPackage rec { pname = "statix"; - # also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix + # also update version of the vim plugin in + # pkgs/applications/editors/vim/plugins/overrides.nix # the version can be found in flake.nix of the source code version = "0.5.4"; diff --git a/pkgs/tools/text/rosie/default.nix b/pkgs/tools/text/rosie/default.nix index 4f70f972b683..a4edf55f7504 100644 --- a/pkgs/tools/text/rosie/default.nix +++ b/pkgs/tools/text/rosie/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchgit , libbsd , readline @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { pname = "rosie"; version = "unstable-2020-01-11"; + src = fetchgit { url = "https://gitlab.com/rosie-pattern-language/rosie"; rev = "670e9027563609ba2ea31e14e2621a1302742795"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1656f6339188..f360f8f31b5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33999,12 +33999,11 @@ with pkgs; viewnior = callPackage ../applications/graphics/viewnior { }; - - vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { + vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix { inherit (lua51Packages) hasLuaModule; }; - vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { + vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins { llvmPackages = llvmPackages_6; luaPackages = lua51Packages; }); From b71ebb32cedef576181e519380f42d1e2fc5d312 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 18 Feb 2022 08:20:38 -0300 Subject: [PATCH 084/231] vim: Update .github/CODEOWNERS and .github/labeler.yml --- .github/CODEOWNERS | 2 +- .github/labeler.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 26b4e54659f6..44007ca4828f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -226,7 +226,7 @@ /pkgs/applications/editors/neovim @jonringer @teto # VimPlugins -/pkgs/misc/vim-plugins @jonringer @softinio +/pkgs/applications/editors/vim/plugins @jonringer # VsCode Extensions /pkgs/applications/editors/vscode/extensions @jonringer diff --git a/.github/labeler.yml b/.github/labeler.yml index a3c1ed1b587f..c5c10d3e4bc1 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -142,7 +142,7 @@ "6.topic: vim": - doc/languages-frameworks/vim.section.md - pkgs/applications/editors/vim/**/* - - pkgs/misc/vim-plugins/**/* + - pkgs/applications/editors/vim/plugins/**/* - nixos/modules/programs/neovim.nix - pkgs/applications/editors/neovim/**/* From b2a83e3c95be96d0f727da606e0885a8cb5622b1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 17 Feb 2022 03:56:44 -0300 Subject: [PATCH 085/231] vim: update the updaters! update.py and its companion update-shell.nix need to know where they are, else they can't find the root default.nix of Nixpkgs. Because of this, I further added a small piece of documentation about those path-dependent pieces of code. --- pkgs/applications/editors/vim/plugins/update-shell.nix | 3 ++- pkgs/applications/editors/vim/plugins/update.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/update-shell.nix b/pkgs/applications/editors/vim/plugins/update-shell.nix index e1b727c49e04..52a9e741af21 100644 --- a/pkgs/applications/editors/vim/plugins/update-shell.nix +++ b/pkgs/applications/editors/vim/plugins/update-shell.nix @@ -1,5 +1,6 @@ -{ pkgs ? import ../../.. { } }: +{ pkgs ? import ../../../../.. { } }: +# Ideally, pkgs points to default.nix file of Nixpkgs official tree with pkgs; let pyEnv = python3.withPackages (ps: [ ps.GitPython ]); diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index 7a631c1c7dc5..ad1c38cb375f 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -13,6 +13,9 @@ # refer to: # # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/vim.section.md#updating-plugins-in-nixpkgs-updating-plugins-in-nixpkgs +# +# (or the equivalent file /doc/languages-frameworks/vim.section.md from Nixpkgs master tree). +# import inspect import os @@ -27,7 +30,8 @@ log.addHandler(logging.StreamHandler()) # Import plugin update library from maintainers/scripts/pluginupdate.py ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) -sys.path.insert(0, os.path.join(ROOT.parent.parent.parent, "maintainers", "scripts")) +# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree +sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")) import pluginupdate GET_PLUGINS = f"""(with import {{}}; From 939e2fad0bb8032de5fc209977f967531dab00a6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 17 Feb 2022 12:07:51 -0300 Subject: [PATCH 086/231] vim-plugin-names: updates + liuchengxu/space-vim + SpaceVim/SpaceVim --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 45b25f5f4d0c..8687e27fb97c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -420,6 +420,7 @@ lighttiger2505/deoplete-vim-lsp lilydjwg/colorizer lilydjwg/fcitx.vim@fcitx5 liuchengxu/graphviz.vim +liuchengxu/space-vim liuchengxu/vim-clap liuchengxu/vim-which-key liuchengxu/vista.vim @@ -772,6 +773,7 @@ sodapopcan/vim-twiggy solarnz/arcanist.vim sonph/onehalf sotte/presenting.vim +SpaceVim/SpaceVim srcery-colors/srcery-vim steelsojka/completion-buffers steelsojka/pears.nvim From 93bc3c2aa448ea3c5d5a071d8d6747a0154a06aa Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 24 Feb 2022 14:37:07 -0300 Subject: [PATCH 087/231] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 232 ++++++++++-------- 1 file changed, 128 insertions(+), 104 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7b9fb616d1c5..b1e0f1367681 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-02-21"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "f4dab432cb3afe0b737f85d823fcd74655727aae"; - sha256 = "0i1qmfnlcwa3d75s4b07yn62737fz87w3jgsjpf5ijmkyxf29d1k"; + rev = "37802e72263f1592575ec1133969890b703e70a7"; + sha256 = "085ln5pv5yk9kxhnvizyy2rm67nlhkmw4m92pg3yakjhx8cxmh1w"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -533,12 +533,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-02-22"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "45177b39245b6aa4efda9f5051aadaad6f953fd5"; - sha256 = "0hgmkfrwwplzw6bsvvd9549rr3326k4bviix8w4ir133qw8av5j5"; + rev = "169134de0d3919837a436cceb806ce8e29a239ea"; + sha256 = "1qfg5k406qdxv534c3xbrhpjhigsxkgj9yqm0sx45z5l6f4cmih6"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -641,12 +641,12 @@ final: prev: cmd-parser-nvim = buildVimPluginFrom2Nix { pname = "cmd-parser.nvim"; - version = "2021-05-30"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "winston0410"; repo = "cmd-parser.nvim"; - rev = "70813af493398217cb1df10950ae8b99c58422db"; - sha256 = "0rfa8cpykarcal8qcfp1dax1kgcbq7bv1ld6r1ia08n9vnqi5vm6"; + rev = "6363b8bddef968c3ec51a38172af44f675f01ef3"; + sha256 = "11vi9fwgbcvrb8jnicsnwmggayn0586glfdknlkg43smz2cay3f1"; }; meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/"; }; @@ -965,12 +965,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-02-19"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "33ddba0d8db509378b59d05939da20d8a8d23df7"; - sha256 = "0vqdv9yscjp7m9p61qwb0jgrdxkj9c5fbw3ccy5z158lnfa4j5hk"; + rev = "1bdaaefc15baea37f4de1f8bedb5b3dd7c0efd32"; + sha256 = "1vjwgbw9r4jd41nkxmkn3yxdmds1alf9gf96kv0jdxjdxryy23dc"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -989,12 +989,12 @@ final: prev: colorbuddy-nvim = buildVimPluginFrom2Nix { pname = "colorbuddy.nvim"; - version = "2021-12-01"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "tjdevries"; repo = "colorbuddy.nvim"; - rev = "c678edd8113274574f9d9ef440773d1123e1431d"; - sha256 = "095347cz5idcb09l4sl236agzi89lyr9r40nix2c8vk5pbskvp8f"; + rev = "e0f5fafb4ee06cb29a915f8128282fc1f99b128f"; + sha256 = "1lfb6ynhjyxzsm6id720f07cc1f52g38mzfc1i0hi4mysjnrkfh3"; }; meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/"; }; @@ -1230,24 +1230,24 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-02-22"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "baad617cc9d9598c563d0571d44ef226d4888ee7"; - sha256 = "0a7yfmqrsbq4x5k0vvjlvw89n3k3hwsbz72cgcazid7a1ngxwh37"; + rev = "6e2e12b2485a03a5f5a62319c6ae638b32a203d8"; + sha256 = "08bwgn1vvsr96p7ifzc6qxhjdldfgxcqjha7jljrpbqjwj9cfdij"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-02-21"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "877cd4b9b023d728d196d7841ceec47d2060c467"; - sha256 = "0qr8zvscwms6w0w4pfzdx319nykiacgj7qvgzk9ip5jfwnnlrxwr"; + rev = "3526cb195cb381cef5d4fc25c532f00942562874"; + sha256 = "0jxbdcjkmfwi05g1xdibr0i24hq23ihslmhpbj4yy0hj1x7afdk2"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1832,12 +1832,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-02-20"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "205cbbdd1181c3d164a84568449904fd1fe270a5"; - sha256 = "1rjwdl4wiv49cr0wrm9ivy21r5cwif5p6ci2yhbsa048bg1gimpc"; + rev = "032c406c7f63874c459234beedf8452d2fa38ee4"; + sha256 = "1qjv2zs07svnw5whs2lsznxpbffr03i95n8q6xipqndzya7g23ym"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2267,12 +2267,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2022-02-21"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "e5a55b7fa046e3b23b7f7e5e2224fa9dc74c1052"; - sha256 = "1l83d2yj8qd1vgc5iqswqim43akf31pm6apgi4y9fsg22lb742ip"; + rev = "cf5f268f8b19262515105739bdcc112cd2a6cdbc"; + sha256 = "1pbvr1yirn17fxw8zlzp8j5brj0n2sdm3ampjryirdxknli93685"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -3300,12 +3300,12 @@ final: prev: litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-02-16"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "a736dd5a177cc36d31b702a6b6d2ffb767e84c80"; - sha256 = "0vhq6an7p6abhm6w9px627ymyq3r3ybsnik14k5x7pfwd5bg4c69"; + rev = "f044fa4b465a102375d8d977e10e6427ec81ff63"; + sha256 = "0blsnmdcyfm5phcwb6lh0ngynlj3i35nvlyvspr63v1vfxjms4x9"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; @@ -3324,12 +3324,12 @@ final: prev: litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-02-17"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "dd231b288ae0bac7fe140aa78b474a094cc69e57"; - sha256 = "1l5hq8jj5jdyd6jbxzmdj8wqgnx4y9mrv4zbjwhs7y67rmp7alqr"; + rev = "7745d713e067b5faa44cffba85278ac820c3fe2c"; + sha256 = "1y8lxrzvcs55chggrbg3h0vpg2ll5fschcp78ivb3cdq9cbs8jfh"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -3467,12 +3467,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-02-19"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "8f2480d7a8c23c164429f2e4b487f28fc9a72d4b"; - sha256 = "0z0ksqc3rkb2vypdm6mkb6iq5g56fw4mxwfz5v4gqzlmfjc790vc"; + rev = "e357328c02d1661ffa7ab0aba0d80b6770ca1c31"; + sha256 = "0w1fwzcv4ngpwa7dkq6vi9fxg7dski7sqv2k432h1ll6ibph8yid"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3647,12 +3647,12 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2022-02-21"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "973ab6ea0bf79021e2992cdf91627f18c4b74b5d"; - sha256 = "0dkfyiv2932r8lqsipq4r9yfq3yi8s42q03iw14njnr68cvnqfn3"; + rev = "ca5b89e28cecc7993f769fc35b0ae794fd73af06"; + sha256 = "0b9j55gjk641rnkbl8b4vmfb8pkz7jml15yf3y65lzb09fchx2dv"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -4043,12 +4043,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-02-13"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "d6d64466f060ff9db87976ca4dfc92dda473a81c"; - sha256 = "0si8pq0scmpvarlssdpllfnbv3r1121dj5c6n88cy2g52f42zldi"; + rev = "25dcc8d87cea1fc18280f4f1149c7dfc5b4a10bf"; + sha256 = "0x5lhr18fw1zqf68r1hmnk0zh2wivdcqk7rpr5x41vq02hqy0ia2"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4235,12 +4235,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-02-18"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "57ef9b52e015530090d9b9c49558197ae413cc19"; - sha256 = "16inv9r7vxwhw9blhd9sy2grf8ghpcpbw2lwd5wq39ij7vwwy2n3"; + rev = "6b6cf94c588c9aba2f0bf65c175f54ddceb3aa85"; + sha256 = "09maybpfclp3kj9diq98y8izwvgwn7h7phmj439c1ppjn8phgy04"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4355,12 +4355,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-02-21"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "ae1edec262c11964d45188b56af19135c5e38c89"; - sha256 = "1bnw1hhm8xbs55dk99nl1sc86zvagfn5kb05vlczhngv7xrx2jpv"; + rev = "b984683d118bd2db53501b774a907485d39a002e"; + sha256 = "19khlf5x7nn9bk73q2mclqxwwwdhbbkzh0b8rng7jyw8367lf1pw"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4559,12 +4559,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-02-22"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "5dfbd6ebfbbfd4866f7eafe723f2fdfa0440733f"; - sha256 = "02ss2mxi5dqa44r06iv69r5c5dp9g0cxg1dk3an1nnsh78wpibjs"; + rev = "22e94f2303c8d8d72b541799d7733c5ded0733c5"; + sha256 = "1761vih6pi2gs3z7bh5515nmr4hkbif82q33gghsvgzjri6a0c3q"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -4655,12 +4655,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-02-15"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "805b61cc7841a9ef700430095ed56cda34fb8619"; - sha256 = "0i8nvdvf5l2966ihprwvh4py37ljlqrrclhwflzhdr7pmyy79k98"; + rev = "2a883d68b93570a66baca5984e416d4c4d079c3f"; + sha256 = "19i442k58jl0rrnxbbmxg0w0nghi1x3vpxy0id7bb10bg5aafwjm"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4703,36 +4703,36 @@ final: prev: nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-11-13"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "cd5267d2d708e908dbd668c7de74e1325eb1e1da"; - sha256 = "1ans2kzg750d4a83hk5p9x5h51m9ywxgk6bxrcj1pwnpkhl5h75z"; + rev = "29ca81408119ba809d1f922edc941868af97ee86"; + sha256 = "04c5wqh42648wzrnwcgwdmwwwqvwk5qn3ncrfjl0827xnpc8049g"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-02-14"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "da931f58a59ff0a441b9e8c0679f91790fe61870"; - sha256 = "13rbvf91xqhjwp4f4gp7gjgqsrbhdasb4k4swhf2f9zcqd51knz5"; + rev = "f3215fa06782829a9705031fab2ec1f6ad514fd8"; + sha256 = "05vsi9vgd2y6y8yv5mjc2lv4z1bdh7h4lq1cx4l2hy9p9z59kdzj"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2022-02-11"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "85e62e572ee63a2877267d023795488c33c0fd6f"; - sha256 = "1c017n0di9zb1lcqqr9pjc4z8n3d2s55qlqzn8m9rrww9mjqqhnl"; + rev = "f769dc92a364f428f9a48726e4c7a0ebfdbf6f66"; + sha256 = "0nl81px6lj0sz0vrpvc4hhd6ccn4am9hd8kxcqzhdz0m37zzp8cr"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; @@ -4775,12 +4775,12 @@ final: prev: nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-02-20"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "8213c2c59c99fdaccb3ea5fe9fed2a532fd3fdf8"; - sha256 = "1hi1yjdaxjsawgci230cnxa5anniq2s6ijxy7z2ibsyfn1jcpb0b"; + rev = "d859891e4bff9729ad6e63bd4aebc51946de8786"; + sha256 = "17dbvr1y7hzrv04c89b4nmgmgg0qccrkz6qsh7vsava0lvjs4zm5"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -4875,20 +4875,20 @@ final: prev: src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "3486c48225265792842545e90dc041e5a214686d"; - sha256 = "0bhp85j5446riacblingmd6z316hdh92lpp0p2kd4sckfw6ih8ja"; + rev = "48e76bc0317de95ac154ae3a26193bf8881340a1"; + sha256 = "06z7c5kcyxdcx7wi5yaw1d1mv3wah5y0kkjn7z5py9x82snk4rwm"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-02-22"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "3533721282669e945b62b3ae9c53d4c5ffe16c76"; - sha256 = "0mlckwhammzh93kililzipynqzw4r09r2xk77yygka54y8vv9kjm"; + rev = "fb7a56548b89670e2147beb15e5bd2487fffc800"; + sha256 = "1ada3hzhya4qcqri63plbvvd7xf6gc7k9rr7v5z53lxj1l4s48v2"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4931,24 +4931,24 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-02-07"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "fea609aa58b3390a09e8df0e96902fd4b094d8b7"; - sha256 = "0221ax71334ghsr8xznp9jk2iv9r0bin47ch8r7hsfh4r0wgc5w7"; + rev = "e23fc8ac796b722dd30f40467d59581d4854c692"; + sha256 = "15fa27dbyrmbsiysmy3rm3ih9jnxrlvvzlf966jcm29ph225zxmn"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-autotag = buildVimPluginFrom2Nix { pname = "nvim-ts-autotag"; - version = "2022-02-09"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "5149f0c6557fa4a492d82895a564f4cd4a9c7715"; - sha256 = "0zyx4qkm6gq2lw75f2b1k974dv3bz12gd4f6j76dr805b8kq6l5m"; + rev = "178e40a213eeea4810cad440b6be56ceeb6af434"; + sha256 = "00zlgc7bnryw3ys1ihsf2pyf7f9wzlgmqrkp8bs99nv5qji6bym4"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -4967,12 +4967,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-02-09"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "c6c26c4def0e9cd82f371ba677d6fc9baa0038af"; - sha256 = "0q0awc93l6cafbvb3wghrmvsn0qqg8hgkhfy5r86bvr0prwbvxga"; + rev = "35bef9212441ef3f4b69c8ead0fbde123357bb4d"; + sha256 = "0dnr3dilcsyfrgwv497aypvn6jk5rzwdqjs09gn5fwfg354nhsbk"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -5111,12 +5111,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-02-16"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "7bfdf32cae7bf83f2209f25a180d9f0bc5330919"; - sha256 = "1877bv4cy1gignpdvhp8xfqgmh4yg04ak7amf9h1q4wg29hna15a"; + rev = "ba41d62559e1008cd03eb373a24f94a5e576134b"; + sha256 = "0sy5vvg4mdgk1sl3z82nblf84wz9ywk3iy0z464l0a9v4i21yscc"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5605,12 +5605,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-02-18"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "7ebc76da62638a852a5a287a00ff94af32fe28da"; - sha256 = "0gs5qb5s2ilqs2nskd9llgjd5zqcyx3yacyh56xwxr65yjvnpjg8"; + rev = "85e3474449967d2ee4377fbb9633f21093a80187"; + sha256 = "05scspf4jxhgbrfnnm363mb8g633rn83zmlxmwsqs1zzvpzgjxvp"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -6036,6 +6036,18 @@ final: prev: meta.homepage = "https://github.com/chikatoike/sourcemap.vim/"; }; + space-vim = buildVimPluginFrom2Nix { + pname = "space-vim"; + version = "2022-02-15"; + src = fetchFromGitHub { + owner = "liuchengxu"; + repo = "space-vim"; + rev = "637390b17a8cd7d154a0d90a5c07612f1538a28e"; + sha256 = "0f43mspfnch1ifqa9rgvc64dmk0hz3cirz8iicpszmdr0fphq3xs"; + }; + meta.homepage = "https://github.com/liuchengxu/space-vim/"; + }; + SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; version = "2021-04-07"; @@ -6072,6 +6084,18 @@ final: prev: meta.homepage = "https://github.com/ctjhoa/spacevim/"; }; + SpaceVim = buildVimPluginFrom2Nix { + pname = "SpaceVim"; + version = "2022-02-20"; + src = fetchFromGitHub { + owner = "SpaceVim"; + repo = "SpaceVim"; + rev = "6975374b3be303b820c61c2fa33a43fe157265ec"; + sha256 = "1lqsk7cpf9nb7h3wnmv4df6047iyck0p662m3gqy57xrhl33j33n"; + }; + meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; + }; + sparkup = buildVimPluginFrom2Nix { pname = "sparkup"; version = "2012-06-11"; @@ -6243,12 +6267,12 @@ final: prev: surround-nvim = buildVimPluginFrom2Nix { pname = "surround.nvim"; - version = "2022-02-15"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "ur4ltz"; repo = "surround.nvim"; - rev = "01756d3f31aeb2307cca5b73f9fa74a0802e5bc3"; - sha256 = "0adxynnlbybj04vxflvrqhcc7z8y3m7myimdm9xyz8vi18qkfk5p"; + rev = "633068182cf894480341b992445f0f0d2883721d"; + sha256 = "0mqg4vki23rs0rj6zyfkd1ki9wndjifp0lmnnw99x3i1qc0ba47i"; }; meta.homepage = "https://github.com/ur4ltz/surround.nvim/"; }; @@ -6654,12 +6678,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-02-15"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "df0b35c8bc0944164828ccba8ea17941423c6725"; - sha256 = "0ryx507ynil4y8y989df06d2j6dci5ywdjr4nb7kgwrfj2hn4cv9"; + rev = "567ec85b157f1606b500a0f755181f284810a28e"; + sha256 = "1pzdn12zg9g3y03grw2xha2h5qia6bbi8058n3z5g2ail58hnw2n"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -7711,12 +7735,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-02-22"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "c22b4eaf296f8779ca8e6ccfa0a1497c4b5831ff"; - sha256 = "13x7ykvh9qfdcik2x3yjz49xwww48b3cm1qq1qripnf2b19an3z6"; + rev = "73fe68b6bfbd9201fb0facf2a13cb819f79b3d82"; + sha256 = "0zs9rg21p0aws6shzvqi5khc3kipqh4yvcx5jpf8f3xcdlv13mrk"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8611,12 +8635,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2022-02-19"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "e433d5ddc1e37cb07d646d58b832a88ee848988d"; - sha256 = "1li873x55q0ia2098ciwn5ayq23si9zqqildz8qxa5xdwv318j8z"; + rev = "18d12985ea6cb7ede59755ff4fd0a9fa1e6bf835"; + sha256 = "1gs7vaf9pyd8ji0vc9iafd46g4iqy8rpa2jif0k56wxzcrjw4r22"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -11087,12 +11111,12 @@ final: prev: vim-toml = buildVimPluginFrom2Nix { pname = "vim-toml"; - version = "2021-12-06"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "cespare"; repo = "vim-toml"; - rev = "2c8983cc391287e5e26e015c3ab9c38de9f9b759"; - sha256 = "1mxn2z3p3lnk3ibwxhqb3dih25qalpqfwy0rx7i393vpjbkn79py"; + rev = "89bcca8a3aeab360f6dfe5ce70999fc928669411"; + sha256 = "0lw45cchgmank2w0y864qwhzw5cjbggk1p46vgjgs7cn1jsdhvr0"; }; meta.homepage = "https://github.com/cespare/vim-toml/"; }; @@ -11603,12 +11627,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-02-19"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "d6641959336d0f0303c94cbea131b160f9dcabe3"; - sha256 = "0r2sr4kissqvi5d63girgxp6swbkj0czfaf5nbq2c4gjnpkr6clx"; + rev = "d044dea0c2669c740052a47900e6e16f64444b63"; + sha256 = "1sv1r4pcz1fx99qi566nncs116vw3wsny344lcnsh0r6b2sc0bz0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; From dd88285ba075f98604fae27b7d2073988c974719 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 24 Feb 2022 19:25:50 -0300 Subject: [PATCH 088/231] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b1e0f1367681..065fed63c14a 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -461,12 +461,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-02-15"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "e97a404bd7449ecebab243c796c1016c98397fc0"; - sha256 = "1cfqcbxvig271zppq0mydj616dgbdy5ryvycc64q5gyq1lfmhnsl"; + rev = "871495d9e2dbe3314a421fd2d5e46f47de7ee537"; + sha256 = "1xw13g6l16i6k32f3mdzmihz0m0n9y586ykiynjwkil69wxpjd1l"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -3228,12 +3228,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-02-18"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "4d8359a30b26ee5316d0e7c79af08b10cb17a57b"; - sha256 = "0j5qn12qmahdbyavp85yd633pap0rds4xnn37v2jhkipm0ag81wg"; + rev = "8fd73360e89a219b5701339c08a469f5703cf163"; + sha256 = "0y43p3sv99rsbks9r67zjm7wp3j7xpdx6ql5n18371ys8wyyddpd"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -4163,12 +4163,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2022-02-12"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "ec002e8f5de441d07cf5cd3ac44f41edc5f939d9"; - sha256 = "1z7xdgqbcpld1742rw52sc0d128b5wsx2607hwm0y0nrzajd57xb"; + rev = "f8671f783baeb0739f556d9b6c440ae1767340d6"; + sha256 = "1j0fxxprxw12b70isnfqixnvz2xd657rr1jphjz8277yfqpdnh2i"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -4359,8 +4359,8 @@ final: prev: src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "b984683d118bd2db53501b774a907485d39a002e"; - sha256 = "19khlf5x7nn9bk73q2mclqxwwwdhbbkzh0b8rng7jyw8367lf1pw"; + rev = "ee6134db8f55ed2ef965fbc2d036de3f87a140d9"; + sha256 = "04dsmih3hmby3sa9w9n6cw2lzz69jmm6yd6nx70fg07730sg364x"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4739,12 +4739,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-02-21"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "ec7119b166b16e681f663fcbf16b7139b38172ae"; - sha256 = "115d4n8i9cjafsl0nkrljcswn5qd0ny1cw7w1mw67sjddp79cqq7"; + rev = "470569379d708e6c8f33f082497e0374067c6fee"; + sha256 = "1rp9ymbss8jjm1k20q9vp3ayd7lv2cbdiz5ylhx9p1v1glqimigw"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5111,12 +5111,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-02-23"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "ba41d62559e1008cd03eb373a24f94a5e576134b"; - sha256 = "0sy5vvg4mdgk1sl3z82nblf84wz9ywk3iy0z464l0a9v4i21yscc"; + rev = "fda3b36be8613f6ba303082fed7a7e20fdf52205"; + sha256 = "14i3lqz1l9k8ai9lskrgz511srvf2wwfjd8zlbkmx55ws085ifca"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5797,12 +5797,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-02-18"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "45761cc7f76abc543e614e2fafa1ea146f4313bb"; - sha256 = "14d7pfrr57i1b8kjg6bn3v6z7pa7vqrpa0gi4y0wqjmwiyl22zvm"; + rev = "90f1123c0d63f41627dca0c5258a4193274edba0"; + sha256 = "0f3jgj1bwvxzmvqf7nbbbwyav5wxmr9kyjw4j4fq7n3mrcapdjj0"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -6834,14 +6834,14 @@ final: prev: todo-nvim = buildVimPluginFrom2Nix { pname = "todo.nvim"; - version = "2022-02-19"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "AmeerTaweel"; repo = "todo.nvim"; - rev = "b252b4116812352161acfa73cdce6a15ffbde2eb"; - sha256 = "+m3jy0ue0rAzRQ4hJDFPVVjNaOGNImkZjhIqI/AGTeY="; + rev = "6bd31dfd64b2730b33aad89423a1055c22fe276a"; + sha256 = "1887d1bjzixrdinr857cqq4x84760scik04r9mz9zmwdf8nfgh6b"; }; - meta.homepage = "https://github.com/AmeerTaweel/todo.nvim"; + meta.homepage = "https://github.com/AmeerTaweel/todo.nvim/"; }; todo-txt-vim = buildVimPluginFrom2Nix { From 0ac4d02ea5a1606d554ed75d9a8888c708c8bd5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 23:51:31 +0000 Subject: [PATCH 089/231] php74Extensions.mailparse: 3.1.2 -> 3.1.3 --- pkgs/development/php-packages/mailparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/mailparse/default.nix b/pkgs/development/php-packages/mailparse/default.nix index f3796eb3b6c6..de3ec2d11d4b 100644 --- a/pkgs/development/php-packages/mailparse/default.nix +++ b/pkgs/development/php-packages/mailparse/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "mailparse"; - version = "3.1.2"; - sha256 = "sha256-sGR6sH6kgPzBNTM2jjj9tPS7RdMNzmX8kGUqZwpPQBA="; + version = "3.1.3"; + sha256 = "sha256-hlnKYtyaTX0V8H+XoOIULLWCUcjncs02Zp7HQNIpJHE="; internalDeps = [ php.extensions.mbstring ]; postConfigure = '' From e79a6462987836acd17b947e2ed46de63f41647c Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Sat, 19 Feb 2022 07:13:27 -0500 Subject: [PATCH 090/231] grcov: init at 0.8.7 --- pkgs/development/tools/misc/grcov/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/tools/misc/grcov/default.nix diff --git a/pkgs/development/tools/misc/grcov/default.nix b/pkgs/development/tools/misc/grcov/default.nix new file mode 100644 index 000000000000..45e1ba8e4bc0 --- /dev/null +++ b/pkgs/development/tools/misc/grcov/default.nix @@ -0,0 +1,38 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "grcov"; + version = "0.8.7"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-4McF9tLIjDCftyGI29pm/LnTUBVWG+pY5z+mGFKySQM="; + }; + + cargoSha256 = "sha256-/filuQ4AWsKVIsXbDX7S1yhCArLNTZpOMEn3ID6WuMo="; + + # tests do not find grcov path correctly + checkFlags = let + skipList = [ + "test_coveralls_service_job_id_is_not_sufficient" + "test_coveralls_service_name_is_not_sufficient" + "test_coveralls_works_with_just_service_name_and_job_id_args" + "test_coveralls_works_with_just_token_arg" + "test_integration" + "test_integration_guess_single_file" + "test_integration_zip_dir" + "test_integration_zip_zip" + ]; + skipFlag = test: "--skip " + test; + in builtins.concatStringsSep " " (builtins.map skipFlag skipList); + + meta = with lib; { + description = + "Rust tool to collect and aggregate code coverage data for multiple source files"; + homepage = "https://github.com/mozilla/grcov"; + license = licenses.mpl20; + maintainers = with maintainers; [ DieracDelta ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 932009fd70c2..7fc227516c47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14955,6 +14955,8 @@ with pkgs; gradle_7 = callPackage gradle-packages.gradle_7 { }; gradle = gradle_7; + grcov = callPackage ../development/tools/misc/grcov { }; + gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. gperf_3_0 = callPackage ../development/tools/misc/gperf/3.0.x.nix { }; From ed99332de5a0cd13995b197dd44ac1356ccf34c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 00:21:46 +0000 Subject: [PATCH 091/231] php74Extensions.rdkafka: 6.0.0 -> 6.0.1 --- pkgs/development/php-packages/rdkafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix index c7c8e8d059c4..04e6df329a1b 100644 --- a/pkgs/development/php-packages/rdkafka/default.nix +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "rdkafka"; - version = "6.0.0"; - sha256 = "sha256-24kHOvonhXvMnnMfe3/fDYHGkyD8vnuC4NaVBwP9TY4="; + version = "6.0.1"; + sha256 = "sha256-ikq+cB5ZPRBCwhB0YQT0sEsVrJjbYzGEju2RrK388ZI="; buildInputs = [ rdkafka pcre2 ]; From a8a1714ba07ba3dd3933d162f1f0a0afb35209b8 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 25 Feb 2022 00:46:35 +0000 Subject: [PATCH 092/231] linux: 4.14.267 -> 4.14.268 --- 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 093e8205630e..8e00263a2e14 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.267"; + version = "4.14.268"; # 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 = "13hq4hcq686gdragjcgmz3m0kkk8abz5lna0ildaa9gybj43yd4c"; + sha256 = "1xdn247j5n3xzm93wr9ff75rg9hbp64ypfp5sf78hnkzm8m44qng"; }; } // (args.argsOverride or {})) From 8585beaf0ad886c040f7d536d916572f7ba308bd Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 25 Feb 2022 00:46:42 +0000 Subject: [PATCH 093/231] linux: 4.19.230 -> 4.19.231 --- 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 1ba37f697f71..56af836e8d95 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.230"; + version = "4.19.231"; # 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 = "107sqv4izdnazscwhyam88vbinsvnd33z8agn4awc42hkqh9l20p"; + sha256 = "0cc1ipar37gvzr1xdbda5hghnvjmy8pk8an8hs2jspmhnfrj6cb7"; }; } // (args.argsOverride or {})) From 6dd9c2a5884ad0d07e97af38b1b67b845c5a90e7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 25 Feb 2022 00:46:48 +0000 Subject: [PATCH 094/231] linux: 4.9.302 -> 4.9.303 --- 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 0b67c3cd5fc7..83179c4bbe2b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.302"; + version = "4.9.303"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0difn0vjz4hz9vl5lklawqy19ccb5gz5p5r1cyckschf0l2nyifm"; + sha256 = "1r8s28ckmg0av9716350hadn99q738k2slciw8pzxw1xq47hbsa5"; }; } // (args.argsOverride or {})) From 4975bf0463ec440ecfaa9b3727cead597002084b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 25 Feb 2022 00:46:57 +0000 Subject: [PATCH 095/231] linux: 5.10.101 -> 5.10.102 --- 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 97416dd91e49..f87aa91b58d3 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.101"; + version = "5.10.102"; # 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 = "13hwpb85dynbayghxs3ln3hbyh8djgl5fj63vxwc8izfny62aj87"; + sha256 = "0yg3y2cb3lb0whxkdrgbdig0kwjf5c71ci473aj0dr62n6alhhg6"; }; } // (args.argsOverride or {})) From 5ecbcef8e9564c1d876c7780799176bea6eb5058 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 25 Feb 2022 00:47:04 +0000 Subject: [PATCH 096/231] linux: 5.15.24 -> 5.15.25 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index e3a8505d9889..92fa05dbb027 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.24"; + version = "5.15.25"; # 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 = "0zx9big7n8gh6y14c05llxsqh543q0czjdrq906m8cc7r01yp5pl"; + sha256 = "0y9qahkya5dfnr6g04w5ym0p6h9ixmcdhvgz9g2b64aaaazgz6a3"; }; } // (args.argsOverride or { })) From 5d84cca2bc1204bab5da0b62f9ab899f6c07ba03 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 25 Feb 2022 00:47:13 +0000 Subject: [PATCH 097/231] linux: 5.16.10 -> 5.16.11 --- pkgs/os-specific/linux/kernel/linux-5.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.16.nix b/pkgs/os-specific/linux/kernel/linux-5.16.nix index 5630b05d4f4d..8144bb2df502 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16.10"; + version = "5.16.11"; # 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 = "17i3j07hgljsiz2kymbskp35p2xp14gb0mdi5s2r61c0h406yk8c"; + sha256 = "08xhm3ngg9157r69v44akp6cj73g33l6wa7073s4sjn4lic6263d"; }; } // (args.argsOverride or { })) From 8236ce5d1b88df6bca009a7d7b1f16eb4cf83696 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 25 Feb 2022 00:47:20 +0000 Subject: [PATCH 098/231] linux: 5.4.180 -> 5.4.181 --- 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 64252a715639..239f5181a382 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.180"; + version = "5.4.181"; # 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 = "07ckmgcqpr39bzpp8v60b2vkb03p8931k7sl3ywg6f00lvcbaf8n"; + sha256 = "0awsv38cclk7npp6q7kb5n0dsdic3k8xnqdsz780yl92dh6s0qzw"; }; } // (args.argsOverride or {})) From 16b568a8fddb9a52d182d4320a8c2f1ba9a7ddf3 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 25 Feb 2022 00:47:39 +0000 Subject: [PATCH 099/231] linux_latest-libre: 18587 -> 18613 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index b647f6c4e156..165779808091 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18587"; - sha256 = "01h3mvj36b3wnkjm932ya5prsyfw7fszifdb9bvqwrd2ggawxng9"; + rev = "18613"; + sha256 = "1qgvhrh4nnn56aykaxqmlnzy8s111b5vn277n7qm4ldyr312g4hs"; } , ... }: From 551f8cd92dcf9d8dab2e18a2e7cc85231c3bc143 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 01:24:44 +0000 Subject: [PATCH 100/231] php74Extensions.redis: 5.3.6 -> 5.3.7 --- pkgs/development/php-packages/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index f893a4ed7979..070112ba6552 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "redis"; - version = "5.3.6"; - sha256 = "sha256-/ilewmolIE5sB+jXFEIQ92e9cAiFhxnaIwQJ6z9vLgk="; + version = "5.3.7"; + sha256 = "sha256-uVgWbM2k9AvRfGmY+eIjkCGuZERnzYrVwV3vQgqtZbA="; internalDeps = with php.extensions; [ session From 4f1ec880995affe0dca0b2fb0ca1cf9eec59ede0 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Thu, 24 Feb 2022 19:50:48 -0600 Subject: [PATCH 101/231] python310Packages.pytwitchapi: 2.5.1 -> 2.5.2 --- pkgs/development/python-modules/pytwitchapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytwitchapi/default.nix b/pkgs/development/python-modules/pytwitchapi/default.nix index 27289a13d5d6..3c7dc0fdaa81 100644 --- a/pkgs/development/python-modules/pytwitchapi/default.nix +++ b/pkgs/development/python-modules/pytwitchapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytwitchapi"; - version = "2.5.1"; + version = "2.5.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "v${version}"; - sha256 = "091p9yx0cc7aclj76s1n1jdzkypicy9b2mxgmk2fym5viqlgpbkk"; + sha256 = "sha256-i+oAx23bMu+jaXHPWElD5GJH6vSytW/9N1amsmma4Lc="; }; propagatedBuildInputs = [ From 4374ade9dfa63d647b9a1eb7cc7adef0fc583093 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 02:16:08 +0000 Subject: [PATCH 102/231] babashka: 0.7.5 -> 0.7.6 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index ca2391ebd25d..4b7f8ee38e96 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.5"; + version = "0.7.6"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-ap6YCRUqtIgh36eTIk5BSjUildvYhqkC48Y4dxNMU8c="; + sha256 = "sha256-bRuf9qUBgb+1Sr2US67NZZrrb2MycSvNbekLLSpvZss="; }; executable = "bb"; From c5a109f8477a2a93edc20da74d381d2eb3df0e5e Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Thu, 24 Feb 2022 20:53:07 -0600 Subject: [PATCH 103/231] heroic: 2.0.2 -> 2.2.1 --- pkgs/games/heroic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index bcbe2a6c6535..c0416d0dd7e8 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -2,11 +2,11 @@ let pname = "heroic"; - version = "2.0.2"; + version = "2.2.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/download/v${version}/Heroic-${version}.AppImage"; - sha256 = "sha256-4gq0ZCcPIx/CkFNZTM5Atkd/GP6v1t3MO2tibrKkcZQ="; + sha256 = "sha256-zzxf3eM1fUWTVtzzABcwlmptNuCVQafvotnbOiCzu0c="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; From df21575304c73a8593ef3d124e29028993b34c9b Mon Sep 17 00:00:00 2001 From: Max Ng Date: Mon, 8 Nov 2021 19:08:15 -0800 Subject: [PATCH 104/231] mariadb: fix invalid PLUGIN_AUTH_PAM value --- pkgs/servers/sql/mariadb/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index dfaf64380a91..b1c71f28a835 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -142,7 +142,7 @@ in stdenv.mkDerivation (common // { ]; cmakeFlags = common.cmakeFlags ++ [ - "-DPLUGIN_AUTH_PAM=OFF" + "-DPLUGIN_AUTH_PAM=NO" "-DWITHOUT_SERVER=ON" "-DWITH_WSREP=OFF" "-DINSTALL_MYSQLSHAREDIR=share/mysql-client" @@ -207,7 +207,8 @@ in stdenv.mkDerivation (common // { ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ "-DWITH_JEMALLOC=yes" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DPLUGIN_AUTH_PAM=OFF" + "-DPLUGIN_AUTH_PAM=NO" + "-DPLUGIN_AUTH_PAM_V1=NO" "-DWITHOUT_OQGRAPH=1" "-DWITHOUT_PLUGIN_S3=1" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ From 5d535adc7a2924554bfa23726252f4d04332d88f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 03:19:16 +0000 Subject: [PATCH 105/231] cargo-make: 0.35.8 -> 0.35.9 --- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 24d309eb68aa..29dc1202d1c2 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.8"; + version = "0.35.9"; src = fetchCrate { inherit pname version; - sha256 = "sha256-YNPAIdN9FDUHs/5aCYJN+1/12ZYk1YJsUjjB1a09KvA="; + sha256 = "sha256-yjApyM3UM4gLUPpbVMv+7hpF5VGXS8W9RUnlsJd/Sbo="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-xLFBF8fEbupLgFNdYC1NzM6p7O2gvsv0Utk4Et2oBDc="; + cargoSha256 = "sha256-YGpQXz35dPUeY8YlZ4Ul/utpNgEgW90xHiT+I+jOJIo="; # Some tests fail because they need network access. # However, Travis ensures a proper build. From 76f3e4a80251dc6e6f291e799cd91b18ea575d65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 03:29:20 +0000 Subject: [PATCH 106/231] cargo-valgrind: 2.0.2 -> 2.0.3 --- pkgs/development/tools/rust/cargo-valgrind/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index 97f3d4d4b3b6..ac54657c8af0 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; rev = version; - sha256 = "sha256-yKmm24X+5P5UATjWn0LJqby9lKRhwlvDK5suTPxKGwU="; + sha256 = "sha256-PEGDao010COqSJGha7GQvR7vNOV+C7faduijVNjB5DE="; }; - cargoSha256 = "sha256-8n2WryAWi/bIL0XCSlNYcxXN2ld1tis435ScuU0QcBs="; + cargoSha256 = "sha256-00WUYrkKKJOEN9jXKQ3YraTq89U+3djdvLRuZSbeNHk="; passthru = { updateScript = nix-update-script { From b0c64a2dfe5ddb617703b938b814d3745247b334 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 03:41:50 +0000 Subject: [PATCH 107/231] certigo: 1.14.1 -> 1.15.0 --- pkgs/tools/admin/certigo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index a47c9e239d8b..b2324a929a6e 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "certigo"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "square"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P6xXXY0INB3Eyuxs1LEJlm2NBfMbG/HvlbIKUMAOxZE="; + sha256 = "sha256-/9JprUOzCmXoWVj0PFtFW7pRYHiqSPKCaqoTnMLtVPg="; }; - vendorSha256 = "sha256-0wul0f8T7E4cXbsNee1j1orUgjrAToqDLgwCjiyii1Y="; + vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs="; doCheck = false; From 41e5c634edb17ec1a7f5bfd67de8118c12dc92ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 03:41:52 +0000 Subject: [PATCH 108/231] python310Packages.aiolyric: 1.0.9 -> 1.0.10 --- pkgs/development/python-modules/aiolyric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix index dd9be3198657..7f067eefd686 100644 --- a/pkgs/development/python-modules/aiolyric/default.nix +++ b/pkgs/development/python-modules/aiolyric/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiolyric"; - version = "1.0.9"; + version = "1.0.10"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "timmo001"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MjV3hroUEX8Ps/Hhv35/hcaLXoOU2ueuM0lvuqLChXc="; + sha256 = "sha256-yKeG0UCQ8haT1hvywoIwKQ519GK2wFg0wXaRTFeKYIk="; }; propagatedBuildInputs = [ aiohttp ]; From a768768d1936f3e4cbac0a1e909a5f28c0311e26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 04:02:41 +0000 Subject: [PATCH 109/231] python310Packages.fastcore: 1.3.27 -> 1.3.29 --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 4783b8d33c78..9d0ce4f2ec72 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.3.27"; + version = "1.3.29"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = version; - sha256 = "sha256-ogCNDh18FHP9KY0q0BIbsjPH5vGGioGh4FFUUb3c3Jc="; + sha256 = "sha256-V5mJJqWsCy8Wes8VzEkCKeb2/1ahvtbUO80R8IFLvNU="; }; propagatedBuildInputs = [ From ca86bdc2a16bf0b25d34da896d82e0081f9357d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 04:08:32 +0000 Subject: [PATCH 110/231] python310Packages.mypy-boto3-s3: 1.21.0 -> 1.21.7 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index bddccabf067f..4f33912d3dfe 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.21.0"; + version = "1.21.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-3P3dThYXpmtZ/cn+NCDS9RNtu6N48Vb78ZqmCdkTK50="; + hash = "sha256-SWzL6AMXoZzYw3LwrBdvbe9JzLMudZioKZWo7HtHM8U="; }; propagatedBuildInputs = [ From 7f3b4e95a24b8ccc923e21dd6dfcf82c8f052fb7 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Thu, 24 Feb 2022 22:44:30 -0600 Subject: [PATCH 111/231] bats: 1.5.0 -> 1.6.0 --- pkgs/development/interpreters/bats/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 9cdde90c41d3..3379d1370af1 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,22 +1,24 @@ { resholvePackage , lib +, stdenv , fetchFromGitHub , bash , coreutils , gnugrep , ncurses +, lsof , doInstallCheck ? true }: resholvePackage rec { pname = "bats"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-core"; rev = "v${version}"; - sha256 = "sha256-MEkMi2w8G9FZhE3JvzzbqObcErQ9WFXy5mtKwQOoxbk="; + sha256 = "sha256-s+SAqX70WeTz6s5ObXYFBVPVUEqvD1d7AX2sGHkjVQ4="; }; patchPhase = '' @@ -45,7 +47,7 @@ resholvePackage rec { }; inherit doInstallCheck; - installCheckInputs = [ ncurses ]; + installCheckInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ lsof ]; installCheckPhase = '' # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows sed -i '/test works even if PATH is reset/a skip' test/bats.bats From fcc5e680d761b4d74f0a6137ff2154d2e7a8c349 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 04:46:37 +0000 Subject: [PATCH 112/231] python310Packages.google-cloud-websecurityscanner: 1.6.1 -> 1.7.0 --- .../google-cloud-websecurityscanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 521d6c49f15c..c7730e5138b3 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "392a21dd238958eb7f480d056ed24110be22808cf4474939db40df0ade2910f3"; + sha256 = "sha256-FBTJlr4mN5qW3BvA1l/glRaqdcJGFFjqPea3KQjwUqQ="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 056c34167d3210a674ef21691afbbce1ed63f8ca Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 18 Feb 2022 21:44:12 +0100 Subject: [PATCH 113/231] =?UTF-8?q?why3:=201.4.0=20=E2=86=92=201.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/why3/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 78631486554a..0f3dab8038ee 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -3,15 +3,15 @@ stdenv.mkDerivation rec { pname = "why3"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38425/why3-${version}.tar.gz"; - sha256 = "0lw0cpx347zz9vvwqibmbxgs80fsd16scgk3isscvwxnajpc3rv8"; + url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; + sha256 = "sha256:1rqyypzlvagrn43ykl0c5wxyvnry5fl1ykn3xcvlzgghk96yq3jq"; }; buildInputs = with ocamlPackages; [ - ocaml findlib ocamlgraph zarith menhir menhirLib + ocaml findlib ocamlgraph zarith menhir # Emacs compilation of why3.el emacs # Documentation @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { coqPackages.coq coqPackages.flocq ]; - propagatedBuildInputs = with ocamlPackages; [ camlzip num re sexplib ]; + propagatedBuildInputs = with ocamlPackages; [ camlzip menhirLib num re sexplib ]; enableParallelBuilding = true; From e6a81f04e7f05d945964dd277b266ffd3dd9be4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 05:12:47 +0000 Subject: [PATCH 114/231] python310Packages.databricks-connect: 9.1.9 -> 9.1.10 --- .../development/python-modules/databricks-connect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index f77b279eb64f..d242c59acdbd 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.9"; + version = "9.1.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/I0yMrh2OinvSeMX8C10Y64FuD/nr3dOKIN3Pkb3Zrs="; + sha256 = "sha256-OR3TXO6IzqwqbBbfFf+FGIUbwTa0DoKry84e1hL0I3Q="; }; sourceRoot = "."; From dc30367f3881b13db425b60ebbcf33788a9ae1f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 05:21:27 +0000 Subject: [PATCH 115/231] deno: 1.19.0 -> 1.19.1 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index c05737d1c86e..fa2fe98f76cc 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FLT4O542Q3qFjrsIsF9O/dgQQNAWhsZq+MaLqF8lLPA="; + sha256 = "sha256-BqwiconG5hn5RPV+hlKu6e6+GjZA4Im/dD+no3IduYw="; }; - cargoSha256 = "sha256-mKmMgAoEavv5kb2fo+X5dfpw0ftAho6aU3/wCTgwXao="; + cargoSha256 = "sha256-q/5AezLQgN7WdGsbHoxX5riJMlxw3cTFhVs5OvCeI5U="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From 214e341fa7c366881c1882d01c03f9001cd3048e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 05:43:26 +0000 Subject: [PATCH 116/231] dunst: 1.7.3 -> 1.8.0 --- pkgs/applications/misc/dunst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 4f1d68774de2..17ce1d562b53 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dunst"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "sha256-8s8g1J8vEogCp29tSwX5eqYTDf1dLoyBznnwAlCMQOU="; + sha256 = "sha256-bSlSOAxIcFS5B5o3pWmXFsKthAXzbCltnbLAV/bIHLw="; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; From 07fbf1ccda0da87c411f498ab8ff0ed0d4911eda Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Fri, 25 Feb 2022 14:19:40 +0800 Subject: [PATCH 117/231] librosa: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/librosa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index c23b9df7cd78..21a58e7e9817 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zSFnXTuYWPjRs7FDKzYONoFFvtN4B+HxOwcRqozTkP0="; + sha256 = "sha256-ftXW4/RUbl48KEBpH53cVoePkUo1pQBg31/KKybUthQ="; }; propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ]; From 852608531af64d07a2f03cfb5a7e29afe98a9b9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 07:18:26 +0000 Subject: [PATCH 118/231] python310Packages.google-cloud-iot: 2.3.0 -> 2.4.0 --- pkgs/development/python-modules/google-cloud-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 507ba6aef18c..063ba0666026 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "cb31a864be75c47880748b6c81f0c57cbce190a87e402ce32b2b772be2dba5fa"; + sha256 = "sha256-5AOurJ/XIggFo3QZOQKiRNpbcHwdrIuMBbHeYDA001M="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; From d13a0403a50b320256c6a072be9bbdc5ab7deed0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 08:32:15 +0100 Subject: [PATCH 119/231] python3Packages.aiolyric: add format --- .../python-modules/aiolyric/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix index 7f067eefd686..cdff27599251 100644 --- a/pkgs/development/python-modules/aiolyric/default.nix +++ b/pkgs/development/python-modules/aiolyric/default.nix @@ -9,24 +9,33 @@ buildPythonPackage rec { pname = "aiolyric"; version = "1.0.10"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "timmo001"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yKeG0UCQ8haT1hvywoIwKQ519GK2wFg0wXaRTFeKYIk="; + hash = "sha256-yKeG0UCQ8haT1hvywoIwKQ519GK2wFg0wXaRTFeKYIk="; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; disabledTests = [ # AssertionError, https://github.com/timmo001/aiolyric/issues/5 "test_location" + ] + + pythonImportsCheck = [ + "aiolyric" ]; - pythonImportsCheck = [ "aiolyric" ]; meta = with lib; { description = "Python module for the Honeywell Lyric Platform"; From 20c9e4013e4b006bc32675b8ce9ae8f5601d3a33 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 08:35:28 +0100 Subject: [PATCH 120/231] python3Packages.pytwitchapi: add format --- pkgs/development/python-modules/pytwitchapi/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytwitchapi/default.nix b/pkgs/development/python-modules/pytwitchapi/default.nix index 3c7dc0fdaa81..9777f3331307 100644 --- a/pkgs/development/python-modules/pytwitchapi/default.nix +++ b/pkgs/development/python-modules/pytwitchapi/default.nix @@ -11,13 +11,15 @@ buildPythonPackage rec { pname = "pytwitchapi"; version = "2.5.2"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "v${version}"; - sha256 = "sha256-i+oAx23bMu+jaXHPWElD5GJH6vSytW/9N1amsmma4Lc="; + hash = "sha256-i+oAx23bMu+jaXHPWElD5GJH6vSytW/9N1amsmma4Lc="; }; propagatedBuildInputs = [ @@ -30,7 +32,9 @@ buildPythonPackage rec { # Project has no tests. doCheck = false; - pythonImportsCheck = [ "twitchAPI" ]; + pythonImportsCheck = [ + "twitchAPI" + ]; meta = with lib; { description = "Python implementation of the Twitch Helix API, its Webhook and PubSub"; From 9db2e932c3a105da262732caf8dc0e5f87497ed9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 08:37:44 +0100 Subject: [PATCH 121/231] python3Packages.aiolyric: fix syntax --- pkgs/development/python-modules/aiolyric/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix index cdff27599251..855748f665cf 100644 --- a/pkgs/development/python-modules/aiolyric/default.nix +++ b/pkgs/development/python-modules/aiolyric/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { disabledTests = [ # AssertionError, https://github.com/timmo001/aiolyric/issues/5 "test_location" - ] + ]; pythonImportsCheck = [ "aiolyric" From c8d355433e47067c2cab8a9049a060cc9f1699eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 08:41:05 +0100 Subject: [PATCH 122/231] python3Packages.b2sdk: add format --- pkgs/development/python-modules/b2sdk/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index c36435b22975..2adc8b784f10 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchPypi , importlib-metadata -, isPy27 , logfury , pytestCheckHook , pytest-lazy-fixture @@ -17,11 +16,13 @@ buildPythonPackage rec { pname = "b2sdk"; version = "1.14.1"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fYOeyhKm9mRT61NcQVaXFKeRC8AS9lfIZMO/s6iFaeg="; + hash = "sha256-fYOeyhKm9mRT61NcQVaXFKeRC8AS9lfIZMO/s6iFaeg="; }; nativeBuildInputs = [ @@ -65,5 +66,6 @@ buildPythonPackage rec { description = "Client library and utilities for access to B2 Cloud Storage (backblaze)"; homepage = "https://github.com/Backblaze/b2-sdk-python"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 67ef7f5c728ee420090f949929d6124bd46ec8f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 08:44:57 +0100 Subject: [PATCH 123/231] python3Packages.aiopyarr: 22.2.1 -> 22.2.2 --- pkgs/development/python-modules/aiopyarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix index 54eab469629f..b1618081b878 100644 --- a/pkgs/development/python-modules/aiopyarr/default.nix +++ b/pkgs/development/python-modules/aiopyarr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiopyarr"; - version = "22.2.1"; + version = "22.2.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - hash = "sha256-SEF47hz5XbATuuuO5t5H40+kT7RWSBjP0BfYd38pNSw="; + hash = "sha256-gkiUPznAJ5nkrdbDKAvODsf6UStsxFugCfkZ0fCJkng="; }; propagatedBuildInputs = [ From 4ff62919ccf9449cf993a4b1dcedd3f40ea65129 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 08:47:10 +0100 Subject: [PATCH 124/231] python3Packages.hahomematic: 0.35.3 -> 0.36.0 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 0982458343c6..c1baa8a3ca34 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.35.3"; + version = "0.36.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-oRqA7soRpEHbjtjmByjbfJrYp7eJrcTbQUPR9TZO/IA="; + sha256 = "sha256-yBkWBIT+FsOk9g3NgBTI3q4hN/dL6gI5UkoZnRcS3Jw="; }; propagatedBuildInputs = [ From b1725d1371243b85cfac0bc708921187d3b6e326 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 08:51:01 +0100 Subject: [PATCH 125/231] python3Packages.pycfmodel: 0.16.2 -> 0.16.3 --- pkgs/development/python-modules/pycfmodel/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index 5918c1feb751..1385b415613f 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.16.2"; + version = "0.16.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = version; - hash = "sha256-hOe6BH8aSGJ7YeraiCsJ10mbeGbFGaR3Bt5fh6M8iWI="; + hash = "sha256-/0JSnJy/OUbYX26wTZ3RloVy74bU2D4Z6NOLq6IkI7o="; }; propagatedBuildInputs = [ @@ -36,6 +36,7 @@ buildPythonPackage rec { "test_auxiliar_cast" "test_valid_es_domain_from_aws_documentation_examples_resource_can_be_built" "test_valid_opensearch_domain_from_aws_documentation_examples_resource_can_be_built" + "test_resolve_booleans_different_properties_for_generic_resource" ]; pythonImportsCheck = [ From b549b58b00f44d9f6885a418519b1115ce375595 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 08:52:47 +0100 Subject: [PATCH 126/231] python3Packages.ttls: 1.4.2 -> 1.4.3 --- pkgs/development/python-modules/ttls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix index a389135bc35e..9f5917749e67 100644 --- a/pkgs/development/python-modules/ttls/default.nix +++ b/pkgs/development/python-modules/ttls/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ttls"; - version = "1.4.2"; + version = "1.4.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jschlyter"; repo = pname; rev = "v${version}"; - hash = "sha256-zDMgH9o9obfuihX8pXj226T1eMiKx33xyYOGKjdB1wk="; + hash = "sha256-lBmkfB7HXB+1xLbfOl4wVtsOVfKhztoDBqzV8i6bFAg="; }; nativeBuildInputs = [ From 553eae0caf4cdef03d45051a91bfec1cad2a50ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 08:56:13 +0100 Subject: [PATCH 127/231] python3Packages.pydexcom: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/pydexcom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix index c2f8953bbced..f79cfc9493dd 100644 --- a/pkgs/development/python-modules/pydexcom/default.nix +++ b/pkgs/development/python-modules/pydexcom/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pydexcom"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "gagebenne"; repo = pname; rev = version; - sha256 = "sha256-8PE+MFQkuwYey82jNSRjMaK8kAhYSBbjqnsbGJHGW9I="; + sha256 = "sha256-ItDGnUUUTwCz4ZJtFVlMYjjoBPn2h8QZgLzgnV2T/Qk="; }; propagatedBuildInputs = [ requests ]; From a9e45e14e79aff14ce725187b96f155d70350383 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 08:00:10 +0000 Subject: [PATCH 128/231] gping: 1.2.7 -> 1.3.0 --- pkgs/tools/networking/gping/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 4703aaf0e086..3ca9d3b553e4 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.2.7"; + version = "1.3.0"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "gping-v${version}"; - sha256 = "sha256-7o7Tj0jWFIOLmpHXWT6zcyowm7vnqMDTf0S4zHkWQ2Q="; + sha256 = "sha256-Q7M/vDhECEIQ8s8qt1U7wESqv+Im79TyZ6s2vqjU5ps="; }; - cargoSha256 = "sha256-t+68Rea74RE43TXTSyhZCLXCdBfh7K92Z/amO+wBUuI="; + cargoSha256 = "sha256-cnmjfvMqq8VDMvjFPnjmmH57Gaqttk36AwEtuuAT6qU="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From ec7093413e4afc37e095ea29cf92e3ada08f6851 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 19:20:01 +0000 Subject: [PATCH 129/231] strawberry: 1.0.1 -> 1.0.2 --- pkgs/applications/audio/strawberry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 6527b90b89e1..b607e2c9a0f1 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -36,13 +36,13 @@ mkDerivation rec { pname = "strawberry"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "sha256-MlS1ShRXfsTMs97MeExW6sfpv40OcQLDIzIzOYGk7Rw="; + sha256 = "sha256-/pwHWmQTV1QBK+5SS0/NC6wMm2QQm+iCZArxiHjn4M4="; }; buildInputs = [ From 4ee1f9eafc15a291bbb838f80a47bf2f4c97ce80 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Feb 2022 10:56:18 +1000 Subject: [PATCH 130/231] podman: 3.4.4 -> 4.0.1 https://github.com/containers/podman/releases/tag/v4.0.0 https://github.com/containers/podman/releases/tag/v4.0.1 - wrap helper binaries via CONTAINERS_HELPER_BINARY_DIR --- nixos/tests/podman/default.nix | 2 +- nixos/tests/podman/tls-ghostunnel.nix | 2 +- .../virtualization/podman/default.nix | 42 ++++++++++--------- .../virtualization/podman/wrapper.nix | 17 ++++++++ 4 files changed, 42 insertions(+), 21 deletions(-) diff --git a/nixos/tests/podman/default.nix b/nixos/tests/podman/default.nix index b52a7f060ad6..67c7823c5a31 100644 --- a/nixos/tests/podman/default.nix +++ b/nixos/tests/podman/default.nix @@ -126,7 +126,7 @@ import ../make-test-python.nix ( podman.succeed("docker network create default") podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") podman.succeed( - "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10" ) podman.succeed("docker ps | grep sleeping") podman.succeed("podman ps | grep sleeping") diff --git a/nixos/tests/podman/tls-ghostunnel.nix b/nixos/tests/podman/tls-ghostunnel.nix index c0bc47cc40b1..268a55701ccf 100644 --- a/nixos/tests/podman/tls-ghostunnel.nix +++ b/nixos/tests/podman/tls-ghostunnel.nix @@ -129,7 +129,7 @@ import ../make-test-python.nix ( podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") client.succeed( - "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10" ) client.succeed("docker ps | grep sleeping") podman.succeed("docker ps | grep sleeping") diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 0dad4d9123dc..46b8e1c7ed5f 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,20 +17,20 @@ buildGoModule rec { pname = "podman"; - version = "3.4.4"; + version = "4.0.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-5Y0+xfoMCe3a6kX+OhmxURZXZLAnrS1t8TFyHqjGCeA="; + sha256 = "sha256-DpSDMjUFA8coRInJO1jhMALOYG444WRFw1w7vJKc7cw="; }; vendorSha256 = null; doCheck = false; - outputs = [ "out" "man" ]; + outputs = [ "out" "man" ] ++ lib.optionals stdenv.isLinux [ "rootlessport" ]; nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; @@ -47,26 +47,31 @@ buildGoModule rec { buildPhase = '' runHook preBuild patchShebangs . - ${if stdenv.isDarwin - then "make podman-remote" - else "make podman"} + ${if stdenv.isDarwin then '' + make podman-remote # podman-mac-helper uses FHS paths + '' else '' + make bin/podman bin/rootlessport + ''} make docs runHook postBuild ''; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' - mv bin/{darwin/podman,podman} - '' + '' - install -Dm555 bin/podman $out/bin/podman - installShellCompletion --bash completions/bash/* - installShellCompletion --fish completions/fish/* - installShellCompletion --zsh completions/zsh/* - MANDIR=$man/share/man make install.man-nobuild - install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d - install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d - install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system + ${if stdenv.isDarwin then '' + mv bin/{darwin/podman,podman} + '' else '' + install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d + install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d + for s in contrib/systemd/**/*.in; do + substituteInPlace "$s" --replace "@@PODMAN@@" "podman" # don't use unwrapped binary + done + PREFIX=$out make install.systemd + install -Dm555 bin/rootlessport -t $rootlessport/bin + ''} + install -Dm555 bin/podman -t $out/bin + PREFIX=$out make install.completions + MANDIR=$man/share/man make install.man runHook postInstall ''; @@ -87,9 +92,8 @@ buildGoModule rec { meta = with lib; { homepage = "https://podman.io/"; description = "A program for managing pods, containers and container images"; - changelog = "https://github.com/containers/podman/blob/v${version}/changelog.txt"; + changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md"; license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index c9ec18593dff..d48153361248 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -1,6 +1,7 @@ { podman-unwrapped , runCommand , makeWrapper +, symlinkJoin , lib , extraPackages ? [] , podman # Docker compat @@ -13,8 +14,13 @@ , cni-plugins # not added to path , iptables , iproute2 +, catatonit }: +# do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed + +# adding aardvark-dns/netavark to `helpersBin` requires changes to the modules and tests + let podman = podman-unwrapped; @@ -29,6 +35,16 @@ let iproute2 ] ++ extraPackages); + helpersBin = symlinkJoin { + name = "${podman.pname}-helper-binary-wrapper-${podman.version}"; + + # this only works for some binaries, others may need to be be added to `binPath` or in the modules + paths = [ + catatonit # added here for the pause image and also set in `containersConf` for `init_path` + podman.rootlessport + ]; + }; + in runCommand podman.name { name = "${podman.pname}-wrapper-${podman.version}"; inherit (podman) pname version passthru; @@ -54,5 +70,6 @@ in runCommand podman.name { ln -s ${podman-unwrapped}/lib $out/lib ln -s ${podman-unwrapped}/share $out/share makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ + --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \ --prefix PATH : ${binPath} '' From ec2028eb3ca59679b829f801524e73223021cb3e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 16 Feb 2022 10:05:14 +1000 Subject: [PATCH 131/231] nixos/kubernetes: use kubectl from kubernetes - also clarify kubectl wrapper naming --- nixos/modules/services/cluster/kubernetes/pki.nix | 2 +- nixos/tests/kubernetes/base.nix | 4 ++-- nixos/tests/kubernetes/rbac.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index 88bde4e91557..7d9198d20e8c 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -266,7 +266,7 @@ in in '' export KUBECONFIG=${clusterAdminKubeconfig} - ${kubectl}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files} + ${kubernetes}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files} ''; })]); diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index f0c72084be5c..d4410beb937e 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -18,7 +18,7 @@ let ${master.ip} api.${domain} ${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip} ${machineName}.${domain}") (attrNames machines)} ''; - kubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } '' + wrapKubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin makeWrapper ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl --set KUBECONFIG "/etc/kubernetes/cluster-admin.kubeconfig" ''; @@ -48,7 +48,7 @@ let }; }; programs.bash.enableCompletion = true; - environment.systemPackages = [ kubectl ]; + environment.systemPackages = [ wrapKubectl ]; services.flannel.iface = "eth1"; services.kubernetes = { proxy.hostname = "${masterName}.${domain}"; diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix index ca73562256e4..9e73fbbd32a8 100644 --- a/nixos/tests/kubernetes/rbac.nix +++ b/nixos/tests/kubernetes/rbac.nix @@ -76,7 +76,7 @@ let }]; }); - kubectl = pkgs.runCommand "copy-kubectl" { buildInputs = [ pkgs.kubernetes ]; } '' + copyKubectl = pkgs.runCommand "copy-kubectl" { } '' mkdir -p $out/bin cp ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl ''; @@ -84,7 +84,7 @@ let kubectlImage = pkgs.dockerTools.buildImage { name = "kubectl"; tag = "latest"; - contents = [ kubectl pkgs.busybox kubectlPod2 ]; + contents = [ copyKubectl pkgs.busybox kubectlPod2 ]; config.Entrypoint = ["/bin/sh"]; }; From ae0a6a6b08b2ac4a2b2380ece50552c881c6ac0e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 16 Feb 2022 10:05:14 +1000 Subject: [PATCH 132/231] kubernetes: only build on linux - don't build kubectl, symlink from pkgs.kubectl - use GOFLAGS and disallowedReferences - move pause to installPhase --- .../networking/cluster/kubernetes/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 7a708c5e061d..8d11bc28017a 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,12 +1,12 @@ { stdenv , lib , fetchFromGitHub -, removeReferencesTo , which , go , makeWrapper , rsync , installShellFiles +, kubectl , nixosTests , components ? [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-srJHW/wvrFKKgxVwJB4h0FGeaT7iSJYOTtSeTkcR3FE="; }; - nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; + nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ]; outputs = [ "out" "man" "pause" ]; @@ -51,12 +51,10 @@ stdenv.mkDerivation rec { WHAT = lib.concatStringsSep " " ([ "cmd/kubeadm" - "cmd/kubectl" ] ++ components); postBuild = '' ./hack/update-generated-docs.sh - (cd build/pause/linux && cc pause.c -o pause) ''; installPhase = '' @@ -65,9 +63,14 @@ stdenv.mkDerivation rec { install -D _output/local/go/bin/''${p##*/} -t $out/bin done - install -D build/pause/linux/pause -t $pause/bin + cc build/pause/linux/pause.c -o pause + install -D pause -t $pause/bin + + rm docs/man/man1/kubectl* installManPage docs/man/man1/*.[1-9] + ln -s ${kubectl}/bin/kubectl $out/bin/kubectl + # Unfortunately, kube-addons-main.sh only looks for the lib file in either the # current working dir or in /opt. We have to patch this for now. substitute cluster/addons/addon-manager/kube-addons-main.sh $out/bin/kube-addons \ @@ -79,24 +82,22 @@ stdenv.mkDerivation rec { cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons-lib.sh - for tool in kubeadm kubectl; do - installShellCompletion --cmd $tool \ - --bash <($out/bin/$tool completion bash) \ - --zsh <($out/bin/$tool completion zsh) - done + installShellCompletion --cmd kubeadm \ + --bash <($out/bin/kubeadm completion bash) \ + --zsh <($out/bin/kubeadm completion zsh) runHook postInstall ''; - preFixup = '' - find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' + - ''; + disallowedReferences = [ go ]; + + GOFLAGS = [ "-trimpath" ]; meta = with lib; { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; homepage = "https://kubernetes.io"; maintainers = with maintainers; [ ] ++ teams.kubernetes.members; - platforms = platforms.unix; + platforms = platforms.linux; }; passthru.tests = nixosTests.kubernetes; From 8c912d5c91ea4064ec905994e8f6e80f4d843c4a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 16 Feb 2022 09:35:25 +1000 Subject: [PATCH 133/231] kubectl: build from source this allows non-linux users to avoid building the entire kubernetes package --- .../networking/cluster/kubernetes/kubectl.nix | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index fec93d8878e0..b1c15458543d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix +++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -1,29 +1,37 @@ -{ stdenv, kubernetes, installShellFiles }: +{ lib, stdenv, kubernetes }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "kubectl"; - version = kubernetes.version; - # kubectl is currently part of the main distribution but will eventially be - # split out (see homepage) - dontUnpack = true; - - nativeBuildInputs = [ installShellFiles ]; + inherit (kubernetes) + disallowedReferences + GOFLAGS + nativeBuildInputs + postBuild + postPatch + src + version + ; outputs = [ "out" "man" ]; - installPhase = '' - install -D ${kubernetes}/bin/kubectl -t $out/bin + WHAT = "cmd/kubectl"; - installManPage "${kubernetes.man}/share/man/man1"/kubectl* + installPhase = '' + runHook preInstall + install -D _output/local/go/bin/kubectl -t $out/bin + + installManPage docs/man/man1/kubectl* installShellCompletion --cmd kubectl \ --bash <($out/bin/kubectl completion bash) \ --zsh <($out/bin/kubectl completion zsh) + runHook postInstall ''; meta = kubernetes.meta // { description = "Kubernetes CLI"; homepage = "https://github.com/kubernetes/kubectl"; + platforms = lib.platforms.unix; }; } From 8d78ce1eb419baf7c8681bbeb0c017a7346f28c0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 24 Feb 2022 23:16:47 +0800 Subject: [PATCH 134/231] =?UTF-8?q?libxmlb:=200.3.1=20=E2=86=92=200.3.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/hughsie/libxmlb/blob/0.3.7/NEWS https://github.com/hughsie/libxmlb/compare/0.3.1...0.3.7 --- pkgs/development/libraries/libxmlb/default.nix | 11 +++++++---- .../libraries/libxmlb/installed-tests-path.patch | 10 +++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index b476edaf5e60..85fda8ddc8ed 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , docbook_xml_dtd_43 , docbook_xsl @@ -11,11 +12,12 @@ , python3 , shared-mime-info , nixosTests +, xz }: stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.1"; + version = "0.3.7"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "sha256-4gJBmSbo5uGj12Y2Ov4gmS8nJshQxuBM9BAevY/lwjg="; + sha256 = "sha256-ZzA1YJYxTR91X79NU9dWd11Ze+PX2wuZeumuEuNdC48="; }; patches = [ @@ -38,12 +40,13 @@ stdenv.mkDerivation rec { meson ninja pkg-config - (python3.withPackages (pkgs: with pkgs; [ setuptools ])) + python3 shared-mime-info ]; buildInputs = [ glib + xz ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/pkgs/development/libraries/libxmlb/installed-tests-path.patch index 4207e9a91d74..0e74d131b2e8 100644 --- a/pkgs/development/libraries/libxmlb/installed-tests-path.patch +++ b/pkgs/development/libraries/libxmlb/installed-tests-path.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 38486c9..c567613 100644 +index c98e1a7..025d9c8 100644 --- a/meson.build +++ b/meson.build -@@ -110,8 +110,8 @@ +@@ -110,8 +110,8 @@ else prefix = get_option('prefix') datadir = join_paths(prefix, get_option('datadir')) libexecdir = join_paths(prefix, get_option('libexecdir')) @@ -14,11 +14,11 @@ index 38486c9..c567613 100644 gio = dependency('gio-2.0', version : '>= 2.45.8') diff --git a/meson_options.txt b/meson_options.txt -index 27e8cb6..74548ae 100644 +index 54ab698..8a7122a 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -2,3 +2,4 @@ - option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data') +@@ -3,3 +3,4 @@ option('introspection', type : 'boolean', value : true, description : 'generate option('tests', type : 'boolean', value : true, description : 'enable tests') option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support') + option('cli', type : 'boolean', value : true, description : 'build and install the xb-tool CLI') +option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') From 3a0afd5401cbd3f8a019399486b1bf8d09286e59 Mon Sep 17 00:00:00 2001 From: Renaud Date: Fri, 25 Feb 2022 10:42:43 +0100 Subject: [PATCH 135/231] geoipupdate: set version with ldflags --- pkgs/applications/misc/geoipupdate/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 4ac2fdc44a3a..26d729fe8a79 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "sha256-S+CnIPoyGM7dEQICOIlAWBIC24Fyt7q+OY382evDgQc="; + ldflags = [ "-X main.version=${version}" ]; + doCheck = false; meta = with lib; { From 55a717e0156dcda57922f1808a479ebe61e46ab8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 11:04:43 +0100 Subject: [PATCH 136/231] python3Packages.aws-lambda-builders: disable on older Python releases --- .../python-modules/aws-lambda-builders/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index b7186f580b0d..db168c9b325e 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -2,19 +2,19 @@ , buildPythonPackage , fetchFromGitHub , six -, pathlib , pytest , mock , parameterized -, isPy27 -, isPy35 +, pythonOlder }: buildPythonPackage rec { pname = "aws-lambda-builders"; version = "1.13.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; @@ -22,12 +22,9 @@ buildPythonPackage rec { sha256 = "sha256-t04g65TPeOYgEQw6kPJrlJN1ssQrsN9kl7g69J4pPwo="; }; - # Package is not compatible with Python 3.5 - disabled = isPy35; - propagatedBuildInputs = [ six - ] ++ lib.optionals isPy27 [ pathlib ]; + ]; checkInputs = [ pytest From 82e1f86e3cb7178429974e1d6b583047dc94b4e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 11:24:24 +0100 Subject: [PATCH 137/231] python3Packages.influxdb-client: add format --- .../python-modules/influxdb-client/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index eb38013d75f4..85456fcc15f8 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -15,13 +15,15 @@ buildPythonPackage rec { pname = "influxdb-client"; version = "1.26.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "sha256-9MI6AgFTEw9dnBWdry3FnPERXnXZJhbYX4tXj9sGMkg="; + hash = "sha256-9MI6AgFTEw9dnBWdry3FnPERXnXZJhbYX4tXj9sGMkg="; }; propagatedBuildInputs = [ @@ -38,12 +40,14 @@ buildPythonPackage rec { # requires influxdb server doCheck = false; - pythonImportsCheck = [ "influxdb_client" ]; + pythonImportsCheck = [ + "influxdb_client" + ]; meta = with lib; { description = "InfluxDB 2.0 Python client library"; homepage = "https://github.com/influxdata/influxdb-client-python"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } From 6895ccff47d4f5a5b8bd6a0c88595f3bfaaca42a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 11:27:32 +0100 Subject: [PATCH 138/231] python3Packages.tldextract: add format --- .../python-modules/tldextract/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 7c580aa676bd..f2f15c8bb7fa 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -15,6 +15,8 @@ buildPythonPackage rec { pname = "tldextract"; version = "3.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -22,7 +24,9 @@ buildPythonPackage rec { sha256 = "sha256-PUtqIQVgC30CkOoje/MLaw3HY+UPy+QOhJoBm9bby/8="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ filelock @@ -38,10 +42,13 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace pytest.ini --replace " --pylint" "" + substituteInPlace pytest.ini \ + --replace " --pylint" "" ''; - pythonImportsCheck = [ "tldextract" ]; + pythonImportsCheck = [ + "tldextract" + ]; meta = with lib; { description = "Python module to accurately separate the TLD from the domain of an URL"; From 3ab90617d3f597004882fee9af51478ab9a74210 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 11:32:34 +0100 Subject: [PATCH 139/231] python3Packages.datamodeldict: clean-up --- .../python-modules/datamodeldict/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix index f09435693e1c..145342a60a36 100644 --- a/pkgs/development/python-modules/datamodeldict/default.nix +++ b/pkgs/development/python-modules/datamodeldict/default.nix @@ -1,27 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , xmltodict }: buildPythonPackage rec { + pname = "datamodeldict"; version = "0.9.9"; - pname = "DataModelDict"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-DadBRsc8qEu9PWgMNllGS2ESKL7kgBLDhg4yDr87WRk="; + pname = "DataModelDict"; + inherit version; + hash = "sha256-DadBRsc8qEu9PWgMNllGS2ESKL7kgBLDhg4yDr87WRk="; }; - propagatedBuildInputs = [ xmltodict ]; + propagatedBuildInputs = [ + xmltodict + ]; # no tests doCheck = false; + pythonImportsCheck = [ + "DataModelDict" + ]; + meta = with lib; { - homepage = "https://github.com/usnistgov/DataModelDict/"; description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML"; + homepage = "https://github.com/usnistgov/DataModelDict/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From 9abf72f229f355c14dc4e332fa16ca8f1d36c1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 21 Feb 2022 09:21:12 +0100 Subject: [PATCH 140/231] bird1: drop package + modules reason: no longer maintained upstream. --- .../from_md/release-notes/rl-2205.section.xml | 8 + .../manual/release-notes/rl-2205.section.md | 2 + nixos/modules/services/networking/bird.nix | 186 +++++++++--------- nixos/tests/bird.nix | 131 +++--------- pkgs/servers/bird/default.nix | 88 +++------ pkgs/top-level/aliases.nix | 3 + pkgs/top-level/all-packages.nix | 3 +- 7 files changed, 162 insertions(+), 259 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 27fbd68a6f3a..34912773161d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -546,6 +546,14 @@ tilp2 was removed together with its module + + + bird1 and its modules + services.bird as well as + services.bird6 have been removed. Upgrade + to services.bird2. + + The options diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 388ddc67fb26..fb5e1975912f 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -178,6 +178,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `tilp2` was removed together with its module +- `bird1` and its modules `services.bird` as well as `services.bird6` have been removed. Upgrade to `services.bird2`. + - The options `networking.interfaces..ipv4.routes` and `networking.interfaces..ipv6.routes` are no longer ignored when using networkd instead of the default scripted network backend by setting `networking.useNetworkd` to `true`. - MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`. diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index fc06cdaa6e58..54c75906742b 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -3,103 +3,103 @@ let inherit (lib) mkEnableOption mkIf mkOption optionalString types; - generic = variant: - let - cfg = config.services.${variant}; - pkg = pkgs.${variant}; - birdBin = if variant == "bird6" then "bird6" else "bird"; - birdc = if variant == "bird6" then "birdc6" else "birdc"; - descr = - { bird = "1.6.x with IPv4 support"; - bird6 = "1.6.x with IPv6 support"; - bird2 = "2.x"; - }.${variant}; - in { - ###### interface - options = { - services.${variant} = { - enable = mkEnableOption "BIRD Internet Routing Daemon (${descr})"; - config = mkOption { - type = types.lines; - description = '' - BIRD Internet Routing Daemon configuration file. - - ''; - }; - checkConfig = mkOption { - type = types.bool; - default = true; - description = '' - Whether the config should be checked at build time. - When the config can't be checked during build time, for example when it includes - other files, either disable this option or use preCheckConfig to create - the included files before checking. - ''; - }; - preCheckConfig = mkOption { - type = types.lines; - default = ""; - example = '' - echo "cost 100;" > include.conf - ''; - description = '' - Commands to execute before the config file check. The file to be checked will be - available as ${variant}.conf in the current directory. - - Files created with this option will not be available at service runtime, only during - build time checking. - ''; - }; - }; + cfg = config.services.bird2; +in +{ + ###### interface + options = { + services.bird2 = { + enable = mkEnableOption "BIRD Internet Routing Daemon"; + config = mkOption { + type = types.lines; + description = '' + BIRD Internet Routing Daemon configuration file. + + ''; }; + checkConfig = mkOption { + type = types.bool; + default = true; + description = '' + Whether the config should be checked at build time. + When the config can't be checked during build time, for example when it includes + other files, either disable this option or use preCheckConfig to create + the included files before checking. + ''; + }; + preCheckConfig = mkOption { + type = types.lines; + default = ""; + example = '' + echo "cost 100;" > include.conf + ''; + description = '' + Commands to execute before the config file check. The file to be checked will be + available as bird2.conf in the current directory. - ###### implementation - config = mkIf cfg.enable { - environment.systemPackages = [ pkg ]; - - environment.etc."bird/${variant}.conf".source = pkgs.writeTextFile { - name = "${variant}.conf"; - text = cfg.config; - checkPhase = optionalString cfg.checkConfig '' - ln -s $out ${variant}.conf - ${cfg.preCheckConfig} - ${pkg}/bin/${birdBin} -d -p -c ${variant}.conf - ''; - }; - - systemd.services.${variant} = { - description = "BIRD Internet Routing Daemon (${descr})"; - wantedBy = [ "multi-user.target" ]; - reloadIfChanged = true; - restartTriggers = [ config.environment.etc."bird/${variant}.conf".source ]; - serviceConfig = { - Type = "forking"; - Restart = "on-failure"; - ExecStart = "${pkg}/bin/${birdBin} -c /etc/bird/${variant}.conf -u ${variant} -g ${variant}"; - ExecReload = "/bin/sh -c '${pkg}/bin/${birdBin} -c /etc/bird/${variant}.conf -p && ${pkg}/bin/${birdc} configure'"; - ExecStop = "${pkg}/bin/${birdc} down"; - CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID" - # see bird/sysdep/linux/syspriv.h - "CAP_NET_BIND_SERVICE" "CAP_NET_BROADCAST" "CAP_NET_ADMIN" "CAP_NET_RAW" ]; - ProtectSystem = "full"; - ProtectHome = "yes"; - SystemCallFilter="~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io"; - MemoryDenyWriteExecute = "yes"; - }; - }; - users = { - users.${variant} = { - description = "BIRD Internet Routing Daemon user"; - group = variant; - isSystemUser = true; - }; - groups.${variant} = {}; - }; + Files created with this option will not be available at service runtime, only during + build time checking. + ''; }; }; + }; -in -{ - imports = map generic [ "bird" "bird6" "bird2" ]; + imports = [ + (lib.mkRemovedOptionModule [ "services" "bird" ] "Use services.bird2 instead") + (lib.mkRemovedOptionModule [ "services" "bird6" ] "Use services.bird2 instead") + ]; + + ###### implementation + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.bird ]; + + environment.etc."bird/bird2.conf".source = pkgs.writeTextFile { + name = "bird2"; + text = cfg.config; + checkPhase = optionalString cfg.checkConfig '' + ln -s $out bird2.conf + ${cfg.preCheckConfig} + ${pkgs.bird}/bin/bird -d -p -c bird2.conf + ''; + }; + + systemd.services.bird2 = { + description = "BIRD Internet Routing Daemon"; + wantedBy = [ "multi-user.target" ]; + reloadIfChanged = true; + restartTriggers = [ config.environment.etc."bird/bird2.conf".source ]; + serviceConfig = { + Type = "forking"; + Restart = "on-failure"; + ExecStart = "${pkgs.bird}/bin/bird -c /etc/bird/bird2.conf -u bird2 -g bird2"; + ExecReload = "/bin/sh -c '${pkgs.bird}/bin/bird -c /etc/bird/bird2.conf -p && ${pkgs.bird}/bin/birdc configure'"; + ExecStop = "${pkgs.bird}/bin/birdc down"; + CapabilityBoundingSet = [ + "CAP_CHOWN" + "CAP_FOWNER" + "CAP_DAC_OVERRIDE" + "CAP_SETUID" + "CAP_SETGID" + # see bird/sysdep/linux/syspriv.h + "CAP_NET_BIND_SERVICE" + "CAP_NET_BROADCAST" + "CAP_NET_ADMIN" + "CAP_NET_RAW" + ]; + ProtectSystem = "full"; + ProtectHome = "yes"; + SystemCallFilter = "~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io"; + MemoryDenyWriteExecute = "yes"; + }; + }; + users = { + users.bird2 = { + description = "BIRD Internet Routing Daemon user"; + group = "bird2"; + isSystemUser = true; + }; + groups.bird2 = { }; + }; + }; } diff --git a/nixos/tests/bird.nix b/nixos/tests/bird.nix index 50d397be14ee..befcf4fb8acf 100644 --- a/nixos/tests/bird.nix +++ b/nixos/tests/bird.nix @@ -9,7 +9,7 @@ let inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; inherit (pkgs.lib) optionalString; - hostShared = hostId: { pkgs, ... }: { + makeBird2Host = hostId: { pkgs, ... }: { virtualisation.vlans = [ 1 ]; environment.systemPackages = with pkgs; [ jq ]; @@ -24,105 +24,6 @@ let name = "eth1"; networkConfig.Address = "10.0.0.${hostId}/24"; }; - }; - - birdTest = v4: - let variant = "bird${optionalString (!v4) "6"}"; in - makeTest { - name = variant; - - nodes.host1 = makeBirdHost variant "1"; - nodes.host2 = makeBirdHost variant "2"; - - testScript = makeTestScript variant v4 (!v4); - }; - - bird2Test = makeTest { - name = "bird2"; - - nodes.host1 = makeBird2Host "1"; - nodes.host2 = makeBird2Host "2"; - - testScript = makeTestScript "bird2" true true; - }; - - makeTestScript = variant: v4: v6: '' - start_all() - - host1.wait_for_unit("${variant}.service") - host2.wait_for_unit("${variant}.service") - - ${optionalString v4 '' - with subtest("Waiting for advertised IPv4 routes"): - host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'") - host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'") - ''} - ${optionalString v6 '' - with subtest("Waiting for advertised IPv6 routes"): - host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'") - host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'") - ''} - - with subtest("Check fake routes in preCheckConfig do not exists"): - ${optionalString v4 ''host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")''} - ${optionalString v4 ''host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")''} - - ${optionalString v6 ''host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")''} - ${optionalString v6 ''host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")''} - ''; - - makeBirdHost = variant: hostId: { pkgs, ... }: { - imports = [ (hostShared hostId) ]; - - services.${variant} = { - enable = true; - - config = '' - log syslog all; - - debug protocols all; - - router id 10.0.0.${hostId}; - - protocol device { - } - - protocol kernel { - import none; - export all; - } - - protocol static { - include "static.conf"; - } - - protocol ospf { - export all; - area 0 { - interface "eth1" { - hello 5; - wait 5; - }; - }; - } - ''; - - preCheckConfig = - let - route = { bird = "1.2.3.4/32"; bird6 = "fd00::/128"; }.${variant}; - in - ''echo "route ${route} blackhole;" > static.conf''; - }; - - systemd.tmpfiles.rules = - let - route = { bird = "10.10.0.${hostId}/32"; bird6 = "fdff::${hostId}/128"; }.${variant}; - in - [ "f /etc/bird/static.conf - - - - route ${route} blackhole;" ]; - }; - - makeBird2Host = hostId: { pkgs, ... }: { - imports = [ (hostShared hostId) ]; services.bird2 = { enable = true; @@ -198,8 +99,30 @@ let ]; }; in -{ - bird = birdTest true; - bird6 = birdTest false; - bird2 = bird2Test; +makeTest { + name = "bird2"; + + nodes.host1 = makeBird2Host "1"; + nodes.host2 = makeBird2Host "2"; + + testScript = '' + start_all() + + host1.wait_for_unit("bird2.service") + host2.wait_for_unit("bird2.service") + + with subtest("Waiting for advertised IPv4 routes"): + host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'") + host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'") + with subtest("Waiting for advertised IPv6 routes"): + host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'") + host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'") + + with subtest("Check fake routes in preCheckConfig do not exists"): + host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'") + host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'") + + host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'") + host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'") + ''; } diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index f87ff8c664d8..259367712115 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -1,66 +1,34 @@ { lib, stdenv, fetchurl, fetchpatch, flex, bison, readline, libssh, nixosTests }: -with lib; +stdenv.mkDerivation rec { + pname = "bird"; + version = "2.0.9"; -let - - generic = { version, sha256, enableIPv6 ? false }: - stdenv.mkDerivation rec { - pname = "bird"; - inherit version; - - src = fetchurl { - inherit sha256; - url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; - }; - - nativeBuildInputs = [ flex bison ]; - buildInputs = [ readline libssh ]; - - patches = [ - (./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch") - ] - ++ optional (lib.versionOlder version "2") - # https://github.com/BIRD/bird/pull/4 - (fetchpatch { - url = "https://github.com/BIRD/bird/commit/fca9ab48e3823c734886f47156a92f6b804c16e9.patch"; - sha256 = "1pnndc3n56lqqcy74ln0w5kn3i9rbzsm2dqiyp1qw7j33dpkln1b"; - }) - ; - - CPP="${stdenv.cc.targetPrefix}cpp -E"; - - configureFlags = [ - "--localstatedir=/var" - ] ++ optional enableIPv6 "--enable-ipv6"; - - passthru.tests = nixosTests.bird; - - meta = { - description = "BIRD Internet Routing Daemon"; - homepage = "http://bird.network.cz"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fpletz globin ]; - platforms = platforms.linux; - }; - }; - -in - -{ - bird = generic { - version = "1.6.8"; - sha256 = "1ch0pkkhd7axdjlvhprynh9q08x0nm984nvkm1cjb7gm5rfsnqbc"; - }; - - bird6 = generic { - version = "1.6.8"; - sha256 = "1ch0pkkhd7axdjlvhprynh9q08x0nm984nvkm1cjb7gm5rfsnqbc"; - enableIPv6 = true; - }; - - bird2 = generic { - version = "2.0.9"; + src = fetchurl { sha256 = "sha256-dnhrvN7TBh4bsiGwEfLMACIewGPenNoASn2bBhoJbV4="; + url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; + }; + + nativeBuildInputs = [ flex bison ]; + buildInputs = [ readline libssh ]; + + patches = [ + (./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch") + ]; + + CPP="${stdenv.cc.targetPrefix}cpp -E"; + + configureFlags = [ + "--localstatedir=/var" + ]; + + passthru.tests = nixosTests.bird; + + meta = with lib; { + description = "BIRD Internet Routing Daemon"; + homepage = "http://bird.network.cz"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fpletz globin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 954eee637b5b..4604edf10b21 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -110,6 +110,8 @@ mapAliases ({ bridge_utils = bridge-utils; # Added 2015-02-20 bro = zeek; # Added 2019-09-29 btrfsProgs = btrfs-progs; # Added 2016-01-03 + bird2 = bird; + bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) bitwarden_rs = vaultwarden; @@ -118,6 +120,7 @@ mapAliases ({ bitwarden_rs-sqlite = vaultwarden-sqlite; bitwarden_rs-vault = vaultwarden-vault; + blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal."; # Added 2022-01-12 bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # Added 2021-01-02 bsod = throw "bsod has been removed: deleted by upstream"; # Added 2022-01-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c49c8cbc5f8..7de4393416eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21018,8 +21018,7 @@ with pkgs; dnsutils = bind.dnsutils; dig = bind.dnsutils; - inherit (callPackages ../servers/bird { }) - bird bird6 bird2; + bird = callPackage ../servers/bird { }; bosun = callPackage ../servers/monitoring/bosun { }; From a5276e1fbdb1773554fb882ad4432116b9b4d918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 23 Feb 2022 07:10:02 +0100 Subject: [PATCH 141/231] bird: change runtstatedir to systemd convention --- pkgs/servers/bird/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 259367712115..34d1aab3286b 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" + "--runstatedir=/run/bird" ]; passthru.tests = nixosTests.bird; From ad161944605a00dbf036dee4eea10eab8a286121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 23 Feb 2022 07:00:33 +0100 Subject: [PATCH 142/231] nixos/bird: improve systemd hardening / capability set aligned with https://github.com/archlinux/svntogit-packages/blob/packages/bird/trunk/bird.service#L20-L21 --- nixos/modules/services/networking/bird.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index 54c75906742b..4a5192424819 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -72,23 +72,27 @@ in serviceConfig = { Type = "forking"; Restart = "on-failure"; + # We need to start as root so bird can open netlink sockets i.e. for ospf ExecStart = "${pkgs.bird}/bin/bird -c /etc/bird/bird2.conf -u bird2 -g bird2"; ExecReload = "/bin/sh -c '${pkgs.bird}/bin/bird -c /etc/bird/bird2.conf -p && ${pkgs.bird}/bin/birdc configure'"; ExecStop = "${pkgs.bird}/bin/birdc down"; + RuntimeDirectory = "bird"; CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" - "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID" - # see bird/sysdep/linux/syspriv.h - "CAP_NET_BIND_SERVICE" - "CAP_NET_BROADCAST" "CAP_NET_ADMIN" + "CAP_NET_BROADCAST" + "CAP_NET_BIND_SERVICE" "CAP_NET_RAW" ]; ProtectSystem = "full"; ProtectHome = "yes"; + ProtectKernelTunables = true; + ProtectControlGroups = true; + PrivateTmp = true; + PrivateDevices = true; SystemCallFilter = "~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io"; MemoryDenyWriteExecute = "yes"; }; From 75e1bb15fa4d877c7b22e1e629a5d6f5df24a54a Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 23 Feb 2022 19:12:39 +0100 Subject: [PATCH 143/231] vim/update.py: make '--add' option work --- maintainers/scripts/pluginupdate.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 877e66440320..017e3ac758ac 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -454,8 +454,8 @@ def prefetch_plugin( ) -def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin: - plugin, _ = prefetch_plugin(parse_plugin_line(plugin_line)) +def fetch_plugin_from_pluginline(config: FetchConfig, plugin_line: str) -> Plugin: + plugin, _ = prefetch_plugin(parse_plugin_line(config, plugin_line)) return plugin @@ -586,6 +586,7 @@ def prefetch( def rewrite_input( + config: FetchConfig, input_file: Path, deprecated: Path, redirects: Dict[str, str] = None, @@ -603,8 +604,8 @@ def rewrite_input( with open(deprecated, "r") as f: deprecations = json.load(f) for old, new in redirects.items(): - old_plugin = fetch_plugin_from_pluginline(old) - new_plugin = fetch_plugin_from_pluginline(new) + old_plugin = fetch_plugin_from_pluginline(config, old) + new_plugin = fetch_plugin_from_pluginline(config, new) if old_plugin.normalized_name != new_plugin.normalized_name: deprecations[old_plugin.normalized_name] = { "new": new_plugin.normalized_name, @@ -640,7 +641,7 @@ def update_plugins(editor: Editor, args): update = editor.get_update(args.input_file, args.outfile, fetch_config) redirects = update() - editor.rewrite_input(args.input_file, editor.deprecated, redirects) + editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, redirects) autocommit = not args.no_commit @@ -659,9 +660,9 @@ def update_plugins(editor: Editor, args): ) for plugin_line in args.add_plugins: - editor.rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",)) + editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=(plugin_line + "\n",)) update() - plugin = fetch_plugin_from_pluginline(plugin_line) + plugin = fetch_plugin_from_pluginline(fetch_config, plugin_line) if autocommit: commit( nixpkgs_repo, From a7024faac52b8a884330e25934797b3efaa589c5 Mon Sep 17 00:00:00 2001 From: "\"Bruno BELANYI\"" <"bruno@belanyi.fr"> Date: Fri, 25 Feb 2022 12:00:55 +0100 Subject: [PATCH 144/231] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 065fed63c14a..aa0dc36983c0 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-02-22"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "37802e72263f1592575ec1133969890b703e70a7"; - sha256 = "085ln5pv5yk9kxhnvizyy2rm67nlhkmw4m92pg3yakjhx8cxmh1w"; + rev = "0a229de4633a51548cb7257a116ea48dd4dd38c2"; + sha256 = "19w0lkdak24m94hn4sp37h4q30i4893b7dwdvr7kz29na6x254rr"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -533,12 +533,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-02-24"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "169134de0d3919837a436cceb806ce8e29a239ea"; - sha256 = "1qfg5k406qdxv534c3xbrhpjhigsxkgj9yqm0sx45z5l6f4cmih6"; + rev = "f932760f16368c5feeb079a878ed0ff8588aed29"; + sha256 = "18bpfbb8aj2pmh84mq6w3435nyha0xiqpralx8daxb89vl0drvn4"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1230,12 +1230,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-02-24"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "6e2e12b2485a03a5f5a62319c6ae638b32a203d8"; - sha256 = "08bwgn1vvsr96p7ifzc6qxhjdldfgxcqjha7jljrpbqjwj9cfdij"; + rev = "1792fee68dfba89632022e9524c2dcef10d399cd"; + sha256 = "1y0ycmv1394mnxqzmrxx7ac846sy24cw7hgdxvp2w08cicysb38a"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -3228,12 +3228,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-02-24"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "8fd73360e89a219b5701339c08a469f5703cf163"; - sha256 = "0y43p3sv99rsbks9r67zjm7wp3j7xpdx6ql5n18371ys8wyyddpd"; + rev = "e53a14b2b279e92fbca9646ec14188ab76dd009a"; + sha256 = "13lr7kz2jny0slwshk85hv4ccnh3ywwmxy1wwq3a552cbk1p69j2"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3471,8 +3471,8 @@ final: prev: src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "e357328c02d1661ffa7ab0aba0d80b6770ca1c31"; - sha256 = "0w1fwzcv4ngpwa7dkq6vi9fxg7dski7sqv2k432h1ll6ibph8yid"; + rev = "5addafcc2460c7b805f14f8a257b804527bb85d7"; + sha256 = "0whp6gcg059wygpww8mw1gapjd8qgx20xzy5r3g173x0c05kx3a1"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3983,12 +3983,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-02-18"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "e3339888ab2875f7535762a70c916b4986405b58"; - sha256 = "084lhaq3pi157dikhpys0ppg68fhdjkm8pbap55ajmkxh5vh7xlf"; + rev = "3bba2b63417cb679313e0ed0b7d9b7539c7f02b0"; + sha256 = "1pr9hxy36xm8gbl4kkq0sa7qn6ki8k5mkdlz07vizk44yzq1pk95"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4355,12 +4355,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-02-24"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "ee6134db8f55ed2ef965fbc2d036de3f87a140d9"; - sha256 = "04dsmih3hmby3sa9w9n6cw2lzz69jmm6yd6nx70fg07730sg364x"; + rev = "4dd4df18d415d59310ce8e7a42f707edf6e6d270"; + sha256 = "08m6mxanf31269ray76fzfb4il9cixnf78qq9p19i330k2hydqap"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4883,12 +4883,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-02-24"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "fb7a56548b89670e2147beb15e5bd2487fffc800"; - sha256 = "1ada3hzhya4qcqri63plbvvd7xf6gc7k9rr7v5z53lxj1l4s48v2"; + rev = "18c558fd92b5ec800f976c447452ede4e96e9de9"; + sha256 = "1f61237najb65r48j1hsrs6l5yvz9101s0fzi0jpzy40xs0gqb7n"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -5027,12 +5027,12 @@ final: prev: nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-02-19"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "db19db97a5039b8485a9768873e4afd3cd731625"; - sha256 = "0bkxjq3mm6v8h7zsv4mw92nnbj16cxmswdapn7zd2nld23ysyv0l"; + rev = "9b819574b63bbf8883e32602915da22ead08bf9a"; + sha256 = "084wnwmf67bs9ky1sj23fd6sqp27svfxg8gcf1fng8xjf5yk6pdw"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -5801,8 +5801,8 @@ final: prev: src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "90f1123c0d63f41627dca0c5258a4193274edba0"; - sha256 = "0f3jgj1bwvxzmvqf7nbbbwyav5wxmr9kyjw4j4fq7n3mrcapdjj0"; + rev = "7cb75a0e0262244728079a5482f2208b742245f9"; + sha256 = "1ik61x58raln6wailp07w4c34bdzjchsrs4vwdi3pa6xlflw4sih"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; From 4dd229ff0ad53046400cb4e792ca41cf0009392d Mon Sep 17 00:00:00 2001 From: "\"Bruno BELANYI\"" <"bruno@belanyi.fr"> Date: Fri, 25 Feb 2022 12:01:33 +0100 Subject: [PATCH 145/231] vimPlugins.nvim-lightline-lsp: init at 2022-01-06 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index aa0dc36983c0..c76975614620 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4713,6 +4713,18 @@ final: prev: meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; + nvim-lightline-lsp = buildVimPluginFrom2Nix { + pname = "nvim-lightline-lsp"; + version = "2022-01-06"; + src = fetchFromGitHub { + owner = "josa42"; + repo = "nvim-lightline-lsp"; + rev = "d9e61801f54c8824b59e93068865e3bc4f1ca0b8"; + sha256 = "0sd38c4cp7i6prgr86b5nq9fhpi2h1yrn3ggs3d7my65ayz759m6"; + }; + meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/"; + }; + nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; version = "2022-02-23"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 8687e27fb97c..134ea5bc6865 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -314,6 +314,7 @@ joonty/vim-xdebug joosepalviste/nvim-ts-context-commentstring jordwalke/vim-reasonml josa42/coc-lua +josa42/nvim-lightline-lsp josa42/vim-lightline-coc jose-elias-alvarez/minsnip.nvim jose-elias-alvarez/null-ls.nvim From 3917530ac3c9c23be36f63198d380f7b624390bf Mon Sep 17 00:00:00 2001 From: "\"Bruno BELANYI\"" <"bruno@belanyi.fr"> Date: Fri, 25 Feb 2022 12:02:15 +0100 Subject: [PATCH 146/231] vimPlugins.lightline-lsp: init at 2022-01-09 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c76975614620..71bbf865f15e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3214,6 +3214,18 @@ final: prev: meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/"; }; + lightline-lsp = buildVimPluginFrom2Nix { + pname = "lightline-lsp"; + version = "2022-01-09"; + src = fetchFromGitHub { + owner = "spywhere"; + repo = "lightline-lsp"; + rev = "78a8f6880c1d979b7c682e1b37299d970506f480"; + sha256 = "00zkpri1pi6r0m0v91361zixqsfrf05hyml61k4s0i3yabfv84w8"; + }; + meta.homepage = "https://github.com/spywhere/lightline-lsp/"; + }; + lightline-vim = buildVimPluginFrom2Nix { pname = "lightline.vim"; version = "2021-11-21"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 134ea5bc6865..969bb19682c4 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -775,6 +775,7 @@ solarnz/arcanist.vim sonph/onehalf sotte/presenting.vim SpaceVim/SpaceVim +spywhere/lightline-lsp srcery-colors/srcery-vim steelsojka/completion-buffers steelsojka/pears.nvim From 37f23fbfb1ddf22a71aac40ca8d15759fa2932c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 12:03:09 +0100 Subject: [PATCH 147/231] python3Packages.identify: 2.4.10 -> 2.4.11 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 949ae27273c6..9f2a066ebdf2 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.4.10"; + version = "2.4.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a12a4PvACkB+zpJts6syDqMPafjhZp1UWnob9UiKMbM="; + sha256 = "sha256-Q86n2uAjmA05h+0NE77TBkbPiKoRYqB1b2H3MbOVmMY="; }; checkInputs = [ From 2ebe62c929af98a38ca58449983e4817760970d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Feb 2022 12:10:11 +0100 Subject: [PATCH 148/231] python3Packages.pytest-console-scripts: clean-ip --- .../pytest-console-scripts/default.nix | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix index 76323a3498a9..6bc6fb22b031 100644 --- a/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -5,28 +5,41 @@ , python , mock , setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "pytest-console-scripts"; version = "1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-w8rb9nz7MKHrHMHp5py23kTDpkhCbxub9j6F2XNX/H8="; + hash = "sha256-w8rb9nz7MKHrHMHp5py23kTDpkhCbxub9j6F2XNX/H8="; }; - postPatch = '' - # setuptools-scm is pinned to <6 because it dropped Python 3.5 - # support. That's not something that affects us. - substituteInPlace setup.py --replace "'setuptools_scm<6'" "'setuptools_scm'" - # Patch the shebang of a script generated during test. - substituteInPlace tests/test_run_scripts.py --replace "#!/usr/bin/env python" "#!${python.interpreter}" - ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ mock pytestCheckHook ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + postPatch = '' + # Patch the shebang of a script generated during test. + substituteInPlace tests/test_run_scripts.py \ + --replace "#!/usr/bin/env python" "#!${python.interpreter}" + ''; + + pythonImportsCheck = [ + "pytest_console_scripts" + ]; meta = with lib; { description = "Pytest plugin for testing console scripts"; From 3ed84b7b65bf456b91388237983b09d3a7ea8a08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 11:51:17 +0000 Subject: [PATCH 149/231] python310Packages.google-cloud-os-config: 1.9.0 -> 1.10.0 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 3ce5f92fe7b8..893eda8e096a 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.9.0"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "872774c4791b15d59d866fd965c780beac2772f335ded4a0047e2d844d988f30"; + sha256 = "sha256-ng1XmHQ4h32cyz68PjHSzfSmCB2vrwkGkzCtz4vZmcM="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From c2deb7a921f29a3583eaf7b3b535ef0f86913b51 Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 25 Feb 2022 12:53:01 +0100 Subject: [PATCH 150/231] python3Packages.aesara: move cython to nativeBuildInputs --- pkgs/development/python-modules/aesara/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 06836fba5812..3e2e9cb2cf37 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { sha256 = "sha256-933bM15BZi4sTjnIOGAg5dc5tXVWQ9lFzktOtzj5DNQ="; }; - buildInputs = [ + nativeBuildInputs = [ cython ]; From e562efeff6830cf0428bc81480637e741a72f7bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Feb 2022 04:18:06 -0800 Subject: [PATCH 151/231] qtstyleplugin-kvantum-qt4: 0.20.2 -> 1.0.1 * qtstyleplugin-kvantum-qt4: 0.20.2 -> 1.0.0 (#159720) * qtstyleplugin-kvantum-qt4: 1.0.0 -> 1.0.1 and update meta.license Co-authored-by: Renaud --- .../libraries/qtstyleplugin-kvantum-qt4/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 72413b372f00..f2ea86160fb6 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,36 +2,40 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.20.2"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "sha256-aIhLrGKb8iPl8N483+EOaCrTua96Qvl2lc2UXRiqvJA="; + hash = "sha256-Faex1NF5bJa0GdC+Sz4p6kHaGUtAkqZlNGi0TSc5ckw="; }; nativeBuildInputs = [ qmake4Hook ]; buildInputs = [ qt4 libX11 libXext ]; - postUnpack = "sourceRoot=\${sourceRoot}/Kvantum"; + sourceRoot = "source/Kvantum"; buildPhase = '' + runHook preBuild qmake kvantum.pro make + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir $TMP/kvantum make INSTALL_ROOT="$TMP/kvantum" install mv $TMP/kvantum/usr/ $out mv $TMP/kvantum/${qt4}/lib $out + runHook postInstall ''; meta = with lib; { description = "SVG-based Qt4 theme engine"; homepage = "https://github.com/tsujan/Kvantum"; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bugworm ]; }; From e67331103e23dc2a2ee44dbf0e093bcdda417462 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 25 Feb 2022 13:36:54 +0100 Subject: [PATCH 152/231] python3.pkgs.panel: fix package by switching to prebuilt wheel This package is difficult to upgrade because of the nodejs modules needed. --- .../python-modules/panel/default.nix | 37 +- .../python-modules/panel/node/default.nix | 17 - .../python-modules/panel/node/node-env.nix | 573 ------------------ .../panel/node/node-packages.nix | 562 ----------------- .../python-modules/panel/node/package.json | 27 - 5 files changed, 10 insertions(+), 1206 deletions(-) delete mode 100644 pkgs/development/python-modules/panel/node/default.nix delete mode 100644 pkgs/development/python-modules/panel/node/node-env.nix delete mode 100644 pkgs/development/python-modules/panel/node/node-packages.nix delete mode 100644 pkgs/development/python-modules/panel/node/package.json diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 8673c637eda6..c5da10a30b07 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -9,39 +9,22 @@ , pyct , testpath , tqdm -, callPackage +, nodejs }: -let - node = callPackage ./node { }; -in buildPythonPackage rec { pname = "panel"; version = "0.12.6"; - # Don't forget to also update the node packages - # 1. retrieve the package.json file - # 2. nix shell nixpkgs#nodePackages.node2nix - # 3. node2nix - src = fetchPypi { - inherit pname version; - sha256 = "97e158e8eb941f88d71929407f9455c903b5e18d89969db8ce8af66036f46b53"; - }; + format = "wheel"; - # Since 0.10.0 panel attempts to fetch from the web. - # We avoid this: - # - we use node2nix to fetch assets - # - we disable bundling (which also tries to fetch assets) - # Downside of disabling bundling is that in an airgapped environment - # one may miss assets. - # https://github.com/holoviz/panel/issues/1819 - preBuild = '' - substituteInPlace setup.py --replace "bundle_resources()" "" - pushd panel - ln -s ${node.nodeDependencies}/lib/node_modules - export PATH="${node.nodeDependencies}/bin:$PATH" - popd - ''; + # We fetch a wheel because while we can fetch the node + # artifacts using npm, the bundling invoked in setup.py + # tries to fetch even more artifacts + src = fetchPypi { + inherit pname version format; + hash = "sha256-ARAbBM0QYZlZqV51lMRoEZEQH1jlHRhlon3nfTi7dnM="; + }; propagatedBuildInputs = [ bleach @@ -58,7 +41,7 @@ buildPythonPackage rec { doCheck = false; passthru = { - inherit node; # For convenience + inherit nodejs; # For convenience }; meta = with lib; { diff --git a/pkgs/development/python-modules/panel/node/default.nix b/pkgs/development/python-modules/panel/node/default.nix deleted file mode 100644 index 64326c6b2160..000000000000 --- a/pkgs/development/python-modules/panel/node/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/development/python-modules/panel/node/node-env.nix b/pkgs/development/python-modules/panel/node/node-env.nix deleted file mode 100644 index 21089c4d5459..000000000000 --- a/pkgs/development/python-modules/panel/node/node-env.nix +++ /dev/null @@ -1,573 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules - - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi - - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) - cd $TMPDIR - - unpackFile ${src} - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" - - if [ -f "${src}" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash ${src})" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" - fi - - # Unset the stripped name to not confuse the next unpack step - unset strippedName - - # Include the dependencies of the package - cd "$DIR/${packageName}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - replaceDependencies(packageObj.optionalDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 1, - requires: true, - dependencies: {} - }; - - function augmentPackageJSON(filePath, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install - fi - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}-${version}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell < Date: Fri, 25 Feb 2022 13:56:23 +0100 Subject: [PATCH 153/231] schildichat: 1.9.8-sc.1 -> 1.10.3-sc.0.test.1 (#161584) The latest release is being held back because there is an issue with Electron 15 crashing on some platforms. NixOS seems to be not affected by this issue, and the upstream developers say this test release should be fine otherwise. This also means we can have a SchildiChat build that is not using the EOL/insecure Electron 13.x. --- .../instant-messengers/schildichat/pin.json | 9 +++++---- .../schildichat/schildichat-desktop.nix | 2 +- .../schildichat/schildichat-web.nix | 2 +- .../instant-messengers/schildichat/update.sh | 20 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json index aceeec448fdf..c8f5f30daaf3 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,6 +1,7 @@ { - "version": "1.9.8-sc.1", - "srcHash": "1ki4ccsa2i0mv10ypxg6bx9njikipdqkc5bsq5h7bi86scjm4lni", - "webYarnHash": "1za6r0snrflh2605xw4m19p88chx19ip8jj592bqjdagildqm50l", - "desktopYarnHash": "176ih0nzzx2yds6kp3lzdsrlp0glb9nqw146z0s1az7pjp6nrf18" + "version": "1.10.3-sc.0.test.1", + "rev": "3a8eecb023c832acc4390d3a51c0940eafb2b3bd", + "srcHash": "07amc69ghfz39jbps14ysfql4m42dmzbdjq9hqvzirhqz52mshf3", + "webYarnHash": "0knkl8sanqcx0lxjclz6s8vm5wpn8aywx9vydz7lda3l6c2g5zqf", + "desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn" } diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index 97117f87c99f..f7e2ee3c6a9f 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/SchildiChat/schildichat-desktop/"; - rev = "v${version}"; + inherit (pinData) rev; sha256 = pinData.srcHash; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix index 96f211de18da..c3860c9f05c3 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/SchildiChat/schildichat-desktop/"; - rev = "v${version}"; + inherit (pinData) rev; sha256 = pinData.srcHash; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/schildichat/update.sh b/pkgs/applications/networking/instant-messengers/schildichat/update.sh index 3f5289de8c4e..7abc0f3322bb 100755 --- a/pkgs/applications/networking/instant-messengers/schildichat/update.sh +++ b/pkgs/applications/networking/instant-messengers/schildichat/update.sh @@ -1,24 +1,27 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-git jq -if [[ "$#" -gt 1 || "$1" == -* ]]; then +if [[ "$#" -gt 2 || "$1" == -* ]]; then echo "Regenerates packaging data for the SchildiChat packages." - echo "Usage: $0 [git release tag]" + echo "Usage: $0 [git revision or tag] [version string override]" exit 1 fi -version="$1" +rev="$1" +version="$2" set -euo pipefail -if [ -z "$version" ]; then - version="$(wget -O- "https://api.github.com/repos/SchildiChat/schildichat-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" +if [ -z "$rev" ]; then + rev="$(wget -O- "https://api.github.com/repos/SchildiChat/schildichat-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" fi -# strip leading "v" -version="${version#v}" +if [ -z "$version" ]; then + # strip leading "v" + version="${rev#v}" +fi -src_data=$(nix-prefetch-git https://github.com/SchildiChat/schildichat-desktop --fetch-submodules --rev v${version}) +src_data=$(nix-prefetch-git https://github.com/SchildiChat/schildichat-desktop --fetch-submodules --rev $rev) src=$(echo $src_data | jq -r .path) src_hash=$(echo $src_data | jq -r .sha256) @@ -28,6 +31,7 @@ desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock) cat > pin.json << EOF { "version": "$version", + "rev": "$rev", "srcHash": "$src_hash", "webYarnHash": "$web_yarn_hash", "desktopYarnHash": "$desktop_yarn_hash" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c49c8cbc5f8..4c8d9ec44fcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5011,7 +5011,7 @@ with pkgs; schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_13; + electron = electron_15; }; schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' #!/bin/sh From 51ef95e6faa8efd644424dd72796e1bb9997983c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 25 Feb 2022 14:04:07 +0100 Subject: [PATCH 154/231] python3.pkgs.dask: don't offer an option for extras-require Using such an option within the package set this way will result in different packages depending on different versions of dask and thereby collisions. Instead, we can simply declare in the package offering the extras the packages the extra needs. --- pkgs/development/python-modules/dask/default.nix | 8 ++++---- pkgs/development/python-modules/datashader/default.nix | 2 +- pkgs/top-level/python-packages.nix | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 132753b1583f..7af0eca747e8 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -18,7 +18,6 @@ , pythonOlder , pyyaml , toolz -, withExtraComplete ? false }: buildPythonPackage rec { @@ -46,9 +45,6 @@ buildPythonPackage rec { jinja2 bokeh numpy - ] ++ lib.optionals (withExtraComplete) [ - # infinite recursion between distributed and dask - distributed ]; doCheck = true; @@ -104,6 +100,10 @@ buildPythonPackage rec { "dask.diagnostics" ]; + passthru.extras-require = { + complete = [ distributed ]; + }; + meta = with lib; { description = "Minimal task scheduling abstraction"; homepage = "https://dask.org/"; diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index d4515b064833..152582f6716f 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { param pyct scipy - ]; + ] ++ dask.extras-require.complete; checkInputs = [ pytestCheckHook diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7f59aea3b45..c6a62cde8f7d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2044,9 +2044,7 @@ in { datasette-template-sql = callPackage ../development/python-modules/datasette-template-sql { }; - datashader = callPackage ../development/python-modules/datashader { - dask = self.dask.override { withExtraComplete = true; }; - }; + datashader = callPackage ../development/python-modules/datashader { }; datashape = callPackage ../development/python-modules/datashape { }; From 1986bedcffc8f378a8bfe90e8225c9d5fcf69883 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 25 Feb 2022 14:09:41 +0100 Subject: [PATCH 155/231] python3Packages: document how to handle extras-require --- doc/languages-frameworks/python.section.md | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 9f9ace513c30..693ea016e0a5 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -979,6 +979,31 @@ with import {}; in python.withPackages(ps: [ps.blaze])).env ``` +#### Optional extra dependencies + +Some packages define optional dependencies for additional features. With +`setuptools` this is called `extras_require` and `flit` calls it `extras-require`. A +method for supporting this is by declaring the extras of a package in its +`passthru`, e.g. in case of the package `dask` + +```nix +passthru.extras-require = { + complete = [ distributed ]; +}; +``` + +and letting the package requiring the extra add the list to its dependencies + +```nix +propagatedBuildInputs = [ + ... +] ++ dask.extras-require.complete; +``` + +Note this method is preferred over adding parameters to builders, as that can +result in packages depending on different variants and thereby causing +collisions. + #### `buildPythonApplication` function {#buildpythonapplication-function} The `buildPythonApplication` function is practically the same as From 46f8c78337c51b188ba9fa4ea48617d433a26144 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 25 Feb 2022 13:10:40 +0000 Subject: [PATCH 156/231] opentelemetry-collector-contrib: 0.44.0 -> 0.45.1 --- pkgs/tools/misc/opentelemetry-collector/contrib.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index ddd21cbab5a0..4bfc390335d8 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -1,24 +1,29 @@ { buildGoModule , fetchFromGitHub , lib +, stdenv }: buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.44.0"; + version = "0.45.1"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-JRkS51ybFnvCn3pKhDeXO0R23wzT1uso1PtXZllF1fA="; + sha256 = "sha256-HoDQK/WyvDQgYBr6WPJ+bZE3GTx74SGgSj1P6i8AfL0="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-4MnUDakBfo3nhSqMjDYiqx6FNZvAB/9DE1yxOvmQAAk="; + vendorSha256 = "sha256-e33EV1DGpR3XL70sjfCSMeuOSyh334+AkHnE+vqHrh0="; subPackages = [ "cmd/otelcontribcol" ]; + # CGO_ENABLED=0 required for mac - "error: 'TARGET_OS_MAC' is not defined, evaluates to 0" + # https://github.com/shirou/gopsutil/issues/976 + CGO_ENABLED = if stdenv.isLinux then 1 else 0; + ldflags = [ "-s" "-w" From e68fc84783b5d7b962203758cfec1f49d9226acd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Feb 2022 05:24:23 -0800 Subject: [PATCH 157/231] OSCAR: 1.3.0 -> 1.3.1 * OSCAR: 1.3.0 -> 1.3.1 (#159715) * OSCAR: use SPDX3 license identifier and define eligible platforms using the proper attributes Co-authored-by: Renaud --- pkgs/applications/misc/OSCAR/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/OSCAR/default.nix b/pkgs/applications/misc/OSCAR/default.nix index 92eeeb142cc0..9b5d2e68ad92 100644 --- a/pkgs/applications/misc/OSCAR/default.nix +++ b/pkgs/applications/misc/OSCAR/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }: mkDerivation rec { pname = "OSCAR"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitLab { owner = "pholy"; repo = "OSCAR-code"; rev = "v${version}"; - sha256 = "sha256-oKKwX5HiT8RACiqzZegOxH6IHQn/u0N4ih/ubH6YYjg="; + sha256 = "sha256-/70NoyiQ33RFdSTBAyi5c/JPZ2AV1/iRvkAZ6VjpUXw="; }; buildInputs = [ qtbase qttools qtserialport libGLU ]; @@ -19,6 +19,7 @@ mkDerivation rec { qmakeFlags = [ "OSCAR_QT.pro" ]; installPhase = '' + runHook preInstall install -d $out/bin install -d $out/share/OSCAR/Help install -d $out/share/OSCAR/Html @@ -32,15 +33,16 @@ mkDerivation rec { install oscar/Translations/* $out/share/OSCAR/Translations install -T Building/Linux/OSCAR.png $out/share/icons/OSCAR/OSCAR.png install -T Building/Linux/OSCAR.desktop $out/share/applications/OSCAR.desktop + runHook postInstall ''; meta = with lib; { homepage = "https://www.sleepfiles.com/OSCAR/"; description = "Software for reviewing and exploring data produced by CPAP and related machines used in the treatment of sleep apnea"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = [ maintainers.roconnor ]; # Someone needs to create a suitable installPhase for Darwin and Windows. # See https://gitlab.com/pholy/OSCAR-code/-/tree/master/Building. - broken = !stdenv.hostPlatform.isLinux; + platforms = platforms.linux; }; } From 9e605c8d06f9303518f38ad972b1b0a7bfbbc8d7 Mon Sep 17 00:00:00 2001 From: Ivan Popovych Date: Wed, 23 Feb 2022 16:33:45 +0200 Subject: [PATCH 158/231] qmk-udev-rules: 0.13.23 -> 0.15.25 --- pkgs/os-specific/linux/qmk-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/pkgs/os-specific/linux/qmk-udev-rules/default.nix index 7fb5b092ca42..5e956f3baf34 100644 --- a/pkgs/os-specific/linux/qmk-udev-rules/default.nix +++ b/pkgs/os-specific/linux/qmk-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "qmk-udev-rules"; - version = "0.13.23"; + version = "0.15.25"; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; rev = version; - sha256 = "08d2ri9g6lky3ixd5h0scm95hgc52lcjr3vcnmpdxn780q9ygmkm"; + sha256 = "4U1/9DgoKZ1Al76lZ2P8x4LIvtqaJPLq81cCSCy+9iE="; }; dontBuild = true; From dbd8653cd5ceeeb46ba87735dd3d864a1fd5465e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 25 Feb 2022 12:46:45 -0300 Subject: [PATCH 159/231] nsxiv: init at 28 --- pkgs/applications/graphics/nsxiv/default.nix | 61 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/applications/graphics/nsxiv/default.nix diff --git a/pkgs/applications/graphics/nsxiv/default.nix b/pkgs/applications/graphics/nsxiv/default.nix new file mode 100644 index 000000000000..8c414c372479 --- /dev/null +++ b/pkgs/applications/graphics/nsxiv/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, giflib +, imlib2 +, libXft +, libexif +, libwebp +, conf ? null +}: + +stdenv.mkDerivation rec { + pname = "nsxiv"; + version = "28"; + + src = fetchFromGitHub { + owner = "nsxiv"; + repo = pname; + rev = "v${version}"; + hash = "sha256-12RmEAzZdeanrRtnan96loXT7qSjIMjcWf296XmNE+A="; + }; + + buildInputs = [ + giflib + imlib2 + libXft + libexif + libwebp + ]; + + preBuild = lib.optionalString (conf!=null) '' + cp ${(builtins.toFile "config.def.h" conf)} config.def.h + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + homepage = "https://nsxiv.github.io/nsxiv/"; + description = "New Suckless X Image Viewer"; + longDescription = '' + nsxiv is a fork of now unmaintained sxiv with the purpose of being a + drop-in replacement of sxiv, maintaining it and adding simple, sensible + features, like: + + - Basic image operations, e.g. zooming, panning, rotating + - Customizable key and mouse button mappings (in config.h) + - Script-ability via key-handler + - Thumbnail mode: grid of selectable previews of all images + - Ability to cache thumbnails for fast re-loading + - Basic support for animated/multi-frame images (GIF/WebP) + - Display image information in status bar + - Display image name/path in X title + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c8d9ec44fcc..32d8f7148096 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28785,6 +28785,8 @@ with pkgs; sxiv = callPackage ../applications/graphics/sxiv { }; + nsxiv = callPackage ../applications/graphics/nsxiv { }; + resilio-sync = callPackage ../applications/networking/resilio-sync { }; dropbox = callPackage ../applications/networking/dropbox { }; From 3b45a6bf1fb1d241f2cbae322511f0d3d627743d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 18:26:46 +0000 Subject: [PATCH 160/231] python310Packages.scp: 0.14.3 -> 0.14.4 --- pkgs/development/python-modules/scp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index 61baf3724e1a..a8a152b0a34c 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.14.3"; + version = "0.14.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LQNJpUAIHdJGyBQeRWmfP4Y/LVOswISr0H0+OHox5cc="; + sha256 = "sha256-VGmbkstorjS1koxIqIjquXIqISUCy6iap5W9Vll1Bb0="; }; propagatedBuildInputs = [ From f8e0e77e262f92d7f96d68755340c6450bdd1c01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 05:31:51 +0000 Subject: [PATCH 161/231] xbanish: 1.7 -> 1.8 --- pkgs/tools/X11/xbanish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xbanish/default.nix b/pkgs/tools/X11/xbanish/default.nix index 169f87a50f60..9aa7e4f5b023 100644 --- a/pkgs/tools/X11/xbanish/default.nix +++ b/pkgs/tools/X11/xbanish/default.nix @@ -1,7 +1,7 @@ {lib, stdenv, fetchFromGitHub, libX11, libXi, libXt, libXfixes, libXext}: stdenv.mkDerivation rec { - version = "1.7"; + version = "1.8"; pname = "xbanish"; buildInputs = [ @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "jcs"; repo = pname; rev = "v${version}"; - sha256 = "0ic5f7zgc32p5g1wxas9y5h8dhik0pvsa8wmn6skdry56gw9vg9q"; + sha256 = "sha256-jwCoJ2shFGuJHhmXmlw/paFpMl5ARD6e5zDnDZHlsoo="; }; makeFlags=[ "PREFIX=$(out)" ]; From 6487f51f74c2ae4fa120c660776997aff2a2130a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 18:07:03 +0000 Subject: [PATCH 162/231] vale: 2.15.1 -> 2.15.2 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 4ed12b5b1344..91ac9ae2e121 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.15.1"; + version = "2.15.2"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-akJgIS+jf2n9NC4A+/gNQR62BaJ6T9vvdxJggOTRHn8="; + sha256 = "sha256-4KP4/mfuHTYxOwWqHOa2RNHgElOg6YNAEFmiuF/sHa8="; }; vendorSha256 = "sha256-2vYe943HHybOLcP8nDJe7RimMRIJdND2UPwtwB2mttE="; From f184a17d9ca5f6d1a8fd008b1b4ded3ccdf66889 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 02:43:54 +0000 Subject: [PATCH 163/231] circleci-cli: 0.1.16737 -> 0.1.16947 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index ef5b276adaa2..5184f22aecdc 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.16737"; + version = "0.1.16947"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2dgoREWGA+YpsESUmua5HcJu6Z/lEhzBdakx97xfLFk="; + sha256 = "sha256-RGkC1XhrssrX4IBh1OrzEowvbPPUK7jXZxxa+FEV/WE="; }; vendorSha256 = "sha256-7u2y1yBVpXf+D19tslD4s3B1KmABl4OWNzzLaBNL/2U="; From 90f77aa1434644fb2c6cf369d774bfac6a361f4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 15:06:05 +0000 Subject: [PATCH 164/231] python39Packages.jupyter-server-mathjax: 0.2.3 -> 0.2.5 --- .../python-modules/jupyter-server-mathjax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index 47f5f8e58407..cd5e1e0f7620 100644 --- a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "jupyter-server-mathjax"; - version = "0.2.3"; + version = "0.2.5"; src = fetchPypi { inherit version; pname = "jupyter_server_mathjax"; - sha256 = "564e8d1272019c6771208f577b5f9f2b3afb02b9e2bff3b34c042cef8ed84451"; + sha256 = "sha256-ZNlsjm3+btunN5ArLcOi3AWPF1FndsJfTTDKJGF+57M="; }; nativeBuildInputs = [ From 9f105df1b3646ccf08411e00aed48ce24f5e5db7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 15:35:17 +0000 Subject: [PATCH 165/231] seaweedfs: 2.89 -> 2.90 --- pkgs/applications/networking/seaweedfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 4dd603dae1ea..4b6ae464e7d9 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.89"; + version = "2.90"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-OCfgWMKFhdjdmNHnTUP2VthPxBjAVd9Z+yH/c+vF1a4="; + sha256 = "sha256-PZe/yUJGcj3/nIYaf7eAbiJIA2YASJ8nlMLIWWKJrbo="; }; vendorSha256 = "sha256-E6bMpWzXb5dMPXkrVSJJWXJYvkmI3cNRseMgrQNpCl4="; From fa7c86fe2f85041e5352368684b93440e525fc5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 15:27:32 +0000 Subject: [PATCH 166/231] scs: 3.1.0 -> 3.2.0 --- pkgs/development/libraries/science/math/scs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index a945e99ec9cb..6ccbfb11f51f 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -4,13 +4,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scs"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "cvxgrp"; repo = "scs"; rev = version; - sha256 = "sha256-yoh25DmvY7fohAvABCiSLkvr7TskGd0ED2K3rIa/IeM="; + sha256 = "sha256-ewn7AGNqTXY3bp5itHTfAQ2Es2ZAIbuRFM5U600Px50="; }; # Actually link and add libgfortran to the rpath From a5a193eb5312417261a8a8e0aa2bdfa41b7e4308 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 17:06:21 +0000 Subject: [PATCH 167/231] tela-icon-theme: 2022-01-25 -> 2022-02-21 --- pkgs/data/icons/tela-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/data/icons/tela-icon-theme/default.nix index ab7742bb36f0..56491fe4443b 100644 --- a/pkgs/data/icons/tela-icon-theme/default.nix +++ b/pkgs/data/icons/tela-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "tela-icon-theme"; - version = "2022-01-25"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-XKNSCWwanm2dP002TY/mE4SDX13TllHrbrb55V4wLSQ="; + sha256 = "sha256-tnhu//q0Vl7MiMeHopB1Gwokkw/P+nDOo4HKizjxC0Y="; }; nativeBuildInputs = [ gtk3 jdupes ]; From b9cac792d254108c428b1f1ad00ebaef63fb8dce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 14:17:53 +0000 Subject: [PATCH 168/231] remarkable-mouse: 7.0.0 -> 7.0.1 --- .../applications/misc/remarkable/remarkable-mouse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index 7805c06bd6fb..5734adc1b7d2 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "remarkable-mouse"; - version = "7.0.0"; + version = "7.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0c67cd1ef4c46290cb74731c163c3fefc35590cd24749ec354af23012984d99e"; + sha256 = "sha256-kpKA3vrQo45Y6Qy6mcjJxJY3dpXV0ckNIfKdDVS5qhM="; }; propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; From 3b26fc4a3dee45d90f3fe8660d921cacda731285 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 08:01:36 +0000 Subject: [PATCH 169/231] python310Packages.py_scrypt: 0.8.19 -> 0.8.20 --- pkgs/development/python-modules/py_scrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index 01fae999cf4d..acfab6791a2e 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.19"; + version = "0.8.20"; src = fetchPypi { inherit pname version; - sha256 = "ad143035ae0cf5e97c4b399f4e4686adf442c5f0f06f9f198a0cc6c091335fb7"; + sha256 = "sha256-DSJsHGdE+y4wizkUEGabHfXP6CY3/8te1Im/grLS63g="; }; buildInputs = [ openssl ]; From 4bb2d9b4e51221c4f306184419f77341e5988cd3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 05:29:40 +0000 Subject: [PATCH 170/231] folly: 2022.02.14.00 -> 2022.02.21.00 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index f6dfa9695281..9f0585e0eff1 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.02.14.00"; + version = "2022.02.21.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-tJuHzEi4nrj5jb6tmJeG21ggl4F+wvQyssEPNp/t6Ww="; + sha256 = "sha256-QCL+GLc6b4Ae3jUj7VCxnE7Yc1JJ8+P0/r41Zf0KYos="; }; nativeBuildInputs = [ From 9523756331e06ace7982a505df7d6d3f731999dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 10:21:24 +0000 Subject: [PATCH 171/231] python39Packages.gehomesdk: 0.4.23 -> 0.4.24 --- pkgs/development/python-modules/gehomesdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index b74ef29e5438..a4c9d2d7460d 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.4.23"; + version = "0.4.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-y8L0krMSAOFP97j5QQGiJJMhzRidhMgoHGsMYMyUdd8="; + sha256 = "sha256-20l3zNOvZVGucm1SFzmSjkj3iOXPQhp4T5sInTGO/aQ="; }; propagatedBuildInputs = [ From ddf9003dc1b2cc3e951c220d709511fedbac30df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 05:31:37 +0000 Subject: [PATCH 172/231] python310Packages.bitarray: 2.3.6 -> 2.3.7 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 743c749a1f1b..ea2c20df2051 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.6"; + version = "2.3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O/21ne0VyWHm49W38WcVXNoFO+JHXqgBdGHfC02CC30="; + sha256 = "sha256-TaeQqxk+mTEH8/8K68T41q1RlqGQcfuvrRawKJikT9c="; }; checkPhase = '' From 199f1c91fb25c4a6d5ee87003479bcc180cacf14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 09:18:17 +0000 Subject: [PATCH 173/231] python310Packages.sopel: 7.1.7 -> 7.1.8 --- pkgs/development/python-modules/sopel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index bc39bb998e8e..bbc3f8edbf2d 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.1.7"; + version = "7.1.8"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "4eb12e9753162e4c19a1bfdd42aea9eb7f5f15e316a6609b925350792fb454fd"; + sha256 = "sha256-zxb95GVcDrd3FG/k+0PLg+dVlMgQpf1ntG8jF/zpHH4="; }; propagatedBuildInputs = [ From 69380e5461fb308f4efa1dae06a4b31b81edcbea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 14:12:18 +0000 Subject: [PATCH 174/231] pspg: 5.5.3 -> 5.5.4 --- pkgs/tools/misc/pspg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 871398822a5c..fe506a31c0ef 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.5.3"; + version = "5.5.4"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-vjcAvTdqrZFmtVDkG/K4mHiInF63BPOyUXLVKIOq7qU="; + sha256 = "sha256-2j1K9enoPBPLL+0oOhzcYVxfsjb8BzsfeHNi9TJOnmc="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; From 8b2bc00ec85723145fd8bee0252e290ec98672cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 12:03:21 +0000 Subject: [PATCH 175/231] obs-studio: 27.2.0 -> 27.2.1 --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 6d3f9b6d32db..22c206dfe037 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -46,13 +46,13 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "27.2.0"; + version = "27.2.1"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "KZgwAtyxv2vXDW7vF1eArF5Mqw45NngwChc+5OnXuXg="; + sha256 = "sha256-RHPzSw7wjnAHk90N7g53LyIH3ozO/hyZV5hVZpZe+Ow="; fetchSubmodules = true; }; From 919504028f0cbf8fd22f29d1a4807ab4cf7271cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 03:48:38 +0000 Subject: [PATCH 176/231] ocserv: 1.1.5 -> 1.1.6 --- pkgs/tools/networking/ocserv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index d99fe89a47ae..067c614f5850 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ocserv"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitLab { owner = "openconnect"; repo = "ocserv"; rev = version; - sha256 = "sha256-mb1xmv2jM8XpKiUX/IlVctKUimMeF1oMDnT6YMZ0nCY="; + sha256 = "sha256-1grRt0F/myVzK+DMSeK5K0Ui8bJANEtE6/6IY+ZbPAw="; }; nativeBuildInputs = [ autoreconfHook gperf pkg-config ronn ]; From a658e56aefd7335763a09dc8e9ccc6d15c36ec74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 17:56:34 +0000 Subject: [PATCH 177/231] sabnzbd: 3.5.0 -> 3.5.1 --- pkgs/servers/sabnzbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 32c82cfad1be..2dc2d76c891d 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -24,14 +24,14 @@ let ]); path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.5.0"; + version = "3.5.1"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Ay+y02kvFuwefT6f/8orClMiBK201AwSEWnPKgoeOFQ="; + sha256 = "sha256-/HakjY0/oGq3lt0kM5p9n3sZ4g/UDtUNyXNpl9zTFl8="; }; nativeBuildInputs = [ makeWrapper ]; From 733e15de50df4561149b5595e5d4c98d8cd70665 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 14:31:41 +0000 Subject: [PATCH 178/231] gnome.gnome-mines: 40.0 -> 40.1 --- pkgs/desktops/gnome/games/gnome-mines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-mines/default.nix b/pkgs/desktops/gnome/games/gnome-mines/default.nix index 6a7168badbfe..d60a58a83c95 100644 --- a/pkgs/desktops/gnome/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mines/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-mines"; - version = "40.0"; + version = "40.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0sf6kdvhr4pr3hddnj6ql9larz2wy108sri31id6x9g459nbly8z"; + sha256 = "NQLps/ccs7LnEcDmAZGH/rzCvKh349RW3KtwD3vjEnI="; }; # gobject-introspection for finding vapi files From 6f4be6806200b3fa929d2bdaf085a69cd73cc70a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 02:12:15 +0000 Subject: [PATCH 179/231] oil: 0.9.7 -> 0.9.8 --- pkgs/shells/oil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 522acd293279..516d4c43f6fa 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-JtuCQM7uh4tmZrSwJj1Oh3hUzQKqKFxxWS11CDbvl+o="; + sha256 = "sha256-OsrxfJ5dF9Anpg1r6Hj+aD194l99X9Yh4vIZ+R+aH8E="; }; postPatch = '' From ac2165529b9e8704d87badffa0e84c4f1842e935 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 00:50:49 +0000 Subject: [PATCH 180/231] angband: 4.2.3 -> 4.2.4 --- pkgs/games/angband/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index ed18624deb12..3f706b42c32c 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "angband"; - version = "4.2.3"; + version = "4.2.4"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "sha256-SFHAG74qJcV3E+jxPcOH2moW/kXhpwUwbGZVkNxqWd8="; + sha256 = "sha256-Fp3BGCZYYdQCKXOLYsT4zzlibNRlbELZi26ofrbGGPQ="; }; nativeBuildInputs = [ autoreconfHook ]; From 4bc58eef87f35a7172f3483746fb0c431df8d808 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 13:07:58 +0000 Subject: [PATCH 181/231] mold: 1.0.3 -> 1.1 --- pkgs/development/tools/mold/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 6de56fb47058..00bcd3a5f12f 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.0.3"; + version = "1.1"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L/io0kMYkFVSmOiH6sM/CoibE1rPRwDM0fFddw6kM+4="; + sha256 = "sha256-+uIP/U7H9P7oy78TL1edX9+JNYUzpwro105PYj3D6Yk="; }; buildInputs = [ zlib openssl ]; From 3c962d11e476788aff46425d57629262f13e4390 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 07:51:55 +0000 Subject: [PATCH 182/231] gensio: 2.2.9 -> 2.3.6 --- pkgs/development/libraries/gensio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index c4d961f4b76f..90fe46582672 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.9"; + version = "2.3.6"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SN8zMMBX02kIS9q1/7DO+t826DpmbZBO37TDZtvRT1A="; + sha256 = "sha256-aPTwN5DuUFPqLDwq73KvmBR8tEN5bIX6/JOZMfOAoow="; }; passthru = { From 50705e9f0c44bd5bda560d7d3bf3adb15c9585ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 02:33:51 +0000 Subject: [PATCH 183/231] openvswitch: 2.16.2 -> 2.17.0 --- pkgs/os-specific/linux/openvswitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 380d76844c80..ba93b068fddc 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,12 +8,12 @@ let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.16.2"; + version = "2.17.0"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-A6xMMpmzjlbAtNTCejKclYsAOgjztUigo8qLmU8tSTQ="; + sha256 = "sha256-4Dv6t8qC2Bp9OjbeTzkKO1IQ4/OWV2cfkih3zU6m3HM="; }; kernel = optional (_kernel != null) _kernel.dev; From 8af32947b4de0299cc8f223a3787c782cc840a4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 07:32:05 +0000 Subject: [PATCH 184/231] firecracker: 0.25.2 -> 1.0.0 --- pkgs/applications/virtualization/firecracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index a3ef59e8e92e..c2769a0ccf3b 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "0.25.2"; + version = "1.0.0"; suffix = { x86_64-linux = "x86_64"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-ZzlPq+Q9XfWQJr+7nKS0e6bfKwYNfpMHSiBIKeOr/s4="; + x86_64-linux = "sha256-yeWVsrvH3yYlS2uH/TkSleHjXvIDnHWcZSvLgV+CGF0="; aarch64-linux = "sha256-75UC+HeVUfUk1HRvTJsOHbHHkgr6me1OtxDF7lahf68="; }; From 3bfc9a1cc614cd2ba4506d4f833e8367c8f5a7b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 18:13:09 +0000 Subject: [PATCH 185/231] libcouchbase: 3.2.4 -> 3.2.5 --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 0c9cd1a75304..574d0b9d94cb 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-7gHqnhNog0CN92YyvypbHWWUnCDuvGP4oiJjtP9GkIY="; + sha256 = "sha256-ffeSrWcvxvMY4mmA/+VoMitoCVUUP91t1lIOcuzNrJY="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; From a36f455905d55838a0d284656e096fbdb857cf3a Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 22 Feb 2022 00:52:06 +0200 Subject: [PATCH 186/231] aliases.nix: convert or remove aliases older than 2019-06-01 old non-throw aliases are converted into throws and old throws are removed ./alias/maintainers/scripts/remove-old-aliases.py --file ./pkgs/top-level/aliases.nix --year 2019 --month 6 --- pkgs/top-level/aliases.nix | 579 ++++++++++++++++++------------------- 1 file changed, 288 insertions(+), 291 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4604edf10b21..4dc82b9de3e2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -48,12 +48,12 @@ mapAliases ({ ### A ### - accounts-qt = libsForQt5.accounts-qt; # Added 2015-12-19 - adobeReader = adobe-reader; # Added 2013-11-04 - adobe_flex_sdk = apache-flex-sdk; # Added 2018-06-01 + accounts-qt = throw "'accounts-qt' has been renamed to/replaced by 'libsForQt5.accounts-qt'"; # Converted to throw 2022-02-22 + adobeReader = throw "'adobeReader' has been renamed to/replaced by 'adobe-reader'"; # Converted to throw 2022-02-22 + adobe_flex_sdk = throw "'adobe_flex_sdk' has been renamed to/replaced by 'apache-flex-sdk'"; # Converted to throw 2022-02-22 aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05 - ag = silver-searcher; # Added 2018-04-25 - aircrackng = aircrack-ng; # Added 2016-01-14 + ag = throw "'ag' has been renamed to/replaced by 'silver-searcher'"; # Converted to throw 2022-02-22 + aircrackng = throw "'aircrackng' has been renamed to/replaced by 'aircrack-ng'"; # Converted to throw 2022-02-22 airtame = throw "airtame has been removed due to being unmaintained."; # Added 2022-01-19 aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # Added 2020-11-30 alienfx = throw "alienfx has been removed."; # Added 2019-12-08 @@ -65,7 +65,7 @@ mapAliases ({ alsaUtils = alsa-utils; # Added 2021-06-10 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # Added 2020-10-30 aminal = throw "aminal was renamed to darktile."; # Added 2021-09-28 - ammonite-repl = ammonite; # Added 2017-05-02 + ammonite-repl = throw "'ammonite-repl' has been renamed to/replaced by 'ammonite'"; # Converted to throw 2022-02-22 amuleDaemon = throw "amuleDaemon was renamed to amule-daemon."; # Added 2022-02-11 amuleGui = throw "amuleGui was renamed to amule-gui."; # Added 2022-02-11 amsn = throw "amsn has been removed due to being unmaintained."; # Added 2020-12-09 @@ -73,13 +73,13 @@ mapAliases ({ antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # Added 2020-08-06 antimicroX = antimicrox; # Added 2021-10-31 ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # Added 2021-09-28 - arduino_core = arduino-core; # Added 2015-02-04 + arduino_core = throw "'arduino_core' has been renamed to/replaced by 'arduino-core'"; # Converted to throw 2022-02-22 arora = throw "arora has been removed."; # Added 2020-09-09 - asciidocFull = asciidoc-full; # Added 2014-06-22 + asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22 asn1c = throw "asn1c has been removed: deleted by upstream"; # Added 2022-01-07 asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # Added 2020-10-07 - at_spi2_atk = at-spi2-atk; # Added 2018-02-25 - at_spi2_core = at-spi2-core; # Added 2018-02-25 + at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22 + at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22 aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # Added 2020-12-26 avldrums-lv2 = x42-avldrums; # Added 2020-03-29 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 @@ -88,8 +88,8 @@ mapAliases ({ ### B ### badtouch = authoscope; # Project was renamed, added 20210626 - bar-xft = lemonbar-xft; # Added 2015-01-16 - bashCompletion = bash-completion; # Added 2016-09-28 + bar-xft = throw "'bar-xft' has been renamed to/replaced by 'lemonbar-xft'"; # Converted to throw 2022-02-22 + bashCompletion = throw "'bashCompletion' has been renamed to/replaced by 'bash-completion'"; # Converted to throw 2022-02-22 bashInteractive_5 = bashInteractive; # Added 2021-08-20 bash_5 = bash; # Added 2021-08-20 bashburn = throw "bashburn has been removed: deleted by upstream"; # Added 2022-01-07 @@ -107,11 +107,11 @@ mapAliases ({ bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # Added 2019-12-10 bpftool = bpftools; # Added 2021-05-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 + bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22 bro = zeek; # Added 2019-09-29 - btrfsProgs = btrfs-progs; # Added 2016-01-03 - bird2 = bird; - bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; + bird2 = bird; # Added 2022-02-21 + bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21 + btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22 # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) bitwarden_rs = vaultwarden; @@ -125,9 +125,9 @@ mapAliases ({ bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # Added 2021-01-02 bsod = throw "bsod has been removed: deleted by upstream"; # Added 2022-01-07 btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # Added 2020-11-03 - buildPerlPackage = perlPackages.buildPerlPackage; # Added 2018-10-12 - buildkite-agent3 = buildkite-agent; # Added 2018-09-26 - bundler_HEAD = bundler; # Added 2015-11-15 + buildPerlPackage = throw "'buildPerlPackage' has been renamed to/replaced by 'perlPackages.buildPerlPackage'"; # Converted to throw 2022-02-22 + buildkite-agent3 = throw "'buildkite-agent3' has been renamed to/replaced by 'buildkite-agent'"; # Converted to throw 2022-02-22 + bundler_HEAD = throw "'bundler_HEAD' has been renamed to/replaced by 'bundler'"; # Converted to throw 2022-02-22 bunny = throw "bunny has been removed: deleted by upstream"; # Added 2022-01-07 bypass403 = throw "bypass403 has been removed: deleted by upstream"; # Added 2022-01-07 @@ -136,20 +136,20 @@ mapAliases ({ caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # Added 2021-01-13 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # Added 2021-01-13 - cantarell_fonts = cantarell-fonts; # Added 2018-03-03 + cantarell_fonts = throw "'cantarell_fonts' has been renamed to/replaced by 'cantarell-fonts'"; # Converted to throw 2022-02-22 cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # Added 2020-08-20 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken."; catfish = xfce.catfish; # Added 2019-12-22 ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25 cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore."; # Added 2022-01-12 cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # Added 2020-06-05 - checkbashism = checkbashisms; # Added 2016-08-16 + checkbashism = throw "'checkbashism' has been renamed to/replaced by 'checkbashisms'"; # Converted to throw 2022-02-22 chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15 chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07 cide = throw "cide was deprecated on 2019-09-11: abandoned by upstream"; - cifs_utils = cifs-utils; # Added 2016-08 + cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22 cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # Added 2019-12-10 - ckb = ckb-next; # Added 2018-10-21 + ckb = throw "'ckb' has been renamed to/replaced by 'ckb-next'"; # Converted to throw 2022-02-22 callPackage_i686 = pkgsi686Linux.callPackage; creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project."; # Added 2022-01-01 @@ -163,24 +163,24 @@ mapAliases ({ clang11Stdenv = lowPrio llvmPackages_11.stdenv; clang12Stdenv = lowPrio llvmPackages_12.stdenv; - clangAnalyzer = clang-analyzer; # Added 2015-02-20 + clangAnalyzer = throw "'clangAnalyzer' has been renamed to/replaced by 'clang-analyzer'"; # Converted to throw 2022-02-22 claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05 claws-mail-gtk3 = claws-mail; # Added 2021-07-10 - clawsMail = claws-mail; # Added 2016-04-29 - clutter_gtk = clutter-gtk; # Added 2018-02-25 + clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22 + clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22 cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05 codimd = hedgedoc; # Added 2020-11-29 compton = picom; # Added 2019-12-02 - compton-git = compton; # Added 2019-05-20 + compton-git = throw "'compton-git' has been renamed to/replaced by 'compton'"; # Converted to throw 2022-02-22 concurrencykit = libck; # Added 2021-03 - conntrack_tools = conntrack-tools; # Added 2018-05 - cool-old-term = cool-retro-term; # Added 2015-01-31 + conntrack_tools = throw "'conntrack_tools' has been renamed to/replaced by 'conntrack-tools'"; # Converted to throw 2022-02-22 + cool-old-term = throw "'cool-old-term' has been renamed to/replaced by 'cool-retro-term'"; # Converted to throw 2022-02-22 coprthr = throw "coprthr has been removed."; # Added 2019-12-08 coredumper = throw "coredumper has been removed: abandoned by upstream."; # Added 2019-11-16 corsmisc = throw "corsmisc has been removed (upstream is gone)"; # Added 2022-01-24 couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 - cpp-gsl = microsoft_gsl; # Added 2019-05-24 + cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft_gsl'"; # Converted to throw 2022-02-22 cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # Added 2020-11-30 cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07 @@ -209,30 +209,30 @@ mapAliases ({ cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # Added 2020-06-15 cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; - cupsBjnp = cups-bjnp; # Added 2016-01-02 - cups_filters = cups-filters; # Added 2016-08 + cupsBjnp = throw "'cupsBjnp' has been renamed to/replaced by 'cups-bjnp'"; # Converted to throw 2022-02-22 + cups_filters = throw "'cups_filters' has been renamed to/replaced by 'cups-filters'"; # Converted to throw 2022-02-22 curaByDagoma = throw "curaByDagoma has been removed from nixpkgs, because it was unmaintained and dependent on python2 packages."; # Added 2022-01-12 curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # Added 2021-10-23 - cv = progress; # Added 2015-09-06 + cv = throw "'cv' has been renamed to/replaced by 'progress'"; # Converted to throw 2022-02-22 cvs_fast_export = cvs-fast-export; # Added 2021-06-10 ### D ### - d1x_rebirth = dxx-rebirth; # Added 2018-04-25 - d2x_rebirth = dxx-rebirth; # Added 2018-04-25 + d1x_rebirth = throw "'d1x_rebirth' has been renamed to/replaced by 'dxx-rebirth'"; # Converted to throw 2022-02-22 + d2x_rebirth = throw "'d2x_rebirth' has been renamed to/replaced by 'dxx-rebirth'"; # Converted to throw 2022-02-22 dart_dev = throw "Non-stable versions of Dart have been removed."; # Added 2020-01-15 dart_old = throw "Non-stable versions of Dart have been removed."; # Added 2020-01-15 dart_stable = dart; # Added 2020-01-15 dat = nodePackages.dat; - dbus_daemon = dbus.daemon; # Added 2018-04-25 - dbus_glib = dbus-glib; # Added 2018-02-25 - dbus_libs = dbus; # Added 2018-04-25 - dbus_tools = dbus.out; # Added 2018-04-25 + dbus_daemon = throw "'dbus_daemon' has been renamed to/replaced by 'dbus.daemon'"; # Converted to throw 2022-02-22 + dbus_glib = throw "'dbus_glib' has been renamed to/replaced by 'dbus-glib'"; # Converted to throw 2022-02-22 + dbus_libs = throw "'dbus_libs' has been renamed to/replaced by 'dbus'"; # Converted to throw 2022-02-22 + dbus_tools = throw "'dbus_tools' has been renamed to/replaced by 'dbus.out'"; # Converted to throw 2022-02-22 dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # Added 2020-09-20 - deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # Added 2018-02-23 + deadbeef-mpris2-plugin = throw "'deadbeef-mpris2-plugin' has been renamed to/replaced by 'deadbeefPlugins.mpris2'"; # Converted to throw 2022-02-22 deadpixi-sam = deadpixi-sam-unstable; - debian_devscripts = debian-devscripts; # added 2016-03-23 + debian_devscripts = throw "'debian_devscripts' has been renamed to/replaced by 'debian-devscripts'"; # Converted to throw 2022-02-22 debugedit-unstable = debugedit; # Added 2021-11-22 deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 @@ -251,23 +251,23 @@ mapAliases ({ ''; # Added 2021-08-18 demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 - desktop_file_utils = desktop-file-utils; # Added 2018-02-25 - devicemapper = lvm2; # Added 2018-04-25 - digikam5 = digikam; # Added 2017-02-18 + desktop_file_utils = throw "'desktop_file_utils' has been renamed to/replaced by 'desktop-file-utils'"; # Converted to throw 2022-02-22 + devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22 + digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22 displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3."; # Added 2022-01-12 - dmtx = dmtx-utils; # Added 2018-04-25 + dmtx = throw "'dmtx' has been renamed to/replaced by 'dmtx-utils'"; # Converted to throw 2022-02-22 dnnl = oneDNN; # Added 2020-04-22 - docbook5_xsl = docbook_xsl_ns; # Added 2018-04-25 + docbook5_xsl = throw "'docbook5_xsl' has been renamed to/replaced by 'docbook_xsl_ns'"; # Converted to throw 2022-02-22 docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12 - docbook_xml_xslt = docbook_xsl; # Added 2018-04-25 - docker_compose = docker-compose; # Added 2018-11-10 + docbook_xml_xslt = throw "'docbook_xml_xslt' has been renamed to/replaced by 'docbook_xsl'"; # Converted to throw 2022-02-22 + docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22 dolphinEmu = dolphin-emu; # Added 2021-11-10 dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 dotnet-netcore = dotnet-runtime; # Added 2021-10-07 - double_conversion = double-conversion; # Added 2017-11-22 + double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22 draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14 dvb_apps = throw "dvb_apps has been removed."; # Added 2020-11-03 - dwarf_fortress = dwarf-fortress; # Added 2016-01-23 + dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22 dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # Added 2021-02-07 dylibbundler = macdylibbundler; # Added 2021-04-24 @@ -294,22 +294,22 @@ mapAliases ({ emacs27Packages = emacs27.pkgs; # Added 2020-12-18 emacs27WithPackages = emacs27.pkgs.withPackages; # Added 2020-12-18 emacsPackages = emacs.pkgs; # Added 2020-12-18 - emacsPackagesGen = emacsPackagesFor; # Added 2018-08-18 + emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 emacsPackagesNgFor = emacsPackagesFor; # Added 2019-08-07 - emacsPackagesNgGen = emacsPackagesFor; # Added 2018-08-18 + emacsPackagesNgGen = throw "'emacsPackagesNgGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 - enblendenfuse = enblend-enfuse; # Added 2015-09-30 + enblendenfuse = throw "'enblendenfuse' has been renamed to/replaced by 'enblend-enfuse'"; # Converted to throw 2022-02-22 encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06 envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05 epoxy = libepoxy; # Added 2021-11-11 esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12 - etcdctl = etcd; # Added 2018-04-25 + etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22 euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2."; # Added 2022-01-01 evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed."; # Added 2022-01-14 - evolution_data_server = evolution-data-server; # Added 2018-02-25 - exfat-utils = exfat; # Added 2015-09-11 + evolution_data_server = throw "'evolution_data_server' has been renamed to/replaced by 'evolution-data-server'"; # Converted to throw 2022-02-22 + exfat-utils = throw "'exfat-utils' has been renamed to/replaced by 'exfat'"; # Converted to throw 2022-02-22 ### F ### @@ -318,15 +318,15 @@ mapAliases ({ fastnlo = fastnlo_toolkit; # Added 2021-04-24 fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # Added 2021-04-13 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; - ffadoFull = ffado; # Added 2018-05-01 + ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22 firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25."; - firefox-esr-wrapper = firefox-esr; # Added 2016-01 - firefoxWrapper = firefox; # Added 2015-09 - firefox-wrapper = firefox; # Added 2016-01 + firefox-esr-wrapper = throw "'firefox-esr-wrapper' has been renamed to/replaced by 'firefox-esr'"; # Converted to throw 2022-02-22 + firefoxWrapper = throw "'firefoxWrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 + firefox-wrapper = throw "'firefox-wrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firestr = throw "firestr has been removed."; # Added 2019-12-08 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10 - flameGraph = flamegraph; # Added 2018-04-25 + flameGraph = throw "'flameGraph' has been renamed to/replaced by 'flamegraph'"; # Converted to throw 2022-02-22 flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 @@ -337,7 +337,7 @@ mapAliases ({ flvtool2 = throw "flvtool2 has been removed."; # Added 2020-11-03 fme = throw "fme was removed, because it is old and uses Glade, a discontinued library."; # Added 2022-01-26 foldingathome = fahclient; # Added 2020-09-03 - font-awesome-ttf = font-awesome; # Added 2018-02-25 + font-awesome-ttf = throw "'font-awesome-ttf' has been renamed to/replaced by 'font-awesome'"; # Converted to throw 2022-02-22 fontconfig-ultimate = throw '' fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years. @@ -354,12 +354,12 @@ mapAliases ({ and has only been used for old fontconfig caches. ''; - foomatic_filters = foomatic-filters; # Added 2016-08 + foomatic_filters = throw "'foomatic_filters' has been renamed to/replaced by 'foomatic-filters'"; # Converted to throw 2022-02-22 fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl."; # Added 2021-11-07 fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later"; fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # Added 2022-01-15 - fuse_exfat = exfat; # Added 2015-09-11 - fuseki = apache-jena-fuseki; # Added 2018-04-25 + fuse_exfat = throw "'fuse_exfat' has been renamed to/replaced by 'exfat'"; # Converted to throw 2022-02-22 + fuseki = throw "'fuseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 fwupdate = throw "fwupdate was merged into fwupd"; # Added 2020-05-19 ### G ### @@ -367,10 +367,10 @@ mapAliases ({ g4py = python3Packages.geant4; # Added 2020-06-06 gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06 gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # Added 2021-04-03 - gdb-multitarget = gdb; # Added 2017-11-13 - gdk_pixbuf = gdk-pixbuf; # Added 2019-05-22 + gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22 + gdk_pixbuf = throw "'gdk_pixbuf' has been renamed to/replaced by 'gdk-pixbuf'"; # Converted to throw 2022-02-22 getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # Added 2022-01-12 - gettextWithExpat = gettext; # Added 2016-02-19 + gettextWithExpat = throw "'gettextWithExpat' has been renamed to/replaced by 'gettext'"; # Converted to throw 2022-02-22 gfm = throw "gfm has been removed"; # Added 2021-01-15 giblib = throw " giblib has been removed from nixpkgs because upstream is gone."; # Added 2022-01-23 giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 @@ -389,7 +389,7 @@ mapAliases ({ gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # Added 2021-12-07 gitinspector = throw "gitinspector has been removed because it doesn't work with python3."; # Added 2022-01-12 gksu = throw "gksu has been removed"; # Added 2022-01-16 - glib_networking = glib-networking; # Added 2018-02-25 + glib_networking = throw "'glib_networking' has been renamed to/replaced by 'glib-networking'"; # Converted to throw 2022-02-22 gmailieer = lieer; # Added 2020-04-19 gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07 gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 @@ -397,12 +397,11 @@ mapAliases ({ gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome-mpv = celluloid; # Added 2019-08-22 gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15 - gnome-themes-standard = gnome-themes-extra; # Added 2018-03-14 + gnome-themes-standard = throw "'gnome-themes-standard' has been renamed to/replaced by 'gnome-themes-extra'"; # Converted to throw 2022-02-22 gnome_user_docs = gnome-user-docs; # Added 2019-11-20 gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # Added 2019-12-10 - gnome_doc_utils = gnome-doc-utils; # Added 2018-02-25 - gnome_themes_standard = gnome-themes-standard; # Added 2018-02-25 - gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # Added 2019-05-27 + gnome_doc_utils = throw "'gnome_doc_utils' has been renamed to/replaced by 'gnome-doc-utils'"; # Converted to throw 2022-02-22 + gnome_themes_standard = throw "'gnome_themes_standard' has been renamed to/replaced by 'gnome-themes-standard'"; # Converted to throw 2022-02-22 gnuradio-with-packages = gnuradio3_7.override { extraPackages = lib.attrVals [ @@ -421,47 +420,47 @@ mapAliases ({ gnuradio-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 gnuradio-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 - gnustep-make = gnustep.make; # Added 2016-7-6 + gnustep-make = throw "'gnustep-make' has been renamed to/replaced by 'gnustep.make'"; # Converted to throw 2022-02-22 gnuvd = throw "gnuvd was removed because the backend service is missing"; # Added 2020-01-14 gobby5 = gobby; # Added 2021-02-01 - gobjectIntrospection = gobject-introspection; # Added 2018-12-02 + gobjectIntrospection = throw "'gobjectIntrospection' has been renamed to/replaced by 'gobject-introspection'"; # Converted to throw 2022-02-22 gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # Added 2021-12-15 - goimports = gotools; # Added 2018-09-16 + goimports = throw "'goimports' has been renamed to/replaced by 'gotools'"; # Converted to throw 2022-02-22 gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23 - googleAuthenticator = google-authenticator; # Added 2016-10-16 + googleAuthenticator = throw "'googleAuthenticator' has been renamed to/replaced by 'google-authenticator'"; # Converted to throw 2022-02-22 googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # Added 2022-01-22 google-gflags = gflags; # Added 2019-07-25 google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07 google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07 - go-pup = pup; # Added 2017-12-19 + go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22 gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06 graalvm11 = graalvm11-ce; graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19 graalvm8 = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19 gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 - grantlee5 = libsForQt5.grantlee; # Added 2015-12-19 + grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05 gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 - gsettings_desktop_schemas = gsettings-desktop-schemas; # Added 2018-02-25 - gtk_doc = gtk-doc; # Added 2018-02-25 + gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22 + gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22 gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01 gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10 - guileCairo = guile-cairo; # Added 2017-09-24 + guileCairo = throw "'guileCairo' has been renamed to/replaced by 'guile-cairo'"; # Converted to throw 2022-02-22 guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16 guileGnome = throw "guile-gnome has been removed"; # Added 2022-01-16 - guile_lib = guile-lib; # Added 2017-09-24 - guileLint = guile-lint; # Added 2017-09-27 - guile_ncurses = guile-ncurses; # Added 2017-09-24 - gupnp_av = gupnp-av; # Added 2018-02-25 - gupnp_dlna = gupnp-dlna; # Added 2018-02-25 - gupnp_igd = gupnp-igd; # Added 2018-02-25 - gupnptools = gupnp-tools; # Added 2015-12-19 - gutenberg = zola; # Added 2018-11-17 + guile_lib = throw "'guile_lib' has been renamed to/replaced by 'guile-lib'"; # Converted to throw 2022-02-22 + guileLint = throw "'guileLint' has been renamed to/replaced by 'guile-lint'"; # Converted to throw 2022-02-22 + guile_ncurses = throw "'guile_ncurses' has been renamed to/replaced by 'guile-ncurses'"; # Converted to throw 2022-02-22 + gupnp_av = throw "'gupnp_av' has been renamed to/replaced by 'gupnp-av'"; # Converted to throw 2022-02-22 + gupnp_dlna = throw "'gupnp_dlna' has been renamed to/replaced by 'gupnp-dlna'"; # Converted to throw 2022-02-22 + gupnp_igd = throw "'gupnp_igd' has been renamed to/replaced by 'gupnp-igd'"; # Converted to throw 2022-02-22 + gupnptools = throw "'gupnptools' has been renamed to/replaced by 'gupnp-tools'"; # Converted to throw 2022-02-22 + gutenberg = throw "'gutenberg' has been renamed to/replaced by 'zola'"; # Converted to throw 2022-02-22 gwtdragdrop = throw "gwtdragdrop was removed: abandoned by upstream"; # Added 2022-02-06 gwtwidgets = throw "gwtwidgets was removed: unmaintained"; # Added 2022-02-06 @@ -469,24 +468,24 @@ mapAliases ({ hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 - heimdalFull = heimdal; # Added 2018-05-01 + heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06 hepmc = hepmc2; # Added 2019-08-05 hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # Added 2019-12-11 - hicolor_icon_theme = hicolor-icon-theme; # Added 2018-02-25 + hicolor_icon_theme = throw "'hicolor_icon_theme' has been renamed to/replaced by 'hicolor-icon-theme'"; # Converted to throw 2022-02-22 holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01 - htmlTidy = html-tidy; # Added 2014-12-06 + htmlTidy = throw "'htmlTidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22 ht-rust = xh; # Added 2021-02-13 hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # Added 2020-04-06 ### I ### - iana_etc = iana-etc; # Added 2017-03-08 + iana_etc = throw "'iana_etc' has been renamed to/replaced by 'iana-etc'"; # Converted to throw 2022-02-22 iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08 icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream."; # Added 2022-02-15 icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 - idea = jetbrains; # Added 2017-04-03 + idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22 imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15 imagemagick7Big = imagemagickBig; # Added 2021-02-22 imagemagick7 = imagemagick; # Added 2021-02-22 @@ -508,10 +507,10 @@ mapAliases ({ jack2Full = jack2; # moved from top-level 2021-03-14 jamomacore = throw "jamomacore has been removed: abandoned upstream."; # Added 2020-11-21 jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15 - jbuilder = dune_1; # Added 2018-09-09 + jbuilder = throw "'jbuilder' has been renamed to/replaced by 'dune_1'"; # Converted to throw 2022-02-22 jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # Added 2021-04-26 jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; - joseki = apache-jena-fuseki; # Added 2016-02-28 + joseki = throw "'joseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead."; # Julia @@ -521,7 +520,7 @@ mapAliases ({ julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # Added 2021-03-13 julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02 - json_glib = json-glib; # Added 2018-02-25 + json_glib = throw "'json_glib' has been renamed to/replaced by 'json-glib'"; # Converted to throw 2022-02-22 jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 ### K ### @@ -532,15 +531,15 @@ mapAliases ({ kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # Added 2021-04-11 kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-06-16 - kdiff3-qt5 = kdiff3; # Added 2017-02-18 - keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 - keepassx-community = keepassxc; # Added 2017-11 - keepassx-reboot = keepassx-community; # Added 2017-02-01 - keepassx2-http = keepassx-reboot; # Added 2016-10-17 + kdiff3-qt5 = throw "'kdiff3-qt5' has been renamed to/replaced by 'kdiff3'"; # Converted to throw 2022-02-22 + keepass-keefox = throw "'keepass-keefox' has been renamed to/replaced by 'keepass-keepassrpc'"; # Converted to throw 2022-02-22 + keepassx-community = throw "'keepassx-community' has been renamed to/replaced by 'keepassxc'"; # Converted to throw 2022-02-22 + keepassx-reboot = throw "'keepassx-reboot' has been renamed to/replaced by 'keepassx-community'"; # Converted to throw 2022-02-22 + keepassx2-http = throw "'keepassx2-http' has been renamed to/replaced by 'keepassx-reboot'"; # Converted to throw 2022-02-22 keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-01 kerberos = libkrb5; # moved from top-level 2021-03-14 kexectools = kexec-tools; # Added 2021-09-03 - keybase-go = keybase; # Added 2016-08-24 + keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # Added 2019-12-10 keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14 kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 @@ -554,73 +553,73 @@ mapAliases ({ kodiPlainWayland = kodi-wayland; kodiPlugins = kodiPackages; # Added 2021-03-09; kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23 - krename-qt5 = krename; # Added 2017-02-18 + krename-qt5 = throw "'krename-qt5' has been renamed to/replaced by 'krename'"; # Converted to throw 2022-02-22 krita-beta = krita; # moved from top-level 2021-12-23 - kvm = qemu_kvm; # Added 2018-04-25 + kvm = throw "'kvm' has been renamed to/replaced by 'qemu_kvm'"; # Converted to throw 2022-02-22 ### L ### lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 latinmodern-math = lmmath; - letsencrypt = certbot; # Added 2016-05-16 - libGL_driver = mesa.drivers; # Added 2019-05-28 - libaudit = audit; # Added 2018-04-25 - libcanberra_gtk2 = libcanberra-gtk2; # Added 2018-02-25 - libcanberra_gtk3 = libcanberra-gtk3; # Added 2018-02-25 - libcap_manpages = libcap.doc; # Added 2016-04-29 + letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22 + libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22 + libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22 + libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22 + libcanberra_gtk3 = throw "'libcanberra_gtk3' has been renamed to/replaced by 'libcanberra-gtk3'"; # Converted to throw 2022-02-22 + libcap_manpages = throw "'libcap_manpages' has been renamed to/replaced by 'libcap.doc'"; # Converted to throw 2022-02-22 libcap_pam = if stdenv.isLinux then libcap.pam else null; # Added 2016-04-29 - libcap_progs = libcap.out; # Added 2016-04-29 + libcap_progs = throw "'libcap_progs' has been renamed to/replaced by 'libcap.out'"; # Converted to throw 2022-02-22 libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore."; # Added 2021-05-16 libcroco = throw "libcroco has been removed as it's no longer used in any derivations."; # Added 2020-03-04 - libdbusmenu-glib = libdbusmenu; # Added 2018-05-01 - libdbusmenu_qt5 = libsForQt5.libdbusmenu; # Added 2015-12-19 - liberation_ttf_v1_from_source = liberation_ttf_v1; # Added 2018-12-12 - liberation_ttf_v2_from_source = liberation_ttf_v2; # Added 2018-12-12 - liberationsansnarrow = liberation-sans-narrow; # Added 2018-12-12 + libdbusmenu-glib = throw "'libdbusmenu-glib' has been renamed to/replaced by 'libdbusmenu'"; # Converted to throw 2022-02-22 + libdbusmenu_qt5 = throw "'libdbusmenu_qt5' has been renamed to/replaced by 'libsForQt5.libdbusmenu'"; # Converted to throw 2022-02-22 + liberation_ttf_v1_from_source = throw "'liberation_ttf_v1_from_source' has been renamed to/replaced by 'liberation_ttf_v1'"; # Converted to throw 2022-02-22 + liberation_ttf_v2_from_source = throw "'liberation_ttf_v2_from_source' has been renamed to/replaced by 'liberation_ttf_v2'"; # Converted to throw 2022-02-22 + liberationsansnarrow = throw "'liberationsansnarrow' has been renamed to/replaced by 'liberation-sans-narrow'"; # Converted to throw 2022-02-22 libgksu = throw "libgksu has been removed"; # Added 2022-01-16 - libgnome_keyring = libgnome-keyring; # Added 2018-02-25 - libgnome_keyring3 = libgnome-keyring3; # Added 2018-02-25 + libgnome_keyring = throw "'libgnome_keyring' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2022-02-22 + libgnome_keyring3 = throw "'libgnome_keyring3' has been renamed to/replaced by 'libgnome-keyring3'"; # Converted to throw 2022-02-22 libgpgerror = libgpg-error; # Added 2021-09-04 libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21 - libgumbo = gumbo; # Added 2018-01-21 + libgumbo = throw "'libgumbo' has been renamed to/replaced by 'gumbo'"; # Converted to throw 2022-02-22 libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14 libjpeg_drop = libjpeg_original; # Added 2020-06-05 - libjson_rpc_cpp = libjson-rpc-cpp; # Added 2017-02-28 + libjson_rpc_cpp = throw "'libjson_rpc_cpp' has been renamed to/replaced by 'libjson-rpc-cpp'"; # Converted to throw 2022-02-22 libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it."; # Added 2021-11-09 - liblapackWithoutAtlas = lapack-reference; # Added 2018-11-05 + liblapackWithoutAtlas = throw "'liblapackWithoutAtlas' has been renamed to/replaced by 'lapack-reference'"; # Converted to throw 2022-02-22 liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 - liblrdf = lrdf; # Added 2018-04-25 - libmsgpack = msgpack; # Added 2018-08-17 + liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22 + libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22 libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09 - libqrencode = qrencode; # Added 2019-01-01 + libqrencode = throw "'libqrencode' has been renamed to/replaced by 'qrencode'"; # Converted to throw 2022-02-22 librdf = lrdf; # Added 2020-03-22 - librecad2 = librecad; # backwards compatibility alias, added 2015-10 + librecad2 = throw "'librecad2' has been renamed to/replaced by 'librecad'"; # Converted to throw 2022-02-22 librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 libseat = seatd; # Added 2021-06-24 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # Added 2019-12-10 libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # Added 2020-06-22 - libsysfs = sysfsutils; # Added 2018-04-25 - libtidy = html-tidy; # Added 2014-12-21 + libsysfs = throw "'libsysfs' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 + libtidy = throw "'libtidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22 libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20 libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # Added 2020-12-20 libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # Added 2020-12-20 libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # Added 2020-12-20 libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa"; libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa"; - libudev = udev; # Added 2018-04-25 + libudev = throw "'libudev' has been renamed to/replaced by 'udev'"; # Converted to throw 2022-02-22 libungif = giflib; # Added 2020-02-12 libusb = libusb1; # Added 2020-04-28 - libva-full = libva; # Added 2018-03-26 - libva1-full = libva1; # Added 2018-03-26 + libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22 + libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22 libwnck3 = libwnck; lilypond-unstable = lilypond; # Added 2021-03-11 lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # Added 2022-01-14 lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # Added 2022-01-14 - links = links2; # Added 2016-01-31 + links = throw "'links' has been renamed to/replaced by 'links2'"; # Converted to throw 2022-02-22 linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # Added 2021-12-09 # Linux kernels @@ -691,22 +690,22 @@ mapAliases ({ love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # Added 2022-01-15 lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # Added 2021-02-15 - lttngTools = lttng-tools; # Added 2014-07-31 - lttngUst = lttng-ust; # Added 2014-07-31 - lua5_1_sockets = lua51Packages.luasocket; # Added 2017-05-02 - lua5_expat = luaPackages.luaexpat; # Added 2017-05-02 - lua5_sec = luaPackages.luasec; # Added 2017-05-02 + lttngTools = throw "'lttngTools' has been renamed to/replaced by 'lttng-tools'"; # Converted to throw 2022-02-22 + lttngUst = throw "'lttngUst' has been renamed to/replaced by 'lttng-ust'"; # Converted to throw 2022-02-22 + lua5_1_sockets = throw "'lua5_1_sockets' has been renamed to/replaced by 'lua51Packages.luasocket'"; # Converted to throw 2022-02-22 + lua5_expat = throw "'lua5_expat' has been renamed to/replaced by 'luaPackages.luaexpat'"; # Converted to throw 2022-02-22 + lua5_sec = throw "'lua5_sec' has been renamed to/replaced by 'luaPackages.luasec'"; # Converted to throw 2022-02-22 lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-12 lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # Added 2020-06-03 lzma = xz; # moved from top-level 2021-03-14 ### M ### - m3d-linux = m33-linux; # Added 2016-08-13 + m3d-linux = throw "'m3d-linux' has been renamed to/replaced by 'm33-linux'"; # Converted to throw 2022-02-22 mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # Added 2021-08-21 mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-12 - man_db = man-db; # Added 2016-05 - manpages = man-pages; # Added 2015-12-06 + man_db = throw "'man_db' has been renamed to/replaced by 'man-db'"; # Converted to throw 2022-02-22 + manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22 marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 @@ -717,13 +716,13 @@ mapAliases ({ mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # Added 2019-12-10, modified 2020-11-25 mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04 meme = meme-image-generator; # Added 2021-04-21 - memtest86 = memtest86plus; # Added 2019-05-08 + memtest86 = throw "'memtest86' has been renamed to/replaced by 'memtest86plus'"; # Converted to throw 2022-02-22 mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18 mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mess = mame; # Added 2019-10-30 metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2."; # Added 2022-01-12 mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it."; # Added 2022-01-12 - midoriWrapper = midori; # Added 2015-01 + midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22 mime-types = mailcap; # Added 2022-01-21 mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2."; # Added 2022-01-01 minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 @@ -731,23 +730,23 @@ mapAliases ({ minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14 mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # Added 2019-12-10 mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15 - mlt-qt5 = libsForQt5.mlt; # Added 2015-12-19 - mobile_broadband_provider_info = mobile-broadband-provider-info; # Added 2018-02-25 + mlt-qt5 = throw "'mlt-qt5' has been renamed to/replaced by 'libsForQt5.mlt'"; # Converted to throw 2022-02-22 + mobile_broadband_provider_info = throw "'mobile_broadband_provider_info' has been renamed to/replaced by 'mobile-broadband-provider-info'"; # Converted to throw 2022-02-22 moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead."; - module_init_tools = kmod; # Added 2016-04-22 + module_init_tools = throw "'module_init_tools' has been renamed to/replaced by 'kmod'"; # Converted to throw 2022-02-22 monero = monero-cli; # Added 2021-11-28 monodevelop = throw "monodevelop has been removed from nixpgks"; # Added 2022-01-15 mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07 mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # Added 2020-10-18 mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # Added 2020-10-18 - morituri = whipper; # Added 2018-09-13 + morituri = throw "'morituri' has been renamed to/replaced by 'whipper'"; # Converted to throw 2022-02-22 mozart-binary = mozart2-binary; # Added 2019-09-23 mozart = mozart2-binary; # Added 2019-09-23 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = libmpdclient; # Added 2021-02-11 - mpich2 = mpich; # Added 2018-08-06 - msf = metasploit; # Added 2018-04-25 + mpich2 = throw "'mpich2' has been renamed to/replaced by 'mpich'"; # Converted to throw 2022-02-22 + msf = throw "'msf' has been renamed to/replaced by 'metasploit'"; # Converted to throw 2022-02-22 multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 mumble_git = pkgs.mumble; # Added 2019-08-01 murmur_git = pkgs.murmur; # Added 2019-08-01 @@ -760,36 +759,36 @@ mapAliases ({ # floating point textures patents are expired, # so package reduced to alias mesa_drivers = mesa.drivers; - mesa_noglu = mesa; # Added 2019-05-28 + mesa_noglu = throw "'mesa_noglu' has been renamed to/replaced by 'mesa'"; # Converted to throw 2022-02-22 mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # Added 2020-05-22 - mssys = ms-sys; # Added 2015-12-13 - multipath_tools = multipath-tools; # Added 2016-01-21 + mssys = throw "'mssys' has been renamed to/replaced by 'ms-sys'"; # Converted to throw 2022-02-22 + multipath_tools = throw "'multipath_tools' has been renamed to/replaced by 'multipath-tools'"; # Converted to throw 2022-02-22 mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # Added 2021-11-18 - mupen64plus1_5 = mupen64plus; # Added 2016-02-12 + mupen64plus1_5 = throw "'mupen64plus1_5' has been renamed to/replaced by 'mupen64plus'"; # Converted to throw 2022-02-22 mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # Added 2021-04-15 - mysqlWorkbench = mysql-workbench; # Added 2017-01-19 + mysqlWorkbench = throw "'mysqlWorkbench' has been renamed to/replaced by 'mysql-workbench'"; # Converted to throw 2022-02-22 ### N ### net_snmp = net-snmp; # Added 2019-12-21 nagiosPluginsOfficial = monitoring-plugins; navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07 - ncat = nmap; # Added 2016-01-26 + ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 - netcat-openbsd = libressl.nc; # Added 2018-04-25 + netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31 - networkmanager_fortisslvpn = networkmanager-fortisslvpn; # Added 2018-02-25 - networkmanager_iodine = networkmanager-iodine; # Added 2018-02-25 - networkmanager_l2tp = networkmanager-l2tp; # Added 2018-02-25 - networkmanager_openconnect = networkmanager-openconnect; # Added 2018-02-25 - networkmanager_openvpn = networkmanager-openvpn; # Added 2018-02-25 - networkmanager_vpnc = networkmanager-vpnc; # Added 2018-02-25 + networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22 + networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22 + networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22 + networkmanager_openconnect = throw "'networkmanager_openconnect' has been renamed to/replaced by 'networkmanager-openconnect'"; # Converted to throw 2022-02-22 + networkmanager_openvpn = throw "'networkmanager_openvpn' has been renamed to/replaced by 'networkmanager-openvpn'"; # Converted to throw 2022-02-22 + networkmanager_vpnc = throw "'networkmanager_vpnc' has been renamed to/replaced by 'networkmanager-vpnc'"; # Converted to throw 2022-02-22 neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - nfsUtils = nfs-utils; # Added 2014-12-06 - nginxUnstable = nginxMainline; # Added 2018-04-25 - nilfs_utils = nilfs-utils; # Added 2018-04-25 + nfsUtils = throw "'nfsUtils' has been renamed to/replaced by 'nfs-utils'"; # Converted to throw 2022-02-22 + nginxUnstable = throw "'nginxUnstable' has been renamed to/replaced by 'nginxMainline'"; # Converted to throw 2022-02-22 + nilfs_utils = throw "'nilfs_utils' has been renamed to/replaced by 'nilfs-utils'"; # Converted to throw 2022-02-22 nix-direnv-flakes = nix-direnv; nix-review = nixpkgs-review; # Added 2019-12-22 nixFlakes = nixVersions.stable; # Added 2021-05-21 @@ -800,13 +799,13 @@ mapAliases ({ nix_2_5 = nixVersions.nix_2_5; nix_2_6 = nixVersions.nix_2_6; nmap-unfree = nmap; # Added 2021-04-06 - nmap_graphical = nmap-graphical; # Added 2017-01-19 - nologin = shadow; # Added 2018-04-25 + nmap_graphical = throw "'nmap_graphical' has been renamed to/replaced by 'nmap-graphical'"; # Converted to throw 2022-02-22 + nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15 now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05 - nxproxy = nx-libs; # Added 2019-02-15 + nxproxy = throw "'nxproxy' has been renamed to/replaced by 'nx-libs'"; # Converted to throw 2022-02-22 nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; ### O ### @@ -823,42 +822,42 @@ mapAliases ({ onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # Added 2020-12-04 openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 - opencascade_oce = opencascade; # Added 2018-04-25 - opencl-icd = ocl-icd; # Added 2017-01-20 + opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22 + opencl-icd = throw "'opencl-icd' has been renamed to/replaced by 'ocl-icd'"; # Converted to throw 2022-02-22 openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21 openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 - openexr_ctl = ctl; # Added 2018-04-25 + openexr_ctl = throw "'openexr_ctl' has been renamed to/replaced by 'ctl'"; # Converted to throw 2022-02-22 openisns = open-isns; # Added 2020-01-28 openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # Added 2021-01-24 openjpeg_2 = openjpeg; # Added 2021-01-25 openmpt123 = libopenmpt; # Added 2021-09-05 - opensans-ttf = open-sans; # Added 2018-12-04 - openssh_with_kerberos = openssh; # Added 2018-01-28 + opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22 + openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22 orchis = orchis-theme; # Added 2021-06-09 osquery = throw "osquery has been removed."; # Added 2019-11-24 osxfuse = macfuse-stubs; # Added 2021-03-20 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02 - owncloudclient = owncloud-client; # Added 2016-08 + owncloudclient = throw "'owncloudclient' has been renamed to/replaced by 'owncloud-client'"; # Converted to throw 2022-02-22 ### P ### - PPSSPP = ppsspp; # Added 2017-10-01 + PPSSPP = throw "'PPSSPP' has been renamed to/replaced by 'ppsspp'"; # Converted to throw 2022-02-22 - p11_kit = p11-kit; # Added 2018-02-25 + p11_kit = throw "'p11_kit' has been renamed to/replaced by 'p11-kit'"; # Converted to throw 2022-02-22 packet-cli = metal-cli; # Added 2021-10-25 paperless = paperless-ng; # Added 2021-06-06 parity = openethereum; # Added 2020-08-01 parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 - parquet-cpp = arrow-cpp; # Added 2018-09-08 - pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # Added 2018-05-04 + parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22 + pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22 pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22 pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project."; # Added 2022-01-01 pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03 - perlXMLParser = perlPackages.XMLParser; # Added 2018-10-12 - perlArchiveCpio = perlPackages.ArchiveCpio; # Added 2018-10-12 - pgp-tools = signing-party; # Added 2017-03-26 - pg_tmp = ephemeralpg; # Added 2018-01-16 + perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22 + perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22 + pgp-tools = throw "'pgp-tools' has been renamed to/replaced by 'signing-party'"; # Converted to throw 2022-02-22 + pg_tmp = throw "'pg_tmp' has been renamed to/replaced by 'ephemeralpg'"; # Converted to throw 2022-02-22 phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20 @@ -913,26 +912,26 @@ mapAliases ({ php73Packages-unit = phpPackages-unit; php74Packages-unit = phpPackages-unit; - pidgin-with-plugins = pidgin; # Added 2016-06 - pidginlatex = pidgin-latex; # Added 2018-01-08 - pidginlatexSF = pidgin-latex; # Added 2014-11-02 - pidginmsnpecan = pidgin-msn-pecan; # Added 2018-01-08 - pidginosd = pidgin-osd; # Added 2018-01-08 - pidginotr = pidgin-otr; # Added 2018-01-08 - pidginsipe = pidgin-sipe; # Added 2018-01-08 - pidginwindowmerge = pidgin-window-merge; # Added 2018-01-08 + pidgin-with-plugins = throw "'pidgin-with-plugins' has been renamed to/replaced by 'pidgin'"; # Converted to throw 2022-02-22 + pidginlatex = throw "'pidginlatex' has been renamed to/replaced by 'pidgin-latex'"; # Converted to throw 2022-02-22 + pidginlatexSF = throw "'pidginlatexSF' has been renamed to/replaced by 'pidgin-latex'"; # Converted to throw 2022-02-22 + pidginmsnpecan = throw "'pidginmsnpecan' has been renamed to/replaced by 'pidgin-msn-pecan'"; # Converted to throw 2022-02-22 + pidginosd = throw "'pidginosd' has been renamed to/replaced by 'pidgin-osd'"; # Converted to throw 2022-02-22 + pidginotr = throw "'pidginotr' has been renamed to/replaced by 'pidgin-otr'"; # Converted to throw 2022-02-22 + pidginsipe = throw "'pidginsipe' has been renamed to/replaced by 'pidgin-sipe'"; # Converted to throw 2022-02-22 + pidginwindowmerge = throw "'pidginwindowmerge' has been renamed to/replaced by 'pidgin-window-merge'"; # Converted to throw 2022-02-22 pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed."; # Added 2022-01-19 - piwik = matomo; # Added 2018-01-16 + piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22 pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18 - pkgconfigUpstream = pkg-configUpstream; # Added 2018-02-02 + pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22 planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # Added 2021-02-02 pleroma-otp = pleroma; # Added 2021-07-10 - plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 + plexpy = throw "'plexpy' has been renamed to/replaced by 'tautulli'"; # Converted to throw 2022-02-22 pltScheme = racket; # just to be sure - pmtools = acpica-tools; # Added 2018-11-01 - polarssl = mbedtls; # Added 2018-04-25 + pmtools = throw "'pmtools' has been renamed to/replaced by 'acpica-tools'"; # Converted to throw 2022-02-22 + polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22 polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project."; # Added 2022-01-01 - poppler_qt5 = libsForQt5.poppler; # Added 2015-12-19 + poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22 # postgresql postgresql96 = postgresql_9_6; @@ -968,11 +967,11 @@ mapAliases ({ pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # Added 2019-12-10 privateer = throw "privateer was removed because it was broken"; # Added 2021-05-18 processing3 = processing; # Added 2019-08-16 - procps-ng = procps; # Added 2018-06-08 + procps-ng = throw "'procps-ng' has been renamed to/replaced by 'procps'"; # Converted to throw 2022-02-22 proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30 proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # Added 2021-04-12 prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # Added 2021-03-16 - pulseaudioLight = pulseaudio; # Added 2018-04-25 + pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22 pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire."; # Added 2021-02-13 pulseeffects-pw = easyeffects; # Added 2021-07-07 pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; @@ -995,8 +994,8 @@ mapAliases ({ ### Q ### - QmidiNet = qmidinet; # Added 2016-05-22 - qca-qt5 = libsForQt5.qca-qt5; # Added 2015-12-19 + QmidiNet = throw "'QmidiNet' has been renamed to/replaced by 'qmidinet'"; # Converted to throw 2022-02-22 + qca-qt5 = throw "'qca-qt5' has been renamed to/replaced by 'libsForQt5.qca-qt5'"; # Converted to throw 2022-02-22 qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 qflipper = qFlipper; # Added 2022-02-11 qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02 @@ -1007,12 +1006,12 @@ mapAliases ({ qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04 quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22 - quake3game = ioquake3; # Added 2016-01-14 + quake3game = throw "'quake3game' has been renamed to/replaced by 'ioquake3'"; # Converted to throw 2022-02-22 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09 quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-03 qvim = throw "qvim has been removed."; # Added 2020-08-31 qweechat = throw "qweechat has been removed because it was broken"; # Added 2021-03-08 - qwt6 = libsForQt5.qwt; # Added 2015-12-19 + qwt6 = throw "'qwt6' has been renamed to/replaced by 'libsForQt5.qwt'"; # Converted to throw 2022-02-22 ### R ### @@ -1020,8 +1019,8 @@ mapAliases ({ raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24 rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2."; # Added 2022-01-01 rdf4store = throw "rdf4store has been removed from nixpkgs."; # Added 2019-12-21 - rdiff_backup = rdiff-backup; # Added 2014-11-23 - rdmd = dtools; # Added 2017-08-19 + rdiff_backup = throw "'rdiff_backup' has been renamed to/replaced by 'rdiff-backup'"; # Converted to throw 2022-02-22 + rdmd = throw "'rdmd' has been renamed to/replaced by 'dtools'"; # Converted to throw 2022-02-22 readline5 = throw "readline-5 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 readline62 = throw "readline-6.2 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22 @@ -1037,15 +1036,14 @@ mapAliases ({ rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15 ring-daemon = jami-daemon; # Added 2021-10-26 rkt = throw "rkt was archived by upstream"; # Added 2020-05-16 - rng_tools = rng-tools; # Added 2018-10-24 - robomongo = robo3t; #added 2017-09-28 + rng_tools = throw "'rng_tools' has been renamed to/replaced by 'rng-tools'"; # Converted to throw 2022-02-22 + robomongo = throw "'robomongo' has been renamed to/replaced by 'robo3t'"; # Converted to throw 2022-02-22 rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21 rpiboot-unstable = rpiboot; # Added 2021-07-30 - rssglx = rss-glx; #added 2015-03-25 + rssglx = throw "'rssglx' has been renamed to/replaced by 'rss-glx'"; # Converted to throw 2022-02-22 rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # Added 2020-08-25 rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # Added 2021-08-08 rubyMinimal = throw "rubyMinimal was removed due to being unused"; - rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; runwayml = throw "runwayml is now a webapp"; # Added 2021-04-17 @@ -1060,44 +1058,44 @@ mapAliases ({ ### S ### s2n = s2n-tls; # Added 2021-03-03 - s6Dns = s6-dns; # Added 2018-07-23 - s6LinuxUtils = s6-linux-utils; # Added 2018-07-23 - s6Networking = s6-networking; # Added 2018-07-23 - s6PortableUtils = s6-portable-utils; # Added 2018-07-23 - sagemath = sage; # Added 2018-10-27 - sam = deadpixi-sam; # Added 2018-04-25 - samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # Added 2016-01-25 + s6Dns = throw "'s6Dns' has been renamed to/replaced by 's6-dns'"; # Converted to throw 2022-02-22 + s6LinuxUtils = throw "'s6LinuxUtils' has been renamed to/replaced by 's6-linux-utils'"; # Converted to throw 2022-02-22 + s6Networking = throw "'s6Networking' has been renamed to/replaced by 's6-networking'"; # Converted to throw 2022-02-22 + s6PortableUtils = throw "'s6PortableUtils' has been renamed to/replaced by 's6-portable-utils'"; # Converted to throw 2022-02-22 + sagemath = throw "'sagemath' has been renamed to/replaced by 'sage'"; # Converted to throw 2022-02-22 + sam = throw "'sam' has been renamed to/replaced by 'deadpixi-sam'"; # Converted to throw 2022-02-22 + samsungUnifiedLinuxDriver = throw "'samsungUnifiedLinuxDriver' has been renamed to/replaced by 'samsung-unified-linux-driver'"; # Converted to throw 2022-02-22 sane-backends-git = sane-backends; # Added 2021-02-19 - saneBackends = sane-backends; # Added 2016-01-02 - saneBackendsGit = sane-backends; # Added 2016-01-02 - saneFrontends = sane-frontends; # Added 2016-01-02 + saneBackends = throw "'saneBackends' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2022-02-22 + saneBackendsGit = throw "'saneBackendsGit' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2022-02-22 + saneFrontends = throw "'saneFrontends' has been renamed to/replaced by 'sane-frontends'"; # Converted to throw 2022-02-22 scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # Added 2020-03-01 scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # added 2021-12-15 - scim = sc-im; # Added 2016-01-22 - scollector = bosun; # Added 2018-04-25 + scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22 + scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22 scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 sdlmame = mame; # Added 2019-10-30 seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)"; sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 - shared_mime_info = shared-mime-info; # Added 2018-02-25 + shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22 shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15 sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # Added 2022-01-01 sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # Added 2022-01-01 sigurlx = throw "sigurlx has been removed (upstream is gone)"; # Added 2022-01-24 - skrooge2 = skrooge; # Added 2017-02-18 + skrooge2 = throw "'skrooge2' has been renamed to/replaced by 'skrooge'"; # Converted to throw 2022-02-22 sky = throw "sky has been removed from nixpkgs (2020-09-16)"; - skype = skypeforlinux; # Added 2017-07-27 + skype = throw "'skype' has been renamed to/replaced by 'skypeforlinux'"; # Converted to throw 2022-02-22 skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired."; # Added 2021-07-14 skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # Added 2020-10-31 slack-dark = slack; # Added 2020-03-27 - slic3r-prusa3d = prusa-slicer; # Added 2019-05-21 + slic3r-prusa3d = throw "'slic3r-prusa3d' has been renamed to/replaced by 'prusa-slicer'"; # Converted to throw 2022-02-22 slim = throw "slim has been removed. Please use a different display-manager"; # Added 2019-11-11 slimThemes = throw "slimThemes has been removed because slim has been also"; # Added 2019-11-11 - slurm-full = slurm; # Added 2018-05-1 + slurm-full = throw "'slurm-full' has been renamed to/replaced by 'slurm'"; # Converted to throw 2022-02-22 slurm-llnl = slurm; # renamed July 2017 slurm-llnl-full = slurm-full; # renamed July 2017 - smbclient = samba; # Added 2018-04-25 + smbclient = throw "'smbclient' has been renamed to/replaced by 'samba'"; # Converted to throw 2022-02-22 smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # Added 2020-11-04 solr_8 = solr; # Added 2021-01-30 @@ -1125,12 +1123,12 @@ mapAliases ({ source-sans-pro = source-sans; # Added 2021-10-20 source-serif-pro = source-serif; # Added 2021-10-20 - spaceOrbit = space-orbit; # added 2016-05-23 + spaceOrbit = throw "'spaceOrbit' has been renamed to/replaced by 'space-orbit'"; # Converted to throw 2022-02-22 spectral = neochat; # Added 2020-12-27 - speech_tools = speech-tools; # added 2018-04-25 - speedtest_cli = speedtest-cli; # added 2015-02-17 - spice_gtk = spice-gtk; # added 2018-02-25 - spice_protocol = spice-protocol; # added 2018-02-25 + speech_tools = throw "'speech_tools' has been renamed to/replaced by 'speech-tools'"; # Converted to throw 2022-02-22 + speedtest_cli = throw "'speedtest_cli' has been renamed to/replaced by 'speedtest-cli'"; # Converted to throw 2022-02-22 + spice_gtk = throw "'spice_gtk' has been renamed to/replaced by 'spice-gtk'"; # Converted to throw 2022-02-22 + spice_protocol = throw "'spice_protocol' has been renamed to/replaced by 'spice-protocol'"; # Converted to throw 2022-02-22 spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011."; # added 2021-05-03 spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # Added 2021-03-21 spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # Added 2019-10-16 @@ -1139,56 +1137,56 @@ mapAliases ({ # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # Added 2020-10-09 spring-boot = spring-boot-cli; # added 2020-04-24 - sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 - sqliteInteractive = sqlite-interactive; # Added 2014-12-06 + sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22 + sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22 squid4 = squid; # added 2019-08-22 - sshfsFuse = sshfs-fuse; # added 2016-09 + sshfsFuse = throw "'sshfsFuse' has been renamed to/replaced by 'sshfs-fuse'"; # Converted to throw 2022-02-22 stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09 subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; - surf-webkit2 = surf; # Added 2017-04-02 + surf-webkit2 = throw "'surf-webkit2' has been renamed to/replaced by 'surf'"; # Converted to throw 2022-02-22 svgcleaner = throw "svgcleaner has been removed."; # Added 2021-11-17 swec = throw "swec has been removed; broken and abandoned upstream."; # Added 2021-10-14 swfdec = throw "swfdec has been removed as broken and unmaintained."; # Added 2020-08-23 swtpm-tpm2 = swtpm; # Added 2021-02-26 syncthing-cli = syncthing; # Added 2021-04-06 synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # Added 2021-11-26 - system_config_printer = system-config-printer; # Added 2016-01-03 + system_config_printer = throw "'system_config_printer' has been renamed to/replaced by 'system-config-printer'"; # Converted to throw 2022-02-22 systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # Added 2020-07-12 systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # Added 2020-07-12 - systool = sysfsutils; # Added 2018-04-25 + systool = throw "'systool' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 ### T ### - tahoelafs = tahoe-lafs; # Added 2018-03-26 + tahoelafs = throw "'tahoelafs' has been renamed to/replaced by 'tahoe-lafs'"; # Converted to throw 2022-02-22 tangogps = foxtrotgps; # Added 2020-01-26 tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead."; telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # Added 2020-07-02 - telepathy_farstream = telepathy-farstream; # Added 2018-02-25 - telepathy_gabble = telepathy-gabble; # Added 2018-02-25 - telepathy_glib = telepathy-glib; # Added 2018-02-25 - telepathy_haze = telepathy-haze; # Added 2018-02-25 - telepathy_idle = telepathy-idle; # Added 2018-02-25 - telepathy_logger = telepathy-logger; # Added 2018-02-25 - telepathy_mission_control = telepathy-mission-control; # Added 2018-02-25 - telepathy_qt = telepathy-qt; # Added 2018-02-25 - telepathy_qt5 = libsForQt5.telepathy; # Added 2015-12-19 - telepathy_salut = telepathy-salut; # Added 2018-02-25 - telnet = inetutils; # Added 2018-05-15 + telepathy_farstream = throw "'telepathy_farstream' has been renamed to/replaced by 'telepathy-farstream'"; # Converted to throw 2022-02-22 + telepathy_gabble = throw "'telepathy_gabble' has been renamed to/replaced by 'telepathy-gabble'"; # Converted to throw 2022-02-22 + telepathy_glib = throw "'telepathy_glib' has been renamed to/replaced by 'telepathy-glib'"; # Converted to throw 2022-02-22 + telepathy_haze = throw "'telepathy_haze' has been renamed to/replaced by 'telepathy-haze'"; # Converted to throw 2022-02-22 + telepathy_idle = throw "'telepathy_idle' has been renamed to/replaced by 'telepathy-idle'"; # Converted to throw 2022-02-22 + telepathy_logger = throw "'telepathy_logger' has been renamed to/replaced by 'telepathy-logger'"; # Converted to throw 2022-02-22 + telepathy_mission_control = throw "'telepathy_mission_control' has been renamed to/replaced by 'telepathy-mission-control'"; # Converted to throw 2022-02-22 + telepathy_qt = throw "'telepathy_qt' has been renamed to/replaced by 'telepathy-qt'"; # Converted to throw 2022-02-22 + telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 + telepathy_salut = throw "'telepathy_salut' has been renamed to/replaced by 'telepathy-salut'"; # Converted to throw 2022-02-22 + telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 - terraform-provider-ibm = terraform-providers.ibm; # Added 2018-09-28 - terraform-provider-libvirt = terraform-providers.libvirt; # Added 2018-09-28 + terraform-provider-ibm = throw "'terraform-provider-ibm' has been renamed to/replaced by 'terraform-providers.ibm'"; # Converted to throw 2022-02-22 + terraform-provider-libvirt = throw "'terraform-provider-libvirt' has been renamed to/replaced by 'terraform-providers.libvirt'"; # Converted to throw 2022-02-22 terraform-provider-lxd = terraform-providers.lxd; # Added 2020-03-16 terraform_0_12 = throw "terraform_0_12 has been removed from nixpkgs on 2021/01"; terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # Added 2021-12-08 terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # Added 2021-06-15 - tesseract_4 = tesseract4; # Added 2018-12-19 - tex-gyre-bonum-math = tex-gyre-math.bonum; # Added 2018-04-03 - tex-gyre-pagella-math = tex-gyre-math.pagella; # Added 2018-04-03 - tex-gyre-schola-math = tex-gyre-math.schola; # Added 2018-04-03 - tex-gyre-termes-math = tex-gyre-math.termes; # Added 2018-04-03 - tftp_hpa = tftp-hpa; # Added 2015-04-03 + tesseract_4 = throw "'tesseract_4' has been renamed to/replaced by 'tesseract4'"; # Converted to throw 2022-02-22 + tex-gyre-bonum-math = throw "'tex-gyre-bonum-math' has been renamed to/replaced by 'tex-gyre-math.bonum'"; # Converted to throw 2022-02-22 + tex-gyre-pagella-math = throw "'tex-gyre-pagella-math' has been renamed to/replaced by 'tex-gyre-math.pagella'"; # Converted to throw 2022-02-22 + tex-gyre-schola-math = throw "'tex-gyre-schola-math' has been renamed to/replaced by 'tex-gyre-math.schola'"; # Converted to throw 2022-02-22 + tex-gyre-termes-math = throw "'tex-gyre-termes-math' has been renamed to/replaced by 'tex-gyre-math.termes'"; # Converted to throw 2022-02-22 + tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22 thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25."; thunderbird-bin-68 = thunderbird-68; timescale-prometheus = promscale; # Added 2020-09-29 @@ -1199,21 +1197,21 @@ mapAliases ({ tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # Added 2021-06-16 tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # Added 2020-03-11 tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned."; # Added 2022-01-01 - torbrowser = tor-browser-bundle-bin; # Added 2017-04-05 + torbrowser = throw "'torbrowser' has been renamed to/replaced by 'tor-browser-bundle-bin'"; # Converted to throw 2022-02-22 torch = throw "torch has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - trang = jing-trang; # Added 2018-04-25 + trang = throw "'trang' has been renamed to/replaced by 'jing-trang'"; # Converted to throw 2022-02-22 transfig = fig2dev; # Added 2022-02-15 transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14 - transmission_gtk = transmission-gtk; # Added 2018-01-06 - transmission_remote_gtk = transmission-remote-gtk; # Added 2018-01-06 + transmission_gtk = throw "'transmission_gtk' has been renamed to/replaced by 'transmission-gtk'"; # Converted to throw 2022-02-22 + transmission_remote_gtk = throw "'transmission_remote_gtk' has been renamed to/replaced by 'transmission-remote-gtk'"; # Converted to throw 2022-02-22 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned."; trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # Added 2020-04-29 - truecrypt = veracrypt; # Added 2018-10-24 - tshark = wireshark-cli; # Added 2018-04-25 + truecrypt = throw "'truecrypt' has been renamed to/replaced by 'veracrypt'"; # Converted to throw 2022-02-22 + tshark = throw "'tshark' has been renamed to/replaced by 'wireshark-cli'"; # Converted to throw 2022-02-22 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # Added 2021-09-11 @@ -1222,9 +1220,9 @@ mapAliases ({ uberwriter = apostrophe; # Added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 - ucsFonts = ucs-fonts; # Added 2016-07-15 + ucsFonts = throw "'ucsFonts' has been renamed to/replaced by 'ucs-fonts'"; # Converted to throw 2022-02-22 ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # Added 2020-01-11 - ultrastardx-beta = ultrastardx; # Added 2017-08-12 + ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22 unicorn-emu = unicorn; # Added 2020-10-29 unifiStable = unifi6; # Added 2020-12-28 untrunc = untrunc-anthwlock; # Added 2021-02-01 @@ -1236,7 +1234,7 @@ mapAliases ({ urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # Added 2020-02-02 urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # Added 2020-02-02 urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02 - usb_modeswitch = usb-modeswitch; # Added 2016-05-10 + usb_modeswitch = throw "'usb_modeswitch' has been renamed to/replaced by 'usb-modeswitch'"; # Converted to throw 2022-02-22 usbguard-nox = usbguard; # Added 2019-09-04 utillinux = util-linux; # Added 2020-11-24 uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries"; @@ -1252,63 +1250,63 @@ mapAliases ({ varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-09-15 vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05 - vimbWrapper = vimb; # Added 2015-01 + vimbWrapper = throw "'vimbWrapper' has been renamed to/replaced by 'vimb'"; # Converted to throw 2022-02-22 vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # Added 2019-12-05 vimprobable2-unwrapped = vimprobable2; # Added 2019-12-05 virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # Added 2021-07-21 virtuoso = throw "virtuoso has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-15 virtmanager = virt-manager; # Added 2019-10-29 virtmanager-qt = virt-manager-qt; # Added 2019-10-29 - virtviewer = virt-viewer; # Added 2015-12-24 - vorbisTools = vorbis-tools; # Added 2016-01-26 + virtviewer = throw "'virtviewer' has been renamed to/replaced by 'virt-viewer'"; # Converted to throw 2022-02-22 + vorbisTools = throw "'vorbisTools' has been renamed to/replaced by 'vorbis-tools'"; # Converted to throw 2022-02-22 vtun = throw "vtune has been removed as it's unmaintained upstream."; # Added 2021-10-29 ### W ### way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 - webkit = webkitgtk; # Added 2019-03-05 + webkit = throw "'webkit' has been renamed to/replaced by 'webkitgtk'"; # Converted to throw 2022-02-22 webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05 webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05 - weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # Added 2018-09-06 + weechat-matrix-bridge = throw "'weechat-matrix-bridge' has been renamed to/replaced by 'weechatScripts.weechat-matrix-bridge'"; # Converted to throw 2022-02-22 whirlpool-gui = throw "whirlpool-gui has been removed as it depended on an insecure version of Electron."; # added 2022-02-08 wicd = throw "wicd has been removed as it is abandoned."; # Added 2021-09-11 - wineFull = winePackages.full; # Added 2017-05-27 - wineMinimal = winePackages.minimal; # Added 2017-05-27 - wineStable = winePackages.stable; # Added 2017-05-27 - wineStaging = wine-staging; # Added 2018-01-08 - wineUnstable = winePackages.unstable; # Added 2017-05-27 + wineFull = throw "'wineFull' has been renamed to/replaced by 'winePackages.full'"; # Converted to throw 2022-02-22 + wineMinimal = throw "'wineMinimal' has been renamed to/replaced by 'winePackages.minimal'"; # Converted to throw 2022-02-22 + wineStable = throw "'wineStable' has been renamed to/replaced by 'winePackages.stable'"; # Converted to throw 2022-02-22 + wineStaging = throw "'wineStaging' has been renamed to/replaced by 'wine-staging'"; # Converted to throw 2022-02-22 + wineUnstable = throw "'wineUnstable' has been renamed to/replaced by 'winePackages.unstable'"; # Converted to throw 2022-02-22 wineWayland = wine-wayland; winswitch = throw "winswitch has been removed from nixpkgs."; # Added 2019-12-10 - winusb = woeusb; # Added 2017-12-22 - wireguard = wireguard-tools; # Added 2018-05-19 + winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22 + wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22 wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # Added 2019-11-18 wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared."; # Added 2022-01-31 ### X ### - x11 = xlibsWrapper; # Added 2015-09 + x11 = throw "'x11' has been renamed to/replaced by 'xlibsWrapper'"; # Converted to throw 2022-02-22 xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # Added 2020-06-24 - xbmc = kodi; # Added 2018-04-25 + xbmc = throw "'xbmc' has been renamed to/replaced by 'kodi'"; # Converted to throw 2022-02-22 xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19 - xbmcPlain = kodiPlain; # Added 2018-04-25 - xbmcPlugins = kodiPackages; # Added 2018-04-25 + xbmcPlain = throw "'xbmcPlain' has been renamed to/replaced by 'kodiPlain'"; # Converted to throw 2022-02-22 + xbmcPlugins = throw "'xbmcPlugins' has been renamed to/replaced by 'kodiPackages'"; # Converted to throw 2022-02-22 xdg_utils = xdg-utils; # Added 2021-02-01 xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # Added 2020-03-14 xfce4-14 = xfce; xfceUnstable = xfce4-14; # Added 2019-09-17 xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 - xmonad_log_applet_gnome3 = xmonad_log_applet; # Added 2018-05-01 + xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; xp-pen-g430 = pentablet-driver; # Added 2020-05-03 - xf86_video_nouveau = xorg.xf86videonouveau; # Added 2015-09 + xf86_video_nouveau = throw "'xf86_video_nouveau' has been renamed to/replaced by 'xorg.xf86videonouveau'"; # Converted to throw 2022-02-22 xf86_input_mtrack = throw '' xf86_input_mtrack has been removed from nixpkgs as it is broken and unmaintained. Working alternatives are libinput and synaptics. ''; xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # Added 2020-01-20 - xlibs = xorg; # Added 2015-09 - xpraGtk3 = xpra; # Added 2018-09-13 + xlibs = throw "'xlibs' has been renamed to/replaced by 'xorg'"; # Converted to throw 2022-02-22 + xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22 xv = xxv; # Added 2020-02-22 xvfb_run = xvfb-run; # Added 2021-05-07 @@ -1316,7 +1314,7 @@ mapAliases ({ yacc = bison; # moved from top-level 2021-03-14 yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # Added 2022-01-15 - youtubeDL = youtube-dl; # Added 2014-10-26 + youtubeDL = throw "'youtubeDL' has been renamed to/replaced by 'youtube-dl'"; # Converted to throw 2022-02-22 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # Added 2021-03-08 yuzu = yuzu-mainline; # Added 2021-01-25 @@ -1324,13 +1322,13 @@ mapAliases ({ ### Z ### zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # Added 2021-04-07 - zdfmediathk = mediathekview; # Added 2019-01-19 + zdfmediathk = throw "'zdfmediathk' has been renamed to/replaced by 'mediathekview'"; # Converted to throw 2022-02-22 zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # Added 2021-03-28 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off - inherit (ocaml-ng) # Added 2016-09-14 + inherit (ocaml-ng) ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 ocamlPackages_4_03 ocamlPackages_latest; @@ -1346,7 +1344,7 @@ mapAliases ({ zeromq3 = throw "zeromq3 has been deprecated by zeromq4."; jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained"; -} // (with ocaml-ng; { # Added 2016-09-14 +} // (with ocaml-ng; { ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; ocaml_4_02 = ocamlPackages_4_02.ocaml; @@ -1400,7 +1398,6 @@ mapAliases ({ todolist = throw "todolist is now ultralist."; # Added 2020-12-27 tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead."; # Added 2020-01-10 tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead."; # Added 2020-01-10 - tt-rss-plugin-tumblr-gdpr = throw "tt-rss-plugin-tumblr-gdpr was removed because tumblr does not require gdpr acceptance to fetch rss feeds anymore"; # Added 2012-06-12 ttyrec = ovh-ttyrec; # Added 2021-01-02 zplugin = zinit; # Added 2021-01-30 From 975f7d0463751a09ed858a78b06b0a0447241980 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 23 Feb 2022 04:46:11 +0200 Subject: [PATCH 187/231] aliases.nix: deprecate ocaml aliases --- pkgs/top-level/aliases.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4dc82b9de3e2..7bfda23ca5af 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1328,9 +1328,16 @@ mapAliases ({ # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off - inherit (ocaml-ng) - ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 - ocamlPackages_4_03 ocamlPackages_latest; + ocamlPackages_4_00_1 = throw "'ocamlPackages_4_00_1' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_00_1'"; # Converted to throw 2022-02-22 + ocamlPackages_4_01_0 = throw "'ocamlPackages_4_01_0' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_01_0'"; # Converted to throw 2022-02-22 + ocamlPackages_4_02 = throw "'ocamlPackages_4_02' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_02'"; # Converted to throw 2022-02-22 + ocamlPackages_4_03 = throw "'ocamlPackages_4_03' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_03'"; # Converted to throw 2022-02-22 + ocamlPackages_latest = throw "'ocamlPackages_latest' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_latest'"; # Converted to throw 2022-02-22 + + ocaml_4_00_1 = throw "'ocamlPackages_4_00_1.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_00_1.ocaml'"; # Converted to throw 2022-02-22 + ocaml_4_01_0 = throw "'ocamlPackages_4_01_0.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_01_0.ocaml'"; # Converted to throw 2022-02-22 + ocaml_4_02 = throw "'ocamlPackages_4_02.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_02.ocaml'"; # Converted to throw 2022-02-22 + ocaml_4_03 = throw "'ocamlPackages_4_03.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_03.ocaml'"; # Converted to throw 2022-02-22 zabbix44 = throw '' Zabbix 4.4 is end of life. For details on upgrading to Zabbix 5.0 look at @@ -1344,13 +1351,6 @@ mapAliases ({ zeromq3 = throw "zeromq3 has been deprecated by zeromq4."; jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained"; -} // (with ocaml-ng; { - ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; - ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; - ocaml_4_02 = ocamlPackages_4_02.ocaml; - ocaml_4_03 = ocamlPackages_4_03.ocaml; -}) // { - avian = throw '' The package doesn't compile anymore on NixOS and both development & maintenance is abandoned by upstream. From fedd518caf83cb1298304773ea662e89ead2a1be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Feb 2022 05:30:20 +0000 Subject: [PATCH 188/231] python310Packages.sphinxcontrib-tikz: 0.4.15 -> 0.4.16 --- .../development/python-modules/sphinxcontrib-tikz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index dcb96f317d4e..95926b569a0a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; - version = "0.4.15"; + version = "0.4.16"; src = fetchPypi { inherit pname version; - sha256 = "27f9a7a6a64f1bf3ea4dd0e963b7da7c7778948856c8d557a71d64ace086519f"; + sha256 = "sha256-8f9FNx6WMopcqihUzNlQoPBGYoW2YkFi6W1iaFLD4qU="; }; postPatch = '' From db94accbcae041647bcdeaa6b106bd19c1b8ab5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 05:40:57 +0000 Subject: [PATCH 189/231] chezmoi: 2.12.0 -> 2.12.1 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 1ac88f3ab92d..99461f6b1fa6 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-wBt3tlEKN5Woid43hdXm0+JPdb7axRPYCJD6KQEOZ3M="; + sha256 = "sha256-0v7BD/8Hpl6SLsfWWFC+XCH7Pe2RcziMM6nRTPsOBec="; }; - vendorSha256 = "sha256-7PwqekYz/Um67gKeU7v8p9gIEYGCQ4l9K0jew5HCSo4="; + vendorSha256 = "sha256-QWOVcdFlUFS1kjLmwo2zY3s/sVSRxkeOVBWPyUYjbss="; doCheck = false; From 0e0b02c1f798032d0df7f0109e7536ee40b25b4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 04:33:22 +0000 Subject: [PATCH 190/231] python310Packages.qimage2ndarray: 1.8.3 -> 1.9.0 --- pkgs/development/python-modules/qimage2ndarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qimage2ndarray/default.nix b/pkgs/development/python-modules/qimage2ndarray/default.nix index 0bb9ed2199a2..431b5c9bfa10 100644 --- a/pkgs/development/python-modules/qimage2ndarray/default.nix +++ b/pkgs/development/python-modules/qimage2ndarray/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "qimage2ndarray"; - version = "1.8.3"; + version = "1.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b02bd2dc7de774f954544312ec1020cf2d7e03fdd23ec9eb79901da55ccb3365"; + sha256 = "sha256-p5B1xtDYRDxEIu6WmlQJ5E/QJUVxYEzOqHXGyV4/Veo="; }; propagatedBuildInputs = [ From ce6fe7b1c2d77f719d9e4e4de5cec43c1abed47e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 21:47:06 +0000 Subject: [PATCH 191/231] nomad-autoscaler: 0.3.5 -> 0.3.6 --- .../networking/cluster/nomad-autoscaler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index 4bdaf7690869..6329ff9ed11c 100644 --- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -3,7 +3,7 @@ let package = buildGoModule rec { pname = "nomad-autoscaler"; - version = "0.3.5"; + version = "0.3.6"; outputs = [ "out" @@ -25,10 +25,10 @@ let owner = "hashicorp"; repo = "nomad-autoscaler"; rev = "v${version}"; - sha256 = "sha256-2d36ddAjbt+nPmsHawgMq1CnKB2VNv8yMKMrPx5L+yw="; + sha256 = "sha256-fK5GsszNhz/WP0zVk2lOfU/gwYijdQa5qhNYO33RhXc="; }; - vendorSha256 = "sha256-g3INNvAQ124kBJSe5cnsIq1y8sWpPYKLwJONgbIUaoM="; + vendorSha256 = "sha256-Duzjpl011mj/SNoX/jQGMXwqUHPDz7iIMygRmK1vC3Q="; buildPhase = '' runHook preBuild From 668473f04916350224f8972e7532612254091783 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 18:30:36 +0000 Subject: [PATCH 192/231] logseq: 0.5.9 -> 0.6.0 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 0ce868ada676..09e31cd3409f 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.5.9"; + version = "0.6.0"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "e47aaabcd940b54962625e224961e9b95b7f18b99724adbb6334cdc549617389"; + sha256 = "9u2KdrNVAx+sy/8s2VP0DIzSMTvBK56pUGQaj7wulz0="; name = "${pname}-${version}.AppImage"; }; From 1e7c64aae12a346c862882b39aa39faa84e8936a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 01:46:58 +0000 Subject: [PATCH 193/231] bcftools: 1.14 -> 1.15 --- pkgs/applications/science/biology/bcftools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index f6aa5e8892ac..c04d6af080e3 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.14"; + version = "1.15"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-t++Iron8tVZYxb6i6MuOdWsFXhOGADbWvhN1Z4KqGcs="; + sha256 = "sha256-GIXMtFCobpegCqkF1zgcqeB72JZ8BXBaYdAAfS4iKW4="; }; nativeBuildInputs = [ From 0eb1d070c85fb8bd14858596a6b29ae363a6af90 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 13 Jan 2022 13:01:17 +0100 Subject: [PATCH 194/231] ipfs-migrator: 1.7.1 -> 2.0.2 https://github.com/ipfs/fs-repo-migrations/releases/tag/v2.0.2 This is pretty much a complete rewrite of the ipfs-migrator package. In version 2.0.0 a major change was made to the way the migrator works. Before, there was one binary that contained every migration. Now every migration has its own binary. If fs-repo-migrations can't find a required binary in the PATH, it will download it off the internet. To prevent that, build every migration individually, symlink them all into one package and then wrap fs-repo-migrations so it finds the package with all the migrations. The change to the IPFS NixOS module and the IPFS package is needed because without explicitly specifying a repo version to migrate to, fs-repo-migrations will query the internet to find the latest version. This fails in the sandbox, for example when testing the ipfs passthru tests. While it may seem like the repoVersion and IPFS version are in sync and the code could be simplified, this is not the case. See https://github.com/ipfs/fs-repo-migrations#when-should-i-migrate for a table with the IPFS versions and corresponding repo versions. Go 1.17 breaks the migrations, so use Go 1.16 instead. This is also the Go version used in their CI, see https://github.com/ipfs/fs-repo-migrations/blob/3dc218e3006adac25e1cb5e969d7c9d961f15ddd/.github/workflows/test.yml#L4. See https://github.com/ipfs/fs-repo-migrations/pull/140#issuecomment-982715907 for a previous mention of this issue. The issue manifests itself when doing anything with a migration, for example `fs-repo-11-to-12 --help`: ``` panic: qtls.ClientHelloInfo doesn't match goroutine 1 [running]: github.com/marten-seemann/qtls-go1-15.init.0() github.com/marten-seemann/qtls-go1-15@v0.1.1/unsafe.go:20 +0x132 ``` Also add myself as a maintainer for this package. This fixes the test failure discovered in https://github.com/NixOS/nixpkgs/pull/160914. See https://github.com/ipfs/fs-repo-migrations/issues/148 to read some of my struggles with updating this package. --- .../services/network-filesystems/ipfs.nix | 2 +- .../ipfs-migrator/all-migrations.nix | 63 +++++++++++++++++++ .../networking/ipfs-migrator/default.nix | 36 +++++------ .../networking/ipfs-migrator/unwrapped.nix | 35 +++++++++++ pkgs/applications/networking/ipfs/default.nix | 4 +- pkgs/top-level/all-packages.nix | 9 ++- 6 files changed, 124 insertions(+), 25 deletions(-) create mode 100644 pkgs/applications/networking/ipfs-migrator/all-migrations.nix create mode 100644 pkgs/applications/networking/ipfs-migrator/unwrapped.nix diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index b311b91b4a03..17da020bf3e2 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -259,7 +259,7 @@ in ipfs --offline config Mounts.IPFS ${cfg.ipfsMountDir} ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir} '' + optionalString cfg.autoMigrate '' - ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -y + ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y '' + '' ipfs --offline config show \ | ${pkgs.jq}/bin/jq '. * $extraConfig' --argjson extraConfig ${ diff --git a/pkgs/applications/networking/ipfs-migrator/all-migrations.nix b/pkgs/applications/networking/ipfs-migrator/all-migrations.nix new file mode 100644 index 000000000000..a376e9f895b1 --- /dev/null +++ b/pkgs/applications/networking/ipfs-migrator/all-migrations.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, symlinkJoin +, buildGoModule +, ipfs-migrator-unwrapped +}: + +# This package contains all the individual migrations in the bin directory. +# This is used by fs-repo-migrations and could also be used by IPFS itself +# when starting it like this: ipfs daemon --migrate + +let + fs-repo-common = pname: version: buildGoModule { + inherit pname version; + inherit (ipfs-migrator-unwrapped) src; + sourceRoot = "source/${pname}"; + vendorSha256 = null; + doCheck = false; + meta = ipfs-migrator-unwrapped.meta // { + mainProgram = pname; + description = "Individual migration for the filesystem repository of ipfs clients"; + }; + }; + + # Concatenation of the latest repo version and the version of that migration + version = "12.1.0.2"; + + fs-repo-11-to-12 = fs-repo-common "fs-repo-11-to-12" "1.0.2"; + fs-repo-10-to-11 = fs-repo-common "fs-repo-10-to-11" "1.0.1"; + fs-repo-9-to-10 = fs-repo-common "fs-repo-9-to-10" "1.0.1"; + fs-repo-8-to-9 = fs-repo-common "fs-repo-8-to-9" "1.0.1"; + fs-repo-7-to-8 = fs-repo-common "fs-repo-7-to-8" "1.0.1"; + fs-repo-6-to-7 = fs-repo-common "fs-repo-6-to-7" "1.0.1"; + fs-repo-5-to-6 = fs-repo-common "fs-repo-5-to-6" "1.0.1"; + fs-repo-4-to-5 = fs-repo-common "fs-repo-4-to-5" "1.0.1"; + fs-repo-3-to-4 = fs-repo-common "fs-repo-3-to-4" "1.0.1"; + fs-repo-2-to-3 = fs-repo-common "fs-repo-2-to-3" "1.0.1"; + fs-repo-1-to-2 = fs-repo-common "fs-repo-1-to-2" "1.0.1"; + fs-repo-0-to-1 = fs-repo-common "fs-repo-0-to-1" "1.0.1"; + + all-migrations = [ + fs-repo-11-to-12 + fs-repo-10-to-11 + fs-repo-9-to-10 + fs-repo-8-to-9 + fs-repo-7-to-8 + ] ++ lib.optional (!stdenv.isDarwin) # I didn't manage to fix this on macOS: + fs-repo-6-to-7 # gx/ipfs/QmSGRM5Udmy1jsFBr1Cawez7Lt7LZ3ZKA23GGVEsiEW6F3/eventfd/eventfd.go:27:32: undefined: syscall.SYS_EVENTFD2 + ++ [ + fs-repo-5-to-6 + fs-repo-4-to-5 + fs-repo-3-to-4 + fs-repo-2-to-3 + fs-repo-1-to-2 + fs-repo-0-to-1 + ]; + +in + +symlinkJoin { + name = "ipfs-migrator-all-fs-repo-migrations-${version}"; + paths = all-migrations; +} diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix index abc81e213d7d..d8c5de150bb3 100644 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/pkgs/applications/networking/ipfs-migrator/default.nix @@ -1,27 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildEnv +, makeWrapper +, ipfs-migrator-unwrapped +, ipfs-migrator-all-fs-repo-migrations +}: -buildGoModule rec { - pname = "ipfs-migrator"; - version = "1.7.1"; +buildEnv { + name = "ipfs-migrator-${ipfs-migrator-unwrapped.version}"; - src = fetchFromGitHub { - owner = "ipfs"; - repo = "fs-repo-migrations"; - rev = "v${version}"; - sha256 = "sha256-MxEKmoveIpuxBkGGGJHp9T11i3Py8a1fLpF0fWk0ftg="; - }; + nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = null; + paths = [ ipfs-migrator-unwrapped ]; - doCheck = false; + pathsToLink = [ "/bin" ]; - subPackages = [ "." ]; + postBuild = '' + wrapProgram "$out/bin/fs-repo-migrations" \ + --prefix PATH ':' '${lib.makeBinPath [ ipfs-migrator-all-fs-repo-migrations ]}' + ''; - meta = with lib; { - description = "Migrations for the filesystem repository of ipfs clients"; - homepage = "https://ipfs.io/"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ elitak ]; - }; + inherit (ipfs-migrator-unwrapped) meta; } diff --git a/pkgs/applications/networking/ipfs-migrator/unwrapped.nix b/pkgs/applications/networking/ipfs-migrator/unwrapped.nix new file mode 100644 index 000000000000..c8ade793218f --- /dev/null +++ b/pkgs/applications/networking/ipfs-migrator/unwrapped.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ipfs-migrator"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "ipfs"; + repo = "fs-repo-migrations"; + # Use the latest git tag here, since v2.0.2 does not + # contain the latest migration fs-repo-11-to-12/v1.0.2 + # The fs-repo-migrations code itself is the same between + # the two versions but the migration code, which is built + # into separate binaries, is not. + rev = "fs-repo-11-to-12/v1.0.2"; + sha256 = "sha256-CG4utwH+/+Igw+SP3imhl39wijlB53UGtkJG5Mwh+Ik="; + }; + + sourceRoot = "source/fs-repo-migrations"; + + vendorSha256 = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk="; + + doCheck = false; + + meta = with lib; { + description = "Migrations for the filesystem repository of ipfs clients"; + homepage = "https://github.com/ipfs/fs-repo-migrations"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi elitak ]; + mainProgram = "fs-repo-migrations"; + }; +} diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index c0526fc0d97c..4ab075f4cab0 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,9 +2,11 @@ buildGoModule rec { pname = "ipfs"; - version = "0.11.0"; + version = "0.11.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; + repoVersion = "11"; # Also update ipfs-migrator when changing the repo version + # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b7996050a16..6d714bd95002 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6721,13 +6721,16 @@ with pkgs; ipfs = callPackage ../applications/networking/ipfs { buildGoModule = buildGo116Module; }; - ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { - buildGoModule = buildGo116Module; - }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { buildGoModule = buildGo116Module; }; + ipfs-migrator-all-fs-repo-migrations = callPackage ../applications/networking/ipfs-migrator/all-migrations.nix { + buildGoModule = buildGo116Module; + }; + ipfs-migrator-unwrapped = callPackage ../applications/networking/ipfs-migrator/unwrapped.nix { }; + ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; + ipget = callPackage ../applications/networking/ipget { }; i-pi = with python3Packages; toPythonApplication i-pi; From f03446cc4960a745ce814789e3170d7ea031ee0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 13:32:39 +0000 Subject: [PATCH 195/231] fits-cloudctl: 0.10.8 -> 0.10.9 --- pkgs/tools/admin/fits-cloudctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index a218f25f04e8..71274be69ae2 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.10.8"; + version = "0.10.9"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-vqzHZ7DW4ev5soFMcafgL/81k6vCsm6Ds5yto/VheX8="; + sha256 = "sha256-FNlbAxU1FiLl74h+BmpAB3+vZ+RgdlpkehsDLhpZ4EE="; }; vendorSha256 = "sha256-f35Asf9l6ZfixpjMGzesTsxmANreilMxH2CULMH3b2o="; From f8f5be818254609f6cf85c54b9bf8f5851e2cd42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 08:48:23 +0000 Subject: [PATCH 196/231] python310Packages.mariadb: 1.0.9 -> 1.0.10 --- pkgs/development/python-modules/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mariadb/default.nix b/pkgs/development/python-modules/mariadb/default.nix index 251b69e8e67c..987fe203edb7 100644 --- a/pkgs/development/python-modules/mariadb/default.nix +++ b/pkgs/development/python-modules/mariadb/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mariadb"; - version = "1.0.9"; + version = "1.0.10"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Aqmz0KB26aDQ6hxItF7Qm2R14rak6Mge2fHoLK87/Ck="; + hash = "sha256-eQKLpgURc9rRrQvnUYOJyrcCOfkrT/i4gT2uVcPyxT0="; extension = "zip"; }; From 0b92e6dc0a49dc4afc21a92ac45da4d346182f46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Feb 2022 11:57:22 +0000 Subject: [PATCH 197/231] python310Packages.pyicloud: 0.10.2 -> 1.0.0 --- pkgs/development/python-modules/pyicloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 039d6259f36d..56f4e4236215 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "pyicloud"; - version = "0.10.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "picklepete"; repo = pname; rev = version; - sha256 = "0bxbhvimwbj2jm8dg7sil8yvln17xgjhvpwr4m783vwfcf76kdmy"; + sha256 = "sha256-2E1pdHHt8o7CGpdG+u4xy5OyNCueUGVw5CY8oicYd5w="; }; propagatedBuildInputs = [ From fc2cdef599281e4193a32d4cca9a1696c8c30e04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 03:59:33 +0000 Subject: [PATCH 198/231] curaengine: 4.12.1 -> 4.13.1 --- pkgs/applications/misc/curaengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index c6af30b78552..085fcab1475c 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.12.1"; + version = "4.13.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "sha256-+sjysxOaNLq6p3yCoB1qKosBO5Cg2/1o7xmUtZ15wkE="; + sha256 = "sha256-dx0Q6cuA66lG4nwR7quW5Tvs9sdxjdV4gtpxXirI4nY="; }; nativeBuildInputs = [ cmake ]; From b68668746c4cb2c52448b9d521c2b6baf436016c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 21:52:14 +0000 Subject: [PATCH 199/231] python310Packages.islpy: 2021.1 -> 2022.1.1 --- pkgs/development/python-modules/islpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index d6e4332fdeaa..67b547b724ea 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2021.1"; + version = "2022.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b3f49de925149dbf2482e648016507cd66d0dce6668a1bc4de5e7a937e9c576d"; + sha256 = "sha256-eWNc1xxOqEmPdSC1Ha6tfM8ofgkudfOGjvp3ZyM4pxE="; }; postConfigure = '' From 4ee698fad8e2da7189f29c69afb5afa92f29c542 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Feb 2022 06:48:34 +0000 Subject: [PATCH 200/231] python310Packages.bids-validator: 1.8.9 -> 1.9.2 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 49952b4f5f17..4a0bd988c1ef 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.8.9"; + version = "1.9.2"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "01fcb5a8fe6de1280cdfd5b37715103ffa0bafb3c739ca7f5ffc41e46549612e"; + sha256 = "sha256-JxPOHeK8glWwAhYwlCVJtfWeMtU6KHgvNg5b2DgGxGc="; }; # needs packages which are not available in nixpkgs From 5918b5cb4d62180faf20894bc251acfe4de84192 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Feb 2022 02:04:26 +0000 Subject: [PATCH 201/231] wakatime: 1.35.4 -> 1.37.0 --- pkgs/tools/misc/wakatime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index b9c9d73006aa..e936ca584b71 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakatime"; - version = "1.35.4"; + version = "1.37.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - sha256 = "sha256-MG2ROWQh8A7LrdOnDWLG9AsHjzfv84KjmjZXhJlMrLQ="; + sha256 = "sha256-1JOsE8u4+LlWL9nU/fXIqVME1VsgxZV84lJXNTY2pZg="; }; - vendorSha256 = "sha256-8FaM83+d1VQ/9le2hD0nqErhH/jOHMxbNz2o4D3qWb8="; + vendorSha256 = "sha256-WKay4/bsy8jCOTQ2jHQPMBNfIuTI3QzdmhG1aOHNK0Y="; meta = with lib; { inherit (src.meta) homepage; From 58526c2229a3866dc57b2006a848b61f3584cef3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Feb 2022 00:28:10 +0000 Subject: [PATCH 202/231] python310Packages.fastprogress: 1.0.0 -> 1.0.2 --- pkgs/development/python-modules/fastprogress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastprogress/default.nix b/pkgs/development/python-modules/fastprogress/default.nix index 2164bc93f622..cd1b4e3bbacf 100644 --- a/pkgs/development/python-modules/fastprogress/default.nix +++ b/pkgs/development/python-modules/fastprogress/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fastprogress"; - version = "1.0.0"; + version = "1.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1zhv37q6jkqd1pfhlkd4yzrc3dg83vyksgzf32mjlhd5sb0qmql9"; + sha256 = "sha256-lga6RCUFo6RFgdY97dzlv/HfF6y9w3JS98PxvlLB0kM="; }; propagatedBuildInputs = [ numpy ]; From 869c8e25eff41bef4b75d339e694ecbe0edaf1c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Feb 2022 19:35:12 +0000 Subject: [PATCH 203/231] ncnn: 20211208 -> 20220216 --- pkgs/development/libraries/ncnn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/development/libraries/ncnn/default.nix index d53e0d9b42ea..8c0f213b8298 100644 --- a/pkgs/development/libraries/ncnn/default.nix +++ b/pkgs/development/libraries/ncnn/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20211208"; + version = "20220216"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "1c9axrnafksnks7v5fmi6nzs0qim9n6j5kh5d0vfl3b4r22irhqr"; + sha256 = "sha256-QHLD5NQZA7WR4mRQ0NIaXuAu59IV4SjXHOOlar5aOew="; }; patches = [ From b8d575e5b5007b980331af0a08af1c62f8305577 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Feb 2022 04:55:13 +0000 Subject: [PATCH 204/231] python310Packages.fastapi: 0.73.0 -> 0.74.0 --- pkgs/development/python-modules/fastapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index ec14e956c3fd..b8cce5808cc5 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.73.0"; + version = "0.74.0"; format = "flit"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = version; - sha256 = "0v3w9b8107b3g2rgy5y58f0p64inhwl1j9cybp627myypwpqx4b7"; + sha256 = "sha256-pA+oaZpyRDeQ+b9jrzpYdm3LZQ5QWNjvfFRtUe8eDSo="; }; propagatedBuildInputs = [ From 050eb35cee1919520c16200d1739e7d8e12debed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 15:30:00 +0000 Subject: [PATCH 205/231] duo-unix: 1.11.5 -> 1.12.0 --- pkgs/tools/security/duo-unix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 0ec07371df38..5769e1a4b7b4 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "duo-unix"; - version = "1.11.5"; + version = "1.12.0"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "sha256-7pE4EnyV22qQ13RFKHv0ah/BQYHJE1jdTwXBeqpBFgs="; + sha256 = "sha256-i7oAmNjXkGn1MCn5EBmidMY/u3h/rzRAHCD4uhVGV/Q="; }; buildInputs = [ pam openssl zlib ]; From fcb5f68c28b6da9546279ae66d8431ae43ddf167 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 02:59:40 +0000 Subject: [PATCH 206/231] blocky: 0.17 -> 0.18 --- pkgs/applications/networking/blocky/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/applications/networking/blocky/default.nix index 842cbe30309d..2f2a708455e1 100644 --- a/pkgs/applications/networking/blocky/default.nix +++ b/pkgs/applications/networking/blocky/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "blocky"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vG6QAI8gBI2nLRQ0nOFWQHihyzgmJu69rgkWlg3iW3E="; + sha256 = "sha256-rFHDoNrEmMSNEc3RLdSeRk9mF05drUYfJFQKHAk5alE="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorSha256 = "sha256-+mpNPDejK9Trhw41SUXJPL/OX5wQR0QfA2+BXSlE0Jk="; + vendorSha256 = "sha256-rrqDjh5e3KX5+saYjnMPG0bhr5YEOPfz0QCRf6omNZI="; meta = with lib; { description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features."; From 640f96d0461ac8985ac1caa905e728a33e37c433 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 15:01:10 +0000 Subject: [PATCH 207/231] dprint: 0.22.0 -> 0.22.2 --- pkgs/development/tools/dprint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index 87e1ca02745b..f2bd4bb1b2a2 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.22.0"; + version = "0.22.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-sE5Ojm4ZkMNQ6ihaT5GGRjqqJ6gEvoMaliMbRSkS8wI="; + sha256 = "sha256-iYqQABXd3Vra+U7cfGKBEyTXfQGwHxFSxEoDyCfKk5Y="; }; - cargoSha256 = "sha256-KQLoF0yvlZaQIn50WlmlfHsIYjgca6odCnhmWG2au2U="; + cargoSha256 = "sha256-QMOS8Pn3RwZZRtKqp077ihh91Q4VPe8alrtQ6dYIXmA="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 6ca22f0c060803e8c9c3efc33fc65c44e8ba4543 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 03:59:51 +0000 Subject: [PATCH 208/231] cargo-msrv: 0.14.2 -> 0.15.0 --- pkgs/development/tools/rust/cargo-msrv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index 32ecbf9b340a..caac565e621c 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rKkU49sqVArp/iCfcG78ieoEbyZoqB1owTwLfl09DSM="; + sha256 = "sha256-OBcRN0tYNnNqytmmAm6DMtHtp+JzPjomfTpeQEtQE84="; }; - cargoSha256 = "sha256-aA4l7kyVnu416LcHddJqrEpi8WS0AImbROZG+kBy5tk="; + cargoSha256 = "sha256-uZw/ojPAzbpRYb2pkJ/i/+GXvxxU6piCLuMG/fPII2M="; passthru = { updateScript = nix-update-script { From 270f7d21c7f19676b9b9d1c2b7a2833ba2a143f4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 25 Feb 2022 16:38:07 -0300 Subject: [PATCH 209/231] elisp-packages: updated at 2022-02-25 --- .../emacs/elisp-packages/elpa-generated.nix | 6 +- .../elisp-packages/recipes-archive-melpa.json | 284 +++++++++--------- 2 files changed, 145 insertions(+), 145 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index a5004c222bee..2cc03add30b2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -2043,10 +2043,10 @@ elpaBuild { pname = "isearch-mb"; ename = "isearch-mb"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/isearch-mb-0.3.tar"; - sha256 = "01yq1skc6rm9yp80vz2fhh9lbkdb9nhf57h424mrkycdky2w50mx"; + url = "https://elpa.gnu.org/packages/isearch-mb-0.4.tar"; + sha256 = "11q9sdi6l795hspi7hr621bbra66pxsgrkry95k7wxjkmibcbsxr"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 0cfbc40b34e8..0d5f267f5a10 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -3231,8 +3231,8 @@ 20200914, 644 ], - "commit": "56de2d51cfbdee8d67091a4f168022028c0b3f1f", - "sha256": "0n3nf45p30347sj4hhcgqf75pcpfgccjhqwrvz0dhhzmgg614bkv" + "commit": "90c30a8e8d37b606decfabf7b52d37022ea5b3a6", + "sha256": "1vxx4h33dx14hrpgch7xk7y83cdxj6vamma2hanzjgwjq7wvdck3" }, "stable": { "version": [ @@ -7577,26 +7577,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20220219, - 1634 + 20220224, + 1940 ], "deps": [ "a" ], - "commit": "34082bcf54f5a920ac710394b1fdea2f653b9662", - "sha256": "0mph3k0zpi06w3ars7vvh434vz0mpk0nridpc4mvjnii1bslgpkc" + "commit": "45d04ac3935ade2b1e856115c69a32f11e3e7585", + "sha256": "0f2b3i22xl0j8j6b3i5vbfqfn1irylslwk4xvm3w0sk2pghi93y2" }, "stable": { "version": [ 0, 4, - 1 + 2 ], "deps": [ "a" ], - "commit": "f28be75c0d141aa82e3a51818a5ca8543c6bc542", - "sha256": "17rz7wcvv0nrvqqj0f27q391pi5dmqly8srh6bcb921w8jzp69hc" + "commit": "45d04ac3935ade2b1e856115c69a32f11e3e7585", + "sha256": "0f2b3i22xl0j8j6b3i5vbfqfn1irylslwk4xvm3w0sk2pghi93y2" } }, { @@ -9875,11 +9875,11 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220214, - 1115 + 20220225, + 1627 ], - "commit": "e5e11f30f0b6ed0a2b283d5d3dec84bcd36557fc", - "sha256": "0qxypl6ghr31idgn2mvwgjkp1fhjlhwjldnqim4l658yxivh2jyz" + "commit": "2ad8edf9d992034b6e1e46315d72801b9e3aa1e5", + "sha256": "01kshih48hvwdn5gyif5z2vqyhx8h12zs6ygkmqyif5lzm4sqmdc" }, "stable": { "version": [ @@ -10590,8 +10590,8 @@ 20171115, 2108 ], - "commit": "0c12039822e47505cb16325367ae80ab4740c15f", - "sha256": "1m9cs36va0i4s9m428s5721ndrjpsqjyhg9wfigmv4414mhzhjxb" + "commit": "64122d4a77d76689558412b55962cab60524c67c", + "sha256": "1a80pfhys8ja1nh32d3xqab0f7f1k3k5mzsvscnivk90cmsrakhb" }, "stable": { "version": [ @@ -11253,8 +11253,8 @@ "seq", "ts" ], - "commit": "9ef3337c5a68caf73866a6949bb5783d7e246979", - "sha256": "0jd9bcf1qjz9hd9qpajx7xls5h8czadwvcahfdwiy8hqhl09vgii" + "commit": "7cf2c86afd8f6fb6235320ac9f7ebd76153d8bc6", + "sha256": "1gw69ps98bc28kwfqi6m9v4im71jla410ici5cyhfyk67m3dvgbb" }, "stable": { "version": [ @@ -11298,14 +11298,14 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220224, - 1017 + 20220225, + 950 ], "deps": [ "chronometrist" ], - "commit": "9ef3337c5a68caf73866a6949bb5783d7e246979", - "sha256": "0jd9bcf1qjz9hd9qpajx7xls5h8czadwvcahfdwiy8hqhl09vgii" + "commit": "7cf2c86afd8f6fb6235320ac9f7ebd76153d8bc6", + "sha256": "1gw69ps98bc28kwfqi6m9v4im71jla410ici5cyhfyk67m3dvgbb" }, "stable": { "version": [ @@ -11335,8 +11335,8 @@ "chronometrist", "spark" ], - "commit": "9ef3337c5a68caf73866a6949bb5783d7e246979", - "sha256": "0jd9bcf1qjz9hd9qpajx7xls5h8czadwvcahfdwiy8hqhl09vgii" + "commit": "7cf2c86afd8f6fb6235320ac9f7ebd76153d8bc6", + "sha256": "1gw69ps98bc28kwfqi6m9v4im71jla410ici5cyhfyk67m3dvgbb" }, "stable": { "version": [ @@ -12798,8 +12798,8 @@ 20210104, 1831 ], - "commit": "dd9edd99a462ba0cb45e923e683a828fc440fe96", - "sha256": "1l4vx7slcdy5ymsah403hd3rl78ilyaqdgwrxfd0iay17qq0xn3b" + "commit": "0883ab385a8d15075cab99a265a20131a37b506d", + "sha256": "08rhvnhs8ijcsnlvbh40s64zxksjmwjlskv0rxpv1n70jky46fxi" }, "stable": { "version": [ @@ -16236,15 +16236,15 @@ "repo": "OlMon/consult-projectile", "unstable": { "version": [ - 20211018, - 1718 + 20220225, + 1544 ], "deps": [ "consult", "projectile" ], - "commit": "29a7e54dbeb8e5d5e07c0546e60f6a7a6b79bbb8", - "sha256": "1n4hv4yb0pysbcv4rb3xw3550jzz6msi91ghxmvl7nf7shvd9gg7" + "commit": "758cfc259ae83421d008731642ff1ada41b7b514", + "sha256": "0fsqz88xplbkr6hl8zwmg65s3d8jjfnvf2bdfv795i0n8lsprl3c" } }, { @@ -18584,8 +18584,8 @@ 20211111, 1407 ], - "commit": "76e888e267f177126799c3b1981d62bc73204415", - "sha256": "06jv78f360j7krgh4s2dbvbs46m1g19szmf43yaqq7q7shwl45l6" + "commit": "b7ff8224f56af256245d691af589ab10126126d3", + "sha256": "1irhh1320zr19z8i6vphhmga3zymqi6xmnzl4a8ciqwyw2p3hc57" }, "stable": { "version": [ @@ -22498,8 +22498,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20220222, - 1711 + 20220225, + 1528 ], "deps": [ "aio", @@ -22510,8 +22510,8 @@ "tablist", "transient" ], - "commit": "78881bea51c74ef171788fa989908cd51f5b3f8d", - "sha256": "0wgdabjkcwi9a3615imny8xysbrydnlcz9rmkavp22kypk6ydcjw" + "commit": "498ffb2ba51fce12cb543caca0ecbc62782620d3", + "sha256": "1ixzi9lsjra01srvkd30jvryhbgxl9s49mspy2f6975zna390m60" }, "stable": { "version": [ @@ -23613,8 +23613,8 @@ 20210909, 1010 ], - "commit": "11b6c5f25ef440628334d1e0fce4a7b6d6baa105", - "sha256": "16bjlxfw0pbms7cpg9gln0cnm9jm2mybcwm18dqvl6lyj896pa12" + "commit": "c967d8a4880732f2f7cba39d4f283154c5ef914e", + "sha256": "079xxy2569zrfy2r621bb25gw99dlmwmys60qyrxvn01mb9ah9ql" }, "stable": { "version": [ @@ -29541,8 +29541,8 @@ 20200914, 644 ], - "commit": "56de2d51cfbdee8d67091a4f168022028c0b3f1f", - "sha256": "0n3nf45p30347sj4hhcgqf75pcpfgccjhqwrvz0dhhzmgg614bkv" + "commit": "90c30a8e8d37b606decfabf7b52d37022ea5b3a6", + "sha256": "1vxx4h33dx14hrpgch7xk7y83cdxj6vamma2hanzjgwjq7wvdck3" }, "stable": { "version": [ @@ -29566,8 +29566,8 @@ 20220215, 1844 ], - "commit": "c4f24d6718ac56c431f0fccf240c5b15482792ed", - "sha256": "1b6vv11im8zv1sddp2a2qa2z00lkv6pzd3b6kmxlvcrlkfhc28md" + "commit": "b5f0062fc16549b5836f58105e88c7a458e78470", + "sha256": "1r7sb4m2whfs7fnfihf7i10484vzd26ljvfx2j6wll0zmd842avs" }, "stable": { "version": [ @@ -30291,8 +30291,8 @@ 20211005, 221 ], - "commit": "636bf8d8797bdd58f1b543c9d3f4910e3ce879ab", - "sha256": "02hjm685fl4f33s5fi8nc088wwfzhyy6abx5g4i93b2dx3hr2lyi" + "commit": "0435d8e2864bb4f1be59ae548d0068c69fa31c7a", + "sha256": "1ggp122b0a93ji2khxg8kvklwvjxx4a45hayln725d5nsmf82wy6" }, "stable": { "version": [ @@ -30477,11 +30477,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20220213, - 1912 + 20220225, + 1523 ], - "commit": "399f952c4bc1cbe17ce46b6800fc469ed0c6a25e", - "sha256": "01qwcjj90zdgz061nsqxralv9z6l20k0sahznhling9xnalymfjr" + "commit": "39eba283000a7b0220303d7c5a4f3ee05efc1e9c", + "sha256": "1avzxbdj2ghzv94mjmikqdb6za4dxkby2pnyrz0519fs4sc17a06" }, "stable": { "version": [ @@ -40258,8 +40258,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20220219, - 1546 + 20220225, + 1417 ], "deps": [ "closql", @@ -40272,8 +40272,8 @@ "transient", "yaml" ], - "commit": "e3357860886ea9c930f552afb1ec3cd60467aeb9", - "sha256": "1ndk9szl49szbaafvn1khb5s4s8i9qprcqkl77qqp3rsns5nxn2r" + "commit": "0f436173d1660321edac761e3e82c40e97709f63", + "sha256": "03iwng2l5gj3mhk8jw72wzz5iji4c0m5p59f2igbiqm79xrxghys" }, "stable": { "version": [ @@ -40479,8 +40479,8 @@ "deps": [ "seq" ], - "commit": "63f29cbd66b9a3d2ff11ff99b36d4d095638d084", - "sha256": "16pawv0i8pgy3cjrgi6a7fv8jm272l1c9cl0zsx95bhlblwdfy6v" + "commit": "96dd298a2ee2f62739e4a11281daadd90352df70", + "sha256": "0amxqi4jvc0sr5i6pk72ricjwdc0v0lr0q34vccsab2l8iiwid89" }, "stable": { "version": [ @@ -42862,8 +42862,8 @@ "transient", "with-editor" ], - "commit": "52131989f356ecd397d64634266bae7cb3db18b9", - "sha256": "06963skbn719vah43v114r0v23m0zwrw155d02014cnhib27pf9q" + "commit": "44c58868c997f0b86d66faeed2f0b29064f8d0b9", + "sha256": "0yd5h61ykl1kmcla1z71kwi0yikax817da77fxz29l6mv85dlsfm" }, "stable": { "version": [ @@ -47793,15 +47793,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220224, - 1254 + 20220225, + 727 ], "deps": [ "helm-core", "popup" ], - "commit": "57a54ad97e46b0eee8a7aac96cb27b30b84f400c", - "sha256": "0kqjxc4cml4w87ndkj2hl9fcwfd178g4qsl769dzkbz795yf619l" + "commit": "fbe5eb03255c18466162253c60db7b6ca50f32b4", + "sha256": "11n5rwcw4ky96na3gbfxcdwcp0x4dnrqadpgzkcz2pv8s5ih8g1y" }, "stable": { "version": [ @@ -48706,8 +48706,8 @@ "deps": [ "async" ], - "commit": "57a54ad97e46b0eee8a7aac96cb27b30b84f400c", - "sha256": "0kqjxc4cml4w87ndkj2hl9fcwfd178g4qsl769dzkbz795yf619l" + "commit": "fbe5eb03255c18466162253c60db7b6ca50f32b4", + "sha256": "11n5rwcw4ky96na3gbfxcdwcp0x4dnrqadpgzkcz2pv8s5ih8g1y" }, "stable": { "version": [ @@ -53948,8 +53948,8 @@ "deps": [ "dash" ], - "commit": "2b826735bb8d3bcfced489a1e0fa21b10fbc967e", - "sha256": "1ihpwl8rlpxmalpccnkd3xk6ngd4gxz29gjyyhka7p825as5nywm" + "commit": "4ca0638a14a8b304ac2b46e7b342b8d8732ad199", + "sha256": "1d0wi5dm3qri9b502nrbcra3b3gmikbqdbyzk87fccb4gf9k500v" }, "stable": { "version": [ @@ -60280,14 +60280,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20211230, - 814 + 20220225, + 810 ], "deps": [ "s" ], - "commit": "e90b1ed2cc806262b0ee772dcc88f8da693d9210", - "sha256": "0jhfb2shz71kwfzmvlpzhldm2rms3wgwikrym2a2fr9hw91i2zy7" + "commit": "6c1d63511fb2b3b3f2e342eff6a375d78be6c12c", + "sha256": "07fl2bcl1drscp94gpy0v3n31rml8fffc7iv5v80qh8zwvn57d6h" }, "stable": { "version": [ @@ -61765,8 +61765,8 @@ 20210318, 2106 ], - "commit": "1c83cdf2c76d420317d2dfaec82130dae380b4de", - "sha256": "11mrpvrlv849nc7nmacs0041rxzzscrbcf1zgbk32rhl0yk1zgb2" + "commit": "2effe2ed03cebfd11746b1131eef3dd59205cfaf", + "sha256": "1m2bmblvwmlsprhwi92r9ihaddrbwas7fkhxi1cy87w9x4dvwjmq" }, "stable": { "version": [ @@ -63846,7 +63846,7 @@ 20220209, 755 ], - "commit": "9ae8990220f26d341d8e92c47bab014119ef2b9c", + "commit": "bc2ec448077a1aadf11ad5ca3b29aa86e1b29527", "sha256": "0si95v1rswilp0myarvkfd8d47864jplqfrzmy64zbicichkl81j" }, "stable": { @@ -66765,8 +66765,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220224, - 1244 + 20220225, + 943 ], "deps": [ "dash", @@ -66775,8 +66775,8 @@ "transient", "with-editor" ], - "commit": "52131989f356ecd397d64634266bae7cb3db18b9", - "sha256": "06963skbn719vah43v114r0v23m0zwrw155d02014cnhib27pf9q" + "commit": "44c58868c997f0b86d66faeed2f0b29064f8d0b9", + "sha256": "0yd5h61ykl1kmcla1z71kwi0yikax817da77fxz29l6mv85dlsfm" }, "stable": { "version": [ @@ -67141,8 +67141,8 @@ "libgit", "magit" ], - "commit": "52131989f356ecd397d64634266bae7cb3db18b9", - "sha256": "06963skbn719vah43v114r0v23m0zwrw155d02014cnhib27pf9q" + "commit": "44c58868c997f0b86d66faeed2f0b29064f8d0b9", + "sha256": "0yd5h61ykl1kmcla1z71kwi0yikax817da77fxz29l6mv85dlsfm" }, "stable": { "version": [ @@ -67296,8 +67296,8 @@ "deps": [ "dash" ], - "commit": "52131989f356ecd397d64634266bae7cb3db18b9", - "sha256": "06963skbn719vah43v114r0v23m0zwrw155d02014cnhib27pf9q" + "commit": "44c58868c997f0b86d66faeed2f0b29064f8d0b9", + "sha256": "0yd5h61ykl1kmcla1z71kwi0yikax817da77fxz29l6mv85dlsfm" }, "stable": { "version": [ @@ -69109,8 +69109,8 @@ 20220218, 2024 ], - "commit": "2a822b78e0483f2f32995c72870a16e43d3f0c92", - "sha256": "1cljyk7b56idr0qh23sy6spfqws33mq3m4hwnsk8rj5qi0pr6pbn" + "commit": "7d3139c9f55ba85c00e5f5b1a396be98fea1762a", + "sha256": "1brw32ghmk0l98wk0n34v8as0g816n87f8drq794y8hkx8iiw6lz" }, "stable": { "version": [ @@ -70678,11 +70678,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20220223, - 1656 + 20220225, + 1429 ], - "commit": "7773a4ec72d346d6cf4123b574c74507a3dab97f", - "sha256": "14sik5hf3k2p4p6h2qrr5cknfzmksxyhng4xb2fg2cxdvxw7s1aa" + "commit": "b8b26b1e3c63e9cccd3b5fa68e5895ed2662f042", + "sha256": "0dppwx7rn4c7b30j34763qsx8wwgfcig6j1l6vq5m3ms239qlv9q" }, "stable": { "version": [ @@ -71313,8 +71313,8 @@ 20210306, 1053 ], - "commit": "0dcb977536385e18f88e29b3ae42b07fd5f5f433", - "sha256": "0h669a5n1jv3i2hiadv06ymsxqv72vfj4g6qm2z3lh1c3yzv7pkl" + "commit": "063c41f1d7c1a877f44c1f8caad6be1897350336", + "sha256": "0wqkprcg7p5c92lm614sb4l3viy9m526fxr28mshvws2wyn6072l" }, "stable": { "version": [ @@ -71830,14 +71830,14 @@ "url": "https://repo.or.cz/mu4e-marker-icons.git", "unstable": { "version": [ - 20220210, - 1405 + 20220225, + 1137 ], "deps": [ "all-the-icons" ], - "commit": "35ca0c9bd0d1512eed943f704ffc73ed97cca454", - "sha256": "1x7vkc7bagnk8xan0ylckj8wfxpqk2r4ij64vy9p0z0rgyrvj56v" + "commit": "66674ee00dbf953e7d8c1696fb12e9b5b4b272bd", + "sha256": "0pswfq8apihjglysphq3g4la39hyhrms0g010rp691m2mgg1lp39" } }, { @@ -74422,11 +74422,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20220216, - 1156 + 20220225, + 1239 ], - "commit": "08da7f25e5ebf6536002c9a544d687a1d28aea3e", - "sha256": "1vhvhffbghdmgd9w6bcrpxjblpwjgnyg1vd5j62hff03qmjxqdlj" + "commit": "d298af9e9d75f076d767044738b4811a82f9b2ca", + "sha256": "1yximnzcv4j4fxjiw4mk7qpqmn8ix49kfyh2jfx858c1nbvbhkrl" }, "stable": { "version": [ @@ -75760,8 +75760,8 @@ 20200320, 1504 ], - "commit": "cca09b64eff689d8bb15a77de9d4c7fe9845a1f9", - "sha256": "1wwmf14df2rnxlfs8bwb9p4q1a1plschbq2g9vqflphj6kv213m4" + "commit": "b4ce25699e3ebff054f523375d1cf5a17bd0dbaf", + "sha256": "0fhj3241gpj6qj2sawr8pgyn5b7320vjfb7idsy23kh4jvmj2wb8" } }, { @@ -76394,8 +76394,8 @@ 20210923, 1348 ], - "commit": "144f0a634c198c945d562162f77a8a5a1dd9588d", - "sha256": "1yss153hfcn3rrpn46rayrhi6gy3f0c9bm3im7hxg1fly1qxylwz" + "commit": "1ce35b98ff6d76947c648b96ff41ff3b8a9f1234", + "sha256": "19xjj762l6yirqxvjn4gcvxrarbrjrdp88r6x576qzsqppsm5dsk" }, "stable": { "version": [ @@ -78870,16 +78870,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20220129, - 2049 + 20220225, + 158 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "f424364605b21e5f1686f8ce2645afe543538684", - "sha256": "1646hr3mmg0ppa4xx9gjc1zkdryfs2m0j39cjhrfxcn05gsykklh" + "commit": "96e92585ed6f510f87363be3cb10d804f67e1b52", + "sha256": "1n1h3xby4998hdv6j4gllznzbhh4gl2wr9bm4235n859zypq9b4l" }, "stable": { "version": [ @@ -80346,8 +80346,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220221, - 51 + 20220224, + 1711 ], "deps": [ "dash", @@ -80356,8 +80356,8 @@ "magit-section", "org" ], - "commit": "cebe77135a327cacf7fa60265b553c984664e32a", - "sha256": "1z7yyjggdjvs5nc3988pflmis9v51rsba32crms2rfh07vwpn349" + "commit": "c8a360afdd96a99c14de1bd22f5f9cd16f2580a6", + "sha256": "1cj3xwny146f3likhcpxwkvyxflyq6z750m6ig5jjrgyq89gqrfy" }, "stable": { "version": [ @@ -81707,8 +81707,8 @@ "dash", "s" ], - "commit": "a228ebcf408de7096e5cd3a62b14087432e0afb1", - "sha256": "146xp2jsk7a973g0dn8in1sad6lp1ks7s5ma6jld4h26anprvj1g" + "commit": "32f6cfc7265cf24ebb5361264e8c1b61a07e74df", + "sha256": "0dja2mwzzrn64c2qxvf325x88bwch7s29qhpv6jb4rn1143d4qyf" }, "stable": { "version": [ @@ -82967,14 +82967,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20220223, - 2135 + 20220225, + 358 ], "deps": [ "org" ], - "commit": "616c31aba3122801f36e180f2908be4f9f01b1af", - "sha256": "1qxrw66kgjhpyycbvv04jphddmjirpg1gsdlc14djw75ycvn1m1x" + "commit": "8503350603c10d1e264f5599ae288fd71725919f", + "sha256": "1a5idw9p83m3jnf8s3f0lg28pw5059n05q1m4j5d92wajxlxf2wv" }, "stable": { "version": [ @@ -86937,15 +86937,15 @@ "repo": "arifer612/pippel", "unstable": { "version": [ - 20211205, - 1711 + 20220225, + 1128 ], "deps": [ "dash", "s" ], - "commit": "1e96053ffdcbf64e4c8a0a622feddc3cb0a82ded", - "sha256": "00rnzy7r397k6dwsflnv5lc7x5hcnkr4g784zj3bs8rq64h7dcz0" + "commit": "682a40af266f395cf39862ad0bfb30152ddee204", + "sha256": "1gb7nf047gm57jdggj49ri46hgz8gphqy58abniqlqxjcx9zp4z7" } }, { @@ -88145,11 +88145,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20220125, - 1433 + 20220225, + 1521 ], - "commit": "f2a2b9772722aaadf13bd4d35652637b495952d4", - "sha256": "1n6jj3lz72kh2kqp53fx7h2ggbh6c4s96v6cyhwjs4sls40xrbjl" + "commit": "8ba56f841cbbee102e4fd00dff0f88646907bd09", + "sha256": "0vz52wagbpjg3c2br3cl9zhciq74c1is81crkrxbcdwsms1bwhiw" }, "stable": { "version": [ @@ -90131,8 +90131,8 @@ 20211013, 1726 ], - "commit": "a112c4ab9642b13b648b19d3a416cfcf9994f3fd", - "sha256": "0id5xkma582k4ralcqfmfvpbij6l98s0dq4xnm9cl2vvwfp39i8v" + "commit": "6a77c9bab4bd3c8e10096694469b203bc211246f", + "sha256": "1zi75h0a22yzjb8d408lgika9s9h10z899nxc45dr77xqpfcfww1" }, "stable": { "version": [ @@ -91222,8 +91222,8 @@ 20210411, 1931 ], - "commit": "6622d101ab09a23a8529ce01aea285d636235a76", - "sha256": "1c6zw8rsh2v785ycr671nl2q93j920q5il0mfaclgzjppwyv5h4q" + "commit": "b4264112ec10186d5465f7d6af9b2ab91a236216", + "sha256": "0pgzcx8bp6yilsh16zzz51fdykxh1197vcjb9d0sz2bd6267r7qy" }, "stable": { "version": [ @@ -96527,8 +96527,8 @@ 20200830, 301 ], - "commit": "3c87699570bd3377414830f5a9aba6e92d583335", - "sha256": "0kl4ib4hi55r82bh0dfqh67h51x31z3lql0pqyck7h9ghrrrn41w" + "commit": "fb10c5dbf43e51e03c7dfb582522640e0e3bff5a", + "sha256": "1absjrxh6zlsr9dzf6k18byal9vlf088df6kl1h5839p6w8640by" } }, { @@ -99564,15 +99564,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20220217, - 1145 + 20220224, + 2352 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "33d9f46a48809fab77fc0aef209196d99be4df0c", - "sha256": "0mxznpp521nlc2n49f05gwxcjcgq3ssmvsvsrzsr8abipdi5zkni" + "commit": "180dea856b1026fff1546eedf992a0ec0f103613", + "sha256": "1ngmnx2hms9d5mjcv9rha9y48h0dayj7j9x38wqv4njcj4vmc7b4" }, "stable": { "version": [ @@ -101730,11 +101730,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20220207, - 54 + 20220225, + 102 ], - "commit": "cc331a92f5e81613796110a529b3f9fb511dda87", - "sha256": "1z4nyax8glnvax7fj05p2mgwy9g1gbs4n0lqghc4a6ih0cm314nk" + "commit": "fba53cc8d05d768dc7835b06d0fb857d7f13d5ea", + "sha256": "1lmf3zmwain0y6psmdazbbh240p64a4p6cwlj55sngbnzqidf7h1" } }, { @@ -103497,8 +103497,8 @@ "repo": "Wilfred/suggest.el", "unstable": { "version": [ - 20180916, - 1859 + 20190807, + 851 ], "deps": [ "dash", @@ -103507,8 +103507,8 @@ "s", "spinner" ], - "commit": "83a2679baf661ee834e9e75921fd546243a6d919", - "sha256": "11jqglwqi5q14rk44z02dffk6cqmhjgdda0y63095g8n1ll71jsb" + "commit": "7b1c7fd38cd9389e58f672bfe58d9e88aeb898c7", + "sha256": "04cabm1wn1cy78a47rhn1kh8vd6dclsr2js8plvldbgq2qfq7l4q" }, "stable": { "version": [ @@ -106406,8 +106406,8 @@ 20200212, 1903 ], - "commit": "7990e9639873363921cecf21b1966689da7d4bfc", - "sha256": "1nf8g1si37dpi9smxwnl3fg6bhw01qjp0hb94ymn2pn5wnq92az5" + "commit": "d0234924365d8edafc7a4f4d3c1ef2c88e1da375", + "sha256": "01xbpxlqws56mhcd1gaxq5w36kavjpwxradjd6vj4ay1cfi6c500" }, "stable": { "version": [ @@ -107192,8 +107192,8 @@ 20220223, 557 ], - "commit": "7303661244f3e63d763821281290751c3dc05b9c", - "sha256": "11bpvzyxvmkq2r71vlwli8kn3la1khlz0ifiq88ihx8azrgfmyzh" + "commit": "effbc9191a4cf562dbc71fe4460d093753be5c5d", + "sha256": "0idjhsagvsx5v590m78929jbi3bn9z2qiwcj0gjz3sg2rsxypwk7" }, "stable": { "version": [ From 1c979d946b0665da30938991000266d2319f4ba0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 11:09:44 +0000 Subject: [PATCH 210/231] minizinc: 2.5.5 -> 2.6.0 --- pkgs/development/tools/minizinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 06a6bd3dfd54..2cb43f115a26 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, flex, bison }: stdenv.mkDerivation rec { pname = "minizinc"; - version = "2.5.5"; + version = "2.6.0"; nativeBuildInputs = [ cmake flex bison ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "MiniZinc"; repo = "libminizinc"; rev = version; - sha256 = "sha256-9z2E6KqOys9UUXlXWB4eDhg34kS3PhUB1Dd1F6iGYoE="; + sha256 = "sha256-eeviSmbXSZdW27IGZ2EZjV9eKn6aW1wxzhiRC/LaOX4="; }; meta = with lib; { From 1808423ff2a9573e1f083d935476b49f1aaf24ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Feb 2022 21:03:43 +0000 Subject: [PATCH 211/231] oven-media-engine: 0.12.11 -> 0.13.0 --- pkgs/servers/misc/oven-media-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 7bb433f83e24..24c320e9d4fd 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.12.11"; + version = "0.13.0"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-hxnd9zuDq3CfdvriU1P5C9oM2x/sLqLQZPDNolpz5IQ="; + sha256 = "sha256-aQH73gSy9aUleA5r4poouqAKmwYlsTMxKtpGRXjXMmg="; }; sourceRoot = "source/src"; From 2b32daedf4ccd553affa7012e28d9b8c25c883d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 20:13:27 +0000 Subject: [PATCH 212/231] freetds: 1.3.8 -> 1.3.9 --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index e5797d332ae2..1fd088684cf8 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-18p+ZaJgwCvjUchel4aaOjIr5jeVPKRNNhW1WljSezM="; + sha256 = "sha256-qByKmGp6LwuUWZ69eheF1yAX3qbXlqf0S2rGge53wuc="; }; buildInputs = [ From 551e4c56a35d768bccd9a8e440a50a5fd4a5f1e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Fri, 25 Feb 2022 21:57:42 +0100 Subject: [PATCH 213/231] kdev-{php,python}: download from KDE mirrors --- pkgs/applications/editors/kdevelop5/kdev-php.nix | 10 ++++------ pkgs/applications/editors/kdevelop5/kdev-python.nix | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 7a9b030e8217..8308830efccc 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -1,14 +1,12 @@ -{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: stdenv.mkDerivation rec { pname = "kdev-php"; version = "5.6.2"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "kdev-php"; - rev = "v${version}"; - sha256 = "sha256-hEumH7M6yAuH+jPShOmbKjHmuPRg2djaVy9Xt28eK38="; + src = fetchurl { + url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz"; + hash = "sha256-8Qg9rsK4x1LeGgRB0Pn3InSx4tKccjAF7Xjc+Lpxfgw="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 03d3fce67e76..374b4224ca6b 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -1,14 +1,12 @@ -{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: stdenv.mkDerivation rec { pname = "kdev-python"; version = "5.6.2"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "kdev-python"; - rev = "v${version}"; - sha256 = "sha256-xYElqpJjRtBRIyZGf6JaCvurQ+QrGrdLHxtuANYfCds="; + src = fetchurl { + url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz"; + hash = "sha256-IPm3cblhJi3tmGpPMrjSWa2fe8SLsp6sCl1YU74dkX8="; }; cmakeFlags = [ From c1844a2b58b993c97ecd5fc8329f0383e44958fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 01:51:18 +0000 Subject: [PATCH 214/231] suitesparse-graphblas: 6.1.4 -> 6.2.1 --- .../libraries/science/math/suitesparse-graphblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 4c0059184ee3..4af037ea694f 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "6.1.4"; + version = "6.2.1"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "sha256-pjb4Q9b+5hcI0ZYoez46V/ve4+1GJORu2ZGweceaWDY="; + sha256 = "sha256-YgQdhXxXcvhQ10hCGrGM49jjY4jyzqH9ea+gltdh+Uc="; }; nativeBuildInputs = [ From 0c713dbed40dd87090a4632cffc7b088653f35cb Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Feb 2022 16:35:17 +0300 Subject: [PATCH 215/231] build-support/makeDesktopItem: make fully declarative, add all missing options This updates makeDesktopItem to explicitly support all the fields in the spec, converts list-like fields to native Nix lists instead of semicolon-separated strings, and allows automatically generating [Desktop Action] sections from Nix code instead of hardcoding them as extraConfig strings. --- .../make-desktopitem/default.nix | 151 ++++++++++++------ 1 file changed, 101 insertions(+), 50 deletions(-) diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index 1491a3ad9119..787f0f678471 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -1,67 +1,118 @@ -{ lib, runCommandLocal, desktop-file-utils }: +{ lib, writeTextFile, desktop-file-utils }: +# All possible values as defined by the spec, version 1.4. +# Please keep in spec order for easier maintenance. +# When adding a new value, don't forget to update the Version field below! # See https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html { name # The name of the desktop file , type ? "Application" -, exec -, icon ? null -, comment ? null -, terminal ? false +# version is hardcoded , desktopName # The name of the application , genericName ? null -, mimeType ? null -, categories ? null -, startupNotify ? null , noDisplay ? null +, comment ? null +, icon ? null +# we don't support the Hidden key - if you don't need something, just don't install it +, onlyShowIn ? [] +, notShowIn ? [] +, dbusActivatable ? null +, tryExec ? null +, exec ? null +, path ? null +, terminal ? null +, actions ? {} # An attrset of [internal name] -> { name, exec?, icon? } +, mimeTypes ? [] # The spec uses "MimeType" as singular, use plural here to signify list-ness +, categories ? [] +, implements ? [] +, keywords ? [] +, startupNotify ? null +, startupWMClass ? null +, url ? null , prefersNonDefaultGPU ? null -, extraDesktopEntries ? { } # Extra key-value pairs to add to the [Desktop Entry] section. This may override other values -, extraEntries ? "" # Extra configuration. Will be appended to the end of the file and may thus contain extra sections -, fileValidation ? true # whether to validate resulting desktop file. +# not supported until version 1.5, which is not supported by our desktop-file-utils as of 2022-02-23 +# , singleMainWindow ? null +, extraConfig ? {} # Additional values to be added literally to the final item, e.g. vendor extensions }: let - # like builtins.toString, but null -> null instead of null -> "" - nullableToString = value: + # There are multiple places in the FDO spec that make "boolean" values actually tristate, + # e.g. StartupNotify, where "unset" is literally defined as "do something reasonable". + # So, handle null values separately. + boolOrNullToString = value: if value == null then null else if builtins.isBool value then lib.boolToString value - else builtins.toString value; + else throw "Value must be a boolean or null!"; - # The [Desktop entry] section of the desktop file, as attribute set. + # Multiple values are represented as one string, joined by semicolons. + # Technically, it's possible to escape semicolons in values with \;, but this is currently not implemented. + renderList = value: + if !builtins.isList value then throw "Value must be a list!" + else if builtins.any (item: lib.hasInfix ";" item) value then throw "Values in list must not contain semicolons!" + else if value == [] then null + else builtins.concatStringsSep ";" value; + + # The [Desktop Entry] section of the desktop file, as an attribute set. + # Please keep in spec order. mainSection = { - "Type" = toString type; - "Exec" = nullableToString exec; - "Icon" = nullableToString icon; - "Comment" = nullableToString comment; - "Terminal" = nullableToString terminal; - "Name" = toString desktopName; - "GenericName" = nullableToString genericName; - "MimeType" = nullableToString mimeType; - "Categories" = nullableToString categories; - "StartupNotify" = nullableToString startupNotify; - "NoDisplay" = nullableToString noDisplay; - "PrefersNonDefaultGPU" = nullableToString prefersNonDefaultGPU; - } // extraDesktopEntries; + "Type" = type; + "Version" = "1.4"; + "Name" = desktopName; + "GenericName" = genericName; + "NoDisplay" = boolOrNullToString noDisplay; + "Comment" = comment; + "Icon" = icon; + "OnlyShowIn" = renderList onlyShowIn; + "NotShowIn" = renderList notShowIn; + "DBusActivatable" = boolOrNullToString dbusActivatable; + "TryExec" = tryExec; + "Exec" = exec; + "Path" = path; + "Terminal" = boolOrNullToString terminal; + "Actions" = renderList (builtins.attrNames actions); + "MimeType" = renderList mimeTypes; + "Categories" = renderList categories; + "Implements" = renderList implements; + "Keywords" = renderList keywords; + "StartupNotify" = boolOrNullToString startupNotify; + "StartupWMClass" = startupWMClass; + "URL" = url; + "PrefersNonDefaultGPU" = boolOrNullToString prefersNonDefaultGPU; + # "SingleMainWindow" = boolOrNullToString singleMainWindow; + } // extraConfig; - # Map all entries to a list of lines - desktopFileStrings = - [ "[Desktop Entry]" ] - ++ builtins.filter - (v: v != null) - (lib.mapAttrsToList - (name: value: if value != null then "${name}=${value}" else null) - mainSection - ) - ++ (if extraEntries == "" then [ ] else [ "${extraEntries}" ]); + # Render a single attribute pair to a Key=Value line. + # FIXME: this isn't entirely correct for arbitrary strings, as some characters + # need to be escaped. There are currently none in nixpkgs though, so this is OK. + renderLine = name: value: if value != null then "${name}=${value}" else null; + + # Render a full section of the file from an attrset. + # Null values are intentionally left out. + renderSection = sectionName: attrs: + lib.pipe attrs [ + (lib.mapAttrsToList renderLine) + (builtins.filter (v: !isNull v)) + (builtins.concatStringsSep "\n") + (section: '' + [${sectionName}] + ${section} + '') + ]; + + mainSectionRendered = renderSection "Desktop Entry" mainSection; + + # Convert from javaCase names as used in Nix to PascalCase as used in the spec. + preprocessAction = { name, icon ? null, exec ? null }: { + "Name" = name; + "Icon" = icon; + "Exec" = exec; + }; + renderAction = name: attrs: renderSection "Desktop Action ${name}" (preprocessAction attrs); + actionsRendered = lib.mapAttrsToList renderAction actions; + + content = [ mainSectionRendered ] ++ actionsRendered; in -runCommandLocal "${name}.desktop" -{ - nativeBuildInputs = [ desktop-file-utils ]; +writeTextFile { + name = "${name}.desktop"; + destination = "/share/applications/${name}.desktop"; + text = builtins.concatStringsSep "\n" content; + checkPhase = "${desktop-file-utils}/bin/desktop-file-validate $target"; } - ('' - mkdir -p "$out/share/applications" - cat > "$out/share/applications/${name}.desktop" < Date: Tue, 22 Feb 2022 17:56:15 +0300 Subject: [PATCH 216/231] treewide: switch all desktop file generators to new API Notably: - remove explicit arguments that match the defaults - convert everything to the right Nix types --- nixos/modules/misc/documentation.nix | 2 +- nixos/modules/programs/phosh.nix | 19 ++-- .../audio/goattracker/default.nix | 5 +- pkgs/applications/audio/jamesdsp/default.nix | 10 +-- pkgs/applications/audio/lyrebird/default.nix | 2 +- .../audio/netease-cloud-music-gtk/default.nix | 1 - .../audio/roomeqwizard/default.nix | 2 +- .../audio/sony-headphones-client/default.nix | 2 +- .../blockchains/bisq-desktop/default.nix | 2 +- .../blockchains/crypto-org-wallet/default.nix | 2 +- .../blockchains/monero-gui/default.nix | 2 +- .../blockchains/mycrypto/default.nix | 2 +- .../blockchains/wasabiwallet/default.nix | 2 +- .../editors/android-studio/common.nix | 6 +- .../editors/eclipse/build-eclipse.nix | 2 +- .../applications/editors/jetbrains/common.nix | 6 +- .../editors/kodestudio/default.nix | 2 +- .../editors/leo-editor/default.nix | 8 +- .../applications/editors/netbeans/default.nix | 2 +- .../editors/quartus-prime/default.nix | 2 +- pkgs/applications/editors/rstudio/default.nix | 9 +- .../editors/sublime/2/default.nix | 2 +- pkgs/applications/editors/thonny/default.nix | 2 +- pkgs/applications/editors/vis/default.nix | 12 +-- pkgs/applications/editors/vscode/generic.nix | 35 ++++---- pkgs/applications/editors/xxe-pe/default.nix | 2 +- .../applications/emulators/ccemux/default.nix | 2 +- .../emulators/dosbox-staging/default.nix | 2 +- .../applications/emulators/dosbox/default.nix | 2 +- pkgs/applications/emulators/mame/default.nix | 2 +- pkgs/applications/emulators/mgba/default.nix | 4 +- .../emulators/ryujinx/default.nix | 2 +- pkgs/applications/emulators/vice/default.nix | 2 +- pkgs/applications/emulators/zsnes/default.nix | 2 +- .../graphics/antimony/default.nix | 10 +-- .../applications/graphics/avocode/default.nix | 2 +- .../graphics/evilpixie/default.nix | 4 +- pkgs/applications/graphics/fiji/default.nix | 13 +-- pkgs/applications/graphics/imagej/default.nix | 2 +- pkgs/applications/graphics/ipe/default.nix | 10 +-- .../graphics/openboard/default.nix | 4 +- .../graphics/swingsane/default.nix | 2 +- .../graphics/write_stylus/default.nix | 2 +- .../applications/graphics/xournal/default.nix | 4 +- .../misc/azuredatastudio/default.nix | 36 ++++---- .../misc/cubiomes-viewer/default.nix | 2 +- pkgs/applications/misc/cura/stable.nix | 2 +- pkgs/applications/misc/dbeaver/default.nix | 2 +- pkgs/applications/misc/free42/default.nix | 6 +- .../misc/ganttproject-bin/default.nix | 2 +- pkgs/applications/misc/gkrellm/default.nix | 2 +- .../misc/golden-cheetah/default.nix | 2 +- pkgs/applications/misc/gpsprune/default.nix | 2 +- pkgs/applications/misc/ideamaker/default.nix | 4 +- pkgs/applications/misc/ipmiview/default.nix | 2 +- pkgs/applications/misc/keepass/default.nix | 7 +- pkgs/applications/misc/lsd2dsl/default.nix | 2 +- pkgs/applications/misc/michabo/default.nix | 1 - pkgs/applications/misc/obinskit/default.nix | 2 +- pkgs/applications/misc/obsidian/default.nix | 2 +- pkgs/applications/misc/opentrack/default.nix | 2 +- .../misc/pdfsam-basic/default.nix | 4 +- pkgs/applications/misc/pdfstudio/common.nix | 6 +- pkgs/applications/misc/pgadmin/default.nix | 5 +- pkgs/applications/misc/plater/default.nix | 2 +- pkgs/applications/misc/premid/default.nix | 2 +- .../misc/prusa-slicer/default.nix | 4 +- .../misc/prusa-slicer/super-slicer.nix | 2 +- pkgs/applications/misc/robo3t/default.nix | 2 +- pkgs/applications/misc/sidequest/default.nix | 2 +- pkgs/applications/misc/simplenote/default.nix | 5 +- pkgs/applications/misc/slic3r/default.nix | 2 +- .../misc/snapmaker-luban/default.nix | 2 +- pkgs/applications/misc/stretchly/default.nix | 2 +- .../applications/misc/sweethome3d/default.nix | 2 +- .../applications/misc/sweethome3d/editors.nix | 2 +- .../misc/teleprompter/default.nix | 1 - .../misc/toggldesktop/default.nix | 2 +- .../applications/misc/trenchbroom/default.nix | 2 +- pkgs/applications/misc/tvbrowser/bin.nix | 8 +- pkgs/applications/misc/xmind/default.nix | 4 +- pkgs/applications/misc/xpdf/default.nix | 3 +- .../networking/aether/default.nix | 4 +- .../apache-directory-studio/default.nix | 2 +- .../networking/browsers/firefox/wrapper.nix | 5 +- .../tor-browser-bundle-bin/default.nix | 2 +- .../networking/browsers/vieb/default.nix | 4 +- .../browsers/webbrowser/default.nix | 4 +- .../networking/charles/default.nix | 13 ++- .../networking/cisco-packet-tracer/7.nix | 2 +- .../networking/cisco-packet-tracer/8.nix | 2 +- .../networking/dropbox/default.nix | 4 +- .../deltachat-desktop/default.nix | 8 +- .../instant-messengers/discord/linux.nix | 4 +- .../element/element-desktop.nix | 8 +- .../instant-messengers/gitter/default.nix | 2 +- .../instant-messengers/gomuks/default.nix | 4 +- .../instant-messengers/jitsi/default.nix | 2 +- .../instant-messengers/mikutter/default.nix | 4 +- .../instant-messengers/rambox/rambox.nix | 3 +- .../instant-messengers/ricochet/default.nix | 2 +- .../schildichat/schildichat-desktop.nix | 8 +- .../instant-messengers/teamspeak/client.nix | 2 +- .../instant-messengers/tensor/default.nix | 4 +- .../instant-messengers/wavebox/default.nix | 2 +- .../wire-desktop/default.nix | 6 +- .../networking/ostinato/default.nix | 15 ++-- .../networking/p2p/frostwire/default.nix | 2 +- .../networking/p2p/transgui/default.nix | 10 +-- .../networking/remote/anydesk/default.nix | 4 +- .../remote/vmware-horizon-client/default.nix | 2 +- .../networking/ssb-patchwork/default.nix | 2 +- .../networking/sync/unison/default.nix | 9 +- .../networking/termius/default.nix | 2 +- pkgs/applications/office/appflowy/default.nix | 2 +- pkgs/applications/office/jabref/default.nix | 2 +- pkgs/applications/office/jameica/default.nix | 2 +- .../applications/office/portfolio/default.nix | 2 +- pkgs/applications/office/pyspread/default.nix | 2 +- .../office/softmaker/desktop_items.nix | 88 +++++++++++++++---- pkgs/applications/office/timeline/default.nix | 3 +- pkgs/applications/office/trilium/default.nix | 2 +- pkgs/applications/office/tusk/default.nix | 2 +- pkgs/applications/office/zotero/default.nix | 7 +- pkgs/applications/radio/svxlink/default.nix | 2 +- .../science/astronomy/gprojector/default.nix | 4 +- .../science/chemistry/jmol/default.nix | 12 ++- .../science/chemistry/pymol/default.nix | 12 ++- .../science/electronics/diylc/default.nix | 2 +- .../science/electronics/eagle/eagle.nix | 2 +- .../science/electronics/eagle/eagle7.nix | 2 +- .../science/logic/coq/default.nix | 2 +- .../science/logic/isabelle/default.nix | 2 +- .../science/logic/key/default.nix | 2 +- .../logic/logisim-evolution/default.nix | 2 +- .../science/logic/logisim/default.nix | 2 +- .../science/logic/tlaplus/toolbox.nix | 6 +- .../science/math/geogebra/default.nix | 4 +- .../science/misc/netlogo/default.nix | 2 +- .../science/programming/groove/default.nix | 2 +- .../terminal-emulators/mlterm/default.nix | 6 +- .../rxvt-unicode/default.nix | 2 +- .../terminal-emulators/wayst/default.nix | 9 +- .../version-management/gitkraken/default.nix | 2 +- .../version-management/smartgithg/default.nix | 14 ++- pkgs/applications/video/clipgrab/default.nix | 2 +- .../video/streamlink-twitch-gui/bin.nix | 2 +- .../window-managers/berry/default.nix | 2 +- .../embedded/stm32/stm32cubemx/default.nix | 2 +- pkgs/development/pharo/launcher/default.nix | 2 +- pkgs/development/pharo/wrapper/default.nix | 8 +- .../python-modules/spyder/default.nix | 2 +- pkgs/development/tools/alloy/default.nix | 2 +- .../tools/database/sqldeveloper/default.nix | 2 +- .../tools/database/squirrel-sql/default.nix | 2 +- .../development/tools/eclipse-mat/default.nix | 2 +- .../tools/java/visualvm/default.nix | 2 +- pkgs/development/tools/jpexs/default.nix | 6 +- pkgs/development/tools/mars-mips/default.nix | 2 +- .../tools/misc/saleae-logic-2/default.nix | 2 +- .../tools/misc/saleae-logic/default.nix | 2 +- .../tools/react-native-debugger/default.nix | 2 +- .../tools/scenebuilder/default.nix | 4 +- .../development/tools/scenic-view/default.nix | 4 +- pkgs/development/tools/winpdb/default.nix | 2 +- pkgs/development/web/postman/default.nix | 2 +- .../web/protege-distribution/default.nix | 2 +- pkgs/games/90secondportraits/default.nix | 2 +- pkgs/games/abuse/default.nix | 2 +- pkgs/games/alephone/default.nix | 2 +- pkgs/games/assaultcube/default.nix | 2 +- pkgs/games/ballerburg/default.nix | 3 +- pkgs/games/brogue/default.nix | 3 +- pkgs/games/clonehero/fhs-wrapper.nix | 2 +- pkgs/games/dhewm3/default.nix | 2 +- pkgs/games/domination/default.nix | 2 - pkgs/games/duckmarines/default.nix | 2 +- pkgs/games/ecwolf/default.nix | 2 +- pkgs/games/eduke32/default.nix | 2 +- pkgs/games/factorio/default.nix | 3 +- pkgs/games/fish-fillets-ng/default.nix | 2 +- pkgs/games/flightgear/default.nix | 2 +- pkgs/games/freedroid/default.nix | 2 +- pkgs/games/freenukum/default.nix | 5 +- pkgs/games/frogatto/default.nix | 4 +- pkgs/games/frozen-bubble/default.nix | 2 +- pkgs/games/gnujump/default.nix | 2 +- pkgs/games/gzdoom/default.nix | 2 +- pkgs/games/hyperrogue/default.nix | 2 +- pkgs/games/itch/default.nix | 8 +- pkgs/games/ivan/default.nix | 2 +- pkgs/games/lunar-client/default.nix | 2 +- pkgs/games/maelstrom/default.nix | 2 +- pkgs/games/mari0/default.nix | 2 +- pkgs/games/mindustry/default.nix | 1 - pkgs/games/minecraft/default.nix | 2 +- pkgs/games/mrrescue/default.nix | 2 +- pkgs/games/oh-my-git/default.nix | 2 +- pkgs/games/openjk/default.nix | 4 +- pkgs/games/opensupaplex/default.nix | 2 +- pkgs/games/orthorobot/default.nix | 2 +- pkgs/games/osu-lazer/default.nix | 2 +- pkgs/games/quakespasm/default.nix | 2 +- pkgs/games/rocksndiamonds/default.nix | 2 +- pkgs/games/rott/default.nix | 2 +- pkgs/games/runelite/default.nix | 3 +- pkgs/games/sauerbraten/default.nix | 2 +- pkgs/games/scid-vs-pc/default.nix | 2 +- pkgs/games/scummvm/games.nix | 2 +- pkgs/games/sdlpop/default.nix | 2 +- pkgs/games/sienna/default.nix | 2 +- pkgs/games/starsector/default.nix | 2 +- pkgs/games/system-syzygy/default.nix | 2 +- pkgs/games/tome2/default.nix | 4 +- pkgs/games/tome4/default.nix | 3 +- pkgs/games/unciv/default.nix | 2 +- pkgs/games/unvanquished/default.nix | 12 +-- pkgs/games/ut2004/wrapper.nix | 2 +- pkgs/games/vintagestory/default.nix | 3 +- pkgs/games/worldofgoo/default.nix | 3 +- pkgs/games/xbill/default.nix | 2 +- pkgs/games/xonotic/default.nix | 4 +- pkgs/servers/pulseaudio/qpaeq.nix | 4 +- pkgs/tools/X11/opentabletdriver/default.nix | 3 +- pkgs/tools/admin/winbox/default.nix | 7 +- pkgs/tools/games/jpsxdec/default.nix | 2 +- pkgs/tools/graphics/agi/default.nix | 4 +- .../graphics/snapdragon-profiler/default.nix | 4 +- pkgs/tools/graphics/xcolor/default.nix | 2 +- pkgs/tools/misc/hakuneko/default.nix | 3 +- pkgs/tools/misc/hdfview/default.nix | 2 +- pkgs/tools/misc/jdiskreport/default.nix | 3 +- pkgs/tools/misc/sharedown/default.nix | 2 +- pkgs/tools/security/bitwarden/default.nix | 2 +- pkgs/tools/security/ghidra/build.nix | 2 +- pkgs/tools/security/ghidra/default.nix | 2 +- pkgs/tools/security/jd-gui/default.nix | 6 +- pkgs/tools/security/open-ecard/default.nix | 2 +- pkgs/tools/text/dirdiff/default.nix | 2 +- pkgs/tools/text/hottext/default.nix | 2 +- pkgs/tools/text/xml/basex/default.nix | 4 +- 241 files changed, 463 insertions(+), 504 deletions(-) diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index b7746ddc2115..9304c307af2f 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -129,7 +129,7 @@ let genericName = "View NixOS documentation in a web browser"; icon = "nix-snowflake"; exec = "nixos-help"; - categories = "System"; + categories = ["System"]; }; in pkgs.symlinkJoin { diff --git a/nixos/modules/programs/phosh.nix b/nixos/modules/programs/phosh.nix index cba3f73768ec..ad875616ac9e 100644 --- a/nixos/modules/programs/phosh.nix +++ b/nixos/modules/programs/phosh.nix @@ -8,18 +8,17 @@ let # Based on https://source.puri.sm/Librem5/librem5-base/-/blob/4596c1056dd75ac7f043aede07887990fd46f572/default/sm.puri.OSK0.desktop oskItem = pkgs.makeDesktopItem { name = "sm.puri.OSK0"; - type = "Application"; desktopName = "On-screen keyboard"; exec = "${pkgs.squeekboard}/bin/squeekboard"; - categories = "GNOME;Core;"; - extraEntries = '' - OnlyShowIn=GNOME; - NoDisplay=true - X-GNOME-Autostart-Phase=Panel - X-GNOME-Provides=inputmethod - X-GNOME-Autostart-Notify=true - X-GNOME-AutoRestart=true - ''; + categories = [ "GNOME" "Core" ]; + onlyShowIn = [ "GNOME" ]; + noDisplay = true; + extraConfig = { + X-GNOME-Autostart-Phase = "Panel"; + X-GNOME-Provides = "inputmethod"; + X-GNOME-Autostart-Notify = "true"; + X-GNOME-AutoRestart = "true"; + }; }; phocConfigType = types.submodule { diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index 743417570c16..1fb848ae1eda 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -12,7 +12,6 @@ with lib; let pname = "goattracker" + optionalString isStereo "-stereo"; desktopItem = makeDesktopItem { - type = "Application"; name = pname; desktopName = "GoatTracker 2" + optionalString isStereo " Stereo"; genericName = "Music Tracker"; @@ -20,8 +19,8 @@ let then "gt2stereo" else "goattrk2"; icon = "goattracker"; - categories = "AudioVideo;AudioVideoEditing;"; - extraEntries = "Keywords=tracker;music;"; + categories = [ "AudioVideo" "AudioVideoEditing" ]; + keywords = [ "tracker" "music" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index b4d4a02878d3..16683564b2c7 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -38,19 +38,15 @@ mkDerivation rec{ desktopItems = [ (makeDesktopItem { - name = "jamesdsp.desktop"; + name = "jamesdsp"; desktopName = "JamesDSP"; genericName = "Audio effects processor"; exec = "jamesdsp"; icon = "jamesdsp"; comment = "JamesDSP for Linux"; - categories = "AudioVideo;Audio"; + categories = [ "AudioVideo" "Audio" ]; startupNotify = false; - terminal = false; - type = "Application"; - extraDesktopEntries = { - Keywords = "equalizer;audio;effect"; - }; + keywords = [ "equalizer" "audio" "effect" ]; }) ]; diff --git a/pkgs/applications/audio/lyrebird/default.nix b/pkgs/applications/audio/lyrebird/default.nix index b40dbfe65bf8..81c792d95e2d 100644 --- a/pkgs/applications/audio/lyrebird/default.nix +++ b/pkgs/applications/audio/lyrebird/default.nix @@ -15,7 +15,7 @@ let icon = "${placeholder "out"}/share/lyrebird/icon.png"; desktopName = "Lyrebird"; genericName = "Voice Changer"; - categories = "AudioVideo;Audio;"; + categories = [ "AudioVideo" "Audio" ]; }; in python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix index 76e1bc3923a8..72027fe922b8 100644 --- a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix +++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -11,7 +11,6 @@ , wrapGAppsHook , fetchurl , fetchFromGitHub -, makeDesktopItem }: rustPlatform.buildRustPackage rec { pname = "netease-cloud-music-gtk"; diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix index 9d4118a43915..fae8700d811b 100644 --- a/pkgs/applications/audio/roomeqwizard/default.nix +++ b/pkgs/applications/audio/roomeqwizard/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "REW"; genericName = "Software for audio measurements"; - categories = "AudioVideo;"; + categories = [ "AudioVideo" ]; }; responseFile = writeTextFile { diff --git a/pkgs/applications/audio/sony-headphones-client/default.nix b/pkgs/applications/audio/sony-headphones-client/default.nix index 976c4ab5702c..e3e6573c4324 100644 --- a/pkgs/applications/audio/sony-headphones-client/default.nix +++ b/pkgs/applications/audio/sony-headphones-client/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { icon = "SonyHeadphonesClient"; desktopName = "Sony Headphones Client"; comment = "A client recreating the functionality of the Sony Headphones app"; - categories = "Audio;Mixer;"; + categories = [ "Audio" "Mixer" ]; }) ]; meta = with lib; { diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 2bc3813c226a..0e1e9f291128 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { icon = "bisq"; desktopName = "Bisq ${version}"; genericName = "Decentralized bitcoin exchange"; - categories = "Network;P2P;"; + categories = [ "Network" "P2P" ]; }) ]; diff --git a/pkgs/applications/blockchains/crypto-org-wallet/default.nix b/pkgs/applications/blockchains/crypto-org-wallet/default.nix index 7b0a895f4a1a..e45e43497563 100644 --- a/pkgs/applications/blockchains/crypto-org-wallet/default.nix +++ b/pkgs/applications/blockchains/crypto-org-wallet/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }: +{ lib, fetchurl, appimageTools, imagemagick }: let pname = "chain-desktop-wallet"; diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 885e8170d3fa..dfc5f8b326c6 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { icon = "monero"; desktopName = "Monero"; genericName = "Wallet"; - categories = "Network;Utility;"; + categories = [ "Network" "Utility" ]; }; postInstall = '' diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix index f5dbfeb5ff9b..ee7960a843ba 100644 --- a/pkgs/applications/blockchains/mycrypto/default.nix +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -23,7 +23,7 @@ let comment = "MyCrypto is a free, open-source interface for interacting with the blockchain"; exec = pname; icon = "mycrypto"; - categories = "Finance;"; + categories = [ "Finance" ]; }; in appimageTools.wrapType2 rec { diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 0b90fc10bbc1..f8e20f1a05db 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { desktopName = "Wasabi"; genericName = "Bitcoin wallet"; comment = meta.description; - categories = "Network;Utility;"; + categories = [ "Network" "Utility" ]; }; installPhase = '' diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 540c59586a6e..97eb5cad8d02 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -164,9 +164,9 @@ let icon = drvName; desktopName = "Android Studio (${channel} channel)"; comment = "The official Android IDE"; - categories = "Development;IDE;"; - startupNotify = "true"; - extraEntries="StartupWMClass=jetbrains-studio"; + categories = [ "Development" "IDE" ]; + startupNotify = true; + startupWMClass = "jetbrains-studio"; }; # Android Studio downloads prebuilt binaries as part of the SDK. These tools diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 29c063633fce..faa89b9c8778 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { comment = "Integrated Development Environment"; desktopName = "Eclipse IDE"; genericName = "Integrated Development Environment"; - categories = "Development;"; + categories = [ "Development" ]; }; buildInputs = [ diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 709a9b4251ce..a5e0a2611f01 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -27,11 +27,9 @@ with stdenv; lib.makeOverridable mkDerivation (rec { comment = lib.replaceChars ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; - categories = "Development;"; + categories = [ "Development" ]; icon = mainProgram; - extraEntries = '' - StartupWMClass=${wmClass} - ''; + startupWMClass = wmClass; }; vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts); diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index 38fb55ecf7bf..e975678591c7 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -39,7 +39,7 @@ in comment = "Kode Studio is an IDE for Kha based on Visual Studio Code"; desktopName = "Kode Studio"; genericName = "Text Editor"; - categories = "GNOME;GTK;Utility;TextEditor;Development;"; + categories = [ "GNOME" "GTK" "Utility" "TextEditor" "Development" ]; }; sourceRoot = "."; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index ee22c591ad77..4a5f464f4bcb 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -24,11 +24,9 @@ mkDerivation rec { comment = meta.description; desktopName = "Leo"; genericName = "Text Editor"; - categories = lib.concatStringsSep ";" [ - "Application" "Development" "IDE" - ]; - startupNotify = "false"; - mimeType = lib.concatStringsSep ";" [ + categories = [ "Application" "Development" "IDE" ]; + startupNotify = false; + mimeTypes = [ "text/plain" "text/asp" "text/x-c" "text/x-script.elisp" "text/x-fortran" "text/html" "application/inf" "text/x-java-source" "application/x-javascript" "application/javascript" "text/ecmascript" "application/x-ksh" "text/x-script.ksh" diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index f7614e76ef54..a00646437f7d 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -10,7 +10,7 @@ let comment = "Integrated Development Environment"; desktopName = "Apache NetBeans IDE"; genericName = "Integrated Development Environment"; - categories = "Development;"; + categories = [ "Development" ]; icon = "netbeans"; }; in diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 50366863d673..5a790e78090d 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -10,7 +10,7 @@ let icon = "quartus"; desktopName = "Quartus"; genericName = "Quartus Prime"; - categories = "Development;"; + categories = [ "Development" ]; }; # I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` in buildFHSUserEnv rec { diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 04b688622be0..eada77eea843 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -227,8 +227,13 @@ in desktopName = "RStudio"; genericName = "IDE"; comment = description; - categories = "Development;"; - mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; + categories = [ "Development" ]; + mimeTypes = [ + "text/x-r-source" "text/x-r" "text/x-R" "text/x-r-doc" "text/x-r-sweave" "text/x-r-markdown" + "text/x-r-html" "text/x-r-presentation" "application/x-r-data" "application/x-r-project" + "text/x-r-history" "text/x-r-profile" "text/x-tex" "text/x-markdown" "text/html" + "text/css" "text/javascript" "text/x-chdr" "text/x-csrc" "text/x-c++hdr" "text/x-c++src" + ]; }) ]; }) diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 7f14bf8ae14b..074584e3360e 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Sublime Text"; genericName = "Text Editor"; - categories = "TextEditor;Development;"; + categories = [ "TextEditor" "Development" ]; icon = "sublime_text"; }; diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index 20d25bb616ff..eb6ba73b2e0b 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { icon = "thonny"; desktopName = "Thonny"; comment = "Python IDE for beginners"; - categories = "Development;IDE"; + categories = [ "Development" "IDE" ]; }) ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index a658f95ac014..b9fcfe10221e 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -50,14 +50,10 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "vis"; genericName = "Text editor"; - categories = lib.concatStringsSep ";" [ - "Application" "Development" "IDE" - ]; - mimeType = lib.concatStringsSep ";" [ - "text/plain" "application/octet-stream" - ]; - startupNotify = "false"; - terminal = "true"; + categories = [ "Application" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "application/octet-stream" ]; + startupNotify = false; + terminal = true; }; meta = with lib; { diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 133c5fe9cbe1..672eb4b27ba1 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -37,19 +37,16 @@ let genericName = "Text Editor"; exec = "${executableName} %F"; icon = "code"; - startupNotify = "true"; - categories = "Utility;TextEditor;Development;IDE;"; - mimeType = "text/plain;inode/directory;"; - extraEntries = '' - StartupWMClass=${shortName} - Actions=new-empty-window; - Keywords=vscode; - - [Desktop Action new-empty-window] - Name=New Empty Window - Exec=${executableName} --new-window %F - Icon=code - ''; + startupNotify = true; + startupWMClass = shortName; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "inode/directory" ]; + keywords = [ "vscode" ]; + actions.new-empty-window = { + name = "New Empty Window"; + exec = "${executableName} --new-window %F"; + icon = "code"; + }; }; urlHandlerDesktopItem = makeDesktopItem { @@ -59,13 +56,11 @@ let genericName = "Text Editor"; exec = executableName + " --open-url %U"; icon = "code"; - startupNotify = "true"; - categories = "Utility;TextEditor;Development;IDE;"; - mimeType = "x-scheme-handler/vscode;"; - extraEntries = '' - NoDisplay=true - Keywords=vscode; - ''; + startupNotify = true; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "x-scheme-handler/vscode" ]; + keywords = [ "vscode" ]; + noDisplay = true; }; buildInputs = [ libsecret libXScrnSaver libxshmfence ] diff --git a/pkgs/applications/editors/xxe-pe/default.nix b/pkgs/applications/editors/xxe-pe/default.nix index e7cfe6284e35..8734f4d31c82 100644 --- a/pkgs/applications/editors/xxe-pe/default.nix +++ b/pkgs/applications/editors/xxe-pe/default.nix @@ -19,7 +19,7 @@ let icon = "xxe"; desktopName = "xxe"; genericName = "XML Editor"; - categories = "Development;IDE;TextEditor;Java"; + categories = [ "Development" "IDE" "TextEditor" "Java" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/emulators/ccemux/default.nix b/pkgs/applications/emulators/ccemux/default.nix index 11f24d59e5c3..8b7b1c32628a 100644 --- a/pkgs/applications/emulators/ccemux/default.nix +++ b/pkgs/applications/emulators/ccemux/default.nix @@ -29,7 +29,7 @@ let comment = "A modular ComputerCraft emulator"; desktopName = "CCEmuX"; genericName = "ComputerCraft Emulator"; - categories = "Emulator;"; + categories = [ "Emulator" ]; }; in diff --git a/pkgs/applications/emulators/dosbox-staging/default.nix b/pkgs/applications/emulators/dosbox-staging/default.nix index 438849e7fd8a..c1820646dc62 100644 --- a/pkgs/applications/emulators/dosbox-staging/default.nix +++ b/pkgs/applications/emulators/dosbox-staging/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { comment = "x86 dos emulator enhanced"; desktopName = "DosBox-Staging"; genericName = "DOS emulator"; - categories = "Emulator;Game;"; + categories = [ "Emulator" "Game" ]; }) ]; diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index 383e943ff246..87ac444ae491 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { comment = "x86 dos emulator"; desktopName = "DOSBox"; genericName = "DOS emulator"; - categories = "Emulator;Game;"; + categories = [ "Emulator" "Game" ]; }) ]; diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index e0915703003a..ce3fb3d06aed 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -26,7 +26,7 @@ let exec = "mame${lib.optionalString stdenv.is64bit "64"}"; desktopName = "MAME"; genericName = "MAME is a multi-purpose emulation framework"; - categories = "System;Emulator;"; + categories = [ "System" "Emulator" ]; }; dest = "$out/opt/mame"; diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index d8defe6f2e96..4424bedc6f23 100644 --- a/pkgs/applications/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { comment = "A Game Boy Advance Emulator"; desktopName = "mgba"; genericName = "Game Boy Advance Emulator"; - categories = "Game;Emulator;"; - startupNotify = "false"; + categories = [ "Game" "Emulator" ]; + startupNotify = false; }) ]; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 2f684257114a..6dbd356f24cb 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -74,7 +74,7 @@ buildDotnetModule rec { icon = "ryujinx"; comment = meta.description; type = "Application"; - categories = "Game;"; + categories = [ "Game" ]; })]; meta = with lib; { diff --git a/pkgs/applications/emulators/vice/default.nix b/pkgs/applications/emulators/vice/default.nix index ca0de2f82766..13457823a23e 100644 --- a/pkgs/applications/emulators/vice/default.nix +++ b/pkgs/applications/emulators/vice/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { comment = "Commodore 64 emulator"; desktopName = "VICE"; genericName = "Commodore 64 emulator"; - categories = "Emulator;"; + categories = [ "Emulator" ]; }; preBuild = '' diff --git a/pkgs/applications/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix index ba2f5d6bdc1c..a14109bc8572 100644 --- a/pkgs/applications/emulators/zsnes/default.nix +++ b/pkgs/applications/emulators/zsnes/default.nix @@ -9,7 +9,7 @@ let comment = "A SNES emulator"; desktopName = "zsnes"; genericName = "zsnes"; - categories = "Game;"; + categories = [ "Game" ]; }; in stdenv.mkDerivation { diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 8b482626c91a..0b70d67b2719 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -48,13 +48,9 @@ in genericName = "CAD Application"; exec = "antimony %f"; icon = "antimony"; - terminal = "false"; - categories = "Graphics;Science;Engineering"; - mimeType = "application/x-extension-sb;application/x-antimony;"; - extraEntries = '' - StartupWMClass=antimony - Version=1.0 - ''; + categories = [ "Graphics" "Science" "Engineering" ]; + mimeTypes = [ "application/x-extension-sb" "application/x-antimony" ]; + startupWMClass = "antimony"; }) ]; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index fede2c9bb51a..55080f333c23 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { icon = "avocode"; desktopName = "Avocode"; genericName = "Design Inspector"; - categories = "Development;"; + categories = [ "Development" ]; comment = "The bridge between designers and developers"; }; diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix index 2518eb0942a9..be8e00b5154a 100644 --- a/pkgs/applications/graphics/evilpixie/default.nix +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -16,8 +16,8 @@ let exec = "evilpixie %F"; icon = "evilpixie"; genericName = "Image Editor"; - categories = "Graphics;2DGraphics;RasterGraphics;"; - mimeType = "image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/x-pcx;image/x-targa;image/x-tga;"; + categories = [ "Graphics" "2DGraphics" "RasterGraphics" ]; + mimeTypes = [ "image/bmp" "image/gif" "image/jpeg" "image/jpg" "image/png" "image/x-pcx" "image/x-targa" "image/x-tga" ]; }; in mkDerivation rec { diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix index 18fdc2c55ac1..77ffc4b44c86 100644 --- a/pkgs/applications/graphics/fiji/default.nix +++ b/pkgs/applications/graphics/fiji/default.nix @@ -26,20 +26,15 @@ stdenv.mkDerivation rec { (makeDesktopItem { name = "fiji"; exec = "fiji %F"; + tryExec = "fiji"; icon = "fiji"; - mimeType = "image/*;"; + mimeTypes = [ "image/*" ]; comment = "Scientific Image Analysis"; desktopName = "Fiji Is Just ImageJ"; genericName = "Fiji Is Just ImageJ"; - categories = "Education;Science;ImageProcessing;"; - terminal = false; + categories = [ "Education" "Science" "ImageProcessing" ]; startupNotify = true; - extraEntries = '' - Version=1.0 - TryExec=fiji - X-GNOME-FullName=Fiji Is Just ImageJ - StartupWMClass=fiji-Main - ''; + startupWMClass = "fiji-Main"; }) ]; diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 4af139b08443..f21f658ace30 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { name = "ImageJ"; desktopName = "ImageJ"; icon = "imagej"; - categories = "Science;Utility;Graphics;"; + categories = [ "Science" "Utility" "Graphics" ]; exec = "imagej"; }) ]; diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index c454ed0422d1..d4d00ad9c6ff 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -60,12 +60,10 @@ mkDerivation rec { comment = "A drawing editor for creating figures in PDF format"; exec = "ipe"; icon = "ipe"; - mimeType = "text/xml;application/pdf"; - categories = "Graphics;Qt;"; - extraDesktopEntries = { - StartupWMClass = "ipe"; - StartupNotify = "true"; - }; + mimeTypes = [ "text/xml" "application/pdf" ]; + categories = [ "Graphics" "Qt" ]; + startupNotify = true; + startupWMClass = "ipe"; }) ]; diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index b30dbab1570a..cf16ecc03cb6 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -79,8 +79,8 @@ in mkDerivation rec { icon = "OpenBoard"; comment = "OpenBoard, an interactive white board application"; desktopName = "OpenBoard"; - mimeType = "application/ubz"; - categories = "Education;"; + mimeTypes = [ "application/ubz" ]; + categories = [ "Education" ]; startupNotify = true; }) ]; diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index c9d119a7d605..93a600fff847 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { desktopName = "SwingSane"; genericName = "Scan from local or remote SANE servers"; comment = meta.description; - categories = "Office;"; + categories = [ "Office" ]; }; in '' diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index 65f6c46f7daf..ca8cebb2ec0c 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -7,7 +7,7 @@ let icon = "write_stylus"; desktopName = "Write"; genericName = "Write"; - categories = "Office;Graphics"; + categories = [ "Office" "Graphics" ]; }; in mkDerivation rec { diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 7d9ab53bef8b..f83127238756 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { icon = "xournal"; desktopName = "Xournal"; comment = meta.description; - categories = "Office;Graphics;"; - mimeType = "application/pdf;application/x-xoj"; + categories = [ "Office" "Graphics" ]; + mimeTypes = [ "application/pdf" "application/x-xoj" ]; genericName = "PDF Editor"; }; diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 378a04bada9a..458b0484af0b 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -32,19 +32,16 @@ let genericName = "Text Editor"; exec = "azuredatastudio --no-sandbox --unity-launch %F"; icon = "azuredatastudio"; - startupNotify = "true"; - categories = "Utility;TextEditor;Development;IDE;"; - mimeType = "text/plain;inode/directory;application/x-azuredatastudio-workspace;"; - extraEntries = '' - StartupWMClass=azuredatastudio - Actions=new-empty-window; - Keywords=azuredatastudio; - - [Desktop Action new-empty-window] - Name=New Empty Window - Exec=azuredatastudio --no-sandbox --new-window %F - Icon=azuredatastudio - ''; + startupNotify = true; + startupWMClass = "azuredatastudio"; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "inode/directory" "application/x-azuredatastudio-workspace" ]; + keywords = [ "azuredatastudio" ]; + actions.new-empty-window = { + name = "New Empty Window"; + exec = "azuredatastudio --no-sandbox --new-window %F"; + icon = "azuredatastudio"; + }; }; urlHandlerDesktopItem = makeDesktopItem { @@ -54,13 +51,12 @@ let genericName = "Text Editor"; exec = "azuredatastudio --no-sandbox --open-url %U"; icon = "azuredatastudio"; - startupNotify = "true"; - categories = "Utility;TextEditor;Development;IDE;"; - mimeType = "x-scheme-handler/azuredatastudio;"; - extraEntries = '' - NoDisplay=true - Keywords=azuredatastudio; - ''; + startupNotify = true; + startupWMClass = "azuredatastudio"; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "x-scheme-handler/azuredatastudio" ]; + keywords = [ "azuredatastudio" ]; + noDisplay = true; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index f8f7fb8491c8..777c4b97d2b6 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { desktopName = "Cubiomes Viewer"; exec = pname; icon = pname; - categories = "Game"; + categories = [ "Game" ]; comment = meta.description; }) ]; diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix index a2ec91193ea4..d330a8a5ae28 100644 --- a/pkgs/applications/misc/cura/stable.nix +++ b/pkgs/applications/misc/cura/stable.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { comment = "Cura"; desktopName = "Cura"; genericName = "3D printing host software"; - categories = "GNOME;GTK;Utility;"; + categories = [ "GNOME" "GTK" "Utility" ]; }; python_deps = with python27Packages; [ pyopengl pyserial numpy wxPython30 power setuptools ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index e87e9ba4092b..ba1682f02dd6 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { desktopName = "dbeaver"; comment = "SQL Integrated Development Environment"; genericName = "SQL Integrated Development Environment"; - categories = "Development;"; + categories = [ "Development" ]; }) ]; diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index 14351990e72b..e793618f9d2d 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -74,8 +74,7 @@ stdenv.mkDerivation rec { exec = "free42bin"; type = "Application"; comment = meta.description; - categories = "Utility;Calculator;"; - terminal = "false"; + categories = [ "Utility" "Calculator" ]; }) (makeDesktopItem { name = "com.thomasokken.free42dec"; @@ -84,8 +83,7 @@ stdenv.mkDerivation rec { exec = "free42dec"; type = "Application"; comment = meta.description; - categories = "Utility;Calculator;"; - terminal = "false"; + categories = [ "Utility" "Calculator" ]; }) ]; diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 76a19f5188c8..694665727414 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { desktopName = "GanttProject"; genericName = "Shedule and manage projects"; comment = meta.description; - categories = "Office;"; + categories = [ "Office" ]; }; javaOptions = [ diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 0a62ce4ea518..523ba837f3a1 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { desktopName = "GKrellM"; genericName = "System monitor"; comment = "The GNU Krell Monitors"; - categories = "System;Monitor;"; + categories = [ "System" "Monitor" ]; }) ]; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index b2a858d8d3e9..7f796a2bb0c2 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -12,7 +12,7 @@ let desktopName = "GoldenCheetah"; genericName = "GoldenCheetah"; comment = "Performance software for cyclists, runners and triathletes"; - categories = "Utility;"; + categories = [ "Utility" ]; }; in mkDerivation rec { pname = "golden-cheetah"; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 62dccc91e60d..1c898fa343ce 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { desktopName = "GpsPrune"; genericName = "GPS Data Editor"; comment = meta.description; - categories = "Education;Geoscience;"; + categories = [ "Education" "Geoscience" ]; }) ]; diff --git a/pkgs/applications/misc/ideamaker/default.nix b/pkgs/applications/misc/ideamaker/default.nix index 1996ba5c1ea0..1e20a0d6faf0 100644 --- a/pkgs/applications/misc/ideamaker/default.nix +++ b/pkgs/applications/misc/ideamaker/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "Ideamaker"; genericName = meta.description; - categories = "Utility;Viewer;Engineering;"; - mimeType = "application/sla"; + categories = [ "Utility" "Viewer" "Engineering" ]; + mimeTypes = [ "application/sla" ]; }; meta = with lib; { diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 92491f4508e7..4c01e52aa5db 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { exec = "IPMIView"; desktopName = name; genericName = "Supermicro BMC manager"; - categories = "Network"; + categories = [ "Network" ]; }; installPhase = '' diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 4276ce8a8418..bc281bea16ac 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -69,11 +69,8 @@ with builtins; buildDotnetPackage rec { icon = "keepass"; desktopName = "Keepass"; genericName = "Password manager"; - categories = "Utility;"; - mimeType = lib.concatStringsSep ";" [ - "application/x-keepass2" - "" - ]; + categories = [ "Utility" ]; + mimeTypes = [ "application/x-keepass2" ]; }; outputFiles = [ diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix index 2dfbaeb9941a..eceb9308fc0a 100644 --- a/pkgs/applications/misc/lsd2dsl/default.nix +++ b/pkgs/applications/misc/lsd2dsl/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { desktopName = "lsd2dsl"; genericName = "lsd2dsl"; comment = meta.description; - categories = "Dictionary;FileTools;Qt;"; + categories = [ "Dictionary" "FileTools" "Qt" ]; }); installPhase = '' diff --git a/pkgs/applications/misc/michabo/default.nix b/pkgs/applications/misc/michabo/default.nix index 015a326fdc9b..c356dc19786d 100644 --- a/pkgs/applications/misc/michabo/default.nix +++ b/pkgs/applications/misc/michabo/default.nix @@ -10,7 +10,6 @@ let desktopItem = makeDesktopItem { - type = "Application"; name = "Michabo"; desktopName = "Michabo"; exec = "Michabo"; diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix index 664b2bf03ac0..973a05ad1d76 100644 --- a/pkgs/applications/misc/obinskit/default.nix +++ b/pkgs/applications/misc/obinskit/default.nix @@ -15,7 +15,7 @@ let icon = "obinskit"; desktopName = "Obinskit"; genericName = "Obinskit keyboard configurator"; - categories = "Utility"; + categories = [ "Utility" ]; }; electron = electron_13; in diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 6626c3321578..5e71f7d0d107 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -15,7 +15,7 @@ let comment = "Knowledge base"; icon = "obsidian"; exec = "obsidian"; - categories = "Office"; + categories = [ "Office" ]; }; updateScript = writeScript "obsidian-updater" '' diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix index 9bef85c2b249..009633f32734 100644 --- a/pkgs/applications/misc/opentrack/default.nix +++ b/pkgs/applications/misc/opentrack/default.nix @@ -45,7 +45,7 @@ in mkDerivation { }; desktopName = name; genericName = "Head tracking software"; - categories = "Utility;"; + categories = [ "Utility" ]; }) ]; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 298b4bf2c0ae..745796098e8c 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "PDFsam Basic"; genericName = "PDF Split and Merge"; - mimeType = "application/pdf;"; - categories = "Office;"; + mimeTypes = [ "application/pdf" ]; + categories = [ "Office" ]; }; meta = with lib; { diff --git a/pkgs/applications/misc/pdfstudio/common.nix b/pkgs/applications/misc/pdfstudio/common.nix index 7240e8a026e2..8c034d6636b3 100644 --- a/pkgs/applications/misc/pdfstudio/common.nix +++ b/pkgs/applications/misc/pdfstudio/common.nix @@ -40,10 +40,8 @@ let exec = "${pname} %f"; icon = "${pname}${year}"; comment = "Views and edits PDF files"; - mimeType = "application/pdf"; - categories = "Office"; - type = "Application"; - terminal = false; + mimeTypes = [ "application/pdf" ]; + categories = [ "Office" ]; }) ]; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 1bcc36557afa..4e9d674d0cf6 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -52,9 +52,8 @@ stdenv.mkDerivation rec { genericName = "SQL Administration"; exec = "pgadmin3"; icon = "pgAdmin3"; - type = "Application"; - categories = "Development;"; - mimeType = "text/html"; + categories = [ "Development" ]; + mimeTypes = [ "text/html" ]; }; in '' mkdir -p $out/share/pixmaps; diff --git a/pkgs/applications/misc/plater/default.nix b/pkgs/applications/misc/plater/default.nix index 9b034f9f904e..e2e1906926a7 100644 --- a/pkgs/applications/misc/plater/default.nix +++ b/pkgs/applications/misc/plater/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { icon = pname; desktopName = "Ideamaker"; genericName = meta.description; - categories = "Utility;Engineering;"; + categories = ["Utility" "Engineering"]; }; postInstall = '' diff --git a/pkgs/applications/misc/premid/default.nix b/pkgs/applications/misc/premid/default.nix index 98ac0de32680..d2b8663d2453 100644 --- a/pkgs/applications/misc/premid/default.nix +++ b/pkgs/applications/misc/premid/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "PreMiD"; genericName = meta.description; - mimeType = "x-scheme-handler/premid"; + mimeTypes = [ "x-scheme-handler/premid" ]; }) ]; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index f66bb4a3b775..d72d605f021f 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { comment = "G-code generator for 3D printers"; desktopName = "PrusaSlicer"; genericName = "3D printer tool"; - categories = "Development;"; + categories = [ "Development" ]; }) (makeDesktopItem { name = "PrusaSlicer G-code Viewer"; @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { comment = "G-code viewer for 3D printers"; desktopName = "PrusaSlicer G-code Viewer"; genericName = "G-code Viewer"; - categories = "Development;"; + categories = [ "Development" ]; }) ]; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 930051d5b1e5..de00c1174b95 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -39,7 +39,7 @@ let comment = description; desktopName = appname; genericName = "3D printer tool"; - categories = "Development;"; + categories = [ "Development" ]; }) ]; diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 1499cfc40dc8..8c644e5f3cc4 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { comment = "Query GUI for mongodb"; desktopName = "Robo3T"; genericName = "MongoDB management tool"; - categories = "Development;IDE;"; + categories = [ "Development" "IDE" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index a1be4a6b52eb..e26a40667da9 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -8,7 +8,7 @@ exec = "SideQuest"; desktopName = name; genericName = "VR App Store"; - categories = "Settings;PackageManager;"; + categories = [ "Settings" "PackageManager" ]; }; sidequest = stdenv.mkDerivation { diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 675fe9cf1a58..f723ba27beb8 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -46,14 +46,13 @@ let }; desktopItem = makeDesktopItem { - categories = "Development"; + categories = [ "Development" ]; comment = "Simplenote for Linux"; desktopName = "Simplenote"; exec = "simplenote %U"; icon = "simplenote"; name = "simplenote"; - startupNotify = "true"; - type = "Application"; + startupNotify = true; }; dontBuild = true; diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 49ff51c2f485..f4dd6c7185f5 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { comment = "G-code generator for 3D printers"; desktopName = "Slic3r"; genericName = "3D printer tool"; - categories = "Development;"; + categories = [ "Development" ]; }; prePatch = '' diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index 6f2b43785c7a..b5bcbabf8674 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { icon = "snapmaker-luban"; desktopName = "Snapmaker Luban"; genericName = meta.description; - categories = "Office;Printing;"; + categories = [ "Office" "Printing" ]; }) ]; diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index d333640fc50b..4316905e655c 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { icon = icon; desktopName = "Stretchly"; genericName = "Stretchly"; - categories = "Utility;"; + categories = [ "Utility" ]; }; meta = with lib; { diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index bfe9af768412..f2c8e6075d9d 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -37,7 +37,7 @@ let icon = pname; comment = description; genericName = "Computer Aided (Interior) Design"; - categories = "Graphics;2DGraphics;3DGraphics;"; + categories = [ "Graphics" "2DGraphics" "3DGraphics" ]; }; postPatch = '' diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index d6ea3fccfa66..9ef9fd0f7f44 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -40,7 +40,7 @@ let name = pname; comment = description; genericName = "Computer Aided (Interior) Design"; - categories = "Graphics;2DGraphics;3DGraphics;"; + categories = [ "Graphics" "2DGraphics" "3DGraphics" ]; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/applications/misc/teleprompter/default.nix b/pkgs/applications/misc/teleprompter/default.nix index 96265356ead7..7e4ac3a5701a 100644 --- a/pkgs/applications/misc/teleprompter/default.nix +++ b/pkgs/applications/misc/teleprompter/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "teleprompter"; exec = "teleprompter"; - type = "Application"; desktopName = "Teleprompter"; }; diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index 6623a8775a93..910f92a849e2 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -133,7 +133,7 @@ let ''; desktopItem = makeDesktopItem rec { - categories = "Utility;"; + categories = [ "Utility" ]; desktopName = "Toggl"; genericName = desktopName; name = "toggldesktop"; diff --git a/pkgs/applications/misc/trenchbroom/default.nix b/pkgs/applications/misc/trenchbroom/default.nix index b6ff02116914..8a7025060607 100644 --- a/pkgs/applications/misc/trenchbroom/default.nix +++ b/pkgs/applications/misc/trenchbroom/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { desktopName = "TrenchBroom level editor"; icon = "trenchbroom"; comment = meta.description; - categories = "Development"; + categories = [ "Development" ]; exec = "trenchbroom"; }) ]; diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix index fa08b5f555a7..bd8fdf5e48c5 100644 --- a/pkgs/applications/misc/tvbrowser/bin.nix +++ b/pkgs/applications/misc/tvbrowser/bin.nix @@ -8,11 +8,9 @@ let comment = "Themeable and easy to use TV Guide"; desktopName = "TV-Browser"; genericName = "Electronic TV Program Guide"; - categories = "AudioVideo;TV;Java;"; - startupNotify = "true"; - extraEntries = '' - StartupWMClass=tvbrowser-TVBrowser - ''; + categories = [ "AudioVideo" "TV" "Java" ]; + startupNotify = true; + startupWMClass = "tvbrowser-TVBrowser"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index 5f71f9099266..bcc4fca33b13 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { icon = "xmind"; desktopName = "XMind"; comment = meta.description; - categories = "Office;"; - mimeType = "application/xmind;x-scheme-handler/xmind"; + categories = [ "Office" ]; + mimeTypes = [ "application/xmind" "x-scheme-handler/xmind" ]; }; installPhase = let diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index eb5ebf3a7177..927b04d5e210 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -42,8 +42,7 @@ stdenv.mkDerivation rec { comment = "Views Adobe PDF files"; icon = "xpdf"; exec = "xpdf %f"; - categories = "Office;"; - terminal = "false"; + categories = [ "Office" ]; }; postInstall = lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/applications/networking/aether/default.nix b/pkgs/applications/networking/aether/default.nix index 5682091237b4..5f78b244ca41 100644 --- a/pkgs/applications/networking/aether/default.nix +++ b/pkgs/applications/networking/aether/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "Aether"; genericName = meta.description; - categories = "Network;"; - mimeType = "x-scheme-handler/aether"; + categories = [ "Network" ]; + mimeTypes = [ "x-scheme-handler/aether" ]; }) ]; diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index d9fe26fdbdc4..8b20c1aac6b0 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { comment = "Eclipse-based LDAP browser and directory client"; desktopName = "Apache Directory Studio"; genericName = "Apache Directory Studio"; - categories = "Java;Network"; + categories = [ "Java" "Network" ]; }; buildInputs = [ glib libsecret ]; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index b428687025d1..76e0977f18a6 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -159,11 +159,10 @@ let name = applicationName; exec = "${applicationName}${nameSuffix} %U"; inherit icon; - comment = ""; desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; genericName = "Web Browser"; - categories = "Network;WebBrowser;"; - mimeType = lib.concatStringsSep ";" [ + categories = [ "Network" "WebBrowser" ]; + mimeTypes = [ "text/html" "text/xml" "application/xhtml+xml" diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 427f6bcdc9a4..cb2322551add 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { desktopName = "Tor Browser"; genericName = "Web Browser"; comment = meta.description; - categories = "Network;WebBrowser;Security;"; + categories = [ "Network" "WebBrowser" "Security" ]; }; buildCommand = '' diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index fbd0df2fd3ad..d7ba8808cc71 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -24,8 +24,8 @@ mkYarnPackage rec { icon = "vieb"; desktopName = "Web Browser"; genericName = "Web Browser"; - categories = "Network;WebBrowser;"; - mimeType = lib.concatStringsSep ";" [ + categories = [ "Network" "WebBrowser" ]; + mimeTypes = [ "text/html" "application/xhtml+xml" "x-scheme-handler/http" diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix index f9be7e9ec9aa..9f43f981722f 100644 --- a/pkgs/applications/networking/browsers/webbrowser/default.nix +++ b/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -29,8 +29,8 @@ in stdenv.mkDerivation rec { icon = "webbrowser"; desktopName = "Web Browser"; genericName = "Web Browser"; - categories = "Network;WebBrowser;"; - mimeType = lib.concatStringsSep ";" [ + categories = [ "Network" "WebBrowser" ]; + mimeTypes = [ "text/html" "text/xml" "application/xhtml+xml" diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 757f39c5b35e..064213b01ae3 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -11,14 +11,21 @@ let generic = { version, sha256, platform ? "", jdk, ... }@attrs: let desktopItem = makeDesktopItem { - categories = "Network;Development;WebDevelopment;Java;"; + categories = [ "Network" "Development" "WebDevelopment" "Java" ]; desktopName = "Charles"; exec = "charles %F"; genericName = "Web Debugging Proxy"; icon = "charles-proxy"; - mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace"; + mimeTypes = [ + "application/x-charles-savedsession" + "application/x-charles-savedsession+xml" + "application/x-charles-savedsession+json" + "application/har+json" + "application/vnd.tcpdump.pcap" + "application/x-charles-trace" + ]; name = "Charles"; - startupNotify = "true"; + startupNotify = true; }; in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/cisco-packet-tracer/7.nix b/pkgs/applications/networking/cisco-packet-tracer/7.nix index 33f35ba12af3..f7e731713120 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/7.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/7.nix @@ -38,7 +38,7 @@ let desktopName = "Cisco Packet Tracer 7"; icon = "${ptFiles}/opt/pt/art/app.png"; exec = "packettracer7 %f"; - mimeType = "application/x-pkt;application/x-pka;application/x-pkz;"; + mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ]; }; fhs = buildFHSUserEnvBubblewrap { diff --git a/pkgs/applications/networking/cisco-packet-tracer/8.nix b/pkgs/applications/networking/cisco-packet-tracer/8.nix index c823dcbb1d35..1267a061429f 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/8.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/8.nix @@ -94,7 +94,7 @@ let desktopName = "Cisco Packet Tracer 8"; icon = "${ptFiles}/opt/pt/art/app.png"; exec = "packettracer8 %f"; - mimeType = "application/x-pkt;application/x-pka;application/x-pkz;"; + mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ]; }; fhs = buildFHSUserEnvBubblewrap { diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 9c4340fffedb..a65110b80232 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -24,8 +24,8 @@ let comment = "Sync your files across computers and to the web"; desktopName = "Dropbox"; genericName = "File Synchronizer"; - categories = "Network;FileTransfer;"; - startupNotify = "false"; + categories = [ "Network" "FileTransfer" ]; + startupNotify = false; icon = "dropbox"; }; in diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index fa795a11c2ae..9e245b46d061 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -103,11 +103,9 @@ in nodePackages.deltachat-desktop.override rec { desktopName = "Delta Chat"; genericName = "Delta Chat"; comment = meta.description; - categories = "Network;InstantMessaging;Chat;"; - extraEntries = '' - StartupWMClass=DeltaChat - MimeType=x-scheme-handler/openpgp4fpr;x-scheme-handler/mailto; - ''; + categories = [ "Network" "InstantMessaging" "Chat" ]; + startupWMClass = "DeltaChat"; + mimeTypes = [ "x-scheme-handler/openpgp4fpr" "x-scheme-handler/mailto" ]; }); passthru.updateScript = ./update.sh; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index c9e642aceb99..05833c1eeaf4 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -100,8 +100,8 @@ stdenv.mkDerivation rec { icon = pname; inherit desktopName; genericName = meta.description; - categories = "Network;InstantMessaging;"; - mimeType = "x-scheme-handler/discord"; + categories = [ "Network" "InstantMessaging" ]; + mimeTypes = [ "x-scheme-handler/discord" ]; }; passthru.updateScript = writeScript "discord-update-script" '' diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index c9b45b2f8b68..2ad5d8c4654f 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -106,11 +106,9 @@ mkYarnPackage rec { desktopName = "Element"; genericName = "Matrix Client"; comment = meta.description; - categories = "Network;InstantMessaging;Chat;"; - extraEntries = '' - StartupWMClass=element - MimeType=x-scheme-handler/element; - ''; + categories = [ "Network" "InstantMessaging" "Chat" ]; + startupWMClass = "element"; + mimeTypes = [ "x-scheme-handler/element" ]; }; passthru = { diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 853043b97cbe..8ed85cba8546 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { icon = pname; desktopName = "Gitter"; genericName = meta.description; - categories = "Network;InstantMessaging;"; + categories = [ "Network" "InstantMessaging" ]; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 5f2a094ca36b..695089c23e61 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -40,10 +40,10 @@ buildGoModule rec { makeDesktopItem { name = "net.maunium.gomuks.desktop"; exec = "@out@/bin/gomuks"; - terminal = "true"; + terminal = true; desktopName = "Gomuks"; genericName = "Matrix client"; - categories = "Network;Chat"; + categories = [ "Network" "Chat" ]; comment = meta.description; } }/* $out/ diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index e2ace1a5d35f..21c28c7391ae 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { comment = "VoIP and Instant Messaging client"; desktopName = "Jitsi"; genericName = "Instant Messaging"; - categories = "Chat"; + categories = [ "Chat" ]; }; libPath = lib.makeLibraryPath ([ diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index c20ec46f266d..ffc2eea5b868 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -49,9 +49,9 @@ let desktopName = "mikutter"; exec = "mikutter"; icon = "mikutter"; - categories = "Network;"; + categories = [ "Network" ]; comment = description; - extraDesktopEntries.Keywords = "Mastodon;"; + keywords = [ "Mastodon" ]; }; mkInfoPlist = { version }: diff --git a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix index df038611c3b1..d4329ed09d35 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix @@ -10,8 +10,7 @@ let name = pname; exec = pname; icon = pname; - type = "Application"; - categories = "Network;"; + categories = [ "Network" ]; }); appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 0aa2d4cc6771..f612ec524a7b 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { desktopName = "Ricochet"; genericName = "Ricochet"; comment = meta.description; - categories = "Office;Email;"; + categories = [ "Office" "Email" ]; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index f7e2ee3c6a9f..a87d57ecc91f 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -108,11 +108,9 @@ stdenv.mkDerivation rec { desktopName = "SchildiChat"; genericName = "Matrix Client"; comment = meta.description; - categories = "Network;InstantMessaging;Chat;"; - extraEntries = '' - StartupWMClass=schildichat - MimeType=x-scheme-handler/element; - ''; + categories = [ "Network" "InstantMessaging" "Chat" ]; + startupWMClass = "schildichat"; + mimeTypes = [ "x-scheme-handler/element" ]; }) ]; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 513f427ee13d..ca6cc55d65ac 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -23,7 +23,7 @@ let comment = "The TeamSpeak voice communication tool"; desktopName = "TeamSpeak"; genericName = "TeamSpeak"; - categories = "Network"; + categories = [ "Network" ]; }; fakeLess = writeShellScriptBin "less" "cat"; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 943ec299cdbd..2d5f6e2dfb72 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -32,8 +32,8 @@ mkDerivation rec { comment = meta.description; desktopName = "Tensor Matrix Client"; genericName = meta.description; - categories = "Chat;Utility"; - mimeType = "application/x-chat"; + categories = [ "Chat" "Utility" ]; + mimeTypes = [ "application/x-chat" ]; }; installPhase = if stdenv.isDarwin then '' diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 371ac91120b5..26a6b43d4489 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -16,7 +16,7 @@ let icon = "wavebox"; desktopName = name; genericName = name; - categories = "Network;"; + categories = [ "Network" ]; }; tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index fc8fbdcede3d..974d9a6a05df 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -68,16 +68,14 @@ let }; desktopItem = makeDesktopItem { - categories = "Network;InstantMessaging;Chat;VideoConference"; + categories = [ "Network" "InstantMessaging" "Chat" "VideoConference" ]; comment = "Secure messenger for everyone"; desktopName = "Wire"; exec = "wire-desktop %U"; genericName = "Secure messenger"; icon = "wire-desktop"; name = "wire-desktop"; - extraEntries = '' - StartupWMClass=Wire - ''; + startupWMClass = "Wire"; }; dontBuild = true; diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index 0719c137aba5..45307504d731 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -29,21 +29,18 @@ mkDerivation rec { ''; desktopItem = makeDesktopItem { - type = "Application"; name = "ostinato"; desktopName = "Ostinato"; genericName = "Packet/Traffic Generator and Analyzer"; comment = "Network packet and traffic generator and analyzer with a friendly GUI"; - categories = "Network"; - terminal = "false"; - startupNotify = "true"; + categories = [ "Network" ]; + startupNotify = true; exec = "$out/bin/ostinato"; icon = ostinatoIcon; - extraEntries = '' - GenericName[it]=Generatore ed Analizzatore di pacchetti di rete - Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole - ''; - fileValidation = false; + extraConfig = { + "GenericName[it]" = "Generatore ed Analizzatore di pacchetti di rete"; + "Comment[it]" = "Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole"; + }; }; postInstall = '' diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index b3b277bf130a..e4c1c8f5b7ba 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -18,7 +18,7 @@ let exec = "frostwire"; icon = "frostwire"; comment = "Search and explore all kinds of files on the Bittorrent network"; - categories = "Network;FileTransfer;P2P;"; + categories = [ "Network" "FileTransfer" "P2P" ]; }; # fake build to pre-download deps into fixed-output derivation diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 0a2f90ecb711..da7633221a5a 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -49,13 +49,9 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Transmission Remote GUI"; genericName = "BitTorrent Client"; - categories = lib.concatStringsSep ";" [ - "Application" "Network" "FileTransfer" "P2P" "GTK" - ]; - startupNotify = "true"; - mimeType = lib.concatStringsSep ";" [ - "application/x-bittorrent" "x-scheme-handler/magnet" - ]; + categories = [ "Application" "Network" "FileTransfer" "P2P" "GTK" ]; + startupNotify = true; + mimeTypes = [ "application/x-bittorrent" "x-scheme-handler/magnet" ]; }; postInstall = '' diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 890553b338eb..54d7c5c6813a 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -12,8 +12,8 @@ let icon = "anydesk"; desktopName = "AnyDesk"; genericName = description; - categories = "Network;"; - startupNotify = "false"; + categories = [ "Network" ]; + startupNotify = false; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index ee9467467cf4..be0832a075f8 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -105,7 +105,7 @@ let desktopName = "VMware Horizon Client"; icon = "${vmwareHorizonClientFiles}/share/icons/vmware-view.png"; exec = "${vmwareFHSUserEnv "vmware-view"}/bin/vmware-view %u"; - mimeType = "x-scheme-handler/vmware-view"; + mimeTypes = [ "x-scheme-handler/vmware-view" ]; }; binLinkCommands = lib.concatMapStringsSep diff --git a/pkgs/applications/networking/ssb-patchwork/default.nix b/pkgs/applications/networking/ssb-patchwork/default.nix index 0223c153f5c8..4d0fd119285b 100644 --- a/pkgs/applications/networking/ssb-patchwork/default.nix +++ b/pkgs/applications/networking/ssb-patchwork/default.nix @@ -26,7 +26,7 @@ let comment = "Client for the decentralized social network Secure Scuttlebutt"; desktopName = "Patchwork"; genericName = "Patchwork"; - categories = "Network;"; + categories = [ "Network" ]; }; in diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 9759516eddc2..3e0ed7a50208 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -60,12 +60,9 @@ stdenv.mkDerivation rec { genericName = "File synchronization tool"; exec = "unison"; icon = "unison"; - categories = "Utility;FileTools;GTK;"; - extraDesktopEntries = { - StartupWMClass = "Unison"; - StartupNotify = "true"; - X-MultipleArgs = "false"; - }; + categories = [ "Utility" "FileTools" "GTK" ]; + startupNotify = true; + startupWMClass = "Unison"; }); meta = with lib; { diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index c699781376ac..e419a3504890 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; desktopItem = makeDesktopItem { - categories = "Network;"; + categories = [ "Network" ]; comment = "The SSH client that works on Desktop and Mobile"; desktopName = "Termius"; exec = "termius-app"; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 08d5d9ce3613..abc8e33fd370 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { desktopName = "AppFlowy"; comment = meta.description; exec = "appflowy"; - categories = "Office;"; + categories = [ "Office" ]; }) ]; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 964d17587a4a..255dba62294e 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "jabref"; desktopName = "JabRef"; genericName = "Bibliography manager"; - categories = "Office;"; + categories = [ "Office" ]; icon = "jabref"; exec = "jabref"; }; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 678c3bb357c5..9ef7afcf958b 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -17,7 +17,7 @@ let comment = "Free Runtime Environment for Java Applications."; desktopName = "Jameica"; genericName = "Jameica"; - categories = "Office;"; + categories = [ "Office" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index b7ec18c98668..ecabdb85a93c 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -18,7 +18,7 @@ let icon = "portfolio"; comment = "Calculate Investment Portfolio Performance"; desktopName = "Portfolio Performance"; - categories = "Office;"; + categories = [ "Office" ]; }; runtimeLibs = lib.makeLibraryPath [ gtk3 webkitgtk ]; diff --git a/pkgs/applications/office/pyspread/default.nix b/pkgs/applications/office/pyspread/default.nix index b7261dca5a4d..6a63aba4a178 100644 --- a/pkgs/applications/office/pyspread/default.nix +++ b/pkgs/applications/office/pyspread/default.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { desktopName = "Pyspread"; genericName = "Spreadsheet"; comment = meta.description; - categories = "Office;Development;Spreadsheet;"; + categories = [ "Office" "Development" "Spreadsheet" ]; }) ]; diff --git a/pkgs/applications/office/softmaker/desktop_items.nix b/pkgs/applications/office/softmaker/desktop_items.nix index 614c6574faa2..dfdf45da9e51 100644 --- a/pkgs/applications/office/softmaker/desktop_items.nix +++ b/pkgs/applications/office/softmaker/desktop_items.nix @@ -5,38 +5,90 @@ name = "${pname}-planmaker"; desktopName = "${suiteName} PlanMaker"; icon = "${pname}-pml"; - categories = "Office;"; + categories = [ "Office" ]; exec = "${pname}-planmaker %F"; - mimeType = "application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12;"; - extraEntries = '' - TryExec=${pname}-planmaker - StartupWMClass=pm - ''; + tryExec = "${pname}-planmaker"; + mimeTypes = [ + "application/x-pmd" + "application/x-pmdx" + "application/x-pmv" + "application/excel" + "application/x-excel" + "application/x-ms-excel" + "application/x-msexcel" + "application/x-sylk" + "application/x-xls" + "application/xls" + "application/vnd.ms-excel" + "application/vnd.stardivision.calc" + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" + "application/vnd.openxmlformats-officedocument.spreadsheetml.template" + "application/vnd.ms-excel.sheet.macroenabled.12" + "application/vnd.ms-excel.template.macroEnabled.12" + "application/x-dif;text/spreadsheet;text/csv" + "application/x-prn" + "application/vnd.ms-excel.sheet.binary.macroenabled.12" + ]; + startupWMClass = "pm"; }; presentations = makeDesktopItem { name = "${pname}-presentations"; desktopName = "${suiteName} Presentations"; icon = "${pname}-prl"; - categories = "Office;"; + categories = [ "Office" ]; exec = "${pname}-presentations %F"; - mimeType = "application/x-prdx;application/x-prvx;application/x-prsx;application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;"; - extraEntries = '' - TryExec=${pname}-presentations - StartupWMClass=pr - ''; + tryExec = "${pname}-presentations"; + mimeTypes = [ + "application/x-prdx" + "application/x-prvx" + "application/x-prsx" + "application/x-prd" + "application/x-prv" + "application/x-prs" + "application/ppt" + "application/mspowerpoint" + "application/vnd.ms-powerpoint" + "application/vnd.openxmlformats-officedocument.presentationml.presentation" + "application/vnd.ms-powerpoint.presentation.macroenabled.12" + "application/vnd.openxmlformats-officedocument.presentationml.template" + "application/vnd.ms-powerpoint.template.macroEnabled.12" + "application/vnd.ms-powerpoint.slideshow.macroenabled.12" + "application/vnd.openxmlformats-officedocument.presentationml.slideshow" + ]; + startupWMClass = "pr"; }; textmaker = makeDesktopItem { name = "${pname}-textmaker"; desktopName = "${suiteName} TextMaker"; icon = "${pname}-tml"; - categories = "Office;"; + categories = [ "Office" ]; exec = "${pname}-textmaker %F"; - mimeType = "application/x-tmdx;application/x-tmvx;application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/x-pocket-word;application/x-dbf;application/msword-template;"; - extraEntries = '' - TryExec=${pname}-textmaker - StartupWMClass=tm - ''; + tryExec = "${pname}-textmaker"; + mimeTypes = [ + "application/x-tmdx" + "application/x-tmvx" + "application/x-tmd" + "application/x-tmv" + "application/msword" + "application/vnd.ms-word" + "application/x-doc" + "text/rtf" + "application/rtf" + "application/vnd.oasis.opendocument.text" + "application/vnd.oasis.opendocument.text-template" + "application/vnd.stardivision.writer" + "application/vnd.sun.xml.writer" + "application/vnd.sun.xml.writer.template" + "application/vnd.openxmlformats-officedocument.wordprocessingml.document" + "application/vnd.ms-word.document.macroenabled.12" + "application/vnd.openxmlformats-officedocument.wordprocessingml.template" + "application/vnd.ms-word.template.macroenabled.12" + "application/x-pocket-word" + "application/x-dbf" + "application/msword-template" + ]; + startupWMClass = "tm"; }; } diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix index 526777162473..b8b98c19bbf9 100644 --- a/pkgs/applications/office/timeline/default.nix +++ b/pkgs/applications/office/timeline/default.nix @@ -37,9 +37,8 @@ python3.pkgs.buildPythonApplication rec { name = "timeline"; comment = "Display and navigate information on a timeline"; icon = "timeline"; - terminal = false; exec = "timeline"; - categories = "Office;Calendar;"; + categories = [ "Office" "Calendar" ]; }) ]; diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 0c72bc964182..c73c0b87c0c1 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -8,7 +8,7 @@ let icon = "trilium"; comment = description; desktopName = "Trilium Notes"; - categories = "Office"; + categories = [ "Office" ]; }; meta = with lib; { diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/applications/office/tusk/default.nix index d54f27f9bbf3..5bfc8ebc9703 100644 --- a/pkgs/applications/office/tusk/default.nix +++ b/pkgs/applications/office/tusk/default.nix @@ -17,7 +17,7 @@ let icon = icon; desktopName = pname; genericName = "Evernote desktop app"; - categories = "Application"; + categories = [ "Application" ]; }; in appimageTools.wrapType2 rec { diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 74f05a0b4025..6fb8aecbbca5 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -94,13 +94,12 @@ stdenv.mkDerivation rec { name = "zotero-${version}"; exec = "zotero -url %U"; icon = "zotero"; - type = "Application"; comment = meta.description; desktopName = "Zotero"; genericName = "Reference Management"; - categories = "Office;Database;"; - startupNotify = "true"; - mimeType = "text/plain"; + categories = [ "Office" "Database" ]; + startupNotify = true; + mimeTypes = [ "text/plain" ]; }; installPhase = '' diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix index 255f7761be92..8c1d5f2129ea 100644 --- a/pkgs/applications/radio/svxlink/default.nix +++ b/pkgs/applications/radio/svxlink/default.nix @@ -9,7 +9,7 @@ let icon = "qtel"; desktopName = name; genericName = "EchoLink Client"; - categories = "HamRadio;Qt;Network;"; + categories = [ "HamRadio" "Qt" "Network" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/astronomy/gprojector/default.nix b/pkgs/applications/science/astronomy/gprojector/default.nix index 3864058828f4..26e8fe11a32b 100644 --- a/pkgs/applications/science/astronomy/gprojector/default.nix +++ b/pkgs/applications/science/astronomy/gprojector/default.nix @@ -22,8 +22,8 @@ stdenvNoCC.mkDerivation rec { exec = "gprojector"; desktopName = "G.Projector"; comment = meta.description; - categories = "Science;"; - extraEntries = "StartupWMClass = gov-nasa-giss-projector-GProjector"; + categories = [ "Science" ]; + startupWMClass = "gov-nasa-giss-projector-GProjector"; }) ]; buildInputs = [ jre ]; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 65b1f92943dc..cc983e24618f 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -12,8 +12,16 @@ let exec = "jmol"; desktopName = "JMol"; genericName = "Molecular Modeler"; - mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; - categories = "Graphics;Education;Science;Chemistry;"; + mimeTypes = [ + "chemical/x-pdb" + "chemical/x-mdl-molfile" + "chemical/x-mol2" + "chemical/seq-aa-fasta" + "chemical/seq-na-fasta" + "chemical/x-xyz" + "chemical/x-mdl-sdf" + ]; + categories = [ "Graphics" "Education" "Science" "Chemistry" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 39bbae77a66e..5f7c0c1f6be7 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -24,8 +24,16 @@ let genericName = "Molecular Modeler"; comment = description; icon = pname; - mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; - categories = "Graphics;Education;Science;Chemistry;"; + mimeTypes = [ + "chemical/x-pdb" + "chemical/x-mdl-molfile" + "chemical/x-mol2" + "chemical/seq-aa-fasta" + "chemical/seq-na-fasta" + "chemical/x-xyz" + "chemical/x-mdl-sdf" + ]; + categories = [ "Graphics" "Education" "Science" "Chemistry" ]; }; in python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/applications/science/electronics/diylc/default.nix index 987f6156b4b9..ff4e3809fc2b 100644 --- a/pkgs/applications/science/electronics/diylc/default.nix +++ b/pkgs/applications/science/electronics/diylc/default.nix @@ -27,7 +27,7 @@ let comment = "Multi platform circuit layout and schematic drawing tool"; exec = "diylc"; icon = "diylc_icon"; - categories = "Development;Electronics;"; + categories = [ "Development" "Electronics" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 2fb3b8c8b18c..5b4c8eb790fe 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -27,7 +27,7 @@ let comment = "Schematic capture and PCB layout"; desktopName = "Eagle"; genericName = "Schematic editor"; - categories = "Development;"; + categories = [ "Development" ]; }; buildInputs = diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index 94457c81ce93..f48d08d40799 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { comment = "Schematic capture and PCB layout"; desktopName = "Eagle"; genericName = "Schematic editor"; - categories = "Development;"; + categories = [ "Development" ]; }; buildInputs = diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index bdd2796addcd..1be25f54e1ed 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -179,7 +179,7 @@ self = stdenv.mkDerivation { icon = "coq"; desktopName = "CoqIDE"; comment = "Graphical interface for the Coq proof assistant"; - categories = "Development;Science;Math;IDE;GTK"; + categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; }); postInstall = let suffix = if versionAtLeast "8.14" then "-core" else ""; in '' diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 0f0410024251..96e8da059a41 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { icon = "isabelle"; desktopName = "Isabelle"; comment = meta.description; - categories = "Education;Science;Math;"; + categories = [ "Education" "Science" "Math" ]; }; meta = with lib; { diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index 762acbe4ec44..85a7ecb08c39 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { comment = meta.description; desktopName = "KeY"; genericName = "KeY"; - categories = "Science;"; + categories = [ "Science" ]; }) ]; diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 688c8c319bd8..67e699bc63fa 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { exec = "logisim-evolution"; icon = "logisim-evolution"; comment = meta.description; - categories = "Education;"; + categories = [ "Education" ]; }) ]; diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index b4741aaed86e..06dc024e6d23 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { exec = "logisim"; icon = "logisim"; comment = meta.description; - categories = "Education;"; + categories = [ "Education" ]; }) ]; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 21c60d03ac1e..7b1ee4384c9e 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -18,10 +18,8 @@ let comment = "IDE for TLA+"; desktopName = name; genericName = comment; - categories = "Development"; - extraEntries = '' - StartupWMClass=TLA+ Toolbox - ''; + categories = [ "Development" ]; + startupWMClass = "TLA+ Toolbox"; }; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 7ebfe2030d4a..8ab498c61d93 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -15,8 +15,8 @@ let desktopName = "Geogebra"; genericName = "Geogebra"; comment = meta.description; - categories = "Education;Science;Math;"; - mimeType = "application/vnd.geogebra.file;application/vnd.geogebra.tool;"; + categories = [ "Education" "Science" "Math" ]; + mimeTypes = [ "application/vnd.geogebra.file" "application/vnd.geogebra.tool" ]; }; meta = with lib; { diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix index b22c6294fba6..ed92dfb90dab 100644 --- a/pkgs/applications/science/misc/netlogo/default.nix +++ b/pkgs/applications/science/misc/netlogo/default.nix @@ -8,7 +8,7 @@ let icon = name; comment = "A multi-agent programmable modeling environment"; desktopName = "NetLogo"; - categories = "Science;"; + categories = [ "Science" ]; }; in diff --git a/pkgs/applications/science/programming/groove/default.nix b/pkgs/applications/science/programming/groove/default.nix index 86d77072ee8c..f4c323defd6f 100644 --- a/pkgs/applications/science/programming/groove/default.nix +++ b/pkgs/applications/science/programming/groove/default.nix @@ -7,7 +7,7 @@ let icon = "groove"; desktopName = "GROOVE Simulator"; comment = "GRaphs for Object-Oriented VErification"; - categories = "Science;ComputerScience;"; + categories = [ "Science" "ComputerScience" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 4920372411f5..d84aa984a33b 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -106,10 +106,8 @@ stdenv.mkDerivation rec { comment = "Terminal emulator"; desktopName = "mlterm"; genericName = "Terminal emulator"; - categories = lib.concatStringsSep ";" [ - "Application" "System" "TerminalEmulator" - ]; - startupNotify = "false"; + categories = [ "Application" "System" "TerminalEmulator" ]; + startupNotify = false; }; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 0e9402cf4953..1ca84149fdd7 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -21,7 +21,7 @@ let comment = description; desktopName = "URxvt"; genericName = pname; - categories = "System;TerminalEmulator;"; + categories = [ "System" "TerminalEmulator" ]; }; fetchPatchFromAUR = { package, name, rev, sha256 }: diff --git a/pkgs/applications/terminal-emulators/wayst/default.nix b/pkgs/applications/terminal-emulators/wayst/default.nix index c6f39effed62..f3751e39881d 100644 --- a/pkgs/applications/terminal-emulators/wayst/default.nix +++ b/pkgs/applications/terminal-emulators/wayst/default.nix @@ -21,15 +21,12 @@ let desktopItem = makeDesktopItem { desktopName = "Wayst"; name = "wayst"; + genericName = "Terminal"; exec = "wayst"; icon = "wayst"; - terminal = "false"; - categories = "System;TerminalEmulator"; + categories = [ "System" "TerminalEmulator" ]; + keywords = [ "wayst" "terminal" ]; comment = "A simple terminal emulator"; - extraEntries = '' - GenericName=Terminal - Keywords=wayst;terminal; - ''; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index b5372233c247..55a2f1627b94 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -93,7 +93,7 @@ let icon = pname; desktopName = "GitKraken"; genericName = "Git Client"; - categories = "Development;"; + categories = [ "Development" ]; comment = "Graphical Git client from Axosoft"; }) ]; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 3c0e540d228b..4c1470495693 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -65,23 +65,19 @@ stdenv.mkDerivation rec { comment = meta.description; icon = "smartgit"; desktopName = "SmartGit"; - categories = concatStringsSep ";" [ + categories = [ "Application" "Development" "RevisionControl" ]; - mimeType = concatStringsSep ";" [ + mimeTypes = [ "x-scheme-handler/git" "x-scheme-handler/smartgit" "x-scheme-handler/sourcetree" ]; - startupNotify = "true"; - extraEntries = '' - Keywords=git - StartupWMClass=${name} - Version=1.0 - Encoding=UTF-8 - ''; + startupNotify = true; + startupWMClass = name; + keywords = [ "git" ]; }; meta = with lib; { diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 2bd30c9e5291..9a1940cffc75 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { desktopName = "ClipGrab"; comment = meta.description; genericName = "Web video downloader"; - categories = "Qt;AudioVideo;Audio;Video"; + categories = [ "Qt" "AudioVideo" "Audio" "Video" ]; }; installPhase = '' diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 53e87fbb2b9d..911373c58e30 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { icon = basename; desktopName = "Streamlink Twitch GUI"; genericName = meta.description; - categories = "AudioVideo;Network;"; + categories = [ "AudioVideo" "Network" ]; }; meta = with lib; { diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix index 23aa8ff8201e..e7cc1a477c57 100644 --- a/pkgs/applications/window-managers/berry/default.nix +++ b/pkgs/applications/window-managers/berry/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Berry Window Manager"; genericName = "Berry Window Manager"; - categories = "Utility;"; + categories = [ "Utility" ]; }) ]; diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index 9652a95ee27f..7c0b1802bacd 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { name = "stm32CubeMX"; exec = "stm32cubemx"; desktopName = "STM32CubeMX"; - categories = "Development;"; + categories = [ "Development" ]; comment = "STM32Cube initialization code generator"; icon = "stm32cubemx"; }) diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 23afd44b67d9..d8d3bcb2cdd9 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { comment = "Launcher for Pharo distributions"; desktopName = "Pharo"; genericName = "Pharo"; - categories = "Development;"; + categories = [ "Development" ]; }; # because upstream tarball has no top-level directory. diff --git a/pkgs/development/pharo/wrapper/default.nix b/pkgs/development/pharo/wrapper/default.nix index 1f0892950723..1202b2dce6d4 100644 --- a/pkgs/development/pharo/wrapper/default.nix +++ b/pkgs/development/pharo/wrapper/default.nix @@ -11,11 +11,9 @@ stdenv.mkDerivation rec { genericName = "Pharo Virtual Machine"; exec = "pharo %F"; icon = "pharo"; - terminal = "false"; - type="Application"; - startupNotify = "false"; - categories = "Development;"; - mimeType = "application/x-pharo-image"; + startupNotify = false; + categories = [ "Development" ]; + mimeTypes = [ "application/x-pharo-image" ]; }; unpackPhase = '' cp $src ./pharo-vm.sh diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 419ac6bbb39c..cfeaf08fb33f 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { comment = "Scientific Python Development Environment"; desktopName = "Spyder"; genericName = "Python IDE"; - categories = "Development;IDE;"; + categories = [ "Development" "IDE" ]; }; postPatch = '' diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 92f7e8095128..4ec5b28bdd03 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -17,7 +17,7 @@ let generic = { version, sha256 }: desktopName = "Alloy ${lib.versions.major version}"; genericName = "Relational modelling tool"; comment = meta.description; - categories = "Development;IDE;Education;"; + categories = [ "Development" "IDE" "Education" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index ef95263185c9..da43a4daf7d1 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -10,7 +10,7 @@ let desktopName = "Oracle SQL Developer"; genericName = "Oracle SQL Developer"; comment = "Oracle's Oracle DB GUI client"; - categories = "Development;"; + categories = [ "Development" ]; }; in stdenv.mkDerivation { diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 0220e2d61f9d..e908849a3b3a 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "SQuirreL SQL"; genericName = "SQL Client"; - categories = "Development;"; + categories = [ "Development" ]; icon = "squirrel-sql"; }; diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index 01146542d0cc..7408b35fe5ad 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { comment = "Eclipse Memory Analyzer"; desktopName = "Eclipse MAT"; genericName = "Java Memory Analyzer"; - categories = "Development;"; + categories = [ "Development" ]; }; unpackPhase = '' diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 7f89961f9f80..ee72bc62efae 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { comment = "Java Troubleshooting Tool"; desktopName = "VisualVM"; genericName = "Java Troubleshooting Tool"; - categories = "Development;"; + categories = [ "Development" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jpexs/default.nix b/pkgs/development/tools/jpexs/default.nix index 37d1cf7dc2e4..8c0d20d328d2 100644 --- a/pkgs/development/tools/jpexs/default.nix +++ b/pkgs/development/tools/jpexs/default.nix @@ -36,10 +36,8 @@ stdenv.mkDerivation rec { desktopName = "JPEXS Free Flash Decompiler"; genericName = "Flash Decompiler"; comment = meta.description; - categories = "Development;Java;"; - extraEntries = '' - StartupWMClass=com-jpexs-decompiler-flash-gui-Main - ''; + categories = [ "Development" "Java" ]; + startupWMClass = "com-jpexs-decompiler-flash-gui-Main"; }; meta = with lib; { diff --git a/pkgs/development/tools/mars-mips/default.nix b/pkgs/development/tools/mars-mips/default.nix index 97ffd564c45c..fa98ab9da8f1 100644 --- a/pkgs/development/tools/mars-mips/default.nix +++ b/pkgs/development/tools/mars-mips/default.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { exec = "mars-mips"; icon = "mars-mips"; comment = "An IDE for programming in MIPS assembly language"; - categories = "Development;IDE;"; + categories = [ "Development" "IDE" ]; }) ]; diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 4472cae2053a..242d76174ce9 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -13,7 +13,7 @@ let comment = "Software for Saleae logic analyzers"; desktopName = "Saleae Logic"; genericName = "Logic analyzer"; - categories = "Development"; + categories = [ "Development" ]; }; in appimageTools.wrapType2 { diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 5943b57d8088..487445e0fc35 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { comment = "Software for Saleae logic analyzers"; desktopName = "Saleae Logic"; genericName = "Logic analyzer"; - categories = "Development"; + categories = [ "Development" ]; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index ea842c820899..ee03e043dd86 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { exec = "react-native-debugger"; desktopName = "React Native Debugger"; genericName = "React Native Debugger"; - categories = "Development;Debugger;"; + categories = [ "Development" "Debugger" ]; }; meta = with lib; { diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix index 438555998fde..3ae31bbadb9b 100644 --- a/pkgs/development/tools/scenebuilder/default.nix +++ b/pkgs/development/tools/scenebuilder/default.nix @@ -69,8 +69,8 @@ let icon = "scenebuilder"; comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; desktopName = pname; - mimeType = "application/java;application/java-vm;application/java-archive"; - categories = "Development"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/scenic-view/default.nix b/pkgs/development/tools/scenic-view/default.nix index 6dd3e11b6095..1322cfc751a8 100644 --- a/pkgs/development/tools/scenic-view/default.nix +++ b/pkgs/development/tools/scenic-view/default.nix @@ -66,8 +66,8 @@ let desktopName = pname; exec = pname; comment = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications."; - mimeType = "application/java;application/java-vm;application/java-archive"; - categories = "Development"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index 58fef12cd6e8..8f8d03db950b 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { comment = "Platform independend Python debugger"; desktopName = "Winpdb"; genericName = "Python Debugger"; - categories = "Development;Debugger;"; + categories = [ "Development" "Debugger" ]; }; # Don't call gnome-terminal with "--disable-factory" flag, which is diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index a45d06cb4c3e..bf1ed98b4737 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { comment = "API Development Environment"; desktopName = "Postman"; genericName = "Postman"; - categories = "Development;"; + categories = [ "Development" ]; }; buildInputs = [ diff --git a/pkgs/development/web/protege-distribution/default.nix b/pkgs/development/web/protege-distribution/default.nix index 3b885e651510..a6ef66d06950 100644 --- a/pkgs/development/web/protege-distribution/default.nix +++ b/pkgs/development/web/protege-distribution/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { desktopName = "Protege Desktop"; icon = "protege"; comment = "OWL2 ontology editor"; - categories = "Development"; + categories = [ "Development" ]; exec = "run-protege"; }) ]; diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index 07458cc64463..1cf7829cfcd0 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -16,7 +16,7 @@ let comment = "A silly speed painting game"; desktopName = "90 Second Portraits"; genericName = "90secondportraits"; - categories = "Game;"; + categories = [ "Game" ]; }; in diff --git a/pkgs/games/abuse/default.nix b/pkgs/games/abuse/default.nix index 2e863022a68b..1e2d4f82f837 100644 --- a/pkgs/games/abuse/default.nix +++ b/pkgs/games/abuse/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { icon = "abuse"; desktopName = "Abuse"; comment = "Side-scroller action game that pits you against ruthless alien killers"; - categories = "Game;ActionGame;"; + categories = [ "Game" "ActionGame" ]; }) ]; postInstall = '' diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix index aa76cc17b402..98b21865d7ca 100644 --- a/pkgs/games/alephone/default.nix +++ b/pkgs/games/alephone/default.nix @@ -72,7 +72,7 @@ in self // { name = desktopName; exec = pname; genericName = pname; - categories = "Game;"; + categories = [ "Game" ]; comment = meta.description; inherit desktopName icon; }; diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index 640ea81c6c6b..1013be2694e9 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { desktopName = "AssaultCube"; comment = "A multiplayer, first-person shooter game, based on the CUBE engine. Fast, arcade gameplay."; genericName = "First-person shooter"; - categories = "Game;ActionGame;Shooter"; + categories = [ "Game" "ActionGame" "Shooter" ]; icon = "assaultcube.png"; exec = pname; }; diff --git a/pkgs/games/ballerburg/default.nix b/pkgs/games/ballerburg/default.nix index 43b274a12825..b15abdbc4703 100644 --- a/pkgs/games/ballerburg/default.nix +++ b/pkgs/games/ballerburg/default.nix @@ -25,11 +25,10 @@ in stdenv.mkDerivation rec { (makeDesktopItem { name = "Ballerburg"; desktopName = "Ballerburg SDL"; - type = "Application"; exec = "_NET_WM_ICON=ballerburg ballerburg"; comment = meta.description; icon = "ballerburg"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index 77811e76e96d..d4f1f8faeeba 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -26,8 +26,7 @@ stdenv.mkDerivation rec { comment = "Brave the Dungeons of Doom!"; icon = "brogue"; exec = "brogue"; - categories = "Game;AdventureGame;"; - terminal = "false"; + categories = [ "Game" "AdventureGame" ]; }; installPhase = '' diff --git a/pkgs/games/clonehero/fhs-wrapper.nix b/pkgs/games/clonehero/fhs-wrapper.nix index 97758b2c1fab..cd7f3986b109 100644 --- a/pkgs/games/clonehero/fhs-wrapper.nix +++ b/pkgs/games/clonehero/fhs-wrapper.nix @@ -13,7 +13,7 @@ let comment = clonehero-unwrapped.meta.description; exec = name; icon = name; - categories = "Game;"; + categories = [ "Game" ]; }; in buildFHSUserEnv { diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index a87236c48f4a..da75f3fd5d1b 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { name = "dhewm3"; exec = "dhewm3"; desktopName = "Doom 3"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index 0dde8ab16413..dd044656534e 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -11,14 +11,12 @@ let desktopItem = makeDesktopItem { - type = "Application"; name = "Domination"; desktopName = "Domination"; exec = "domination"; icon = "domination"; }; editorDesktopItem = makeDesktopItem { - type = "Application"; name = "Domination Map Editor"; desktopName = "Domination Map Editor"; exec = "domination-map-editor"; diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index af34742b9fd8..a4e37081ab0e 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { comment = "Duck-themed action puzzle video game"; desktopName = "Duck Marines"; genericName = "duckmarines"; - categories = "Game;"; + categories = [ "Game" ]; }; src = fetchurl { diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index 251b51df43a8..f8ca3b40f532 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { exec = "ecwolf"; comment = "Enhanced Wolfenstein 3D port"; desktopName = "Wolfenstein 3D"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index c34922349612..4eb46e0ac155 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -11,7 +11,7 @@ let comment = "Duke Nukem 3D port"; desktopName = "Enhanced Duke Nukem 3D"; genericName = "Duke Nukem 3D port"; - categories = "Game;"; + categories = [ "Game" ]; }; wrapper = "eduke32-wrapper"; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 74702a973397..4cf335a61378 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -53,8 +53,7 @@ let comment = "A game in which you build and maintain factories."; exec = "factorio"; icon = "factorio"; - type = "Application"; - categories = "Game"; + categories = [ "Game" ]; }; branch = if experimental then "experimental" else "stable"; diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix index 5ddad7fda4c9..e610f2427a2e 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { icon = "fish-fillets-ng"; desktopName = "Fish Fillets"; comment = "Puzzle game about witty fish saving the world sokoban-style"; - categories = "Game;LogicGame;"; + categories = [ "Game" "LogicGame" ]; }) ]; postInstall = '' diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 6f4a57587de9..af79a6d4b2b4 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { comment = "FlightGear Flight Simulator"; desktopName = "FlightGear"; genericName = "Flight simulator"; - categories = "Game;Simulation"; + categories = [ "Game" "Simulation" ]; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/games/freedroid/default.nix b/pkgs/games/freedroid/default.nix index 266407d17dba..38eb60e7e045 100644 --- a/pkgs/games/freedroid/default.nix +++ b/pkgs/games/freedroid/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "Freedroid Classic"; comment = "A clone of the classic game 'Paradroid' on Commodore 64"; - categories = "Game;ArcadeGame;"; + categories = [ "Game" "ArcadeGame" ]; }) ]; meta = with lib; { diff --git a/pkgs/games/freenukum/default.nix b/pkgs/games/freenukum/default.nix index ff1e8872233e..0d2f833671e3 100644 --- a/pkgs/games/freenukum/default.nix +++ b/pkgs/games/freenukum/default.nix @@ -16,12 +16,9 @@ let name = pname; exec = pname; icon = pname; - terminal = "false"; comment = description; - type = "Application"; - categories = "Game;ArcadeGame;ActionGame"; + categories = [ "Game" "ArcadeGame" "ActionGame" ]; genericName = pname; - fileValidation = false; }; in diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index 0b53e3d0bea3..f987992858da 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -7,12 +7,12 @@ let desktopItem = makeDesktopItem { name = "frogatto"; exec = "frogatto"; - startupNotify = "true"; + startupNotify = true; icon = "${data}/share/frogatto/modules/frogatto/images/os/frogatto-icon.png"; comment = description; desktopName = "Frogatto"; genericName = "frogatto"; - categories = "Game;ArcadeGame;"; + categories = [ "Game" "ArcadeGame" ]; }; version = "unstable-2020-12-04"; in buildEnv { diff --git a/pkgs/games/frozen-bubble/default.nix b/pkgs/games/frozen-bubble/default.nix index f9dd3fd61592..6738f979d00b 100644 --- a/pkgs/games/frozen-bubble/default.nix +++ b/pkgs/games/frozen-bubble/default.nix @@ -25,7 +25,7 @@ perlPackages.buildPerlModule { desktopName = "Frozen Bubble"; genericName = "Frozen Bubble"; comment = "Arcade/reflex colour matching game"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix index 6f91b1034581..1c918395d40b 100644 --- a/pkgs/games/gnujump/default.nix +++ b/pkgs/games/gnujump/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { icon = "gnujump"; desktopName = "GNUjump"; comment = "Jump up the tower to survive"; - categories = "Game;ArcadeGame;"; + categories = [ "Game" "ArcadeGame" ]; }) ]; postInstall = '' diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index e38294ff4014..a10b370e648b 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -60,7 +60,7 @@ let name = "gzdoom"; exec = "gzdoom"; desktopName = "GZDoom"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 08427bd29205..0397bb474da3 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { comment = meta.description; icon = "hyperrogue"; exec = "hyperrogue"; - categories = "Game;AdventureGame;"; + categories = [ "Game" "AdventureGame" ]; }; postInstall = '' diff --git a/pkgs/games/itch/default.nix b/pkgs/games/itch/default.nix index a8cfe8f24d76..34a2775c3c80 100644 --- a/pkgs/games/itch/default.nix +++ b/pkgs/games/itch/default.nix @@ -24,14 +24,12 @@ stdenvNoCC.mkDerivation rec{ (makeDesktopItem { name = pname; exec = pname; + tryExec = "itch %U"; icon = pname; desktopName = pname; - mimeType = "x-scheme-handler/itchio;x-scheme-handler/itch"; + mimeTypes = [ "x-scheme-handler/itchio" "x-scheme-handler/itch" ]; comment = "Install and play itch.io games easily"; - extraDesktopEntries = { - TryExec = "itch %U"; - Categories = "Game;"; - }; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index ce0eeea738af..53e1b3cf00e1 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { icon = "ivan.png"; desktopName = "IVAN"; genericName = pname; - categories = "Game;AdventureGame;RolePlaying;"; + categories = [ "Game" "AdventureGame" "RolePlaying" ]; comment = meta.description; }; diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index 2dc0e14daf8e..dceb9755fa27 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -11,7 +11,7 @@ let comment = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client"; desktopName = "Lunar Client"; genericName = "Minecraft Client"; - categories = "Game;"; + categories = [ "Game" ]; }; appimageContents = appimageTools.extract { diff --git a/pkgs/games/maelstrom/default.nix b/pkgs/games/maelstrom/default.nix index 5f78e34edac9..065784d605ef 100644 --- a/pkgs/games/maelstrom/default.nix +++ b/pkgs/games/maelstrom/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { desktopName = "Maelstrom"; genericName = "Maelstrom"; comment = "An arcade-style game resembling Asteroids"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix index 55ef9f51d5b3..8189c0789811 100644 --- a/pkgs/games/mari0/default.nix +++ b/pkgs/games/mari0/default.nix @@ -10,7 +10,7 @@ let comment = "Crossover between Super Mario Bros. and Portal"; desktopName = "mari0"; genericName = "mari0"; - categories = "Game"; + categories = [ "Game" ]; }; in diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index d28f2b1d1e7f..82df3710c577 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -66,7 +66,6 @@ let ''; desktopItem = makeDesktopItem { - type = "Application"; name = "Mindustry"; desktopName = "Mindustry"; exec = "mindustry"; diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 254c01fdf1b6..08104310faa3 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -38,7 +38,7 @@ let icon = "minecraft-launcher"; comment = "Official launcher for Minecraft, a sandbox-building game"; desktopName = "Minecraft Launcher"; - categories = "Game;"; + categories = [ "Game" ]; }; envLibPath = lib.makeLibraryPath [ diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index 2328c20ef91d..a873424aa24c 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -16,7 +16,7 @@ let comment = "Arcade-style fire fighting game"; desktopName = "Mr. Rescue"; genericName = "mrrescue"; - categories = "Game;"; + categories = [ "Game" ]; }; in diff --git a/pkgs/games/oh-my-git/default.nix b/pkgs/games/oh-my-git/default.nix index 881935279fe4..57fbad34057b 100644 --- a/pkgs/games/oh-my-git/default.nix +++ b/pkgs/games/oh-my-git/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { desktopName = "oh-my-git"; comment = "An interactive Git learning game!"; genericName = "An interactive Git learning game!"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index c16b38fc8f1f..d2844809eea8 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -8,7 +8,7 @@ let comment = "Open Source Jedi Academy game released by Raven Software"; desktopName = "Jedi Academy (Multi Player)"; genericName = "Jedi Academy"; - categories = "Game;"; + categories = [ "Game" ]; }; jasp = makeDesktopItem rec { name = "jasp"; @@ -17,7 +17,7 @@ let comment = "Open Source Jedi Academy game released by Raven Software"; desktopName = "Jedi Academy (Single Player)"; genericName = "Jedi Academy"; - categories = "Game;"; + categories = [ "Game" ]; }; in stdenv.mkDerivation { pname = "OpenJK"; diff --git a/pkgs/games/opensupaplex/default.nix b/pkgs/games/opensupaplex/default.nix index 44fc219bef91..d3f8155f546c 100644 --- a/pkgs/games/opensupaplex/default.nix +++ b/pkgs/games/opensupaplex/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { icon = "open-supaplex"; desktopName = "OpenSupaplex"; comment = meta.description; - categories = "Application;Game;"; + categories = [ "Application" "Game" ]; })]; meta = with lib; { diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index c168af81ad6b..34808438da7d 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { comment = "Robot game"; desktopName = "Orthorobot"; genericName = "orthorobot"; - categories = "Game;"; + categories = [ "Game" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 5ddbabe042ea..2b1a2f044fa0 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -63,7 +63,7 @@ buildDotnetModule rec { icon = "osu!"; comment = meta.description; type = "Application"; - categories = "Game;"; + categories = [ "Game" ]; })]; meta = with lib; { diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index ec5ae3e7d154..137b86f57b6b 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { name = "quakespasm"; exec = "quake"; desktopName = "Quakespasm"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index fd570e4d7c63..b01d616452bb 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Rocks'n'Diamonds"; genericName = "Tile-based puzzle"; - categories = "Game;LogicGame;"; + categories = [ "Game" "LogicGame" ]; }; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net ]; diff --git a/pkgs/games/rott/default.nix b/pkgs/games/rott/default.nix index cac357faf2e0..b3a517dab02b 100644 --- a/pkgs/games/rott/default.nix +++ b/pkgs/games/rott/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { name = "rott"; exec = "launch-rott"; desktopName = "Rise of the Triad: ${if buildShareware then "The HUNT Begins" else "Dark War"}"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 9a2ce6314cd1..d342d543e2fc 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -31,10 +31,9 @@ stdenv.mkDerivation rec { exec = "runelite"; icon = icon; comment = "Open source Old School RuneScape client"; - terminal = "false"; desktopName = "RuneLite"; genericName = "Oldschool Runescape"; - categories = "Game"; + categories = [ "Game" ]; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 7373779c9e5a..1d2e39d4164e 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { icon = "sauerbraten"; desktopName = "Sauerbraten"; comment = "FPS that uses an improved version of the Cube engine"; - categories = "Application;Game;ActionGame;"; + categories = [ "Application" "Game" "ActionGame" ]; }) ]; diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index e6fb00eb76cf..4711ffa2f549 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -68,7 +68,7 @@ tcl.mkTclDerivation rec { comment = meta.description; icon = "scid"; exec = "scid"; - categories = "Game;BoardGame;"; + categories = [ "Game" "BoardGame" ]; }; meta = with lib; { diff --git a/pkgs/games/scummvm/games.nix b/pkgs/games/scummvm/games.nix index 2ffd176ccf6e..b146bf1bc49d 100644 --- a/pkgs/games/scummvm/games.nix +++ b/pkgs/games/scummvm/games.nix @@ -3,7 +3,7 @@ let desktopItem = name: short: long: description: makeDesktopItem { - categories = "Game;AdventureGame;"; + categories = [ "Game" "AdventureGame" ]; comment = description; desktopName = long; exec = "@out@/bin/${short}"; diff --git a/pkgs/games/sdlpop/default.nix b/pkgs/games/sdlpop/default.nix index f9b91e3dc158..f9f2f6d0dc91 100644 --- a/pkgs/games/sdlpop/default.nix +++ b/pkgs/games/sdlpop/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { exec = "prince"; desktopName = "SDLPoP"; comment = "An open-source port of Prince of Persia"; - categories = "Game;AdventureGame;"; + categories = [ "Game" "AdventureGame" ]; }) ]; meta = with lib; { diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index 59f01f6a2c47..37138f152b6a 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { comment = "Fast-paced one button platformer"; desktopName = "Sienna"; genericName = "sienna"; - categories = "Game;"; + categories = [ "Game" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index 4aac0afb22b1..95fb3988f28e 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { comment = meta.description; genericName = "starsector"; desktopName = "Starsector"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/system-syzygy/default.nix b/pkgs/games/system-syzygy/default.nix index f01f93572ba2..67bb6b716616 100644 --- a/pkgs/games/system-syzygy/default.nix +++ b/pkgs/games/system-syzygy/default.nix @@ -6,7 +6,7 @@ let exec = "@out@/bin/syzygy"; comment = "A puzzle game"; desktopName = "System Syzygy"; - categories = "Game;"; + categories = [ "Game" ]; }; in rustPlatform.buildRustPackage rec { diff --git a/pkgs/games/tome2/default.nix b/pkgs/games/tome2/default.nix index d40717c9a385..3440e183515c 100644 --- a/pkgs/games/tome2/default.nix +++ b/pkgs/games/tome2/default.nix @@ -9,12 +9,10 @@ let name = pname; exec = "${pname}-x11"; icon = pname; - terminal = "false"; comment = description; type = "Application"; - categories = "Game;RolePlaying;"; + categories = [ "Game" "RolePlaying" ]; genericName = pname; - fileValidation = false; }; in stdenv.mkDerivation { diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 581220c339c4..70fbebe084c7 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -15,10 +15,9 @@ stdenv.mkDerivation rec { name = pname; exec = "@out@/bin/${pname}"; icon = pname; - terminal = "false"; comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal."; type = "Application"; - categories = "Game;RolePlaying;"; + categories = [ "Game" "RolePlaying" ]; genericName = pname; }; diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index b6085fdce391..d58c9aee0de4 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -14,7 +14,7 @@ let exec = "unciv"; comment = "An open-source Android/Desktop remake of Civ V"; desktopName = "Unciv"; - categories = "Game;"; + categories = [ "Game" ]; }; envLibPath = lib.makeLibraryPath [ diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index f3f8c1413dbc..191d8c218070 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -135,25 +135,17 @@ in stdenv.mkDerivation rec { desktopName = "Unvanquished"; comment = "FPS/RTS Game - Aliens vs. Humans"; icon = "unvanquished"; - terminal = false; exec = "unvanquished"; - categories = "Game;ActionGame;StrategyGame;"; - # May or may not work + categories = [ "Game" "ActionGame" "StrategyGame" ]; prefersNonDefaultGPU = true; - fileValidation = false; # it doesn't like PrefersNonDefaultGPU - # yes, PrefersNonDefaultGPU is standard: - # https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html }) (makeDesktopItem { name = "net.unvanquished.UnvanquishedProtocolHandler.desktop"; desktopName = "Unvanquished (protocol handler)"; noDisplay = true; - terminal = false; exec = "unvanquished -connect %u"; - mimeType = "x-scheme-handler/unv"; - # May or may not work + mimeTypes = [ "x-scheme-handler/unv" ]; prefersNonDefaultGPU = true; - fileValidation = false; # it doesn't like PrefersNonDefaultGPU }) ]; diff --git a/pkgs/games/ut2004/wrapper.nix b/pkgs/games/ut2004/wrapper.nix index 0f70a07ca8fc..bf344372933d 100644 --- a/pkgs/games/ut2004/wrapper.nix +++ b/pkgs/games/ut2004/wrapper.nix @@ -27,7 +27,7 @@ let desktopName = "Unreal Tournament 2004"; comment = "A first-person shooter video game developed by Epic Games and Digital Extreme"; genericName = "First-person shooter"; - categories = "Game;"; + categories = [ "Game" ]; exec = "ut2004"; }; diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index 8c2e8573177e..a14e80759b53 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -47,8 +47,7 @@ stdenv.mkDerivation rec { exec = "vintagestory"; icon = "vintagestory"; comment = "Innovate and explore in a sandbox world"; - type = "Application"; - categories = "Game;"; + categories = [ "Game" ]; }; installPhase = '' diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index fee4699aec92..00a8af6d8b70 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -8,11 +8,10 @@ let desktopItem = makeDesktopItem { desktopName = "World of Goo"; genericName = "World of Goo"; - categories = "Game;"; + categories = [ "Game" ]; exec = "WorldOfGoo.bin.${arch}"; icon = "2dboy-worldofgoo"; name = "worldofgoo"; - type = "Application"; }; in diff --git a/pkgs/games/xbill/default.nix b/pkgs/games/xbill/default.nix index a20b52e78546..765af44936a2 100644 --- a/pkgs/games/xbill/default.nix +++ b/pkgs/games/xbill/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { icon = "xbill"; desktopName = "XBill"; comment = "Get rid of those Wingdows viruses!"; - categories = "Game;ArcadeGame;"; + categories = [ "Game" "ArcadeGame" ]; }) ]; postInstall = '' diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index d5374c5446d1..46b0b594d724 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -50,9 +50,9 @@ let exec = "xonotic"; comment = meta.description; desktopName = "Xonotic"; - categories = "Game;Shooter;"; + categories = [ "Game" "Shooter" ]; icon = "xonotic"; - startupNotify = "false"; + startupNotify = false; }; xonotic-unwrapped = stdenv.mkDerivation rec { diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix index 1f50022a9181..3761453f446b 100644 --- a/pkgs/servers/pulseaudio/qpaeq.nix +++ b/pkgs/servers/pulseaudio/qpaeq.nix @@ -13,8 +13,8 @@ let icon = "audio-volume-high"; desktopName = "qpaeq"; genericName = "Audio equalizer"; - categories = "AudioVideo;Audio;Mixer;"; - startupNotify = "false"; + categories = [ "AudioVideo" "Audio" "Mixer" ]; + startupNotify = false; }; in mkDerivation rec { diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index 7cfec7aaffcc..87fc049a6d53 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -100,8 +100,7 @@ buildDotnetModule rec { exec = "otd-gui"; icon = "otd"; comment = meta.description; - type = "Application"; - categories = "Utility;"; + categories = [ "Utility" ]; }) ]; diff --git a/pkgs/tools/admin/winbox/default.nix b/pkgs/tools/admin/winbox/default.nix index 64b58ee9093a..38e76064b18d 100644 --- a/pkgs/tools/admin/winbox/default.nix +++ b/pkgs/tools/admin/winbox/default.nix @@ -45,11 +45,8 @@ let comment = "GUI administration for Mikrotik RouterOS"; exec = pname; icon = pname; - type = "Application"; - categories = "Utility"; - extraDesktopEntries = { - StartupWMClass = last (splitString "/" executable); - }; + categories = [ "Utility" ]; + startupWMClass = last (splitString "/" executable); }; # The icon is also from the winbox AUR package (see above). diff --git a/pkgs/tools/games/jpsxdec/default.nix b/pkgs/tools/games/jpsxdec/default.nix index 2c18f29bbf33..54d3e2a968c0 100644 --- a/pkgs/tools/games/jpsxdec/default.nix +++ b/pkgs/tools/games/jpsxdec/default.nix @@ -24,7 +24,7 @@ let icon = pname; comment = description; desktopName = "jPSXdec"; - categories = "AudioVideo;Utility;"; + categories = [ "AudioVideo" "Utility" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 0365a8073277..aefa2c3f7897 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -54,9 +54,7 @@ stdenv.mkDerivation rec { desktopName = "Android GPU Inspector"; exec = "$out/bin/agi"; icon = "agi"; - type = "Application"; - categories = "Development;Debugger;Graphics;3DGraphics"; - terminal = "false"; + categories = [ "Development" "Debugger" "Graphics" "3DGraphics" ]; })]; meta = with lib; { diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/tools/graphics/snapdragon-profiler/default.nix index 02a96184812e..298975ef18b6 100644 --- a/pkgs/tools/graphics/snapdragon-profiler/default.nix +++ b/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -72,10 +72,8 @@ stdenv.mkDerivation rec { desktopName = "Snapdragon Profiler"; exec = "$out/bin/snapdragon-profiler"; icon = "snapdragon-profiler"; - type = "Application"; comment = meta.description; - categories = "Development;Debugger;Graphics;3DGraphics"; - terminal = "false"; + categories = [ "Development" "Debugger" "Graphics" "3DGraphics" ]; })]; dontStrip = true; # Always needed on Mono diff --git a/pkgs/tools/graphics/xcolor/default.nix b/pkgs/tools/graphics/xcolor/default.nix index 707e9a95a127..1ef2c807bde7 100644 --- a/pkgs/tools/graphics/xcolor/default.nix +++ b/pkgs/tools/graphics/xcolor/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { desktopName = "XColor"; comment = "Select colors visible anywhere on the screen to get their RGB representation"; icon = "xcolor"; - categories = "Graphics;"; + categories = [ "Graphics" ]; }) ]; diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index 0a1d070d77ea..eb6101f6498a 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -13,11 +13,10 @@ let desktopItem = makeDesktopItem { desktopName = "HakuNeko Desktop"; genericName = "Manga & Anime Downloader"; - categories = "Network;FileTransfer;"; + categories = [ "Network" "FileTransfer" ]; exec = "hakuneko"; icon = "hakuneko-desktop"; name = "hakuneko-desktop"; - type = "Application"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index b33fee8e0b52..6030913a2286 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { exec = name; icon = name; comment = meta.description; - categories = "Science;DataVisualization;"; + categories = [ "Science" "DataVisualization" ]; }; installPhase = '' diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 22b16c7f9b34..cfdc8cba5df5 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -4,10 +4,9 @@ let desktopItem = makeDesktopItem { desktopName = "JDiskReport"; genericName = "A graphical utility to visualize disk usage"; - categories = "Utility;"; + categories = [ "Utility" ]; exec = "jdiskreport"; name = "jdiskreport"; - type = "Application"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 048e8eb6008a..78c86aeff74c 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation rec { icon = "Sharedown"; comment = "An Application to save your Sharepoint videos for offline usage."; desktopName = "Sharedown"; - categories = "Network;Archiving"; + categories = [ "Network" "Archiving" ]; }) ]; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 40552d149043..ad7574257610 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { icon = "bitwarden"; comment = "A secure and free password manager for all of your devices"; desktopName = "Bitwarden"; - categories = "Utility"; + categories = [ "Utility" ]; }; dontBuild = true; diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 831ec3b6133e..bb53a1958e00 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -34,7 +34,7 @@ let icon = "ghidra"; desktopName = "Ghidra"; genericName = "Ghidra Software Reverse Engineering Suite"; - categories = "Development;"; + categories = [ "Development" ]; }; # postPatch scripts. diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index e57f60637e25..d65d7abc4de6 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -19,7 +19,7 @@ let icon = "ghidra"; desktopName = "Ghidra"; genericName = "Ghidra Software Reverse Engineering Suite"; - categories = "Development;"; + categories = [ "Development" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 046abed36f0c..4e7a62374040 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -62,9 +62,9 @@ let comment = "Java Decompiler JD-GUI"; desktopName = "JD-GUI"; genericName = "Java Decompiler"; - mimeType = "application/java;application/java-vm;application/java-archive"; - categories = "Development;Debugger;"; - extraEntries="StartupWMClass=org-jd-gui-App"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" "Debugger" ]; + startupWMClass = "org-jd-gui-App"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index 470e5f6530fc..e7e21aec7c8e 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { comment = "Client side implementation of the eCard-API-Framework"; icon = "oec_logo_bg-transparent.svg"; exec = pname; - categories = "Utility;Security;"; + categories = [ "Utility" "Security" ]; }; installPhase = '' diff --git a/pkgs/tools/text/dirdiff/default.nix b/pkgs/tools/text/dirdiff/default.nix index e0385d332450..3577242fc0e9 100644 --- a/pkgs/tools/text/dirdiff/default.nix +++ b/pkgs/tools/text/dirdiff/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { desktopName = "Dirdiff"; genericName = "Directory Diff Viewer"; comment = "Diff and merge directory trees"; - categories = "Development;"; + categories = [ "Development" ]; }) ]; diff --git a/pkgs/tools/text/hottext/default.nix b/pkgs/tools/text/hottext/default.nix index 5472c8a36cf5..f6c70013b4ce 100644 --- a/pkgs/tools/text/hottext/default.nix +++ b/pkgs/tools/text/hottext/default.nix @@ -19,7 +19,7 @@ nimPackages.buildNimPackage rec { HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf"; desktopItem = makeDesktopItem { - categories = "Utility;"; + categories = [ "Utility" ]; comment = meta.description; desktopName = pname; exec = pname; diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 92fde60c23c0..4d6d23054da1 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { comment = "Visually query and analyse your XML data"; desktopName = "BaseX XML Database"; genericName = "XML database tool"; - categories = "Development;Utility;Database"; - mimeType = "text/xml"; + categories = [ "Development" "Utility" "Database" ]; + mimeTypes = [ "text/xml" ]; }); dontBuild = true; From 8bb8f9c8118be62d632b6636c2f52e26e2f763bd Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Feb 2022 16:46:06 +0300 Subject: [PATCH 217/231] firefox/wrapper: allow specifying StartupWMClass Primarily useful for out of tree beta/nightly builds, which use a different WM_CLASS --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 76e0977f18a6..52fe1ffe2d0e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -27,6 +27,7 @@ let (lib.toUpper (lib.substring 0 1 applicationName) + lib.substring 1 (-1) applicationName) , nameSuffix ? "" , icon ? applicationName + , wmClass ? null , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] , forceWayland ? false @@ -171,6 +172,7 @@ let "x-scheme-handler/https" "x-scheme-handler/ftp" ]; + startupWMClass = wmClass; }; nativeBuildInputs = [ makeWrapper lndir replace jq ]; From 066a581a80c0939423ff8b2d4b451a07ea8e5865 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 23 Feb 2022 10:26:30 +0300 Subject: [PATCH 218/231] nixos/doc: add release note for makeDesktopItem changes --- .../from_md/release-notes/rl-2205.section.xml | 64 +++++++++++++++++++ .../manual/release-notes/rl-2205.section.md | 12 ++++ 2 files changed, 76 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 56f9f60f3ebe..0760a781ea33 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -746,6 +746,70 @@ false. + + + pkgs.makeDesktopItem has been refactored to + provide a more idiomatic API. Specifically: + + + + + All valid options as of FDO Desktop Entry specification + version 1.4 can now be passed in as explicit arguments + + + + + exec can now be null, for entries that + are not of type Application + + + + + mimeType argument is renamed to + mimeTypes for consistency + + + + + mimeTypes, + categories, + implements, + keywords, onlyShowIn + and notShowIn take lists of strings + instead of one string with semicolon separators + + + + + extraDesktopEntries renamed to + extraConfig for consistency + + + + + Actions should now be provided as an attrset + actions, the Actions + line will be autogenerated. + + + + + extraEntries is removed. + + + + + Additional validation is added both at eval time and at + build time. + + + + + See the vscode package for a more detailed + example. + +
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 2994facffc97..2a931cd7fd6f 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -231,6 +231,18 @@ In addition to numerous new and upgraded packages, this release has the followin pipewire-media-session is deprecated by upstream and not recommended, but can still be manually enabled by setting `services.pipewire.media-session.enable` to `true` and `services.pipewire.wireplumber.enable` to `false`. +- `pkgs.makeDesktopItem` has been refactored to provide a more idiomatic API. Specifically: + - All valid options as of FDO Desktop Entry specification version 1.4 can now be passed in as explicit arguments + - `exec` can now be null, for entries that are not of type Application + - `mimeType` argument is renamed to `mimeTypes` for consistency + - `mimeTypes`, `categories`, `implements`, `keywords`, `onlyShowIn` and `notShowIn` take lists of strings instead of one string with semicolon separators + - `extraDesktopEntries` renamed to `extraConfig` for consistency + - Actions should now be provided as an attrset `actions`, the `Actions` line will be autogenerated. + - `extraEntries` is removed. + - Additional validation is added both at eval time and at build time. + + See the `vscode` package for a more detailed example. + ## Other Notable Changes {#sec-release-22.05-notable-changes} From 7d4c1995de4af86f4d85867dc6d00f1d824fb54a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 10:14:40 +0000 Subject: [PATCH 219/231] python310Packages.teamcity-messages: 1.30 -> 1.31 --- pkgs/development/python-modules/teamcity-messages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix index e378227b2f56..4f2b7f76de89 100644 --- a/pkgs/development/python-modules/teamcity-messages/default.nix +++ b/pkgs/development/python-modules/teamcity-messages/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "teamcity-messages"; - version = "1.30"; + version = "1.31"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "JetBrains"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5C9ElCmTH+xSrFQ/x9IRJ89RfSd9cxzkETlOCzwyU8s="; + sha256 = "sha256-oYXP9HWdgmEq48rYyuX6zHf+cp835C0BtHUAME+5S+k="; }; checkInputs = [ From 35e9fa3d13a260cb546478fec91b0b4ea54f3377 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 17:36:44 +0000 Subject: [PATCH 220/231] exodus: 21.12.3 -> 22.2.11 --- pkgs/applications/blockchains/exodus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 389497b2ec39..3660aebef709 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "21.12.3"; + version = "22.2.11"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "sha256-8Jgg9OxptkhD1SBjVBoklHQVCUOO+EePWnyEajqlivE="; + sha256 = "sha256-/K5dB5Qfaiv68YWTQ4j5QnqSo+TXPkWcQ+PlJpzDoe8="; }; sourceRoot = "."; From d95cba4463cb951518fcbd132981143c269a82dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 09:38:32 +0000 Subject: [PATCH 221/231] liquibase: 4.7.1 -> 4.8.0 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index ec56d582e603..06f4c947b205 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.7.1"; + version = "4.8.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-cHMsBkP5R7rxRZgzzKaHJrFq36xC9PBuzTzc1kHKc4U="; + sha256 = "sha256-dGK26S9wd+GFiGXEA9UvDc4b1m0DsfrpB4FcEIJf6zM="; }; nativeBuildInputs = [ makeWrapper ]; From 32b2f8481a464d54ecebacc27416162364be651f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 06:33:42 +0000 Subject: [PATCH 222/231] gofumpt: 0.2.1 -> 0.3.0 --- pkgs/development/tools/gofumpt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index b807006369e5..2c3922964948 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gofumpt"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NkflJwFdVcFTjXkDr8qqAFUlKwGNPTso6hvu7Vikn2U="; + sha256 = "sha256-S6IF/MtNCkhPHHdaQJyT78j2z4xdf4z/xLfXDmCWR2Y="; }; - vendorSha256 = "sha256-RZPfdj+rimKGvRZKaXOirkd7ietri55rBofwa/l2z8s="; + vendorSha256 = "sha256-LhiCxpjySEezhcgICfgD+mABd1QXyZn3uI1Fj+eWiyo="; doCheck = false; From 287381cef4390b5307700b4a970d5fa7937b5c35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 06:29:04 +0000 Subject: [PATCH 223/231] go-swag: 1.7.9-p1 -> 1.8.0 --- pkgs/development/tools/go-swag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index 967fbb625a6e..8c340b2ccf6c 100644 --- a/pkgs/development/tools/go-swag/default.nix +++ b/pkgs/development/tools/go-swag/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-swag"; - version = "1.7.9-p1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-JzPCNUoO3biNJLYKLkyJvVG/L7pqWBthtBuZL+Lc21U="; + sha256 = "sha256-axvc3iwAfsKunheLLKmUThZh27axRh/GJRcKy9EfEBw="; }; vendorSha256 = "sha256-QphjiJSQRULphWjrJ8RzrUblTDYL/fYoSNT3+g0tP48="; From 3ac4708072af03992593ed61a6ec5c485deba2fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 05:47:37 +0000 Subject: [PATCH 224/231] frugal: 3.14.14 -> 3.14.15 --- pkgs/development/tools/frugal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index f0e125245efa..5cb92b3b834b 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.14"; + version = "3.14.15"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1ie/pkg0pv8bJphQ8PXceRd2WALYaVxBAW1O/s4kKHA="; + sha256 = "sha256-7840HndsU5+mWKQ/HXLVYA2dV7L8NlM7so1nk8Zdc2c="; }; subPackages = [ "." ]; From 72419c91e4943141100ca2304482086a2649c973 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 01:11:14 +0000 Subject: [PATCH 225/231] subgit: 3.3.12 -> 3.3.13 --- .../version-management/git-and-tools/subgit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 4124ca67e65d..54dbc195f07f 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "subgit"; - version = "3.3.12"; + version = "3.3.13"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://subgit.com/download/subgit-${version}.zip"; - sha256 = "sha256-Mdjm7rkF/iw3HBftCgXrbFCG00g/RowFcF/oeKLyzL0="; + sha256 = "sha256-+sG7yD2aVLV9i7iPZTMMsY1CQ1VuJ8w+jPguuTulR8c="; }; } From 7485a6ac038ca276a0607ef1a3e98d13db1da7a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 06:52:29 +0000 Subject: [PATCH 226/231] gpac: 1.0.1 -> 2.0.0 --- pkgs/applications/video/gpac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 6597b5fbffe8..6fd7a2036c56 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, pkg-config, zlib }: stdenv.mkDerivation rec { - version = "1.0.1"; + version = "2.0.0"; pname = "gpac"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - sha256 = "0gj46jpprfqv3wyagblv3a52chbplyzhvpra66v63czjibqsslm5"; + sha256 = "sha256-MIX32lSqf/lrz9240h4wMIQp/heUmwvDJz8WN08yf6c="; }; postPatch = '' From 9654fd3182d564aa09dcc977f6135217a3cbe766 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 17:46:41 +0000 Subject: [PATCH 227/231] tilix: 1.9.4 -> 1.9.5 --- pkgs/applications/terminal-emulators/tilix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index c217ae7f991d..0538a2060aec 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tilix"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; rev = version; - sha256 = "sha256:020gr4q7kmqq8vnsh8rw97gf1p2n1yq4d7ncyjjh9l13zkaxqqv9"; + sha256 = "sha256-sPVL5oYDOmloRVm/nONKkC20vZc907c7ixBF6E2PQ8Y="; }; # Default upstream else LDC fails to link From 4759acb8a50abde3587d28277697b381a23cd556 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 13 Jan 2022 13:01:17 +0100 Subject: [PATCH 228/231] ipfs: 0.11.0 -> 0.12.0 https://github.com/ipfs/go-ipfs/releases/tag/v0.12.0 --- pkgs/applications/networking/ipfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 4ab075f4cab0..2cceddf0bd7c 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs"; - version = "0.11.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.12.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; - repoVersion = "11"; # Also update ipfs-migrator when changing the repo version + repoVersion = "12"; # Also update ipfs-migrator when changing the repo version # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "lTPGnFqDgyMWmSCPmLHguGNnJQMWi9LPrOZfDgeS9Y4="; + sha256 = "jWoMm/xIp3Zn/FiHWQ5/q39i6Lh4Fdoi9OdnRVc51Xk="; }; # tarball contains multiple files/directories From 21a1125f3729e145650b253b19dc9bcd5a0e34cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 02:39:31 +0000 Subject: [PATCH 229/231] gmsh: 4.9.4 -> 4.9.5 --- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 76fc20c4b048..4306ae091515 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-rP8zQtGQfEKaS+PkWW7UT2zUP9WpSrdWZ/SGPNzy92k="; + sha256 = "sha256-/9ZJAIRCCHGciNkaZsKBiJAjEyt6nigsUVSMufbzrUQ="; }; buildInputs = [ From c88fc7454a9b27d67f733143fc41547f10c5feae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 14:43:21 +0000 Subject: [PATCH 230/231] cups-filters: 1.28.11 -> 1.28.12 --- pkgs/misc/cups/filters.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 5efa78edcd9a..fdf4f163ba85 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -33,11 +33,11 @@ let in stdenv.mkDerivation rec { pname = "cups-filters"; - version = "1.28.11"; + version = "1.28.12"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz"; - sha256 = "sha256-KYbLSNE0Db5XnELAjCqINYem2+WUNuQi9BhMzQqWZm0="; + sha256 = "sha256-RuLqPYhK0iK7hjzmUR5ZzzkO+Og1KVvkSoDlALKjOjo="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; From d9b6b8a84934aaf5b7261abcdb98f7786e32a0e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Feb 2022 15:49:39 +0000 Subject: [PATCH 231/231] ytfzf: 2.1 -> 2.2 https://github.com/pystardust/ytfzf/releases/tag/v2.2 --- pkgs/tools/misc/ytfzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index 3bb0f4382bbf..fd58e79063eb 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-NJLXXam7FmBWj9sM+S71e5o5e6OtVpw0m32kUo3Fbec="; + hash = "sha256-dQq7p/aK9iiyuhuxh5eVXR9GLukwsvosONpQTI0mknw="; }; nativeBuildInputs = [ makeWrapper ];