From 6ea34850ff78d513d173392404694a557397e054 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Tue, 12 Oct 2021 09:45:54 -0400 Subject: [PATCH 001/140] mingw_w64_pthreads: enable 'static' lib output This make this 'mingw_w64_pthreads' package suitable for use when cross compiling rust code from linux to windows. --- pkgs/os-specific/windows/mingw-w64/pthreads.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/windows/mingw-w64/pthreads.nix b/pkgs/os-specific/windows/mingw-w64/pthreads.nix index bbcb028d3cbb..3b143efed1d7 100644 --- a/pkgs/os-specific/windows/mingw-w64/pthreads.nix +++ b/pkgs/os-specific/windows/mingw-w64/pthreads.nix @@ -4,6 +4,12 @@ stdenv.mkDerivation { name = "${mingw_w64.name}-pthreads"; inherit (mingw_w64) src meta; + configureFlags = [ + # Rustc require 'libpthread.a' when targeting 'x86_64-pc-windows-gnu'. + # Enabling this makes it work out of the box instead of failing. + "--enable-static" + ]; + preConfigure = '' cd mingw-w64-libraries/winpthreads ''; From 2b3c8211f7af3b7d0c14b0a91f3090cb977c93d6 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Wed, 11 Aug 2021 22:44:26 +0200 Subject: [PATCH 002/140] fwupd-efi: init at 1.1 --- .../linux/firmware/fwupd-efi/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/fwupd-efi/default.nix diff --git a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix b/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix new file mode 100644 index 000000000000..0e74b32b3b6b --- /dev/null +++ b/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, substituteAll +, pkg-config +, meson +, ninja +, gnu-efi +, python3 +}: + +stdenv.mkDerivation rec { + pname = "fwupd-efi"; + version = "1.1"; + + src = fetchurl { + url = "https://people.freedesktop.org/~hughsient/releases/${pname}-${version}.tar.xz"; + sha256 = "1w879qxlnsaz5xyp168a08f2p8yrgfpkfycls28jw8qxmz6g20aw"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + ]; + + buildInputs = [ + gnu-efi + ]; + + postPatch = '' + patchShebangs \ + efi/generate_binary.py \ + efi/generate_sbat.py + ''; + + mesonFlags = [ + "-Defi-includedir=${gnu-efi}/include/efi" + "-Defi-libdir=${gnu-efi}/lib" + "-Defi-ldsdir=${gnu-efi}/lib" + "-Defi_sbat_distro_id=nixos" + "-Defi_sbat_distro_summary=NixOS" + "-Defi_sbat_distro_pkgname=${pname}" + "-Defi_sbat_distro_version=${version}" + "-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd-efi&from=0&size=50&sort=relevance&query=fwupd-efi" + ]; + + meta = with lib; { + homepage = "https://fwupd.org/"; + maintainers = with maintainers; [ maxeaubrey ]; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2f6f1763e06..0323b55f6e26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21576,6 +21576,8 @@ with pkgs; fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; + fwupd-efi = callPackage ../os-specific/linux/firmware/fwupd-efi { }; + firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; fwts = callPackage ../os-specific/linux/fwts { }; From 777a4ba508c9500d85f4e6b2d98d15a9da1a01a3 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 27 Oct 2021 02:11:31 -0400 Subject: [PATCH 003/140] singularity-tools.buildImage: fix building from non-standard store paths --- pkgs/build-support/singularity-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 318f5b430fef..a6a3cd001b4a 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -73,7 +73,7 @@ rec { ''} # Build /bin and copy across closure - mkdir -p bin nix/store + mkdir -p bin ./${builtins.storeDir} for f in $(cat $layerClosure) ; do cp -ar $f ./$f done From ab6ec4332aac93a36fd37472782cc4c235a1f241 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 07:02:13 +0000 Subject: [PATCH 004/140] x42-avldrums: 0.4.1 -> 0.4.2 --- pkgs/applications/audio/x42-avldrums/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index 31ef68714f6a..d698ef68da5c 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "x42-avldrums"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "x42"; repo = "avldrums.lv2"; rev = "v${version}"; - sha256 = "1vwdp3d8qzd493qa99ddya7iql67bbfxmbcl8hk96lxif2lhmyws"; + sha256 = "sha256-L9rLSHHQIM6PqZ397TIxR6O1N9GKAQtDfWCofV5R85E="; fetchSubmodules = true; }; From bec092461a64d98fc916af6d78bab4c2ee6c64da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 08:47:46 +0000 Subject: [PATCH 005/140] x42-plugins: 20210714 -> 20211016 --- pkgs/applications/audio/x42-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 557802a8a0fb..70353e2497f1 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20210714"; + version = "20211016"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "sha256-X389bA+cf3N5eJpAlpDn/CJQ6xM4qzrBQ47fYPIyIHk="; + sha256 = "sha256-Z2lXaJweOPB9hWOuy2cx1P9/CAJ+IMc7JtPDKAg2boU="; }; nativeBuildInputs = [ pkg-config ]; From 7127f494eff4169b716a01ffa5c4045f789561e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 12:06:32 +0000 Subject: [PATCH 006/140] exiv2: 0.27.4 -> 0.27.5 --- pkgs/development/libraries/exiv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 930bfc99f28e..e532898f80e2 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.27.4"; + version = "0.27.5"; outputs = [ "out" "dev" "doc" "man" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - sha256 = "0m1x79q6i5fw3gr9k0dw0bbl7ym27g9vbmxiamks6yw028xqwc5a"; + sha256 = "sha256-5kdzw/YzpYldfHjUSPOzu3gW2TPgxt8Oxs0LZDFphgA="; }; nativeBuildInputs = [ From cb2d80ae6e3c91231fa0a3889c2995eb3005f9b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Oct 2021 01:57:42 +0000 Subject: [PATCH 007/140] zam-plugins: 3.13 -> 3.14 --- pkgs/applications/audio/zam-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 777ac79a22da..a07bfa60b054 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zam-plugins"; - version = "3.13"; + version = "3.14"; src = fetchFromGitHub { owner = "zamaudio"; repo = pname; rev = version; - sha256 = "02blg0iqich4vx5z1ahj6avkh83yqszdiq83p9jd5qwm0i4llqjq"; + sha256 = "sha256-zlANfFuEXQdXlSu4CuXNyChiuV7wkumaOJqgthl6Y9Q="; fetchSubmodules = true; }; From 5c8aab2c2d26bf2b4bd13a7c576946c2e5d4255e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Oct 2021 19:02:24 +0000 Subject: [PATCH 008/140] faust: 2.30.5 -> 2.37.3 --- pkgs/applications/audio/faust/faust2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index c1d351fa53e1..0309031cf785 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,13 +20,13 @@ with lib.strings; let - version = "2.30.5"; + version = "2.37.3"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "0cs52w4rwaj5d8pjak4cxsg02sxvx4y07592nc3ck81clqjmszmm"; + sha256 = "sha256-Jzauw8+vBjtbK73Bh4huhX1ql1cWmh80EzEET3x03rc="; fetchSubmodules = true; }; From 81a6758be9d325333fa808a3ea31a77c4a64ba97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 08:12:10 +0000 Subject: [PATCH 009/140] kubepug: 1.1.3 -> 1.2.2 --- pkgs/development/tools/kubepug/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/development/tools/kubepug/default.nix index df619086861d..4795d35e7e6c 100644 --- a/pkgs/development/tools/kubepug/default.nix +++ b/pkgs/development/tools/kubepug/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubepug"; - version = "1.1.3"; + version = "1.2.2"; src = fetchFromGitHub { owner = "rikatz"; repo = "kubepug"; rev = "v${version}"; - sha256 = "094c1qfmsdmy963bxs6lq3xh1zpfdfh16vlhfwi9yywmgcynb3b6"; + sha256 = "sha256-jQ/LzwxYxfCKiu+2VhjQ3YWwLEqZkYrH7+olBOMUA1A="; }; - vendorSha256 = "0jzry4znq4kcl6i9jcawilyjm8av1zxbml6nlr96v8x47ijxav5j"; + vendorSha256 = "sha256-P5HoU9AAGFrSrp9iymjW+r8w5L90KUOrmaXM8p+Wn44="; ldflags = [ "-s" "-w" "-X=github.com/rikatz/kubepug/version.Version=${src.rev}" From 7a1f2fd9e605484308b89236d6d644af0483a857 Mon Sep 17 00:00:00 2001 From: James Landrein Date: Thu, 4 Nov 2021 00:08:06 +0100 Subject: [PATCH 010/140] kubectl-evict-pod: init at 0.0.10 --- .../cluster/kubectl-evict-pod/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix diff --git a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix new file mode 100644 index 000000000000..bd160db33cb8 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubectl-evict-pod"; + version = "0.0.10"; + + src = fetchFromGitHub { + owner = "rajatjindal"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Z4fJzU317p7K+klcDQAukXAfZOpHd3PlH5fKO0PgKHA="; + }; + + vendorSha256 = "sha256-8VTrywlzrzoBEi/xOqkwhGW/R2B2oGqgh01Gv9FcW80="; + + meta = with lib; { + description = "This plugin evicts the given pod and is useful for testing pod disruption budget rules"; + homepage = "https://github.com/rajatjindal/kubectl-evict-pod"; + license = licenses.asl20; + maintainers = [ maintainers.j4m3s ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b19c0e62ca19..a82e6f99f72e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25835,6 +25835,8 @@ with pkgs; kube-score = callPackage ../applications/networking/cluster/kube-score { }; + kubectl-evict-pod = callPackage ../applications/networking/cluster/kubectl-evict-pod { }; + kubeval = callPackage ../applications/networking/cluster/kubeval { }; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; From 0b546fc53f6487785dad1e0481d0b7d7073b9786 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Wed, 11 Aug 2021 22:46:22 +0200 Subject: [PATCH 011/140] fwupd: 1.5.12 -> 1.7.1 - https://github.com/fwupd/fwupd/releases/tag/1.6.0 - https://github.com/fwupd/fwupd/releases/tag/1.6.1 - https://github.com/fwupd/fwupd/releases/tag/1.6.2 - https://github.com/fwupd/fwupd/releases/tag/1.6.3 - https://github.com/fwupd/fwupd/releases/tag/1.6.4 - https://github.com/fwupd/fwupd/releases/tag/1.7.0 - https://github.com/fwupd/fwupd/releases/tag/1.7.1 Installed tests python not needed since the utility was moved to C code: https://github.com/fwupd/fwupd/commit/9d37e447a1dbd4c333c36c18eee2aa7472c8ca04 Co-Authored-By: Jan Tojnar --- ...d-option-for-installation-sysconfdir.patch | 82 ++++++----- .../linux/firmware/fwupd/default.nix | 128 ++++++++++-------- .../fwupd/fix-install-detection.patch | 13 ++ .../linux/firmware/fwupd/fix-paths.patch | 8 -- .../fwupd/install-fwupdplugin-to-out.patch | 22 +-- .../firmware/fwupd/installed-tests-path.patch | 10 -- 6 files changed, 139 insertions(+), 124 deletions(-) create mode 100644 pkgs/os-specific/linux/firmware/fwupd/fix-install-detection.patch delete mode 100644 pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index cd42f2f44e20..66194430b251 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -1,21 +1,21 @@ diff --git a/data/meson.build b/data/meson.build -index 50154569..f8058a8e 100644 +index f10d4ff6..2dc66fb6 100644 --- a/data/meson.build +++ b/data/meson.build -@@ -17,7 +17,7 @@ endif +@@ -21,7 +21,7 @@ endif if build_standalone install_data(['daemon.conf'], - install_dir : join_paths(sysconfdir, 'fwupd') + install_dir : join_paths(sysconfdir_install, 'fwupd') ) - endif - + install_data(['power.quirk'], + install_dir: join_paths(datadir, 'fwupd', 'quirks.d')) diff --git a/data/pki/meson.build b/data/pki/meson.build -index 94bb0b6f..1ea6a9ac 100644 +index dcd9e128..ff137f3a 100644 --- a/data/pki/meson.build +++ b/data/pki/meson.build -@@ -3,24 +3,23 @@ install_data([ +@@ -2,24 +2,23 @@ install_data([ 'GPG-KEY-Linux-Foundation-Firmware', 'GPG-KEY-Linux-Vendor-Firmware-Service', ], @@ -45,19 +45,28 @@ index 94bb0b6f..1ea6a9ac 100644 ) - diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build -index 826a3c1d..b78db663 100644 +index 02d8777b..2c89d593 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build -@@ -3,7 +3,7 @@ if build_daemon and get_option('lvfs') - 'lvfs.conf', +@@ -2,7 +2,7 @@ if build_standalone and get_option('lvfs') != 'false' + install_data([ 'lvfs-testing.conf', ], - install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d') + install_dir : join_paths(sysconfdir_install, 'fwupd', 'remotes.d') + ) + con3 = configuration_data() + if get_option('lvfs') == 'disabled' +@@ -15,7 +15,7 @@ if build_standalone and get_option('lvfs') != 'false' + output : 'lvfs.conf', + configuration : con3, + install: true, +- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), ++ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) i18n.merge_file( input: 'lvfs.metainfo.xml', -@@ -37,12 +37,12 @@ configure_file( +@@ -49,12 +49,12 @@ configure_file( output : 'vendor.conf', configuration : con2, install: true, @@ -73,10 +82,10 @@ index 826a3c1d..b78db663 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index b075ca89..8d504d3c 100644 +index 7557cd4a..4c98de6d 100644 --- a/meson.build +++ b/meson.build -@@ -194,6 +194,12 @@ endif +@@ -190,6 +190,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -90,43 +99,44 @@ index b075ca89..8d504d3c 100644 gio = dependency('gio-2.0', version : '>= 2.45.8') giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false) diff --git a/meson_options.txt b/meson_options.txt -index bc76c0ab..8a67d012 100644 +index 94f73898..5de6cc7b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type') - option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent') option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support') + option('firmware-packager', type : 'boolean', value : true, description : 'enable firmware-packager installation') diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build -index ed4eee70..76dbdb1d 100644 +index e9f12879..a0126dbb 100644 --- a/plugins/dell-esrt/meson.build +++ b/plugins/dell-esrt/meson.build -@@ -37,5 +37,5 @@ configure_file( +@@ -38,6 +38,6 @@ configure_file( output : 'dell-esrt.conf', configuration : con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) + endif diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index 205d1394..3223f404 100644 +index 5263048c..c46fac64 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build -@@ -27,7 +27,7 @@ shared_module('fu_plugin_redfish', +@@ -53,7 +53,7 @@ shared_module('fu_plugin_redfish', ) install_data(['redfish.conf'], -- install_dir: join_paths(sysconfdir, 'fwupd') -+ install_dir: join_paths(sysconfdir_install, 'fwupd') +- install_dir: join_paths(sysconfdir, 'fwupd'), ++ install_dir: join_paths(sysconfdir_install, 'fwupd'), + install_mode: 'rw-r-----', ) - if get_option('tests') diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build -index 6b2368fb..2bd06fed 100644 +index 646ed6cb..8d7c59aa 100644 --- a/plugins/thunderbolt/meson.build +++ b/plugins/thunderbolt/meson.build -@@ -31,7 +31,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', +@@ -35,7 +35,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', ) install_data(['thunderbolt.conf'], @@ -136,10 +146,19 @@ index 6b2368fb..2bd06fed 100644 # we use functions from 2.52 in the tests if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52') diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build -index 0b793a07..ebd3e5ea 100644 +index 708586b0..f29536b1 100644 --- a/plugins/uefi-capsule/meson.build +++ b/plugins/uefi-capsule/meson.build -@@ -97,7 +97,7 @@ if get_option('man') +@@ -21,7 +21,7 @@ if host_machine.system() == 'linux' + output : '35_fwupd', + configuration : con2, + install: true, +- install_dir: join_paths(sysconfdir, 'grub.d') ++ install_dir: join_paths(sysconfdir_install, 'grub.d') + ) + elif host_machine.system() == 'freebsd' + backend_srcs += 'fu-uefi-backend-freebsd.c' +@@ -116,7 +116,7 @@ if get_option('man') endif install_data(['uefi_capsule.conf'], @@ -147,15 +166,4 @@ index 0b793a07..ebd3e5ea 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd') ) - if get_option('tests') -diff --git a/plugins/upower/meson.build b/plugins/upower/meson.build -index 290a3eb6..9ab2f452 100644 ---- a/plugins/upower/meson.build -+++ b/plugins/upower/meson.build -@@ -23,5 +23,5 @@ shared_module('fu_plugin_upower', - ) - - install_data(['upower.conf'], -- install_dir: join_paths(sysconfdir, 'fwupd') -+ install_dir: join_paths(sysconfdir_install, 'fwupd') - ) + # add all the .po files as inputs to watch diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 4f3c3a79f5b0..0333a9e43105 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -1,9 +1,10 @@ # Updating? Keep $out/etc synchronized with passthru keys -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , fetchFromGitHub -, substituteAll , gtk-doc , pkg-config , gobject-introspection @@ -15,13 +16,11 @@ , sqlite , libarchive , curl -, help2man , libjcat , libxslt , elfutils , libsmbios , efivar -, gnu-efi , valgrind , meson , libuuid @@ -31,6 +30,7 @@ , ninja , gcab , gnutls +, protobufc , python3 , wrapGAppsHook , json-glib @@ -40,32 +40,24 @@ , vala , makeFontsConf , freefont_ttf -, cairo -, freetype -, fontconfig , pango , tpm2-tss , bubblewrap , efibootmgr , flashrom , tpm2-tools +, fwupd-efi , nixosTests , runCommand +, unstableGitUpdater }: let python = python3.withPackages (p: with p; [ pygobject3 - pycairo - pillow setuptools ]); - installedTestsPython = python3.withPackages (p: with p; [ - pygobject3 - requests - ]); - isx86 = stdenv.isx86_64 || stdenv.isi686; # Dell isn't supported on Aarch64 @@ -89,9 +81,38 @@ let exec python3 -c "$buildCommandPython" ''; + test-firmware = + let + version = "unstable-2021-11-02"; + src = fetchFromGitHub { + name = "fwupd-test-firmware-${version}"; + owner = "fwupd"; + repo = "fwupd-test-firmware"; + rev = "aaa2f9fd68a40684c256dd85b86093cba38ffd9d"; + sha256 = "Slk7CNfkmvmOh3WtIBkPs3NYT96co6i8PwqcbpeVFgA="; + passthru = { + inherit src version; # For update script + updateScript = unstableGitUpdater { + url = "${test-firmware.meta.homepage}.git"; + }; + }; + }; + in + src // { + meta = src.meta // { + # For update script + position = + let + pos = builtins.unsafeGetAttrPos "updateScript" test-firmware; + in + pos.file + ":" + toString pos.line; + }; + }; + + self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.5.12"; + version = "1.7.1"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -100,27 +121,27 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-BluwLlm6s/2H/USARQpAvDR0+X8WP/q0h8VvxA6Qftc="; + sha256 = "sha256-rlbOtEt4byH1TRM6xwvF2cuM1L2gFnM5xmmiKNpn+jw="; }; patches = [ - # Do not try to create useless paths in /var. - ./fix-paths.patch - - # Allow installing + # Since /etc is the domain of NixOS, not Nix, + # we cannot install files there. + # Let’s install the files to $prefix/etc + # while still reading them from /etc. + # NixOS module for fwupd will take take care of copying the files appropriately. ./add-option-for-installation-sysconfdir.patch - # Install plug-ins and libfwupdplugin to out, + # Install plug-ins and libfwupdplugin to $out output, # they are not really part of the library. ./install-fwupdplugin-to-out.patch # Installed tests are installed to different output # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. - (substituteAll { - src = ./installed-tests-path.patch; - # Needs a different set of modules than po/make-images. - inherit installedTestsPython; - }) + ./installed-tests-path.patch + + # Tests detect fwupd is installed when prefix is /usr. + ./fix-install-detection.patch ]; nativeBuildInputs = [ @@ -136,8 +157,8 @@ let gnutls docbook_xml_dtd_43 docbook-xsl-nons - help2man libxslt + protobufc # for protoc python wrapGAppsHook vala @@ -151,7 +172,6 @@ let libarchive curl elfutils - gnu-efi libgudev colord libjcat @@ -159,18 +179,17 @@ let json-glib umockdev bash-completion - cairo - freetype - fontconfig pango tpm2-tss efivar + fwupd-efi + protobufc ] ++ lib.optionals haveDell [ libsmbios ]; mesonFlags = [ - "-Dgtkdoc=true" + "-Ddocs=gtkdoc" "-Dplugin_dummy=true" # We are building the official releases. "-Dsupported_build=true" @@ -180,17 +199,10 @@ let "-Dudevdir=lib/udev" "-Dsystemd_root_prefix=${placeholder "out"}" "-Dinstalled_test_prefix=${placeholder "installedTests"}" - "-Defi-libdir=${gnu-efi}/lib" - "-Defi-ldsdir=${gnu-efi}/lib" - "-Defi-includedir=${gnu-efi}/include/efi" - "-Defi_sbat_distro_id=nixos" - "-Defi_sbat_distro_summary=NixOS" - "-Defi_sbat_distro_pkgname=fwupd" - "-Defi_sbat_distro_version=${version}" - "-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd&from=0&size=50&sort=relevance&query=fwupd" "--localstatedir=/var" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" + "-Defi_os_dir=nixos" # We do not want to place the daemon into lib (cyclic reference) "--libexecdir=${placeholder "out"}/libexec" @@ -232,13 +244,8 @@ let postPatch = '' patchShebangs \ - contrib/get-version.py \ contrib/generate-version-script.py \ meson_post_install.sh \ - plugins/uefi-capsule/efi/generate_sbat.py \ - plugins/uefi-capsule/efi/generate_binary.py \ - po/make-images \ - po/make-images.sh \ po/test-deps ''; @@ -246,18 +253,20 @@ let addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" ''; - postInstall = - let - testFw = fetchFromGitHub { - owner = "fwupd"; - repo = "fwupd-test-firmware"; - rev = "c13bfb26cae5f4f115dd4e08f9f00b3cb9acc25e"; - sha256 = "US81i7mtLEe85KdWz5r+fQTk61IhqjVkzykBaBPuKL4="; - }; - in '' - # These files have weird licenses so they are shipped separately. - cp --recursive --dereference "${testFw}/installed-tests/tests" "$installedTests/libexec/installed-tests/fwupd" - ''; + preInstall = '' + # We have pkexec on PATH so Meson will try to use it when installation fails + # due to being unable to write to e.g. /etc. + # Let’s pretend we already ran pkexec – + # the pkexec on PATH would complain it lacks setuid bit, + # obscuring the underlying error. + # https://github.com/mesonbuild/meson/blob/492cc9bf95d573e037155b588dc5110ded4d9a35/mesonbuild/minstall.py#L558 + export PKEXEC_UID=-1 + ''; + + postInstall = '' + # These files have weird licenses so they are shipped separately. + cp --recursive --dereference "${test-firmware}/installed-tests/tests" "$installedTests/libexec/installed-tests/fwupd" + ''; preFixup = let binPath = [ @@ -294,7 +303,6 @@ let "fwupd/remotes.d/vendor.conf" "fwupd/remotes.d/vendor-directory.conf" "fwupd/thunderbolt.conf" - "fwupd/upower.conf" "fwupd/uefi_capsule.conf" "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" @@ -302,6 +310,7 @@ let "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata" "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" "pki/fwupd-metadata/LVFS-CA.pem" + "grub.d/35_fwupd" ] ++ lib.optionals haveDell [ "fwupd/remotes.d/dell-esrt.conf" ] ++ lib.optionals haveRedfish [ @@ -315,6 +324,9 @@ let "invalid" ]; + # For updating. + inherit test-firmware; + tests = let listToPy = list: "[${lib.concatMapStringsSep ", " (f: "'${f}'") list}]"; in { diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-install-detection.patch b/pkgs/os-specific/linux/firmware/fwupd/fix-install-detection.patch new file mode 100644 index 000000000000..56d7def5c16a --- /dev/null +++ b/pkgs/os-specific/linux/firmware/fwupd/fix-install-detection.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c +index 4710c769..1c68fdb9 100644 +--- a/plugins/redfish/fu-self-test.c ++++ b/plugins/redfish/fu-self-test.c +@@ -27,7 +27,7 @@ fu_test_is_installed_test(void) + const gchar *builddir = g_getenv("G_TEST_BUILDDIR"); + if (builddir == NULL) + return FALSE; +- return g_str_has_prefix(builddir, "/usr"); ++ return g_str_has_prefix(builddir, "/nix"); + } + + static void diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch b/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch deleted file mode 100644 index 474b250097d0..000000000000 --- a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff --git a/data/builder/meson.build b/data/builder/meson.build -index c7a430c0..e69de29b 100644 ---- a/data/builder/meson.build -+++ b/data/builder/meson.build -@@ -1,3 +0,0 @@ --install_data('README.md', -- install_dir : join_paths(localstatedir, 'lib', 'fwupd', 'builder') --) diff --git a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch b/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch index 347b6862146d..6667156e831c 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch @@ -1,8 +1,8 @@ diff --git a/libfwupdplugin/meson.build b/libfwupdplugin/meson.build -index 0abcd45c..51cbc912 100644 +index d6a2ed68..12c82a95 100644 --- a/libfwupdplugin/meson.build +++ b/libfwupdplugin/meson.build -@@ -114,7 +114,8 @@ +@@ -216,7 +216,8 @@ fwupdplugin = library( ], link_args : vflag, link_depends : fwupdplugin_mapfile, @@ -12,26 +12,26 @@ index 0abcd45c..51cbc912 100644 ) fwupdplugin_pkgg = import('pkgconfig') -@@ -167,7 +168,8 @@ - 'GUsb-1.0', +@@ -276,7 +277,8 @@ if get_option('introspection') + girtargets, fwupd_gir[0], ], - install : true + install : true, + install_dir_typelib : bindir / '..' / 'lib' / 'girepository-1.0', ) - gnome.generate_vapi('fwupdplugin', - sources : fwupd_gir[0], + + # Verify the map file is correct -- note we can't actually use the generated diff --git a/meson.build b/meson.build -index b1a523d2..00125997 100644 +index 38aa36b0..3fb7e579 100644 --- a/meson.build +++ b/meson.build -@@ -389,7 +389,7 @@ +@@ -521,7 +521,7 @@ if build_standalone if host_machine.system() == 'windows' - plugin_dir = 'fwupd-plugins-3' + plugin_dir = 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current) else -- plugin_dir = join_paths(libdir, 'fwupd-plugins-3') -+ plugin_dir = join_paths(bindir, '..', 'lib', 'fwupd-plugins-3') +- plugin_dir = join_paths(libdir, 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)) ++ plugin_dir = join_paths(bindir, '..', 'lib', 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)) endif conf.set_quoted('FWUPD_PLUGINDIR', plugin_dir) endif diff --git a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch index d8f1a533b824..2024e84b0a83 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch @@ -1,13 +1,3 @@ -diff --git a/data/device-tests/hardware.py b/data/device-tests/hardware.py -index 7f1e1907..10fee1b8 100755 ---- a/data/device-tests/hardware.py -+++ b/data/device-tests/hardware.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!@installedTestsPython@/bin/python3 - # pylint: disable=wrong-import-position,too-many-locals,unused-argument,wrong-import-order - # - # Copyright (C) 2017 Richard Hughes diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build index adadbcdd..1b51bb9c 100644 --- a/data/installed-tests/meson.build From 4ec119009b31d916966ad27d110580bb113c9780 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 5 Nov 2021 21:06:08 +0100 Subject: [PATCH 012/140] virtualisation/qemu-vm: Double the default diskSize The default has been unchanged for a decade. Space is cheaper and software catches up with that. Let's not make our testing harder than necessary by default. --- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index a8db42f5ed6f..6ce4461babc7 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -318,7 +318,7 @@ in virtualisation.diskSize = mkOption { type = types.nullOr types.ints.positive; - default = 512; + default = 1024; description = '' The disk size in megabytes of the virtual machine. From 3d852ae4e864b9e7bffe913eaa5436c059b60ae8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 2 Nov 2021 10:44:23 +0000 Subject: [PATCH 013/140] libbsd: 0.10.0 -> 0.11.3 --- .../development/libraries/libbsd/darwin.patch | 293 +++--------------- pkgs/development/libraries/libbsd/default.nix | 7 +- 2 files changed, 47 insertions(+), 253 deletions(-) diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch index 340eb47a6301..f491867ac5aa 100644 --- a/pkgs/development/libraries/libbsd/darwin.patch +++ b/pkgs/development/libraries/libbsd/darwin.patch @@ -1,26 +1,17 @@ -diff --git a/configure.ac b/configure.ac -index 6e9496d..60b6e4c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -44,6 +44,8 @@ AC_SUBST([TESTU01_LIBS]) - AM_CONDITIONAL([HAVE_LIBTESTU01], - [test "x$ac_cv_lib_testu01_unif01_CreateExternGenBits" = "xyes"]) - -+AX_CHECK_VSCRIPT -+ - is_windows=no - AS_CASE([$host_os], - [*-gnu*], [ -@@ -68,7 +70,7 @@ AS_CASE([$host_os], +diff --git c/configure.ac w/configure.ac +index 09cb310..30c0e2a 100644 +--- c/configure.ac ++++ w/configure.ac +@@ -110,7 +110,7 @@ AS_CASE([$host_os], AM_CONDITIONAL([OS_WINDOWS], [test "x$is_windows" = "xyes"]) # Checks for header files. --AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h grp.h]) -+AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h grp.h nlist.h]) +-AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h pwd.h grp.h]) ++AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h pwd.h grp.h nlist.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE -@@ -169,7 +171,8 @@ AC_LINK_IFELSE( +@@ -210,7 +210,8 @@ AC_LINK_IFELSE( AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ getauxval getentropy getexecname getline \ @@ -29,11 +20,11 @@ index 6e9496d..60b6e4c 100644 + strlcpy strlcat strnstr strmode fpurge]) AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"]) - AC_CONFIG_FILES([ -diff --git a/include/bsd/string.h b/include/bsd/string.h + AC_SUBST([LIBBSD_LIBS]) +diff --git c/include/bsd/string.h w/include/bsd/string.h index f987fee..a1e17ed 100644 ---- a/include/bsd/string.h -+++ b/include/bsd/string.h +--- c/include/bsd/string.h ++++ w/include/bsd/string.h @@ -41,10 +41,21 @@ #include @@ -56,175 +47,10 @@ index f987fee..a1e17ed 100644 #if !defined(__GLIBC__) || \ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) -diff --git a/m4/ax_check_vscript.m4 b/m4/ax_check_vscript.m4 -new file mode 100644 -index 0000000..9851f32 ---- /dev/null -+++ b/m4/ax_check_vscript.m4 -@@ -0,0 +1,142 @@ -+# =========================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_check_vscript.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CHECK_VSCRIPT -+# -+# DESCRIPTION -+# -+# Check whether the linker supports version scripts. Version scripts are -+# used when building shared libraries to bind symbols to version nodes -+# (helping to detect incompatibilities) or to limit the visibility of -+# non-public symbols. -+# -+# Output: -+# -+# If version scripts are supported, VSCRIPT_LDFLAGS will contain the -+# appropriate flag to pass to the linker. On GNU systems this would -+# typically be "-Wl,--version-script", and on Solaris it would typically -+# be "-Wl,-M". -+# -+# Two Automake conditionals are also set: -+# -+# HAVE_VSCRIPT is true if the linker supports version scripts with -+# entries that use simple wildcards, like "local: *". -+# -+# HAVE_VSCRIPT_COMPLEX is true if the linker supports version scripts with -+# pattern matching wildcards, like "global: Java_*". -+# -+# On systems that do not support symbol versioning, such as Mac OS X, both -+# conditionals will be false. They will also be false if the user passes -+# "--disable-symvers" on the configure command line. -+# -+# Example: -+# -+# configure.ac: -+# -+# AX_CHECK_VSCRIPT -+# -+# Makefile.am: -+# -+# if HAVE_VSCRIPT -+# libfoo_la_LDFLAGS += $(VSCRIPT_LDFLAGS),@srcdir@/libfoo.map -+# endif -+# -+# if HAVE_VSCRIPT_COMPLEX -+# libbar_la_LDFLAGS += $(VSCRIPT_LDFLAGS),@srcdir@/libbar.map -+# endif -+# -+# LICENSE -+# -+# Copyright (c) 2014 Kevin Cernekee -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 2 -+ -+# _AX_CHECK_VSCRIPT(flag, global-sym, action-if-link-succeeds, [junk-file=no]) -+AC_DEFUN([_AX_CHECK_VSCRIPT], [ -+ AC_LANG_PUSH([C]) -+ ax_check_vscript_save_flags="$LDFLAGS" -+ echo "V1 { global: $2; local: *; };" > conftest.map -+ AS_IF([test x$4 = xyes], [ -+ echo "{" >> conftest.map -+ ]) -+ LDFLAGS="$LDFLAGS -Wl,$1,conftest.map" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[int show, hide;]], [])], [$3]) -+ LDFLAGS="$ax_check_vscript_save_flags" -+ rm -f conftest.map -+ AC_LANG_POP([C]) -+]) dnl _AX_CHECK_VSCRIPT -+ -+AC_DEFUN([AX_CHECK_VSCRIPT], [ -+ -+ AC_ARG_ENABLE([symvers], -+ AS_HELP_STRING([--disable-symvers], -+ [disable library symbol versioning [default=auto]]), -+ [want_symvers=$enableval], -+ [want_symvers=yes] -+ ) -+ -+ AS_IF([test x$want_symvers = xyes], [ -+ -+ dnl First test --version-script and -M with a simple wildcard. -+ -+ AC_CACHE_CHECK([linker version script flag], ax_cv_check_vscript_flag, [ -+ ax_cv_check_vscript_flag=unsupported -+ _AX_CHECK_VSCRIPT([--version-script], [show], [ -+ ax_cv_check_vscript_flag=--version-script -+ ]) -+ AS_IF([test x$ax_cv_check_vscript_flag = xunsupported], [ -+ _AX_CHECK_VSCRIPT([-M], [show], [ax_cv_check_vscript_flag=-M]) -+ ]) -+ -+ dnl The linker may interpret -M (no argument) as "produce a load map." -+ dnl If "-M conftest.map" doesn't fail when conftest.map contains -+ dnl obvious syntax errors, assume this is the case. -+ -+ AS_IF([test x$ax_cv_check_vscript_flag != xunsupported], [ -+ _AX_CHECK_VSCRIPT([$ax_cv_check_vscript_flag], [show], -+ [ax_cv_check_vscript_flag=unsupported], [yes]) -+ ]) -+ ]) -+ -+ dnl If the simple wildcard worked, retest with a complex wildcard. -+ -+ AS_IF([test x$ax_cv_check_vscript_flag != xunsupported], [ -+ ax_check_vscript_flag=$ax_cv_check_vscript_flag -+ AC_CACHE_CHECK([if version scripts can use complex wildcards], -+ ax_cv_check_vscript_complex_wildcards, [ -+ ax_cv_check_vscript_complex_wildcards=no -+ _AX_CHECK_VSCRIPT([$ax_cv_check_vscript_flag], [sh*], [ -+ ax_cv_check_vscript_complex_wildcards=yes]) -+ ]) -+ ax_check_vscript_complex_wildcards="$ax_cv_check_vscript_complex_wildcards" -+ ], [ -+ ax_check_vscript_flag= -+ ax_check_vscript_complex_wildcards=no -+ ]) -+ ], [ -+ AC_MSG_CHECKING([linker version script flag]) -+ AC_MSG_RESULT([disabled]) -+ -+ ax_check_vscript_flag= -+ ax_check_vscript_complex_wildcards=no -+ ]) -+ -+ AS_IF([test x$ax_check_vscript_flag != x], [ -+ VSCRIPT_LDFLAGS="-Wl,$ax_check_vscript_flag" -+ AC_SUBST([VSCRIPT_LDFLAGS]) -+ ]) -+ -+ AM_CONDITIONAL([HAVE_VSCRIPT], -+ [test x$ax_check_vscript_flag != x]) -+ AM_CONDITIONAL([HAVE_VSCRIPT_COMPLEX], -+ [test x$ax_check_vscript_complex_wildcards = xyes]) -+ -+]) dnl AX_CHECK_VSCRIPT -diff --git a/src/Makefile.am b/src/Makefile.am -index 8384b92..e2c8e15 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -65,8 +65,11 @@ libbsd_la_LIBADD = \ - $(ARC4RANDOM_ATFORK_LIBS) \ - $(nil) - libbsd_la_LDFLAGS = \ -- -Wl,--version-script=$(srcdir)/libbsd.map \ - -version-number $(LIBBSD_ABI) -+if HAVE_VSCRIPT -+libbsd_la_LDFLAGS += $(VSCRIPT_LDFLAGS),@srcdir@/libbsd.map -+endif -+ - libbsd_la_SOURCES = \ - arc4random.c \ - arc4random.h \ -diff --git a/src/fpurge.c b/src/fpurge.c +diff --git c/src/fpurge.c w/src/fpurge.c index 462535a..a8941db 100644 ---- a/src/fpurge.c -+++ b/src/fpurge.c +--- c/src/fpurge.c ++++ w/src/fpurge.c @@ -26,9 +26,10 @@ #include @@ -274,10 +100,10 @@ index 462535a..a8941db 100644 #else #error "Function fpurge() needs to be ported." #endif -diff --git a/src/funopen.c b/src/funopen.c -index 1e05c7e..65ba5a8 100644 ---- a/src/funopen.c -+++ b/src/funopen.c +diff --git c/src/funopen.c w/src/funopen.c +index 1e6f43a..3a3af6a 100644 +--- c/src/funopen.c ++++ w/src/funopen.c @@ -143,6 +143,7 @@ funopen(const void *cookie, * they will not add the needed support to implement it. Just ignore this * interface there, as it has never been provided anyway. @@ -286,43 +112,10 @@ index 1e05c7e..65ba5a8 100644 #else #error "Function funopen() needs to be ported or disabled." #endif -diff --git a/src/hash/sha512.h b/src/hash/sha512.h -index 4f368a1..7632e25 100644 ---- a/src/hash/sha512.h -+++ b/src/hash/sha512.h -@@ -29,7 +29,11 @@ - #ifndef _SHA512_H_ - #define _SHA512_H_ - -+#ifdef __MACH__ -+#include -+#else - #include -+#endif - - #define SHA512_DIGEST_LENGTH 64 - -diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c -index b3c8d5e..602f54e 100644 ---- a/src/hash/sha512c.c -+++ b/src/hash/sha512c.c -@@ -25,7 +25,12 @@ - */ - - #include -+ -+#ifdef __MACH__ -+#include -+#else - #include -+#endif - #include - - #include -diff --git a/src/local-link.h b/src/local-link.h +diff --git c/src/local-link.h w/src/local-link.h index 0d4351a..fc520af 100644 ---- a/src/local-link.h -+++ b/src/local-link.h +--- c/src/local-link.h ++++ w/src/local-link.h @@ -27,6 +27,11 @@ #ifndef LIBBSD_LOCAL_LINK_H #define LIBBSD_LOCAL_LINK_H @@ -340,10 +133,10 @@ index 0d4351a..fc520af 100644 #endif +#endif -diff --git a/src/nlist.c b/src/nlist.c -index 228c220..46c2d77 100644 ---- a/src/nlist.c -+++ b/src/nlist.c +diff --git c/src/nlist.c w/src/nlist.c +index d22fa19..f41333f 100644 +--- c/src/nlist.c ++++ w/src/nlist.c @@ -41,6 +41,7 @@ #include #include @@ -351,16 +144,16 @@ index 228c220..46c2d77 100644 +#if !HAVE_NLIST_H #include "local-elf.h" - #define SIZE_T_MAX 0xffffffffU -@@ -280,3 +281,4 @@ nlist(const char *name, struct nlist *list) + #ifndef SIZE_T_MAX +@@ -282,3 +283,4 @@ nlist(const char *name, struct nlist *list) (void)close(fd); return (n); } +#endif -diff --git a/src/readpassphrase.c b/src/readpassphrase.c +diff --git c/src/readpassphrase.c w/src/readpassphrase.c index f9f6195..2bc5fb4 100644 ---- a/src/readpassphrase.c -+++ b/src/readpassphrase.c +--- c/src/readpassphrase.c ++++ w/src/readpassphrase.c @@ -36,6 +36,14 @@ #define TCSASOFT 0 #endif @@ -376,10 +169,10 @@ index f9f6195..2bc5fb4 100644 static volatile sig_atomic_t signo[_NSIG]; static void handler(int); -diff --git a/src/setproctitle.c b/src/setproctitle.c +diff --git c/src/setproctitle.c w/src/setproctitle.c index ff32aa3..51ed833 100644 ---- a/src/setproctitle.c -+++ b/src/setproctitle.c +--- c/src/setproctitle.c ++++ w/src/setproctitle.c @@ -33,6 +33,10 @@ #include #include "local-link.h" @@ -401,10 +194,10 @@ index ff32aa3..51ed833 100644 extern __typeof__(setproctitle_impl) setproctitle_stub __attribute__((__alias__("setproctitle_impl"))); -diff --git a/src/strlcat.c b/src/strlcat.c +diff --git c/src/strlcat.c w/src/strlcat.c index 14c53a1..5961c17 100644 ---- a/src/strlcat.c -+++ b/src/strlcat.c +--- c/src/strlcat.c ++++ w/src/strlcat.c @@ -26,6 +26,7 @@ * Returns strlen(src) + MIN(dsize, strlen(initial dst)). * If retval >= dsize, truncation occurred. @@ -418,10 +211,10 @@ index 14c53a1..5961c17 100644 return(dlen + (src - osrc)); /* count does not include NUL */ } +#endif -diff --git a/src/strlcpy.c b/src/strlcpy.c +diff --git c/src/strlcpy.c w/src/strlcpy.c index e9a7fe4..5137acb 100644 ---- a/src/strlcpy.c -+++ b/src/strlcpy.c +--- c/src/strlcpy.c ++++ w/src/strlcpy.c @@ -24,6 +24,7 @@ * chars will be copied. Always NUL terminates (unless dsize == 0). * Returns strlen(src); if retval >= dsize, truncation occurred. @@ -435,10 +228,10 @@ index e9a7fe4..5137acb 100644 return(src - osrc - 1); /* count does not include NUL */ } +#endif -diff --git a/src/strmode.c b/src/strmode.c +diff --git c/src/strmode.c w/src/strmode.c index e6afde5..da680c9 100644 ---- a/src/strmode.c -+++ b/src/strmode.c +--- c/src/strmode.c ++++ w/src/strmode.c @@ -32,6 +32,7 @@ #include #include diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 8754dd5f65d2..ecea00086585 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook, libmd }: stdenv.mkDerivation rec { pname = "libbsd"; - version = "0.10.0"; + version = "0.11.3"; src = fetchurl { url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "11x8q45jvjvf2dvgclds64mscyg10lva33qinf2hwgc84v3svf1l"; + sha256 = "18a2bcl9z0zyxhrm1lfv4yhhz0589s6jz0s78apaq78mhj0wz5gz"; }; outputs = [ "out" "dev" "man" ]; @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { # darwin changes configure.ac which means we need to regenerate # the configure scripts nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libmd ]; patches = [ ./darwin.patch ]; From e409e2f3eb02befadb679b0b8df735686161068f Mon Sep 17 00:00:00 2001 From: Vanilla Date: Sat, 6 Nov 2021 10:23:30 +0800 Subject: [PATCH 014/140] jetbrains: update --- .../editors/jetbrains/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 05ee956e4679..4c65ddcc8f67 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -268,12 +268,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.2.3"; /* updated by script */ + version = "2021.2.4"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "1n0yrk05xv4pard82b6z349ksiw8k75s9525pnpa2ny1ay1klhdg"; /* updated by script */ + sha256 = "03x7yz8jz5r4pblm7cvph39zppa33lalvkpzmgvr3wjq0chqmh65"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -307,13 +307,13 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.2"; /* updated by script */ versionMajorMinor = "2021.2"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz"; - sha256 = "1yawjc5xwga1mmlsl3068ml532941mq08i9ji3dhj1nwdkyav2jz"; /* updated by script */ + sha256 = "011prnpab72kfgkwq0ms27qqnjamh33h023gb01fxvqwwzcmp6sk"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -334,12 +334,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.2.2"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0s9kk3n5ac6lvqi2yw9gvvm45865jchiwyrs8pq2dgdkgaligrjv"; /* updated by script */ + sha256 = "0m98qhkgwnmqkay8sclfyig2xcqvpva74l2kdira3r5sbszmxvcr"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -347,12 +347,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.2.2"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0mgmmf926n3ipr8fxn6f9hsa5vkil8yrw5qlixi8nwnx7chmkp56"; /* updated by script */ + sha256 = "0zp72ag9jqhq0sv4x5n43d6g9y2yzkxa4pkflc7gd5rpg555cqr7"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -386,12 +386,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.2.2"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1a3vlqza9nbc4a2qxrzdckmq003zx1db9dy7wx462amc8sbh6v92"; /* updated by script */ + sha256 = "0d79x1jz4ymd6cc1n4s3y3n8lb6gw4g0yj6d4qzjlr5c9snx3zdf"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; From 0f3744bdb3d9b88b90b27ed36a9b9ab472067b36 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 6 Nov 2021 11:07:50 +0000 Subject: [PATCH 015/140] catatonit: pull pending upstream inclusion fix for automake-1.16.5 Without the fix build on automake-1.16.5 fails as: configure.ac:34: error: AM_INIT_AUTOMAKE expanded multiple times .../automake-1.16.5/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... configure.ac:19: the top level .../automake-1.16.5/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... configure.ac:34: the top level --- .../virtualization/catatonit/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/catatonit/default.nix b/pkgs/applications/virtualization/catatonit/default.nix index 2a9fbdbd27f1..e059a254cb97 100644 --- a/pkgs/applications/virtualization/catatonit/default.nix +++ b/pkgs/applications/virtualization/catatonit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, glibc, nixosTests }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, glibc, nixosTests }: stdenv.mkDerivation rec { pname = "catatonit"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-jX4fYC/rpfd3ro2UZ6OEu4kU5wpusOwmEVPWEjxwlW4="; }; + patches = [ + # Pull the fix pending upstream inclusion to support automake-1.16.5: + # https://github.com/openSUSE/catatonit/pull/18 + (fetchpatch { + name = "automake-1.16.5.patch"; + url = "https://github.com/openSUSE/catatonit/commit/99bb9048f532257f3a2c3856cfa19fe957ab6cec.patch"; + sha256 = "sha256-ooxVjtWXJddQiBvO9I5aRyLeL8y3ecxW/Kvtfg/bpRA="; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; From f63ada60e443467a5aab30d6c8cc3195fd22636b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 6 Nov 2021 11:32:39 +0000 Subject: [PATCH 016/140] tasknc: fix build against upcoming ncurses-6.3 Without the change build fails as: src/keys.c:122:6: error: 'KEY_EVENT' undeclared here (not in a function); did you mean 'KEY_SLEFT'? 122 | {KEY_EVENT, "event"}, | ^~~~~~~~~ | KEY_SLEFT --- pkgs/applications/misc/tasknc/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index d24a7d3e0d13..5250581762b0 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, ncurses5, taskwarrior }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, perl, ncurses5, taskwarrior }: stdenv.mkDerivation rec { version = "2020-12-17"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0jrv2k1yizfdjndbl06lmy2bb62ky2rjdk308967j31c5kqqnw56"; }; + # Pull pending upstream inclusion for ncurses-6.3: + # https://github.com/lharding/tasknc/pull/57 + patches = [ + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/lharding/tasknc/commit/f74ea0641e9bf287acf22fac9f6eeea571b01800.patch"; + sha256 = "18a90zj85sw2zfnfcv055nvi0lx3h8lcgsyabdfk94ksn78pygrv"; + }) + ]; + nativeBuildInputs = [ makeWrapper perl # For generating the man pages with pod2man From ee9649b2a85e806d541ef8a439c292b3a2ff857b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 4 Nov 2021 09:27:48 +0100 Subject: [PATCH 017/140] buildGo117{Package,Module}: enable Required to bump Grafana to 8.2.3 in order to fix CVE-2021-41174. Building it works fine on both `x86_64-linux` and `aarch64-linux`, so the only blocker are incompatible hashes. As long as `buildGoModule` doesn't default to Go 1.17 without a coordinated update, this should be OK. --- pkgs/top-level/all-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ed423b6e573..9289a02f4b09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20237,10 +20237,10 @@ with pkgs; # across different go versions and/or platforms: # https://github.com/NixOS/nixpkgs/issues/144667 # - # do not uncomment this without approval from the go CODEOWNERS - #buildGo117Package = callPackage ../development/go-packages/generic { - # go = buildPackages.go_1_17; - #}; + # That's why `buildGoPackage != buildGo117Package`. + buildGo117Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_17; + }; buildGoPackage = buildGo116Package; @@ -20254,10 +20254,10 @@ with pkgs; # across different go versions and/or platforms: # https://github.com/NixOS/nixpkgs/issues/144667 # - # do not uncomment this without approval from the go CODEOWNERS - #buildGo117Module = callPackage ../development/go-modules/generic { - # go = buildPackages.go_1_17; - #}; + # That's why `buildGoModule != buildGo117Module`. + buildGo117Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_17; + }; buildGoModule = buildGo116Module; From 7733d9cae98ab91f36d35005d8aef52873d23b5b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 4 Nov 2021 09:34:43 +0100 Subject: [PATCH 018/140] grafana: 8.1.6 -> 8.2.3, fix CVE-2021-41174 ChangeLogs: * https://github.com/grafana/grafana/releases/tag/v8.1.7 * https://github.com/grafana/grafana/releases/tag/v8.2.0 * https://github.com/grafana/grafana/releases/tag/v8.2.1 * https://github.com/grafana/grafana/releases/tag/v8.2.2 * https://github.com/grafana/grafana/releases/tag/v8.2.3 Apart from a few new features, most notably is CVE-2021-41174[1]. Darwin is temporarily marked as unsupported because Go 1.17 doesn't support the Apple SDK versions used in `nixpkgs`. [1] https://nvd.nist.gov/vuln/detail/CVE-2021-41174 --- pkgs/servers/monitoring/grafana/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 848bcaca4340..1ebac5327339 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata }: +{ lib, buildGo117Module, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: -buildGoModule rec { +buildGo117Module rec { pname = "grafana"; - version = "8.1.6"; + version = "8.2.3"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,17 +10,23 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-PUVRFa3b+O2lY6q3vO+rLUcC+fx80iB78tt60f6Vugk="; + sha256 = "sha256-GC4pHwthsXu/+dXb1cBk5bC0O6NnyiChC+UWleq7JzA="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-So9xzet9kPkjcDwNts3iXlCd+u2uiXTo0LVcLc8toyk="; + sha256 = "sha256-LOswYw0P3dy6arrmUbnzBU0ie2YcPtk6xqtp9CowG2s="; }; - vendorSha256 = "sha256-dn4sliRp58oZALZ8Iu7kE83ntkcMIU84Xr5WoeXlhCI="; + vendorSha256 = "sha256-yZbdUiuRNFRaXduOYps5ygiaUgvNXw+Ah4wZrfYcJlY="; + + nativeBuildInputs = [ wire ]; preBuild = '' + # Generate DI code that's required to compile the package. + # From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35 + wire gen -tags oss ./pkg/server + # The testcase makes an API call against grafana.com: # # --- Expected From b0f20dad57200c86f6b13b7780eedf6196884d42 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 7 Nov 2021 22:32:06 +0000 Subject: [PATCH 019/140] moarvm: fix build for darwin --- pkgs/development/interpreters/rakudo/moarvm.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index e4c070107bde..b8ed60c69a99 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -10,6 +10,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-fzSHpw6Ld74OTi8SsUxJ9qAdA3jglAyGlYyQFsSVrXU="; }; + postPatch = '' + patchShebangs . + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace Configure.pl \ + --replace '`/usr/bin/arch`' '"${stdenv.hostPlatform.darwinArch}"' \ + --replace '/usr/bin/arch' "$(type -P true)" \ + --replace '/usr/' '/nope/' + substituteInPlace 3rdparty/dyncall/configure \ + --replace '`sw_vers -productVersion`' '"$MACOSX_DEPLOYMENT_TARGET"' + ''; + buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; doCheck = false; # MoarVM does not come with its own test suite From efd2a1bb8d143bf28162ee775bfe3e35333984d9 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 7 Nov 2021 22:10:02 -0800 Subject: [PATCH 020/140] ocamlPackages: fix some packages for cross-compilation --- pkgs/development/ocaml-modules/afl-persistent/default.nix | 2 +- pkgs/development/ocaml-modules/lwt/default.nix | 4 ++-- pkgs/development/ocaml-modules/ocplib-endian/default.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/afl-persistent/default.nix b/pkgs/development/ocaml-modules/afl-persistent/default.nix index 5625cd95764f..ba266ade830e 100644 --- a/pkgs/development/ocaml-modules/afl-persistent/default.nix +++ b/pkgs/development/ocaml-modules/afl-persistent/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "06yyds2vcwlfr2nd3gvyrazlijjcrd1abnvkfpkaadgwdw3qam1i"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; # don't run tests in buildPhase # don't overwrite test binary diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 7d6424564d2f..4798cfe69c27 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -17,8 +17,8 @@ buildDunePackage rec { sha256 = "0cq2qy23sa1a5zk6nja3c652mp29i84yfrkcwks6i8sdqwli36jy"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cppo dune-configurator ] + nativeBuildInputs = [ pkg-config cppo dune-configurator ]; + buildInputs = [ ] ++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index 2cb066a7c035..f2cf4acbf27b 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { useDune2 = true; - buildInputs = [ cppo ]; + nativeBuildInputs = [ cppo ]; meta = with lib; { description = "Optimised functions to read and write int16/32/64"; From 19fc2904f335a54532b624ee25163a495624389d Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 13 Oct 2021 20:36:59 +0200 Subject: [PATCH 021/140] nixos/collectd: give plugins option a mergeable type --- nixos/modules/services/monitoring/collectd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index ad0cf4735ad4..6af04d22f0f7 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -57,7 +57,7 @@ in { description = '' Build a minimal collectd package with only the configured `services.collectd.plugins` ''; - type = types.bool; + type = bool; }; user = mkOption { @@ -98,7 +98,7 @@ in { description = '' Attribute set of plugin names to plugin config segments ''; - type = types.attrsOf types.str; + type = attrsOf lines; }; extraConfig = mkOption { From 78f07d0f899b750e1a1fcdbe5aeef9bb4536805c Mon Sep 17 00:00:00 2001 From: Mark Mulder Date: Mon, 8 Nov 2021 17:20:33 +0100 Subject: [PATCH 022/140] termscp: fix darwin build I was running into Foundation.h errors during compilation on mac/darwin, adding Foundation fixes that for me. Error: ``` The following warnings were emitted during compilation: warning: In file included from objc/notify.m:1: warning: objc/notify.h:1:9: fatal error: 'Foundation/Foundation.h' file not found warning: #import warning: ^~~~~~~~~~~~~~~~~~~~~~~~~ warning: 1 error generated. error: failed to run custom build command for `mac-notification-sys v0.3.0` Caused by: process didn't exit successfully: `/tmp/cargo-installEt3UWW/release/build/mac-notification-sys-f414f8995c05e541/build-script-build` (exit status: 1) --- stdout TARGET = Some("x86_64-apple-darwin") OPT_LEVEL = Some("3") HOST = Some("x86_64-apple-darwin") CC_x86_64-apple-darwin = None CC_x86_64_apple_darwin = None HOST_CC = None CC = Some("clang") CFLAGS_x86_64-apple-darwin = None CFLAGS_x86_64_apple_darwin = None HOST_CFLAGS = None CFLAGS = None CRATE_CC_NO_DEFAULTS = None DEBUG = Some("false") running: "clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-fmodules" "-o" "/tmp/cargo-installEt3UWW/release/build/mac-notification-sys-ce5dd87fdfef4721/out/objc/notify.o" "-c" "objc/notify.m" cargo:warning=In file included from objc/notify.m:1: cargo:warning=objc/notify.h:1:9: fatal error: 'Foundation/Foundation.h' file not found cargo:warning=#import cargo:warning= ^~~~~~~~~~~~~~~~~~~~~~~~~ cargo:warning=1 error generated. exit status: 1 --- stderr error occurred: Command "clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-fmodules" "-o" "/tmp/cargo-installEt3UWW/release/build/mac-notification-sys-ce5dd87fdfef4721/out/objc/notify.o" "-c" "objc/notify.m" with args "clang" did not execute successfully (status code exit status: 1). warning: build failed, waiting for other jobs to finish... error: failed to compile `termscp v0.7.0`, intermediate artifacts can be found at `/tmp/cargo-installEt3UWW` Caused by: build failed ``` --- pkgs/tools/networking/termscp/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/termscp/default.nix b/pkgs/tools/networking/termscp/default.nix index 3bc12747b746..58bbfe5e46c6 100644 --- a/pkgs/tools/networking/termscp/default.nix +++ b/pkgs/tools/networking/termscp/default.nix @@ -5,6 +5,7 @@ , openssl , pkg-config , rustPlatform +, Foundation , Security , stdenv }: @@ -31,6 +32,7 @@ rustPlatform.buildRustPackage rec { libssh openssl ] ++ lib.optional stdenv.isDarwin [ + Foundation Security ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da791f4ecad7..f6b732f69554 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9857,7 +9857,7 @@ with pkgs; telescope = callPackage ../applications/networking/browsers/telescope { }; termscp = callPackage ../tools/networking/termscp { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Foundation Security; }; termius = callPackage ../applications/networking/termius { }; From 32ef30ce245852cfef8ee8001126918fb1dac015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 8 Nov 2021 17:25:40 +0100 Subject: [PATCH 023/140] go_1_17: 1.17.2 -> 1.17.3 --- pkgs/development/compilers/go/1.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index 28858d92d464..62b435c4615b 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -50,11 +50,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.17.2"; + version = "1.17.3"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-IlXrPk6CTdfV/Nwuf4RTQ3HBhjEuVG+xCGo0wXdS9DE="; + sha256 = "sha256-cFxkJR5bJdXVXt4QOcaqIr6kCnqTHRTDcDOYU2Q8PfA="; }; # perl is used for testing go vet From ceebd60ceffb15ef995d032b06c37f1b9daf7fd7 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Mon, 8 Nov 2021 09:45:07 -0800 Subject: [PATCH 024/140] Update pkgs/development/ocaml-modules/lwt/default.nix Co-authored-by: Sandro --- pkgs/development/ocaml-modules/lwt/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 4798cfe69c27..be15d2b72a54 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -18,8 +18,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkg-config cppo dune-configurator ]; - buildInputs = [ ] - ++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims + buildInputs = optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; From 7e507c5fa8d7c7ad258f5c9a90c80d52b7046ea0 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Mon, 8 Nov 2021 09:59:05 -0800 Subject: [PATCH 025/140] fix buildinputs for mrmime --- pkgs/development/ocaml-modules/mrmime/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/mrmime/default.nix b/pkgs/development/ocaml-modules/mrmime/default.nix index 6d3663509bc1..a5c2a68ee47b 100644 --- a/pkgs/development/ocaml-modules/mrmime/default.nix +++ b/pkgs/development/ocaml-modules/mrmime/default.nix @@ -36,15 +36,6 @@ buildDunePackage rec { useDune2 = true; - buildInputs = [ - afl-persistent - bigarray-compat - bigarray-overlap - bigstringaf - fpath - mirage-crypto-rng - ]; - propagatedBuildInputs = [ angstrom base64 @@ -59,6 +50,12 @@ buildDunePackage rec { rresult unstrctrd uutf + afl-persistent + bigarray-compat + bigarray-overlap + bigstringaf + fpath + mirage-crypto-rng ]; checkInputs = [ From ac4e8f12a1301ffef7bdbfb97be1d138ae3dbc2d Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Mon, 8 Nov 2021 21:56:25 +0100 Subject: [PATCH 026/140] chia: fix spurious permissions warning Fixes #145111 --- pkgs/applications/blockchains/chia/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index b4ffd2a4f2ad..01fd3da472a7 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -20,7 +20,7 @@ let chia = python3Packages.buildPythonApplication rec { substituteInPlace setup.py \ --replace "==" ">=" - ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem + cp ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem ''; nativeBuildInputs = [ From c983d3e37e08d532609119b4d3a0d59421d69299 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 8 Nov 2021 16:16:11 -0500 Subject: [PATCH 027/140] webkitgtk: mark as broken on darwin --- .../libraries/webkitgtk/428774.patch | 86 ------------------- .../libraries/webkitgtk/default.nix | 22 +---- 2 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 pkgs/development/libraries/webkitgtk/428774.patch diff --git a/pkgs/development/libraries/webkitgtk/428774.patch b/pkgs/development/libraries/webkitgtk/428774.patch deleted file mode 100644 index 85da185dc4e4..000000000000 --- a/pkgs/development/libraries/webkitgtk/428774.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -aru a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp ---- a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-02-26 04:57:15.000000000 -0500 -+++ b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-05-16 14:45:32.000000000 -0400 -@@ -87,7 +87,7 @@ - if (!m_store.createSharedMemoryHandle(handle)) - return; - --#if OS(DARWIN) || OS(WINDOWS) -+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS) - uint64_t dataSize = handle.size(); - #else - uint64_t dataSize = 0; -diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp ---- a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-02-26 04:57:15.000000000 -0500 -+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-05-16 15:54:53.000000000 -0400 -@@ -26,8 +26,6 @@ - #include "config.h" - #include "IPCSemaphore.h" - --#if !OS(DARWIN) -- - namespace IPC { - - Semaphore::Semaphore() = default; -@@ -46,5 +44,3 @@ - } - - } -- --#endif -diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.h b/Source/WebKit/Platform/IPC/IPCSemaphore.h ---- a/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-02-26 04:57:15.000000000 -0500 -+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-05-16 14:46:13.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - --#if OS(DARWIN) -+#if PLATFORM(COCOA) - #include - #include - #endif -@@ -51,7 +51,7 @@ - void encode(Encoder&) const; - static Optional decode(Decoder&); - --#if OS(DARWIN) -+#if PLATFORM(COCOA) - explicit Semaphore(MachSendRight&&); - - void signal(); -@@ -64,7 +64,7 @@ - #endif - - private: --#if OS(DARWIN) -+#if PLATFORM(COCOA) - void destroy(); - MachSendRight m_sendRight; - semaphore_t m_semaphore { SEMAPHORE_NULL }; -Only in b/Source/WebKit/Platform/IPC: IPCSemaphore.h.orig -diff -aru a/Source/WebKit/Platform/SharedMemory.h b/Source/WebKit/Platform/SharedMemory.h ---- a/Source/WebKit/Platform/SharedMemory.h 2021-02-26 04:57:15.000000000 -0500 -+++ b/Source/WebKit/Platform/SharedMemory.h 2021-05-16 14:45:32.000000000 -0400 -@@ -75,7 +75,7 @@ - - bool isNull() const; - --#if OS(DARWIN) || OS(WINDOWS) -+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS) - size_t size() const { return m_size; } - #endif - -diff -aru a/Source/WebKit/UIProcess/VisitedLinkStore.cpp b/Source/WebKit/UIProcess/VisitedLinkStore.cpp ---- a/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-02-26 04:57:16.000000000 -0500 -+++ b/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-05-16 14:45:32.000000000 -0400 -@@ -119,7 +119,7 @@ - return; - - // FIXME: Get the actual size of data being sent from m_linkHashStore and send it in the SharedMemory::IPCHandle object. --#if OS(DARWIN) || OS(WINDOWS) -+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS) - uint64_t dataSize = handle.size(); - #else - uint64_t dataSize = 0; -Only in b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics: DrawingAreaCoordinatedGraphics.cpp.orig diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 761c97510b76..304dfbc2e784 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , runCommand , fetchurl -, fetchpatch , perl , python3 , ruby @@ -83,26 +82,6 @@ stdenv.mkDerivation rec { inherit (addOpenGLRunpath) driverLink; }) ./libglvnd-headers.patch - ] ++ lib.optionals stdenv.isDarwin [ - # https://bugs.webkit.org/show_bug.cgi?id=225856 - (fetchpatch { - url = "https://bug-225856-attachments.webkit.org/attachment.cgi?id=428797"; - sha256 = "sha256-ffo5p2EyyjXe3DxdrvAcDKqxwnoqHtYBtWod+1fOjMU="; - excludes = [ "Source/WebCore/ChangeLog" ]; - }) - - # https://bugs.webkit.org/show_bug.cgi?id=225850 - ./428774.patch # https://bug-225850-attachments.webkit.org/attachment.cgi?id=428774 - (fetchpatch { - url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428776"; - sha256 = "sha256-ryNRYMsk72SL0lNdh6eaAdDV3OT8KEqVq1H0j581jmQ="; - excludes = [ "Source/WTF/ChangeLog" ]; - }) - (fetchpatch { - url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428778"; - sha256 = "sha256-78iP+T2vaIufO8TmIPO/tNDgmBgzlDzalklrOPrtUeo="; - excludes = [ "Source/WebKit/ChangeLog" ]; - }) ]; preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -231,5 +210,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; maintainers = teams.gnome.members; + broken = stdenv.isDarwin; }; } From eb22cbd0ecc71b2b3ce4fa824044eca1063e81a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Nov 2021 23:28:12 +0100 Subject: [PATCH 028/140] certipy: init at unstable-2021-11-08 --- pkgs/tools/security/certipy/default.nix | 39 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/security/certipy/default.nix diff --git a/pkgs/tools/security/certipy/default.nix b/pkgs/tools/security/certipy/default.nix new file mode 100644 index 000000000000..9e3d4573df22 --- /dev/null +++ b/pkgs/tools/security/certipy/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "certipy"; + version = "unstable-2021-11-08"; + + src = fetchFromGitHub { + owner = "ly4k"; + repo = "Certipy"; + rev = "c2f5581505c54f3bf9fe4e6f07c17fa9ef501cab"; + sha256 = "0m2n30prqd9d02kmryk8vry4cabcad1892qr8a02qfg6r98x8q3q"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + asn1crypto + pycryptodome + impacket + ldap3 + pyasn1 + dnspython + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "certipy" + ]; + + meta = with lib; { + description = "Tool to enumerate and abuse misconfigurations in Active Directory Certificate Services"; + homepage = "https://github.com/ly4k/Certipy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56c15d52b3d5..305f53dddcb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1514,6 +1514,8 @@ with pkgs; certigo = callPackage ../tools/admin/certigo { }; + certipy = callPackage ../tools/security/certipy { }; + catcli = python3Packages.callPackage ../tools/filesystems/catcli { }; chezmoi = callPackage ../tools/misc/chezmoi { }; From 0ab65e47802f365fb7dc720fef22b9927a510cdf Mon Sep 17 00:00:00 2001 From: David Houston Date: Mon, 8 Nov 2021 19:02:07 -0500 Subject: [PATCH 029/140] awesome-lint: init at 0.18.0 Signed-off-by: David Houston --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 966 ++++++++++++++++++ 2 files changed, 967 insertions(+) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 4ac24a546d07..715b1995f873 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -21,6 +21,7 @@ , "asar" , "autoprefixer" , "aws-azure-login" +, "awesome-lint" , "balanceofsatoshis" , "bash-language-server" , "beancount-langserver" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 5b95896f439b..1e1adabbd2e9 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -10480,6 +10480,15 @@ let sha512 = "rPMUMkR8JjjPDDHHDZ/YeLO0KIbUGCrXgy921F6sBkEXBR9jYYxK8LUlwpZkUVi70cMR6r8uSmHZ/5HvtrntHg=="; }; }; + "append-type-1.0.2" = { + name = "append-type"; + packageName = "append-type"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/append-type/-/append-type-1.0.2.tgz"; + sha512 = "hac740vT/SAbrFBLgLIWZqVT5PUAcGTWS5UkDDhr+OCizZSw90WKw6sWAEgGaYd2viIblggypMXwpjzHXOvAQg=="; + }; + }; "appendable-cli-menu-2.0.0" = { name = "appendable-cli-menu"; packageName = "appendable-cli-menu"; @@ -11038,6 +11047,15 @@ let sha512 = "/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ=="; }; }; + "array-to-sentence-1.1.0" = { + name = "array-to-sentence"; + packageName = "array-to-sentence"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-to-sentence/-/array-to-sentence-1.1.0.tgz"; + sha1 = "c804956dafa53232495b205a9452753a258d39fc"; + }; + }; "array-union-1.0.2" = { name = "array-union"; packageName = "array-union"; @@ -11299,6 +11317,15 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; + "assert-valid-glob-opts-1.0.0" = { + name = "assert-valid-glob-opts"; + packageName = "assert-valid-glob-opts"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-valid-glob-opts/-/assert-valid-glob-opts-1.0.0.tgz"; + sha512 = "/mttty5Xh7wE4o7ttKaUpBJl0l04xWe3y6muy1j27gyzSsnceK0AYU9owPtUoL9z8+9hnPxztmuhdFZ7jRoyWw=="; + }; + }; "assertion-error-1.1.0" = { name = "assertion-error"; packageName = "assertion-error"; @@ -24551,6 +24578,15 @@ let sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; + "eslint-formatter-pretty-4.1.0" = { + name = "eslint-formatter-pretty"; + packageName = "eslint-formatter-pretty"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz"; + sha512 = "IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ=="; + }; + }; "eslint-plugin-no-unsanitized-3.1.5" = { name = "eslint-plugin-no-unsanitized"; packageName = "eslint-plugin-no-unsanitized"; @@ -24578,6 +24614,15 @@ let sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw=="; }; }; + "eslint-rule-docs-1.1.231" = { + name = "eslint-rule-docs"; + packageName = "eslint-rule-docs"; + version = "1.1.231"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-rule-docs/-/eslint-rule-docs-1.1.231.tgz"; + sha512 = "egHz9A1WG7b8CS0x1P6P/Rj5FqZOjray/VjpJa14tMZalfRKvpE2ONJ3plCM7+PcinmU4tcmbPLv0VtwzSdLVA=="; + }; + }; "eslint-scope-3.7.3" = { name = "eslint-scope"; packageName = "eslint-scope"; @@ -28709,6 +28754,15 @@ let sha1 = "f985fedcc0a9aa579dc88d7aff068d55cc6251a0"; }; }; + "github-url-to-object-4.0.6" = { + name = "github-url-to-object"; + packageName = "github-url-to-object"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/github-url-to-object/-/github-url-to-object-4.0.6.tgz"; + sha512 = "NaqbYHMUAlPcmWFdrAB7bcxrNIiiJWJe8s/2+iOc9vlcHlwHqSGrPk+Yi3nu6ebTwgsZEa7igz+NH2vEq3gYwQ=="; + }; + }; "github-username-6.0.0" = { name = "github-username"; packageName = "github-username"; @@ -28826,6 +28880,15 @@ let sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; }; }; + "glob-option-error-1.0.0" = { + name = "glob-option-error"; + packageName = "glob-option-error"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-option-error/-/glob-option-error-1.0.0.tgz"; + sha1 = "57cc65def9c7d5c1461baf13129bb5403cff6176"; + }; + }; "glob-parent-2.0.0" = { name = "glob-parent"; packageName = "glob-parent"; @@ -32032,6 +32095,15 @@ let sha512 = "m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg=="; }; }; + "indexed-filter-1.0.3" = { + name = "indexed-filter"; + packageName = "indexed-filter"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/indexed-filter/-/indexed-filter-1.0.3.tgz"; + sha512 = "oBIzs6EARNMzrLgVg20fK52H19WcRHBiukiiEkw9rnnI//8rinEBMLrYdwEfJ9d4K7bjV1L6nSGft6H/qzHNgQ=="; + }; + }; "indexes-of-1.0.1" = { name = "indexes-of"; packageName = "indexes-of"; @@ -32860,6 +32932,15 @@ let sha512 = "Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw=="; }; }; + "irregular-plurals-3.3.0" = { + name = "irregular-plurals"; + packageName = "irregular-plurals"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz"; + sha512 = "MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g=="; + }; + }; "is-3.3.0" = { name = "is"; packageName = "is"; @@ -33391,6 +33472,15 @@ let sha512 = "jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A=="; }; }; + "is-github-url-1.2.2" = { + name = "is-github-url"; + packageName = "is-github-url"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-github-url/-/is-github-url-1.2.2.tgz"; + sha1 = "0734176092c9599a38a72422d121ff3e11d6ff3e"; + }; + }; "is-glob-2.0.1" = { name = "is-glob"; packageName = "is-glob"; @@ -44159,6 +44249,15 @@ let sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; }; + "normalize-url-5.3.1" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-5.3.1.tgz"; + sha512 = "K1c7+vaAP+Yh5bOGmA10PGPpp+6h7WZrl7GwqKhUflBc9flU9pzG27DDeB9+iuhZkE3BJZOcgN1P/2sS5pqrWw=="; + }; + }; "normalize-url-6.1.0" = { name = "normalize-url"; packageName = "normalize-url"; @@ -48093,6 +48192,15 @@ let sha512 = "t1Ax8KUvV3FFII8ltczPn2tJdjqbd1sIzu6t4JL7nQ3EyeL/lTrj5PWKb06ic5/6XYDr65rQ4uzQEGN70/6X5w=="; }; }; + "plur-4.0.0" = { + name = "plur"; + packageName = "plur"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz"; + sha512 = "4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg=="; + }; + }; "pluralize-1.2.1" = { name = "pluralize"; packageName = "pluralize"; @@ -53278,6 +53386,15 @@ let sha512 = "JBY6zz5fYQFN724Vq6VeiHwhyjVIlrww/dE1+hWGcDyUuz7YNCqwZKwBdQGDvslICkzHw/wEExNEb8D4PNiLlA=="; }; }; + "remark-lint-8.0.0" = { + name = "remark-lint"; + packageName = "remark-lint"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint/-/remark-lint-8.0.0.tgz"; + sha512 = "ESI8qJQ/TIRjABDnqoFsTiZntu+FRifZ5fJ77yX63eIDijl/arvmDvT+tAf75/Nm5BFL4R2JFUtkHRGVjzYUsg=="; + }; + }; "remark-lint-blockquote-indentation-1.0.4" = { name = "remark-lint-blockquote-indentation"; packageName = "remark-lint-blockquote-indentation"; @@ -53287,6 +53404,33 @@ let sha512 = "ExcDP7lufshEBNkVddSHa+Bz/97PtFstIniQ8ZF2TahHPmpx92z3mkI/nXL2Qt5d3B09eTVvh4Pvhgp6x2470g=="; }; }; + "remark-lint-blockquote-indentation-2.0.1" = { + name = "remark-lint-blockquote-indentation"; + packageName = "remark-lint-blockquote-indentation"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-2.0.1.tgz"; + sha512 = "uJ9az/Ms9AapnkWpLSCJfawBfnBI2Tn1yUsPNqIFv6YM98ymetItUMyP6ng9NFPqDvTQBbiarulkgoEo0wcafQ=="; + }; + }; + "remark-lint-checkbox-character-style-3.0.0" = { + name = "remark-lint-checkbox-character-style"; + packageName = "remark-lint-checkbox-character-style"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-checkbox-character-style/-/remark-lint-checkbox-character-style-3.0.0.tgz"; + sha512 = "691OJ5RdBRXVpvnOEiBhMB4uhHJSHVttw83O4qyAkNBiqxa1Axqhsz8FgmzYgRLQbOGd2ncVUcXG1LOJt6C0DQ=="; + }; + }; + "remark-lint-checkbox-content-indent-3.0.0" = { + name = "remark-lint-checkbox-content-indent"; + packageName = "remark-lint-checkbox-content-indent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-checkbox-content-indent/-/remark-lint-checkbox-content-indent-3.0.0.tgz"; + sha512 = "+T4+hoY85qZE2drD2rCe14vF7fAgD3Kv2fkFd1HRvv3M5Riy148w/4YeoBI5U5BpybGTVUeEUYLCeJ8zbJLjkw=="; + }; + }; "remark-lint-code-block-style-1.0.4" = { name = "remark-lint-code-block-style"; packageName = "remark-lint-code-block-style"; @@ -53296,6 +53440,15 @@ let sha512 = "Wq5F94nkaWTx8W/9C/ydG+DhVWLirBrWb0xnoMQ0cHnizAd3BWw8g0x5L7yglMYSUSVLWY0jfMHgOe9UW3JfTw=="; }; }; + "remark-lint-code-block-style-2.0.1" = { + name = "remark-lint-code-block-style"; + packageName = "remark-lint-code-block-style"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-code-block-style/-/remark-lint-code-block-style-2.0.1.tgz"; + sha512 = "eRhmnColmSxJhO61GHZkvO67SpHDshVxs2j3+Zoc5Y1a4zQT2133ZAij04XKaBFfsVLjhbY/+YOWxgvtjx2nmA=="; + }; + }; "remark-lint-definition-case-1.0.5" = { name = "remark-lint-definition-case"; packageName = "remark-lint-definition-case"; @@ -53305,6 +53458,15 @@ let sha512 = "iirq74fKhJZsFw7x4FJuLVRkXclntutG1YKajfLaE3Gm14YlJWBEoabNTk+ENR4QXoB9rTdEqn3Cc3ImO8qciQ=="; }; }; + "remark-lint-definition-case-2.0.1" = { + name = "remark-lint-definition-case"; + packageName = "remark-lint-definition-case"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-definition-case/-/remark-lint-definition-case-2.0.1.tgz"; + sha512 = "M+XlThtQwEJLQnQb5Gi6xZdkw92rGp7m2ux58WMw/Qlcg02WgHR/O0OcHPe5VO5hMJrtI+cGG5T0svsCgRZd3w=="; + }; + }; "remark-lint-definition-spacing-1.0.5" = { name = "remark-lint-definition-spacing"; packageName = "remark-lint-definition-spacing"; @@ -53314,6 +53476,24 @@ let sha512 = "ss8OQmK4c/1amEAJpDjkFiByLyXpsYFNzmk6rEZQkxZZd+DVHI0oF+CzSeMVHu48rF2qHOkKhVghqrCM0vleAA=="; }; }; + "remark-lint-definition-spacing-2.0.1" = { + name = "remark-lint-definition-spacing"; + packageName = "remark-lint-definition-spacing"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-definition-spacing/-/remark-lint-definition-spacing-2.0.1.tgz"; + sha512 = "xK9DOQO5MudITD189VyUiMHBIKltW1oc55L7Fti3i9DedXoBG7Phm+V9Mm7IdWzCVkquZVgVk63xQdqzSQRrSQ=="; + }; + }; + "remark-lint-double-link-0.1.3" = { + name = "remark-lint-double-link"; + packageName = "remark-lint-double-link"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-double-link/-/remark-lint-double-link-0.1.3.tgz"; + sha512 = "0zHUJimo0fNAqQPzwt6ii9pRYCxBU0wqilVlily1RxRyTqhy0ANgTQOERMaf+lkTEN1ADEeoyh9gE7VWzqI+WA=="; + }; + }; "remark-lint-emphasis-marker-1.0.4" = { name = "remark-lint-emphasis-marker"; packageName = "remark-lint-emphasis-marker"; @@ -53323,6 +53503,15 @@ let sha512 = "TdYISSw7Ib6EJDApDj9zcZNDCJEaEoQIrYS3+QH2TQxoDx96B0t1bbErRM5L/hx1UWPBpeFLKpgIWL163eMmYA=="; }; }; + "remark-lint-emphasis-marker-2.0.1" = { + name = "remark-lint-emphasis-marker"; + packageName = "remark-lint-emphasis-marker"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-2.0.1.tgz"; + sha512 = "7mpbAUrSnHiWRyGkbXRL5kfSKY9Cs8cdob7Fw+Z02/pufXMF4yRWaegJ5NTUu1RE+SKlF44wtWWjvcIoyY6/aw=="; + }; + }; "remark-lint-fenced-code-flag-1.0.4" = { name = "remark-lint-fenced-code-flag"; packageName = "remark-lint-fenced-code-flag"; @@ -53341,6 +53530,15 @@ let sha512 = "aJF4ISIEvK3NX+C2rN93QoS/32SSiytQKRSeGa+HwsAn3sTwqmy2IoAwbFeZIZA2vqKcVB4h1b9yKamSlfX30Q=="; }; }; + "remark-lint-fenced-code-marker-2.0.1" = { + name = "remark-lint-fenced-code-marker"; + packageName = "remark-lint-fenced-code-marker"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-2.0.1.tgz"; + sha512 = "lujpjm04enn3ma6lITlttadld6eQ1OWAEcT3qZzvFHp+zPraC0yr0eXlvtDN/0UH8mrln/QmGiZp3i8IdbucZg=="; + }; + }; "remark-lint-file-extension-1.0.5" = { name = "remark-lint-file-extension"; packageName = "remark-lint-file-extension"; @@ -53359,6 +53557,15 @@ let sha512 = "y9aDZPhqWcI7AtrJtL69HE6MoWMqDqLQUyWMadzAYUYb9/m4ciLdygJ4cWVpEN3n4mkBepHIsWzASaKHHBDJOQ=="; }; }; + "remark-lint-final-newline-1.0.5" = { + name = "remark-lint-final-newline"; + packageName = "remark-lint-final-newline"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-final-newline/-/remark-lint-final-newline-1.0.5.tgz"; + sha512 = "rfLlW8+Fz2dqnaEgU4JwLA55CQF1T4mfSs/GwkkeUCGPenvEYwSkCN2KO2Gr1dy8qPoOdTFE1rSufLjmeTW5HA=="; + }; + }; "remark-lint-hard-break-spaces-1.0.5" = { name = "remark-lint-hard-break-spaces"; packageName = "remark-lint-hard-break-spaces"; @@ -53368,6 +53575,15 @@ let sha512 = "Rss7ujNtxipO/hasWYc0QdiO8D5VyliSwj3zAZ8GeDn0ix2KH+pY4/AJC7i9IGcVVbUGvvXLpJB3Pp1VeY7oKw=="; }; }; + "remark-lint-hard-break-spaces-2.0.1" = { + name = "remark-lint-hard-break-spaces"; + packageName = "remark-lint-hard-break-spaces"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-2.0.1.tgz"; + sha512 = "Qfn/BMQFamHhtbfLrL8Co/dbYJFLRL4PGVXZ5wumkUO5f9FkZC2RsV+MD9lisvGTkJK0ZEJrVVeaPbUIFM0OAw=="; + }; + }; "remark-lint-heading-increment-1.0.4" = { name = "remark-lint-heading-increment"; packageName = "remark-lint-heading-increment"; @@ -53386,6 +53602,15 @@ let sha512 = "ASssbw0vj9urTMxDJGpOn4K7d9MgPQPJGaCD+7v7je42krofvqC4CxpYvO/fOAkRZcttE91VfFHxkaPjiBtQLw=="; }; }; + "remark-lint-heading-style-2.0.1" = { + name = "remark-lint-heading-style"; + packageName = "remark-lint-heading-style"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-heading-style/-/remark-lint-heading-style-2.0.1.tgz"; + sha512 = "IrFLNs0M5Vbn9qg51AYhGUfzgLAcDOjh2hFGMz3mx664dV6zLcNZOPSdJBBJq3JQR4gKpoXcNwN1+FFaIATj+A=="; + }; + }; "remark-lint-link-title-style-1.0.5" = { name = "remark-lint-link-title-style"; packageName = "remark-lint-link-title-style"; @@ -53395,6 +53620,24 @@ let sha512 = "Nu0cKj220q/PmUzELhYRUR2uxXabWuFJq9sApkgsc59uh+NKDtCEdpxkx7Zwvn6kUEwpuQVimeRfdesiKxX52g=="; }; }; + "remark-lint-link-title-style-2.0.1" = { + name = "remark-lint-link-title-style"; + packageName = "remark-lint-link-title-style"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-link-title-style/-/remark-lint-link-title-style-2.0.1.tgz"; + sha512 = "+Q7Ew8qpOQzjqbDF6sUHmn9mKgje+m2Ho8Xz7cEnGIRaKJgtJzkn/dZqQM/az0gn3zaN6rOuwTwqw4EsT5EsIg=="; + }; + }; + "remark-lint-list-item-bullet-indent-3.0.0" = { + name = "remark-lint-list-item-bullet-indent"; + packageName = "remark-lint-list-item-bullet-indent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-list-item-bullet-indent/-/remark-lint-list-item-bullet-indent-3.0.0.tgz"; + sha512 = "X2rleWP8XReC4LXKF7Qi5vYiPJkA4Grx5zxsjHofFrVRz6j0PYOCuz7vsO+ZzMunFMfom6FODnscSWz4zouDVw=="; + }; + }; "remark-lint-list-item-content-indent-1.0.4" = { name = "remark-lint-list-item-content-indent"; packageName = "remark-lint-list-item-content-indent"; @@ -53404,6 +53647,15 @@ let sha512 = "zfEeAayZjEKkPr07fnhkGLENxOhnm0WZJTj6UBIXhtGu7rX23WNKSZaiou8iUoHxcO6ySCvIUJAEmq/XN1FxkQ=="; }; }; + "remark-lint-list-item-content-indent-2.0.1" = { + name = "remark-lint-list-item-content-indent"; + packageName = "remark-lint-list-item-content-indent"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-2.0.1.tgz"; + sha512 = "OzUMqavxyptAdG7vWvBSMc9mLW9ZlTjbW4XGayzczd3KIr6Uwp3NEFXKx6MLtYIM/vwBqMrPQUrObOC7A2uBpQ=="; + }; + }; "remark-lint-list-item-indent-1.0.5" = { name = "remark-lint-list-item-indent"; packageName = "remark-lint-list-item-indent"; @@ -53413,6 +53665,15 @@ let sha512 = "DjRgxjqaVMrnlQFJypizTPtLa9gSM5ad0LVIFDSstV2UVXSgpBi2+bSsFJEXb4Fkjo/d2JAgt27UhzhcoF2lnw=="; }; }; + "remark-lint-list-item-indent-2.0.1" = { + name = "remark-lint-list-item-indent"; + packageName = "remark-lint-list-item-indent"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-list-item-indent/-/remark-lint-list-item-indent-2.0.1.tgz"; + sha512 = "4IKbA9GA14Q9PzKSQI6KEHU/UGO36CSQEjaDIhmb9UOhyhuzz4vWhnSIsxyI73n9nl9GGRAMNUSGzr4pQUFwTA=="; + }; + }; "remark-lint-list-item-spacing-1.1.4" = { name = "remark-lint-list-item-spacing"; packageName = "remark-lint-list-item-spacing"; @@ -53422,6 +53683,15 @@ let sha512 = "zZELzTPYCoOCnOWh/nYTfQWnGXWg4/I5KpwrjBqe7WYwoMtvLVU9mqjRj2jHEbmirEXas54NZnYnkCoIBMS4bw=="; }; }; + "remark-lint-match-punctuation-0.2.1" = { + name = "remark-lint-match-punctuation"; + packageName = "remark-lint-match-punctuation"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-match-punctuation/-/remark-lint-match-punctuation-0.2.1.tgz"; + sha512 = "XgarnmpBHMsCNRnhTNLf/8dDe5/gXdA/mQnBDPG/XZFNMebS6GFnWQpuL3cyzLmuWD62I1A5ouZczRZcrWYrTQ=="; + }; + }; "remark-lint-maximum-heading-length-1.0.4" = { name = "remark-lint-maximum-heading-length"; packageName = "remark-lint-maximum-heading-length"; @@ -53449,6 +53719,15 @@ let sha512 = "dhDHQLeaI79p7SRoKfxJ9c8J5otQsGua7ILeNbs2Onzn46/tp9ir6zjq3Lfh4VJJr4OVign2e8u+MzXsS7Uu/A=="; }; }; + "remark-lint-no-auto-link-without-protocol-2.0.1" = { + name = "remark-lint-no-auto-link-without-protocol"; + packageName = "remark-lint-no-auto-link-without-protocol"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-2.0.1.tgz"; + sha512 = "TFcXxzucsfBb/5uMqGF1rQA+WJJqm1ZlYQXyvJEXigEZ8EAxsxZGPb/gOQARHl/y0vymAuYxMTaChavPKaBqpQ=="; + }; + }; "remark-lint-no-blockquote-without-marker-2.0.4" = { name = "remark-lint-no-blockquote-without-marker"; packageName = "remark-lint-no-blockquote-without-marker"; @@ -53458,6 +53737,15 @@ let sha512 = "a5LFGj7It2z7aBRGaAcztk4D2pax2b7dK9iOarIWv/JBus/PSjZJxzZCma2aAAOQhv3wbNTwqQwuQC0UJHMbPg=="; }; }; + "remark-lint-no-blockquote-without-marker-4.0.0" = { + name = "remark-lint-no-blockquote-without-marker"; + packageName = "remark-lint-no-blockquote-without-marker"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-4.0.0.tgz"; + sha512 = "Y59fMqdygRVFLk1gpx2Qhhaw5IKOR9T38Wf7pjR07bEFBGUNfcoNVIFMd1TCJfCPQxUyJzzSqfZz/KT7KdUuiQ=="; + }; + }; "remark-lint-no-consecutive-blank-lines-1.0.4" = { name = "remark-lint-no-consecutive-blank-lines"; packageName = "remark-lint-no-consecutive-blank-lines"; @@ -53485,6 +53773,24 @@ let sha512 = "gnsInLxTkc59eVD3/qelFagD/NcrMPKXT1sy7i4e8D2jqQyrIHHl0p3TfiyNNt8qIjKMKhlIii4k4kVk/3Mczg=="; }; }; + "remark-lint-no-emphasis-as-heading-2.0.1" = { + name = "remark-lint-no-emphasis-as-heading"; + packageName = "remark-lint-no-emphasis-as-heading"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-2.0.1.tgz"; + sha512 = "z86+yWtVivtuGIxIC4g9RuATbgZgOgyLcnaleonJ7/HdGTYssjJNyqCJweaWSLoaI0akBQdDwmtJahW5iuX3/g=="; + }; + }; + "remark-lint-no-empty-sections-4.0.0" = { + name = "remark-lint-no-empty-sections"; + packageName = "remark-lint-no-empty-sections"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-empty-sections/-/remark-lint-no-empty-sections-4.0.0.tgz"; + sha512 = "Tx1nCu7Dq3dsJ500402sSvM0uVK/6khSuEjx8K8u9aHN+Y4vjL6h88xVzdzCmZq2J2yqyFnvMjG1y7lQv+DRvg=="; + }; + }; "remark-lint-no-file-name-articles-1.0.5" = { name = "remark-lint-no-file-name-articles"; packageName = "remark-lint-no-file-name-articles"; @@ -53530,6 +53836,24 @@ let sha512 = "rT8CmcIlenegS0Yst4maYXdZfqIjBOiRUY8j/KJkORF5tKH+3O1/S07025qPGmcRihzK3w4yO0K8rgkKQw0b9w=="; }; }; + "remark-lint-no-heading-content-indent-3.0.0" = { + name = "remark-lint-no-heading-content-indent"; + packageName = "remark-lint-no-heading-content-indent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-heading-content-indent/-/remark-lint-no-heading-content-indent-3.0.0.tgz"; + sha512 = "yULDoVSIqKylLDfW6mVUbrHlyEWUSFtVFiKc+/BA412xDIhm8HZLUnP+FsuBC0OzbIZ+bO9Txy52WtO3LGnK1A=="; + }; + }; + "remark-lint-no-heading-indent-3.0.0" = { + name = "remark-lint-no-heading-indent"; + packageName = "remark-lint-no-heading-indent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-heading-indent/-/remark-lint-no-heading-indent-3.0.0.tgz"; + sha512 = "b8ImhLv2AnRDxtYUODplzsl/7IwQ+lqRmD1bwbZgSerEP9MLaULW3SjH37EyA6z+8rCDjvEyppKKU6zec0TCjg=="; + }; + }; "remark-lint-no-heading-punctuation-1.0.4" = { name = "remark-lint-no-heading-punctuation"; packageName = "remark-lint-no-heading-punctuation"; @@ -53539,6 +53863,15 @@ let sha512 = "++/HXg/qtVssJjzq2ZgEreoxaazw9KkYrAbTDImKV7Fypo+7bZFELUvFicq0/i9qwAwt1tvhkKtLYt1W/sr1JQ=="; }; }; + "remark-lint-no-heading-punctuation-2.0.1" = { + name = "remark-lint-no-heading-punctuation"; + packageName = "remark-lint-no-heading-punctuation"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-2.0.1.tgz"; + sha512 = "lY/eF6GbMeGu4cSuxfGHyvaQQBIq/6T/o+HvAR5UfxSTxmxZFwbZneAI2lbeR1zPcqOU87NsZ5ZZzWVwdLpPBw=="; + }; + }; "remark-lint-no-inline-padding-1.0.5" = { name = "remark-lint-no-inline-padding"; packageName = "remark-lint-no-inline-padding"; @@ -53548,6 +53881,15 @@ let sha512 = "AjS34hBRasYiIAKZJ7/9U42LouRHok2WVTRdQPcVtRBswStNOuot59S+FRsatqlk1wvMmjytqxUKQfVTSeu9ag=="; }; }; + "remark-lint-no-inline-padding-3.0.0" = { + name = "remark-lint-no-inline-padding"; + packageName = "remark-lint-no-inline-padding"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-3.0.0.tgz"; + sha512 = "3s9uW3Yux9RFC0xV81MQX3bsYs+UY7nPnRuMxeIxgcVwxQ4E/mTJd9QjXUwBhU9kdPtJ5AalngdmOW2Tgar8Cg=="; + }; + }; "remark-lint-no-literal-urls-1.0.4" = { name = "remark-lint-no-literal-urls"; packageName = "remark-lint-no-literal-urls"; @@ -53566,6 +53908,24 @@ let sha512 = "RZ1YPxRO7Bo8mT+A36cZ7nx2QHFAKk+oE6j87YrZYpAKr2oF6snKS8nIGhVku4PSI/9cW1G12MZz1cAA5rcjFw=="; }; }; + "remark-lint-no-multiple-toplevel-headings-2.0.1" = { + name = "remark-lint-no-multiple-toplevel-headings"; + packageName = "remark-lint-no-multiple-toplevel-headings"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-2.0.1.tgz"; + sha512 = "VKSItR6c+u3OsE5pUiSmNusERNyQS9Nnji26ezoQ1uvy06k3RypIjmzQqJ/hCkSiF+hoyC3ibtrrGT8gorzCmQ=="; + }; + }; + "remark-lint-no-repeat-punctuation-0.1.4" = { + name = "remark-lint-no-repeat-punctuation"; + packageName = "remark-lint-no-repeat-punctuation"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-repeat-punctuation/-/remark-lint-no-repeat-punctuation-0.1.4.tgz"; + sha512 = "JJduCs4FimdBcR1AB576SqIYOjt+7t8OjTnnlZMvjnw7lzkuL0+nNNHyNXVPaK6jxaLjEUhrH2/smU6vZFUT7g=="; + }; + }; "remark-lint-no-shell-dollars-1.0.4" = { name = "remark-lint-no-shell-dollars"; packageName = "remark-lint-no-shell-dollars"; @@ -53575,6 +53935,15 @@ let sha512 = "YXFj8FUVTKkVvoAbFY3zv1Ol7Kj1i+qdze3pXSgRG61y1LpfL8/HpnvFrseMbBmNw6o4WpjTo7GoArngJ1sCeg=="; }; }; + "remark-lint-no-shell-dollars-2.0.2" = { + name = "remark-lint-no-shell-dollars"; + packageName = "remark-lint-no-shell-dollars"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-2.0.2.tgz"; + sha512 = "zhkHZOuyaD3r/TUUkkVqW0OxsR9fnSrAnHIF63nfJoAAUezPOu8D1NBsni6rX8H2DqGbPYkoeWrNsTwiKP0yow=="; + }; + }; "remark-lint-no-shortcut-reference-image-1.0.4" = { name = "remark-lint-no-shortcut-reference-image"; packageName = "remark-lint-no-shortcut-reference-image"; @@ -53602,6 +53971,51 @@ let sha512 = "eE1GL+IzU3vtHdYCKHCZEIhCwiwCM7UH+pMDIMpGfH2LB3cB/Nrfbiz9xadGkARKqxxDMsJSBZDw4A/01IU+kA=="; }; }; + "remark-lint-no-table-indentation-3.0.0" = { + name = "remark-lint-no-table-indentation"; + packageName = "remark-lint-no-table-indentation"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-3.0.0.tgz"; + sha512 = "+l7GovI6T+3LhnTtz/SmSRyOb6Fxy6tmaObKHrwb/GAebI/4MhFS1LVo3vbiP/RpPYtyQoFbbuXI55hqBG4ibQ=="; + }; + }; + "remark-lint-no-undefined-references-3.0.0" = { + name = "remark-lint-no-undefined-references"; + packageName = "remark-lint-no-undefined-references"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-undefined-references/-/remark-lint-no-undefined-references-3.0.0.tgz"; + sha512 = "0hzaJS9GuzSQVOeeNdJr/s66LRQOzp618xuOQPYWHcJdd+SCaRTyWbjMrTM/cCI5L1sYjgurp410NkIBQ32Vqg=="; + }; + }; + "remark-lint-no-unneeded-full-reference-image-2.0.1" = { + name = "remark-lint-no-unneeded-full-reference-image"; + packageName = "remark-lint-no-unneeded-full-reference-image"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-unneeded-full-reference-image/-/remark-lint-no-unneeded-full-reference-image-2.0.1.tgz"; + sha512 = "ZqkrW6l/n1EmcGdtzBFoDygG2ehd/Wx46Id9Dagg15oLzwvbhp5mJIXArXU2qGrF82w1hfainCaZzyH/OBJtEg=="; + }; + }; + "remark-lint-no-unneeded-full-reference-link-2.0.1" = { + name = "remark-lint-no-unneeded-full-reference-link"; + packageName = "remark-lint-no-unneeded-full-reference-link"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-unneeded-full-reference-link/-/remark-lint-no-unneeded-full-reference-link-2.0.1.tgz"; + sha512 = "OcPQiG6meVpvfydzxkxPdVc8jcXdklQW4gMjY2BevLtVoaIJ+dgNBPazyYHP/0EzpVY2RftD3CZ+5hiLW2rgpA=="; + }; + }; + "remark-lint-no-unused-definitions-2.0.1" = { + name = "remark-lint-no-unused-definitions"; + packageName = "remark-lint-no-unused-definitions"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-no-unused-definitions/-/remark-lint-no-unused-definitions-2.0.1.tgz"; + sha512 = "+BMc0BOjc364SvKYLkspmxDch8OaKPbnUGgQBvK0Bmlwy42baR4C9zhwAWBxm0SBy5Z4AyM4G4jKpLXPH40Oxg=="; + }; + }; "remark-lint-ordered-list-marker-style-1.0.4" = { name = "remark-lint-ordered-list-marker-style"; packageName = "remark-lint-ordered-list-marker-style"; @@ -53611,6 +54025,15 @@ let sha512 = "c6AIqeePzm3nfkPCbTdwBS3/AQICgwE76+ryOc7tsSq4ulyK/Nt8Syvi/oiHYuonBddZoGtFTNCn0jqen9qscA=="; }; }; + "remark-lint-ordered-list-marker-style-2.0.1" = { + name = "remark-lint-ordered-list-marker-style"; + packageName = "remark-lint-ordered-list-marker-style"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-2.0.1.tgz"; + sha512 = "Cnpw1Dn9CHn+wBjlyf4qhPciiJroFOEGmyfX008sQ8uGoPZsoBVIJx76usnHklojSONbpjEDcJCjnOvfAcWW1A=="; + }; + }; "remark-lint-ordered-list-marker-value-1.0.5" = { name = "remark-lint-ordered-list-marker-value"; packageName = "remark-lint-ordered-list-marker-value"; @@ -53620,6 +54043,15 @@ let sha512 = "eKepbNNfu9rEuG8WvV0sc7B+KiPMgq5Nc9baAxL9Hi6mhpj347YFWXxJUNttSINS13YTpnHxPvXmF9SzhjFKNQ=="; }; }; + "remark-lint-ordered-list-marker-value-2.0.1" = { + name = "remark-lint-ordered-list-marker-value"; + packageName = "remark-lint-ordered-list-marker-value"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-2.0.1.tgz"; + sha512 = "blt9rS7OKxZ2NW8tqojELeyNEwPhhTJGVa+YpUkdEH+KnrdcD7Nzhnj6zfLWOx6jFNZk3jpq5nvLFAPteHaNKg=="; + }; + }; "remark-lint-rule-style-1.0.4" = { name = "remark-lint-rule-style"; packageName = "remark-lint-rule-style"; @@ -53629,6 +54061,15 @@ let sha512 = "omr5P6CCvo2zixCzK9uiGZpwzOE+4rc+95kWH95k2iA6Rp8Qohp8RK4unSRKLtFYGUhSbiQPgWaQXHDxMkWczg=="; }; }; + "remark-lint-rule-style-2.0.1" = { + name = "remark-lint-rule-style"; + packageName = "remark-lint-rule-style"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-rule-style/-/remark-lint-rule-style-2.0.1.tgz"; + sha512 = "hz4Ff9UdlYmtO6Czz99WJavCjqCer7Cav4VopXt+yVIikObw96G5bAuLYcVS7hvMUGqC9ZuM02/Y/iq9n8pkAg=="; + }; + }; "remark-lint-strong-marker-1.0.4" = { name = "remark-lint-strong-marker"; packageName = "remark-lint-strong-marker"; @@ -53638,6 +54079,15 @@ let sha512 = "X9f6yhZ85cdP0cmCgkqlbxllpeQ60pS9Qqk9Jb9SZo6f95esaHptQ5bExb1ZVXzhSHz2Xz86tUhXtzG3zGFD4g=="; }; }; + "remark-lint-strong-marker-2.0.1" = { + name = "remark-lint-strong-marker"; + packageName = "remark-lint-strong-marker"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-strong-marker/-/remark-lint-strong-marker-2.0.1.tgz"; + sha512 = "8X2IsW1jZ5FmW9PLfQjkL0OVy/J3xdXLcZrG1GTeQKQ91BrPFyEZqUM2oM6Y4S6LGtxWer+neZkPZNroZoRPBQ=="; + }; + }; "remark-lint-table-cell-padding-1.0.5" = { name = "remark-lint-table-cell-padding"; packageName = "remark-lint-table-cell-padding"; @@ -53647,6 +54097,15 @@ let sha512 = "N/WpcymrGBSPbLiv2OQTvdzNn6H9ctdyEA+P/odn4G9FqyrLmeTMkGJuGtinU569hLG/RtHqZIDeFVDiYi8Wzw=="; }; }; + "remark-lint-table-cell-padding-3.0.0" = { + name = "remark-lint-table-cell-padding"; + packageName = "remark-lint-table-cell-padding"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-3.0.0.tgz"; + sha512 = "sEKrbyFZPZpxI39R8/r+CwUrin9YtyRwVn0SQkNQEZWZcIpylK+bvoKIldvLIXQPob+ZxklL0GPVRzotQMwuWQ=="; + }; + }; "remark-lint-table-pipe-alignment-1.0.4" = { name = "remark-lint-table-pipe-alignment"; packageName = "remark-lint-table-pipe-alignment"; @@ -53656,6 +54115,15 @@ let sha512 = "pmELEOXeUjMQedyVvOtZcTCnTu6FxZ4gfBskMx6iJhOFEEKTFOmviqlKLpndPBxFNZB86AiE0C00/NvAaut8dw=="; }; }; + "remark-lint-table-pipe-alignment-2.0.1" = { + name = "remark-lint-table-pipe-alignment"; + packageName = "remark-lint-table-pipe-alignment"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-2.0.1.tgz"; + sha512 = "O89U7bp0ja6uQkT2uQrNB76GaPvFabrHiUGhqEUnld21yEdyj7rgS57kn84lZNSuuvN1Oor6bDyCwWQGzzpoOQ=="; + }; + }; "remark-lint-table-pipes-1.0.4" = { name = "remark-lint-table-pipes"; packageName = "remark-lint-table-pipes"; @@ -53665,6 +54133,15 @@ let sha512 = "0fdnoiiSLIPd/76gNvQY4pg27d8HkMmmv5gCGfD+Z/Si9DdpbJdq93U0kX+Botb3+/4VEDIlcU7Cp5HXppMTWA=="; }; }; + "remark-lint-table-pipes-3.0.0" = { + name = "remark-lint-table-pipes"; + packageName = "remark-lint-table-pipes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-table-pipes/-/remark-lint-table-pipes-3.0.0.tgz"; + sha512 = "QPokSazEdl0Y8ayUV9UB0Ggn3Jos/RAQwIo0z1KDGnJlGDiF80Jc6iU9RgDNUOjlpQffSLIfSVxH5VVYF/K3uQ=="; + }; + }; "remark-lint-unordered-list-marker-style-1.0.4" = { name = "remark-lint-unordered-list-marker-style"; packageName = "remark-lint-unordered-list-marker-style"; @@ -53674,6 +54151,15 @@ let sha512 = "lcuG1J74VGTT4gl8oH33HpkHrqorxjxMlJnBupLFrVowqvJ2hAq8yPJdGZ7P46uZOYw+Xz+Qv08bF8A73PNWxQ=="; }; }; + "remark-lint-unordered-list-marker-style-2.0.1" = { + name = "remark-lint-unordered-list-marker-style"; + packageName = "remark-lint-unordered-list-marker-style"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-2.0.1.tgz"; + sha512 = "8KIDJNDtgbymEvl3LkrXgdxPMTOndcux3BHhNGB2lU4UnxSpYeHsxcDgirbgU6dqCAfQfvMjPvfYk19QTF9WZA=="; + }; + }; "remark-mdx-2.0.0-next.7" = { name = "remark-mdx"; packageName = "remark-mdx"; @@ -54817,6 +55303,15 @@ let sha512 = "d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ=="; }; }; + "rmfr-2.0.0" = { + name = "rmfr"; + packageName = "rmfr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rmfr/-/rmfr-2.0.0.tgz"; + sha512 = "nQptLCZeyyJfgbpf2x97k5YE8vzDn7bhwx9NlvODdhgbU0mL1ruh71X0HYdRaOEvWC7Cr+SfV0p5p+Ib5yOl7A=="; + }; + }; "rndm-1.2.0" = { name = "rndm"; packageName = "rndm"; @@ -63917,6 +64412,24 @@ let sha512 = "xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ=="; }; }; + "unist-util-find-all-before-3.0.1" = { + name = "unist-util-find-all-before"; + packageName = "unist-util-find-all-before"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-find-all-before/-/unist-util-find-all-before-3.0.1.tgz"; + sha512 = "00YMzXOOu4z/qCHKQI6z7TeERAbIBda0E/1sZqP0cJdGd3d1OtUPvQlMhNCwz4QBFo//GcW2dHOYXPdu3jINdA=="; + }; + }; + "unist-util-find-all-between-2.1.0" = { + name = "unist-util-find-all-between"; + packageName = "unist-util-find-all-between"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-find-all-between/-/unist-util-find-all-between-2.1.0.tgz"; + sha512 = "OCCUtDD8UHKeODw3TPXyFDxPCbpgBzbGTTaDpR68nvxkwiVcawBqMVrokfBMvUi7ij2F5q7S4s4Jq5dvkcBt+w=="; + }; + }; "unist-util-generated-1.1.6" = { name = "unist-util-generated"; packageName = "unist-util-generated"; @@ -64088,6 +64601,15 @@ let sha512 = "SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA=="; }; }; + "unist-util-to-list-of-char-0.1.3" = { + name = "unist-util-to-list-of-char"; + packageName = "unist-util-to-list-of-char"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-to-list-of-char/-/unist-util-to-list-of-char-0.1.3.tgz"; + sha512 = "f8GrLHdhBKfaW6mzJc25BKeUOqhsuiRXlGrXBtb3pmRT3QCuYS+jH4g7Uf52hjV7TLQN4PGnjzrTFMFXAQaprA=="; + }; + }; "unist-util-visit-1.4.1" = { name = "unist-util-visit"; packageName = "unist-util-visit"; @@ -65169,6 +65691,15 @@ let sha1 = "1c14479b40f1397a75782f115e4086447433a200"; }; }; + "validate-glob-opts-1.0.2" = { + name = "validate-glob-opts"; + packageName = "validate-glob-opts"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-glob-opts/-/validate-glob-opts-1.0.2.tgz"; + sha512 = "3PKjRQq/R514lUcG9OEiW0u9f7D4fP09A07kmk1JbNn2tfeQdAHhlT+A4dqERXKu2br2rrxSM3FzagaEeq9w+A=="; + }; + }; "validate-npm-package-license-3.0.4" = { name = "validate-npm-package-license"; packageName = "validate-npm-package-license"; @@ -65862,6 +66393,15 @@ let sha512 = "GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA=="; }; }; + "vfile-reporter-pretty-5.0.0" = { + name = "vfile-reporter-pretty"; + packageName = "vfile-reporter-pretty"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-reporter-pretty/-/vfile-reporter-pretty-5.0.0.tgz"; + sha512 = "pynx5Xvqp6TArfaP6T1JcyZK45Z7iQH6mv4XV7ce0Kry9t15zWaoZqFQvs9PNvivgxm7PFKzZV/l88VswW8Upw=="; + }; + }; "vfile-sort-1.0.0" = { name = "vfile-sort"; packageName = "vfile-sort"; @@ -65889,6 +66429,15 @@ let sha512 = "lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA=="; }; }; + "vfile-to-eslint-2.0.2" = { + name = "vfile-to-eslint"; + packageName = "vfile-to-eslint"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-to-eslint/-/vfile-to-eslint-2.0.2.tgz"; + sha512 = "QvKxY1zCwLiDoM+Y4J46AHTRrY6WgVg9u8Ae/KbLRUmphcscmtIgSnttKefWH0X93JkONO+UD1DrltCpYYmDAQ=="; + }; + }; "videostream-3.2.2" = { name = "videostream"; packageName = "videostream"; @@ -74171,6 +74720,423 @@ in bypassCache = true; reconstructLock = true; }; + awesome-lint = nodeEnv.buildNodePackage { + name = "awesome-lint"; + packageName = "awesome-lint"; + version = "0.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/awesome-lint/-/awesome-lint-0.18.0.tgz"; + sha512 = "Jc5aV6fjaAnx5Rmgk26lSUAreSU4UAFrRdedTYK1x2yXB5348X5bHN7J0xUf70AUw5ujloYVkZPCw4mwuVXllg=="; + }; + dependencies = [ + sources."@babel/code-frame-7.16.0" + sources."@babel/helper-validator-identifier-7.15.7" + (sources."@babel/highlight-7.16.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/eslint-7.28.2" + sources."@types/estree-0.0.50" + sources."@types/json-schema-7.0.9" + sources."@types/mdast-3.0.10" + sources."@types/minimist-1.2.2" + sources."@types/normalize-package-data-2.4.1" + sources."@types/unist-2.0.6" + sources."aggregate-error-3.1.0" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."append-type-1.0.2" + sources."array-to-sentence-1.1.0" + sources."array-union-2.1.0" + sources."arrify-2.0.1" + sources."assert-valid-glob-opts-1.0.0" + sources."bail-1.0.5" + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + sources."bl-4.1.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."buffer-5.7.1" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."case-1.6.3" + sources."chalk-4.1.2" + sources."character-entities-1.2.4" + sources."character-entities-legacy-1.1.4" + sources."character-reference-invalid-1.1.4" + sources."clean-stack-2.2.0" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.6.1" + sources."clone-1.0.4" + sources."clone-response-1.0.2" + sources."co-3.1.0" + sources."collapse-white-space-1.0.6" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."concat-map-0.0.1" + sources."cross-spawn-6.0.5" + sources."crypto-random-string-2.0.0" + sources."debug-4.3.2" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."decompress-response-3.3.0" + sources."defaults-1.0.3" + sources."defer-to-connect-1.1.3" + (sources."del-6.0.0" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) + sources."dir-glob-3.0.1" + sources."duplexer3-0.1.4" + sources."emoji-regex-9.2.2" + sources."end-of-stream-1.4.4" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."eslint-formatter-pretty-4.1.0" + sources."eslint-rule-docs-1.1.231" + sources."execa-1.0.0" + sources."extend-3.0.2" + sources."fast-glob-3.2.7" + sources."fastq-1.13.0" + sources."fill-range-7.0.1" + sources."find-up-4.1.0" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."get-stream-4.1.0" + sources."git-clone-0.1.0" + sources."github-slugger-1.4.0" + sources."github-url-to-object-4.0.6" + sources."glob-7.2.0" + sources."glob-option-error-1.0.0" + sources."glob-parent-5.1.2" + sources."globby-11.0.4" + sources."got-9.6.0" + sources."graceful-fs-4.2.8" + sources."hard-rejection-2.1.0" + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."hosted-git-info-4.0.2" + sources."http-cache-semantics-4.1.0" + sources."ieee754-1.2.1" + sources."ignore-5.1.9" + sources."indent-string-4.0.0" + sources."indexed-filter-1.0.3" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."inspect-with-kind-1.0.5" + sources."irregular-plurals-3.3.0" + sources."is-alphabetical-1.0.4" + sources."is-alphanumerical-1.0.4" + sources."is-arrayish-0.2.1" + sources."is-buffer-2.0.5" + sources."is-core-module-2.8.0" + sources."is-decimal-1.0.4" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-github-url-1.2.2" + sources."is-glob-4.0.3" + sources."is-hexadecimal-1.0.4" + sources."is-interactive-1.0.0" + sources."is-number-7.0.0" + sources."is-path-cwd-2.2.0" + sources."is-path-inside-3.0.3" + sources."is-plain-obj-1.1.0" + sources."is-stream-1.1.0" + sources."is-unicode-supported-0.1.0" + sources."is-url-1.2.4" + sources."is-url-superb-4.0.0" + sources."isexe-2.0.0" + sources."js-tokens-4.0.0" + sources."json-buffer-3.0.0" + sources."json-parse-even-better-errors-2.3.1" + sources."keyv-3.1.0" + sources."kind-of-6.0.3" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" + sources."lodash.iteratee-4.7.0" + sources."log-symbols-4.1.0" + sources."longest-streak-2.0.4" + sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" + sources."map-obj-4.3.0" + sources."mdast-comment-marker-1.1.2" + (sources."mdast-util-from-markdown-0.8.5" // { + dependencies = [ + sources."mdast-util-to-string-2.0.0" + ]; + }) + sources."mdast-util-heading-style-1.0.6" + (sources."mdast-util-to-markdown-0.6.5" // { + dependencies = [ + sources."mdast-util-to-string-2.0.0" + ]; + }) + sources."mdast-util-to-string-1.1.0" + sources."meow-9.0.0" + sources."merge2-1.4.1" + sources."micromark-2.11.4" + sources."micromatch-4.0.4" + sources."mimic-fn-2.1.0" + sources."mimic-response-1.0.1" + sources."min-indent-1.0.1" + sources."minimatch-3.0.4" + (sources."minimist-options-4.1.0" // { + dependencies = [ + sources."arrify-1.0.1" + ]; + }) + sources."ms-2.1.2" + sources."nice-try-1.0.5" + (sources."normalize-package-data-3.0.3" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) + sources."normalize-url-4.5.1" + sources."npm-run-path-2.0.2" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."ora-5.4.1" + sources."p-cancelable-1.1.0" + sources."p-finally-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-map-4.0.0" + sources."p-try-2.2.0" + sources."parse-entities-2.0.0" + sources."parse-github-url-1.0.2" + sources."parse-json-5.2.0" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-parse-1.0.7" + sources."path-type-4.0.0" + sources."picomatch-2.3.0" + sources."pify-5.0.0" + sources."plur-4.0.0" + sources."pluralize-8.0.0" + sources."prepend-http-2.0.0" + sources."pump-3.0.0" + sources."queue-microtask-1.2.3" + sources."quick-lru-4.0.1" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + sources."normalize-package-data-2.5.0" + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."readable-stream-3.6.0" + sources."redent-3.0.0" + sources."remark-13.0.0" + sources."remark-lint-8.0.0" + sources."remark-lint-blockquote-indentation-2.0.1" + sources."remark-lint-checkbox-character-style-3.0.0" + sources."remark-lint-checkbox-content-indent-3.0.0" + sources."remark-lint-code-block-style-2.0.1" + sources."remark-lint-definition-case-2.0.1" + sources."remark-lint-definition-spacing-2.0.1" + (sources."remark-lint-double-link-0.1.3" // { + dependencies = [ + sources."normalize-url-5.3.1" + ]; + }) + sources."remark-lint-emphasis-marker-2.0.1" + sources."remark-lint-fenced-code-marker-2.0.1" + sources."remark-lint-file-extension-1.0.5" + sources."remark-lint-final-newline-1.0.5" + sources."remark-lint-hard-break-spaces-2.0.1" + sources."remark-lint-heading-style-2.0.1" + sources."remark-lint-link-title-style-2.0.1" + sources."remark-lint-list-item-bullet-indent-3.0.0" + sources."remark-lint-list-item-content-indent-2.0.1" + sources."remark-lint-list-item-indent-2.0.1" + sources."remark-lint-match-punctuation-0.2.1" + sources."remark-lint-no-auto-link-without-protocol-2.0.1" + sources."remark-lint-no-blockquote-without-marker-4.0.0" + sources."remark-lint-no-emphasis-as-heading-2.0.1" + (sources."remark-lint-no-empty-sections-4.0.0" // { + dependencies = [ + sources."unist-util-visit-1.4.1" + ]; + }) + sources."remark-lint-no-file-name-articles-1.0.5" + sources."remark-lint-no-file-name-consecutive-dashes-1.0.5" + sources."remark-lint-no-file-name-irregular-characters-1.0.5" + sources."remark-lint-no-file-name-mixed-case-1.0.5" + sources."remark-lint-no-file-name-outer-dashes-1.0.6" + sources."remark-lint-no-heading-content-indent-3.0.0" + sources."remark-lint-no-heading-indent-3.0.0" + sources."remark-lint-no-heading-punctuation-2.0.1" + sources."remark-lint-no-inline-padding-3.0.0" + sources."remark-lint-no-multiple-toplevel-headings-2.0.1" + sources."remark-lint-no-repeat-punctuation-0.1.4" + sources."remark-lint-no-shell-dollars-2.0.2" + sources."remark-lint-no-table-indentation-3.0.0" + sources."remark-lint-no-undefined-references-3.0.0" + sources."remark-lint-no-unneeded-full-reference-image-2.0.1" + sources."remark-lint-no-unneeded-full-reference-link-2.0.1" + sources."remark-lint-no-unused-definitions-2.0.1" + sources."remark-lint-ordered-list-marker-style-2.0.1" + sources."remark-lint-ordered-list-marker-value-2.0.1" + sources."remark-lint-rule-style-2.0.1" + sources."remark-lint-strong-marker-2.0.1" + sources."remark-lint-table-cell-padding-3.0.0" + sources."remark-lint-table-pipe-alignment-2.0.1" + sources."remark-lint-table-pipes-3.0.0" + sources."remark-lint-unordered-list-marker-style-2.0.1" + sources."remark-message-control-6.0.0" + sources."remark-parse-9.0.0" + sources."remark-stringify-9.0.1" + sources."repeat-string-1.6.1" + sources."resolve-1.20.0" + sources."responselike-1.0.2" + sources."restore-cursor-3.1.0" + sources."reusify-1.0.4" + sources."rimraf-2.7.1" + sources."rmfr-2.0.0" + sources."run-parallel-1.2.0" + sources."safe-buffer-5.2.1" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.5" + sources."slash-3.0.0" + sources."sliced-1.0.1" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.10" + (sources."string-width-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + ]; + }) + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.1" + sources."strip-eof-1.0.0" + sources."strip-indent-3.0.0" + sources."supports-color-7.2.0" + sources."supports-hyperlinks-2.2.0" + sources."temp-dir-2.0.0" + (sources."tempy-1.0.1" // { + dependencies = [ + sources."is-stream-2.0.1" + sources."type-fest-0.16.0" + ]; + }) + sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" + sources."to-vfile-6.1.0" + sources."trim-newlines-3.0.1" + sources."trough-1.0.5" + sources."type-fest-0.18.1" + (sources."unified-9.2.2" // { + dependencies = [ + sources."is-plain-obj-2.1.0" + ]; + }) + sources."unified-lint-rule-1.0.6" + sources."unified-message-control-3.0.3" + sources."unique-string-2.0.0" + (sources."unist-util-find-1.0.2" // { + dependencies = [ + sources."unist-util-visit-1.4.1" + ]; + }) + (sources."unist-util-find-all-after-3.0.2" // { + dependencies = [ + sources."unist-util-is-4.1.0" + ]; + }) + (sources."unist-util-find-all-before-3.0.1" // { + dependencies = [ + sources."unist-util-is-4.1.0" + ]; + }) + (sources."unist-util-find-all-between-2.1.0" // { + dependencies = [ + sources."unist-util-is-4.1.0" + ]; + }) + sources."unist-util-generated-1.1.6" + sources."unist-util-is-3.0.0" + sources."unist-util-map-1.0.5" + sources."unist-util-position-3.1.0" + sources."unist-util-stringify-position-2.0.3" + (sources."unist-util-to-list-of-char-0.1.3" // { + dependencies = [ + sources."unist-util-visit-1.4.1" + ]; + }) + (sources."unist-util-visit-2.0.3" // { + dependencies = [ + sources."unist-util-is-4.1.0" + sources."unist-util-visit-parents-3.1.1" + ]; + }) + sources."unist-util-visit-parents-2.1.2" + sources."url-parse-lax-3.0.0" + sources."util-deprecate-1.0.2" + sources."validate-glob-opts-1.0.2" + sources."validate-npm-package-license-3.0.4" + sources."vfile-4.2.1" + sources."vfile-location-3.2.0" + sources."vfile-message-2.0.4" + sources."vfile-reporter-pretty-5.0.0" + sources."vfile-statistics-1.1.4" + sources."vfile-to-eslint-2.0.2" + sources."wcwidth-1.0.1" + sources."which-1.3.1" + sources."wrapped-1.0.1" + sources."wrappy-1.0.2" + sources."yallist-4.0.0" + sources."yargs-parser-20.2.9" + sources."zwitch-1.0.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Linter for Awesome lists"; + homepage = "https://github.com/sindresorhus/awesome-lint#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; From 1b7f2e8b3e9887ac130355bcdf449afc5a70e94c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Nov 2021 12:14:59 +0100 Subject: [PATCH 030/140] python3Packages.ansible-core.collections: 4.7.0 -> 4.8.0 --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 574af6d37957..73362f9359ca 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,8 +23,8 @@ let ansible-collections = callPackage ./collections.nix { - version = "4.7.0"; - sha256 = "0aab9id6dqfw2111r731c7y1p77dpzczynmgl4d989p3a7n54z0b"; + version = "4.8.0"; + sha256 = "0dlfmvh7jqna6rig39wrnxhklc3k5a3ky3bfq73dqbmcr5hzli8k"; }; in buildPythonPackage rec { From ab8c049e63929ce5e5de1d9672cc0d2f31fc7b0f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Nov 2021 12:15:45 +0100 Subject: [PATCH 031/140] python3Packages.ansible-core: 2.11.6 -> 2.12.0 And add an override for ansible_2_11 at 2.11.6. --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- pkgs/tools/admin/ansible/default.nix | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 73362f9359ca..904a94717a97 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -29,11 +29,11 @@ let in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.6"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-k9UCg8fFtHbev4PcCJs/Z5uTmouae11ijSjar7s9MDo="; + sha256 = "sha256-DpBJoauLjFTdyAc43AqytXhwvm/kzU5VhdRxVHq3SxM="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 4c66bda06f73..6be403b9e534 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,9 +1,19 @@ -{ python3Packages, fetchurl, fetchFromGitHub }: +{ python3Packages, fetchFromGitHub }: rec { - ansible = ansible_2_11; + ansible = ansible_2_12; - ansible_2_11 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible_2_12 = python3Packages.toPythonApplication python3Packages.ansible-core; + + ansible_2_11 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (old: rec { + pname = "ansible-core"; + version = "2.11.6"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-k9UCg8fFtHbev4PcCJs/Z5uTmouae11ijSjar7s9MDo="; + }; + })); ansible_2_10 = python3Packages.toPythonApplication python3Packages.ansible-base; From fcf045e691912ef908a0ee91fb0209daa6ca4377 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 8 Nov 2021 17:35:33 -0600 Subject: [PATCH 032/140] joplin-desktop: 2.4.6 -> 2.5.12 https://github.com/laurent22/joplin/releases In particular, fixes LetsEncrypt cert issues. --- pkgs/applications/misc/joplin-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 4701fe0b54f3..9d3b751fcd6a 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.4.6"; + version = "2.5.12"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-BMpRWtfx5fXEJy3hp/+q86sd+Yd/QPJbSqi2nWE2dcQ="; - x86_64-darwin = "sha256-4UNKdoGtQSN5/m+xQZrY77ZE5A7jvpDOUCRvwrS5e6g="; + x86_64-linux = "sha256-/S/paqMKVerSQFjA4wQ9fLV0WaqKm4CzQfy+0OdH7c8="; + x86_64-darwin = "sha256-5eKTfZRpW7IYwFt8TeJiytrwEpiHBgN4k9kth+Lh0Bo="; }.${system} or throwSystem; }; From 6a75497278eab84385f10967b1f9321fabad72d1 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 9 Nov 2021 18:41:10 +0100 Subject: [PATCH 033/140] julia: -lts -> -stable --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 9 +++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index d7dfcb5381cc..250d07ffba77 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1887,6 +1887,15 @@ Superuser created successfully. upgrade guide. + + + julia now refers to + julia-stable instead of + julia-lts. In practice this means it has + been upgraded from 1.0.4 to + 1.5.4. + + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 1c737542e7d2..770a6d93b9a8 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -522,3 +522,5 @@ In addition to numerous new and upgraded packages, this release has the followin - `security.pam.services..makeHomeDir` now uses `umask=0077` instead of `umask=0022` when creating the home directory. - Loki has had another release. Some default values have been changed for the configuration and some configuration options have been renamed. For more details, please check [the upgrade guide](https://grafana.com/docs/loki/latest/upgrading/#240). + +- `julia` now refers to `julia-stable` instead of `julia-lts`. In practice this means it has been upgraded from `1.0.4` to `1.5.4`. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7652c0b3e9b..ac66ed3065fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12296,14 +12296,14 @@ with pkgs; julia-lts = julia_10; julia-stable = julia_15; - julia = julia-lts; + julia = julia-stable; julia_10-bin = callPackage ../development/compilers/julia/1.0-bin.nix { }; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; julia-lts-bin = julia_10-bin; julia-stable-bin = julia_16-bin; - julia-bin = julia-lts-bin; + julia-bin = julia-stable-bin; jwasm = callPackage ../development/compilers/jwasm { }; From 710974d8010568b8a6823c5585036f31b5603624 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 9 Nov 2021 20:03:15 +0200 Subject: [PATCH 034/140] unrar-wrapper: init at 1.0.0 --- .../tools/archivers/unrar-wrapper/default.nix | 36 +++++++++++++++++++ .../archivers/unrar-wrapper/setup-hook.sh | 5 +++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 pkgs/tools/archivers/unrar-wrapper/default.nix create mode 100644 pkgs/tools/archivers/unrar-wrapper/setup-hook.sh diff --git a/pkgs/tools/archivers/unrar-wrapper/default.nix b/pkgs/tools/archivers/unrar-wrapper/default.nix new file mode 100644 index 000000000000..7452969cbdb4 --- /dev/null +++ b/pkgs/tools/archivers/unrar-wrapper/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonApplication, fetchFromGitHub, unar }: + +buildPythonApplication rec { + pname = "unrar-wrapper"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "openSUSE"; + repo = "unrar_wrapper"; + rev = "unrar_wrapper-${version}"; + sha256 = "sha256-HjrUif8MrbtLjRQMAPZ/Y2o43rGSDj0HHY4fZQfKz5w="; + }; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ unar ]}" + ]; + + postFixup = '' + ln -s $out/bin/unrar_wrapper $out/bin/unrar + rm -rf $out/nix-support/propagated-build-inputs + ''; + + setupHook = ./setup-hook.sh; + + meta = with lib; { + homepage = "https://github.com/openSUSE/unrar_wrapper"; + description = "Backwards compatibility between unar and unrar"; + longDescription = '' + unrar_wrapper is a wrapper python script that transforms the basic UnRAR commands + to unar and lsar calls in order to provide a backwards compatibility. + ''; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/tools/archivers/unrar-wrapper/setup-hook.sh b/pkgs/tools/archivers/unrar-wrapper/setup-hook.sh new file mode 100644 index 000000000000..41d6a5cd217b --- /dev/null +++ b/pkgs/tools/archivers/unrar-wrapper/setup-hook.sh @@ -0,0 +1,5 @@ +unpackCmdHooks+=(_tryUnrar) +_tryUnrar() { + if ! [[ "$curSrc" =~ \.rar$ ]]; then return 1; fi + unrar x "$curSrc" >/dev/null +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdd881fba23f..29a3a80e6322 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10602,6 +10602,8 @@ with pkgs; unrar = callPackage ../tools/archivers/unrar { }; + unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { }; + vul = callPackage ../applications/misc/vul { }; xar = callPackage ../tools/compression/xar { }; From 289bc160ac56de907749fe21b594a2753ea6a471 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 9 Nov 2021 22:27:52 +0000 Subject: [PATCH 035/140] irqbalance: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: ui/ui.c:714:16: error: format not a string literal and no format arguments [-Werror=format-security] 714 | printw(copy_to); | ^~~~~~~ --- pkgs/os-specific/linux/irqbalance/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 4b7a4527e2c7..b11be3f27353 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, ncurses, libcap_ng }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, glib, ncurses, libcap_ng }: stdenv.mkDerivation rec { pname = "irqbalance"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-K+Nv6HqBZb0pwfNV127QDq+suaUD7TTV413S6j8NdUU="; }; + patches = [ + # pull pending upstream inclusion fix for ncurses-6.3: + # https://github.com/Irqbalance/irqbalance/pull/194 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/Irqbalance/irqbalance/commit/f8bdd0e64284d841544fd3ebe22f4652902ba8d2.patch"; + sha256 = "sha256-QJIXr8BiKmn/81suuhNJsBRhY2as19/e480lsp2wd6g="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib ncurses libcap_ng ]; From 82577ee122a9f0609d42944e4ed12bd27483f722 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 00:31:47 +0100 Subject: [PATCH 036/140] python3Packages.archinfo: 9.0.10409 -> 9.0.10534 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 9f8a90e5348a..ba23fc83b539 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.10409"; + version = "9.0.10534"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yPI80xIJ4zQSWAo6kQchMqYMUMLSR9mx8OceDj8TPnY="; + sha256 = "sha256-8bGDl3rHVT2JKEOfYPHzFTxJ7t3Yz7aLQMVKAUNCSBo="; }; checkInputs = [ From a2f12d8be395c8dc7fe4bad87daee0439814b467 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 00:31:50 +0100 Subject: [PATCH 037/140] python3Packages.ailment: 9.0.10409 -> 9.0.10534 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 83961e714166..025180d6869a 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.10409"; + version = "9.0.10534"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QIQ/NzhFdO4+GrfhAvZRLycydgzB8Ae4L1RvBs8D5No="; + sha256 = "sha256-EmfbyXHoWEd2Yp1RFRkW94dzeRXw0rsBtvVcl+Vg0qI="; }; propagatedBuildInputs = [ pyvex ]; From 802710a91ad9368d2708b0ee16eab383a76e3a20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 00:31:53 +0100 Subject: [PATCH 038/140] python3Packages.pyvex: 9.0.10409 -> 9.0.10534 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index f4af5d4f21eb..ea8bf1b72c09 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.10409"; + version = "9.0.10534"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PEUNfitkbc0d306JzvYlM1/qwiwjPznpLHM/Zt1dUd0="; + sha256 = "sha256-tUjASwLQy/p3Q+XnkbpUQNM6VHk94bIle2BzRd4EYsg="; }; postPatch = lib.optionalString stdenv.isDarwin '' From 839c7ce0882ba2954994a9004cb263a4e40967a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 00:31:57 +0100 Subject: [PATCH 039/140] python3Packages.claripy: 9.0.10409 -> 9.0.10534 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 8bbb26925b4f..76d0f730401c 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.10409"; + version = "9.0.10534"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tDlxeSBPvSGLPmvflMywxTieE9AgjrPb0IxeMkhqXpU="; + sha256 = "sha256-WeqfNVGQio5ugC14iv0ls5b3O1ymEjfpV8J47cCqXeQ="; }; # Use upstream z3 implementation From 2fde954af31eb85c7b5bf37936bf71ca02da7ac6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 00:32:04 +0100 Subject: [PATCH 040/140] python3Packages.angr: 9.0.10409 -> 9.0.10534 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index e0a1d3bc6843..d7b540f50ca9 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.10409"; + version = "9.0.10534"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-etBXFDl5TPGpLHXRCH+ImQDnbpsp30vKxCU+O4pF7PY="; + sha256 = "sha256-A2dqCABkqkn/rjWGc8hrGs60BK+V8j2+jVAYxnEpx8Y="; }; propagatedBuildInputs = [ From 016c0ddca3c2f462d8139d673758d932fdd73261 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 00:32:08 +0100 Subject: [PATCH 041/140] python3Packages.angrop: 9.0.10409 -> 9.0.10534 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index d5b3d1ee8832..35f98a172c7c 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.10409"; + version = "9.0.10534"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3PU+WA5718L2qDl0j3hDdMS1wxJG3jJlM0yPFWE3NJ4="; + sha256 = "sha256-PaAhEn/eJg1qfuq2sHWTGTiJKNfs60NJuvfS9hVObX4="; }; propagatedBuildInputs = [ From c83bfca9f1205cb61311d3a1b7cd3d5503bcbc47 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 00:43:11 +0100 Subject: [PATCH 042/140] python3Packages.cle: 9.0.10409 -> 9.0.10534 --- pkgs/development/python-modules/cle/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 7825b7824dfc..950b6c903fb2 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.10409"; + version = "9.0.10534"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LWzaLGsunHfz5OOWt6ii6+RFME13agsWN0GFkarFhRk="; + sha256 = "sha256-edZC0pZf6A2lpqJDfpMeslLQQGEokq4B9qywgS7wLxo="; }; propagatedBuildInputs = [ @@ -66,9 +66,13 @@ buildPythonPackage rec { "test_ppc_addr16_lo_relocation" # Binary not found, seems to be missing in the current binaries release "test_plt_full_relro" + # Test fails + "test_tls_pe_incorrect_tls_data_start" ]; - pythonImportsCheck = [ "cle" ]; + pythonImportsCheck = [ + "cle" + ]; meta = with lib; { description = "Python loader for many binary formats"; From 55fa5e286fbebebf6af29e9c156819429f0a3d88 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Wed, 10 Nov 2021 10:43:11 +1100 Subject: [PATCH 043/140] opentelemetry-collector: 0.31.0 -> 0.38.0 --- pkgs/tools/misc/opentelemetry-collector/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 3250047e0e3d..27dc4ee6d5c9 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -5,18 +5,20 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.31.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-iJL3EFoBtp4UOLm4/b4JBwzK6iZSTE0cb6EzmlziOLk="; + sha256 = "1sgzz7p19vy7grvq1qrfgf5rw3yjnidcsdsky2l2g98i54md25ml"; }; - vendorSha256 = "sha256-LNlglYys4F7+W7PUmBT9cBnYs7y6AlB9wdaDibaxqC0="; + vendorSha256 = "1p9i01lwz7yidlmcri3pndmg8brgdrd0ai8sag9xn021hw2sn6qq"; proxyVendor = true; + CGO_ENABLED = 0; + subPackages = [ "cmd/otelcontribcol" ]; meta = with lib; { From 00cf347b9b5a27b742c5470c0772f7564321c8d3 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" <53131727+bryanasdev000@users.noreply.github.com> Date: Tue, 9 Nov 2021 20:46:31 -0300 Subject: [PATCH 044/140] tfk8s: add myself as maintainer --- pkgs/tools/misc/tfk8s/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix index daf5738d73ae..e1841ba426fa 100644 --- a/pkgs/tools/misc/tfk8s/default.nix +++ b/pkgs/tools/misc/tfk8s/default.nix @@ -44,6 +44,6 @@ buildGoModule rec { * Strip out server side fields when piping kubectl get $R -o yaml | tfk8s --strip ''; homepage = "https://github.com/jrhouston/tfk8s/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ bryanasdev000 ]; }; } From 875145864970a72dbec4928c562d22c86ead6bf7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 9 Nov 2021 18:09:54 -0500 Subject: [PATCH 045/140] rust-script: 0.17.0 -> 0.18.0 --- pkgs/development/tools/rust/rust-script/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/rust-script/default.nix b/pkgs/development/tools/rust/rust-script/default.nix index b13a1f66db2d..947b4721b0a3 100644 --- a/pkgs/development/tools/rust/rust-script/default.nix +++ b/pkgs/development/tools/rust/rust-script/default.nix @@ -2,19 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "rust-script"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "fornwall"; repo = pname; rev = "v${version}"; - sha256 = "0jz8hlvl31c5h8whd6pnpmslw6w6alkxijd9lhgric1yypiym9x3"; + sha256 = "sha256-B/xh0eYRJxjjIEXdxmLz6usQvo4v/HQK5VNnnjcDBjM="; }; - cargoSha256 = "sha256-hg0QtxR1qm/x8G6HoN7xAyOwh9jiQvX2wWYjUR8YvMs="; + cargoSha256 = "sha256-7qMrrs6K+mJVDHNkGQDb6abM18RyBPToseTNM7ogdQ0="; - # TODO: switch to `cargoCheckType = "false"` after #138822 is merged - # tests only work in debug mode + # tests require network access doCheck = false; meta = with lib; { From a56d0d167b3e74aeef39cca12e4960a9748ed7eb Mon Sep 17 00:00:00 2001 From: "Bryan A. S" <53131727+bryanasdev000@users.noreply.github.com> Date: Tue, 9 Nov 2021 20:48:01 -0300 Subject: [PATCH 046/140] minio-certgen: add myself as maintainer --- pkgs/tools/security/minio-certgen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/minio-certgen/default.nix b/pkgs/tools/security/minio-certgen/default.nix index 2fa7a7b9b403..ec7b0e976ee2 100644 --- a/pkgs/tools/security/minio-certgen/default.nix +++ b/pkgs/tools/security/minio-certgen/default.nix @@ -17,6 +17,6 @@ buildGoModule rec { description = "A simple Minio tool to generate self-signed certificates, and provides SAN certificates with DNS and IP entries"; downloadPage = "https://github.com/minio/certgen"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ bryanasdev000 ]; }; } From 12e3937ec95a77eaf4b0b788f6aa141b9ce061e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 01:01:04 +0100 Subject: [PATCH 047/140] todoman: disable failing tests --- pkgs/applications/office/todoman/default.nix | 30 ++++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index e01391519e49..8c7b4ee43842 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -4,7 +4,6 @@ , installShellFiles , jq }: - let inherit (python3.pkgs) buildPythonApplication fetchPypi setuptools-scm; in @@ -23,6 +22,7 @@ buildPythonApplication rec { installShellFiles setuptools-scm ]; + propagatedBuildInputs = with python3.pkgs; [ atomicwrites click @@ -42,25 +42,37 @@ buildPythonApplication rec { flake8-import-order freezegun hypothesis - pytest - pytest-runner - pytest-cov + pytestCheckHook glibcLocales ]; LC_ALL = "en_US.UTF-8"; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=todoman --cov-report=term-missing" "" + ''; + postInstall = '' installShellCompletion --bash contrib/completion/bash/_todo substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${jq}/bin/jq " installShellCompletion --zsh contrib/completion/zsh/_todo ''; - preCheck = '' - # Remove one failing test that only checks whether the command line works - rm tests/test_main.py - rm tests/test_cli.py - ''; + disabledTests = [ + # Testing of the CLI part and output + "test_color_due_dates" + "test_color_flag" + "test_default_command" + "test_main" + "test_missing_cache_dir" + "test_sorting_null_values" + "test_xdg_existant" + ]; + + pythonImportsCheck = [ + "todoman" + ]; meta = with lib; { homepage = "https://github.com/pimutils/todoman"; From 94b44236a0ae3f2ca399c867f4c41105d4181ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 10 Nov 2021 01:03:32 +0100 Subject: [PATCH 048/140] plasma5Packages.baloo: fix default output, fix broken symlinks in dev output --- pkgs/development/libraries/kde-frameworks/baloo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 7b092653a327..0c8f181a188a 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -12,6 +12,6 @@ mkDerivation { kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative solid ]; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ]; } From 26d329e7a898f8695fafd4543c828241d59711b6 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Wed, 10 Nov 2021 00:09:37 +0000 Subject: [PATCH 049/140] vscode: 1.62.0 -> 1.62.1 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index fff0f07477f1..4b53c91edf28 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "18sa2avr7xl8d0yaxs0df1pkwx7bbg21s8qf3mijdndsnhri0j1c"; - x86_64-darwin = "0vx0jiw341gsf00xw92fwwylnsi5c0ybrbj5syag4vkqddvp410k"; - aarch64-linux = "0jswwz1rxddaxz6v7hzpvddhx9dia5nk5rdsaj93q4gs3nda90hk"; - aarch64-darwin = "11lxg543kl85vbndqcq5zccycxfk63ijmka0jb973jfp0nm4iq60"; - armv7l-linux = "1ryr6k93z24yk0qqv3yasbp4achwpn0mpi6f28d2pvnsr9v9bh3y"; + x86_64-linux = "10p815dv86775ky90m96l11026xkhjwvrrhvviqw6g6hsayjqhia"; + x86_64-darwin = "1b8d7iw9v172viczdbcdxhf51dyshmx2665prv2pm0ygsy8yii3p"; + aarch64-linux = "155sbsmnapnzhkzkaggm80bkarh4l7dbqyhgy40mmdgqpyp3gx1v"; + aarch64-darwin = "1pnqjih37r4xqfjfrf8mhsbvmn62358rmf50rackqh5as50siwa2"; + armv7l-linux = "00k2fmivbsp8fyh9cy6vr6sq031f6marz4sbj1nrlzdl40wd30bi"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.62.0"; + version = "1.62.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From b67444cc491927d7a2b34c9b199330aeb47087a1 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Tue, 9 Nov 2021 21:16:33 -0300 Subject: [PATCH 050/140] fluxcd: 0.20.1 -> 0.21.1 Also add myself as maintainer --- .../applications/networking/cluster/fluxcd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index bc6ef18c6446..0fe3ac021232 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.20.1"; - sha256 = "1cbppkfw5jb0w36jjg32a4kffq616zdmib4kdhny4wwgskq4b2ng"; - manifestsSha256 = "0hwza39a31fjk37lgd0bdk8ja46sradyvkrnq2ad587zr8a8ddvb"; + version = "0.21.1"; + sha256 = "1sb3912h28z097n7mn3hlh33hnxr9978h04py2m7gh27hmygscj3"; + manifestsSha256 = "1rrnz50jfn3zgaz5hn7ghmgc31ahm4q49f0rxfagfygvks1h4910"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -23,7 +23,7 @@ buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-pY+fTOZocHygT8GdRQGOujr+Pik2f21H8cqIFBKvzYQ="; + vendorSha256 = "sha256-m0uVatnV4GIyllZTOkLxXGEiAWXGloFfxSJn51y0AQo="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests @@ -66,6 +66,6 @@ buildGoModule rec { ''; homepage = "https://fluxcd.io"; license = licenses.asl20; - maintainers = with maintainers; [ jlesquembre ]; + maintainers = with maintainers; [ jlesquembre bryanasdev000 ]; }; } From 9b49668324a7ef7ca3036cbe7f9ca79e3cd40918 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 01:17:47 +0100 Subject: [PATCH 051/140] python3Packages.onnx: 1.10.1 -> 1.10.2 --- .../python-modules/onnx/default.nix | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 3f6a86928bc3..6a682f448104 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -1,30 +1,32 @@ { lib , buildPythonPackage +, cmake , fetchPypi , isPy27 -, cmake -, protobuf -, numpy -, six -, typing-extensions -, pytestCheckHook , nbval +, numpy +, protobuf +, pytestCheckHook +, six , tabulate +, typing-extensions }: buildPythonPackage rec { pname = "onnx"; - version = "1.10.1"; + version = "1.10.2"; + format = "setuptools"; - # Python 2 is not supported as of Onnx v1.8 disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9d941ba76cab55db8913ecad9dc50cefeb368460f6338a91783a5d7643f3a044"; + sha256 = "sha256-JNc8p9/X5sczmUT4lVS0AQcZiZM3kk/KFEfY8bXbUNY="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; propagatedBuildInputs = [ protobuf @@ -34,8 +36,8 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestCheckHook nbval + pytestCheckHook tabulate ]; @@ -59,10 +61,14 @@ buildPythonPackage rec { # The setup.py does all the configuration dontUseCmakeConfigure = true; - meta = { - homepage = "http://onnx.ai"; + pythonImportsCheck = [ + "onnx" + ]; + + meta = with lib; { description = "Open Neural Network Exchange"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.acairncross ]; + homepage = "http://onnx.ai"; + license = licenses.asl20; + maintainers = with maintainers; [ acairncross ]; }; } From 6db345c50e70e18908ac7936e12c9f2156025d56 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Wed, 10 Nov 2021 01:22:12 +0100 Subject: [PATCH 052/140] moodle: 3.11.2 -> 3.11.4 (#145172) Co-authored-by: Sandro --- pkgs/servers/web-apps/moodle/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index d6fcedf8dc6c..35c519c16fab 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ] }: let - version = "3.11.2"; + version = "3.11.4"; stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version)); in stdenv.mkDerivation rec { @@ -9,9 +9,8 @@ in stdenv.mkDerivation rec { inherit version; src = fetchurl { - url = - "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-owe/8CVz7+uBrHJQDN4csWVcdk49AvT1ip88lAe/tKg="; + url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; + sha256 = "sha256-OPTImFgXuRK7bxK8KCan68/5D43qUOEK+TcC/9VQxu8="; }; phpConfig = writeText "config.php" '' From d849eaee70c97071921b5e64653ffd6a062f8083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 10 Nov 2021 01:23:53 +0100 Subject: [PATCH 053/140] plasma5Packages.kwin: fix expected output --- pkgs/desktops/plasma-5/kwin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index ec5e594542c7..4e5ba348cd86 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -34,7 +34,7 @@ mkDerivation { plasma-framework libqaccessibilityclient ]; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; patches = [ ./0001-follow-symlinks.patch ./0002-xwayland.patch From 7e2a123acb70a34b0cd5399324c8f0b701b0e40f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 8 Nov 2021 14:02:29 -0500 Subject: [PATCH 054/140] fastnlo_toolkit: fix on darwin --- .../libraries/physics/fastnlo_toolkit/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index fae2ff5a0f22..ce6ea561e271 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -53,6 +53,10 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace ./fastnlotoolkit/Makefile.in \ --replace "-fext-numeric-literals" "" + + # disable test that fails due to strict floating-point number comparison + echo "#!/usr/bin/env perl" > check/fnlo-tk-stattest.pl.in + chmod +x check/fnlo-tk-stattest.pl.in ''; configureFlags = [ @@ -88,6 +92,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; - broken = stdenv.isAarch64; # failing test "fnlo-tk-stattest.pl" }; } From 14bbc387a9fffe6e58515119168d6d3f0453c141 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 8 Nov 2021 19:15:18 -0500 Subject: [PATCH 055/140] fastnlo_toolkit: 2.5.0pre-2823 -> 2.5.0-2826 Since this comes with pre-generated files, this fixes the python extension. --- .../physics/fastnlo_toolkit/default.nix | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index ce6ea561e271..d9e88c4293ac 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchFromGitLab -, autoreconfHook +, fetchurl , boost , gfortran , lhapdf @@ -14,28 +13,14 @@ , withPython ? false }: -let - tag = "2823"; -in - stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; - version = "2.5.0pre-${tag}"; + version = "2.5.0-2826"; - src = fetchFromGitLab { - domain = "gitlab.etp.kit.edu"; - owner = "qcd-public"; - repo = "fastNLO"; - rev = tag; - hash = "sha256-FEKnEnK90tT4BJJ6MLva9lCl3aYzO1YGdx/8Ol2vM7M="; - } + /v2.5/toolkit; - - postPatch = '' - # remove duplicate macro, to fix for autoconf 2.70 - sed -e '0,/AC_CONFIG_MACRO_DIR\([m4]\)/{/AC_CONFIG_MACRO_DIR/d}' -i configure.ac - ''; - - nativeBuildInputs = [ autoreconfHook ]; + src = fetchurl { + url = "https://fastnlo.hepforge.org/code/v25/fastnlo_toolkit-${version}.tar.gz"; + sha256 = "sha256-7aIMYCOkHC/17CHYiEfrxvtSJxTDivrS7BQ32cGiEy0="; + }; buildInputs = [ boost From df17da77298f13a3a92366056252ec703b6a9b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 10 Nov 2021 01:40:47 +0100 Subject: [PATCH 056/140] virtualbox: remove ? null from inputs, remove optional (), other minor cleanups --- .../virtualization/virtualbox/default.nix | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 0dcebb71cc5f..128753f26433 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -5,12 +5,12 @@ , alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). -, open-watcom-bin ? null +, open-watcom-bin , makeself, perl -, javaBindings ? true, jdk ? null # Almost doesn't affect closure size -, pythonBindings ? false, python3 ? null -, extensionPack ? null, fakeroot ? null -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null +, javaBindings ? true, jdk # Almost doesn't affect closure size +, pythonBindings ? false, python3 +, extensionPack ? null, fakeroot +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio , enableHardening ? false , headless ? false , enable32bitGuests ? true @@ -20,7 +20,6 @@ with lib; let - python = python3; buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. @@ -42,23 +41,23 @@ in stdenv.mkDerivation { # Wrap manually because we wrap just a small number of executables. dontWrapQtApps = true; - buildInputs = - [ acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL - libcap glib lvm2 alsa-lib curl libvpx pam makeself perl - libXmu libpng libopus python ] + buildInputs = [ + acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL + libcap glib lvm2 alsa-lib curl libvpx pam makeself perl + libXmu libpng libopus python3 ] ++ optional javaBindings jdk - ++ optional pythonBindings python # Python is needed even when not building bindings + ++ optional pythonBindings python3 # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio - ++ optionals (headless) [ libXrandr libGL ] + ++ optionals headless [ libXrandr libGL ] ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ] - ++ optionals (enableWebService) [ gsoap zlib ]; + ++ optionals enableWebService [ gsoap zlib ]; hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ]; prePatch = '' set -x sed -e 's@MKISOFS --version@MKISOFS -version@' \ - -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ + -e 's@PYTHONDIR=.*@PYTHONDIR=${lib.optionalString pythonBindings python3}@' \ -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \ ${optionalString (!headless) '' -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \ @@ -135,7 +134,7 @@ in stdenv.mkDerivation { PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease ''} - ${optionalString (enableWebService) '' + ${optionalString enableWebService '' # fix gsoap missing zlib include and produce errors with --as-needed VBOX_GSOAP_CXX_LIBS := gsoapssl++ z ''} @@ -148,7 +147,7 @@ in stdenv.mkDerivation { ${optionalString (!pulseSupport) "--disable-pulse"} \ ${optionalString (!enableHardening) "--disable-hardening"} \ ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ - ${optionalString (enableWebService) "--enable-webservice"} \ + ${optionalString enableWebService "--enable-webservice"} \ ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \ --disable-kmods sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ @@ -175,7 +174,7 @@ in stdenv.mkDerivation { -name src -o -exec cp -avt "$libexec" {} + mkdir -p $out/bin - for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} ${optionalString (enableWebService) "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do + for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do echo "Linking $file to /bin" test -x "$libexec/$file" ln -s "$libexec/$file" $out/bin/$file @@ -183,14 +182,14 @@ in stdenv.mkDerivation { ${optionalString (extensionPack != null) '' mkdir -p "$share" - "${fakeroot}/bin/fakeroot" "${stdenv.shell}" < Date: Tue, 9 Nov 2021 20:00:10 -0500 Subject: [PATCH 057/140] id3lib: fix build on aarch64-darwin --- pkgs/development/libraries/id3lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 141be2092a50..8f5512e94db5 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, zlib}: +{ lib, stdenv, fetchurl, libiconv, zlib }: stdenv.mkDerivation rec { pname = "id3lib"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { ./patch_id3lib_3.8.3_UTF16_writing_bug.diff ]; - buildInputs = [ zlib ]; + buildInputs = [ libiconv zlib ]; src = fetchurl { url = "mirror://sourceforge/id3lib/${pname}-${version}.tar.gz"; From 93c293ed21acc2cc4befbc6c9120ebf35ca01450 Mon Sep 17 00:00:00 2001 From: Liji Yu Date: Thu, 4 Nov 2021 14:36:08 +1100 Subject: [PATCH 058/140] perceptualdiff: set "meta.platforms = platforms.unix" --- pkgs/tools/graphics/perceptualdiff/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix index 454352986edf..f2281bc5d35f 100644 --- a/pkgs/tools/graphics/perceptualdiff/default.nix +++ b/pkgs/tools/graphics/perceptualdiff/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/myint/perceptualdiff"; license = licenses.gpl2Plus; maintainers = with maintainers; [ uri-canva ]; - platforms = platforms.x86; + platforms = platforms.unix; + broken = stdenv.hostPlatform.system == "aarch64-darwin"; }; } From 1410227449644c48ead3f53ab50b875aa7339841 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 9 Nov 2021 22:00:59 +0000 Subject: [PATCH 059/140] zita-resampler: fix build for aarch64 --- pkgs/development/libraries/audio/zita-resampler/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 3b3c005a015b..6395ff10683f 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { patchPhase = '' cd source - sed -e "s@ldconfig@@" -i Makefile + substituteInPlace Makefile \ + --replace 'ldconfig' "" + '' + lib.optionalString (!stdenv.targetPlatform.isx86_64) '' + substituteInPlace Makefile \ + --replace '-DENABLE_SSE2' "" ''; fixupPhase = '' From 73df68c1ab6ebe0cafd834f7317669c0a58d516c Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 9 Nov 2021 21:35:37 -0500 Subject: [PATCH 060/140] sqlitebrowser: fix darwin build --- pkgs/development/tools/database/sqlitebrowser/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 0a4df4bd21b7..aa5e2d8f6e0e 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,5 +1,6 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake -, qtbase, qttools, sqlcipher, wrapGAppsHook }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake +, qtbase, qttools, sqlcipher, wrapGAppsHook, qtmacextras +}: mkDerivation rec { pname = "sqlitebrowser"; @@ -16,7 +17,7 @@ mkDerivation rec { # but qscintilla is currently in a bit of a mess as some consumers expect a # -qt4 or -qt5 prefix while others do not. # We *really* should get that cleaned up. - buildInputs = [ qtbase sqlcipher ]; + buildInputs = [ qtbase sqlcipher ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; nativeBuildInputs = [ cmake qttools wrapGAppsHook ]; From c03040cfd5fef7dc99a7663c30e33df5ebec6984 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 9 Nov 2021 11:31:46 -0800 Subject: [PATCH 061/140] nix-direnv: use nix (2.4) and remove enableFlakes Follow-up to #144197 since nixUnstable is no longer needed for flake support. --- pkgs/tools/misc/nix-direnv/default.nix | 9 ++------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 1873cc60557d..0de14426f213 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -2,14 +2,9 @@ , stdenv , fetchFromGitHub , gnugrep -, nixStable -, nixUnstable -, enableFlakes ? false +, nix +, enableFlakes ? null # deprecated }: - -let - nix = if enableFlakes then nixUnstable else nixStable; -in stdenv.mkDerivation rec { pname = "nix-direnv"; version = "1.5.0"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 399d424c59c0..25e566e85aff 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -589,6 +589,7 @@ mapAliases ({ nfsUtils = nfs-utils; # added 2014-12-06 nginxUnstable = nginxMainline; # added 2018-04-25 nilfs_utils = nilfs-utils; # added 2018-04-25 + nix-direnv-flakes = nix-direnv; nix-review = nixpkgs-review; # added 2019-12-22 nixFlakes = nixStable; # added 2021-05-21 nmap_graphical = nmap-graphical; # added 2017-01-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2a6f1fa42ee..3ec947eec258 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3336,7 +3336,6 @@ with pkgs; nfstrace = callPackage ../tools/networking/nfstrace { }; nix-direnv = callPackage ../tools/misc/nix-direnv { }; - nix-direnv-flakes = callPackage ../tools/misc/nix-direnv { enableFlakes = true; }; nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor); From 546d60c5e6748b0479aceba50acd58e741daecf3 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 9 Nov 2021 20:13:14 -0800 Subject: [PATCH 062/140] nixos/tests/misc: fix nix 2.4 support --- nixos/tests/misc.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index fb19b7060562..0587912c9a22 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -50,17 +50,18 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { def get_path_info(path): - result = machine.succeed(f"nix path-info --json {path}") + result = machine.succeed(f"nix --option experimental-features nix-command path-info --json {path}") parsed = json.loads(result) return parsed with subtest("nix-db"): info = get_path_info("${foo}") + print(info) if ( info[0]["narHash"] - != "sha256:0afw0d9j1hvwiz066z93jiddc33nxg6i6qyp26vnqyglpyfivlq5" + != "sha256-BdMdnb/0eWy3EddjE83rdgzWWpQjfWPAj3zDIFMD3Ck=" ): raise Exception("narHash not set") From a4266d37289d0d769644b15ab071ec61584ba5fb Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 9 Nov 2021 20:29:41 -0800 Subject: [PATCH 063/140] session-management-for-emacs: fix lib attr missing --- .../elisp-packages/session-management-for-emacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix index 64a8402650b2..afc51e8fcc2a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, emacs }: +{ stdenv, fetchurl, emacs, lib }: stdenv.mkDerivation rec { pname = "session-management-for-emacs"; From 6e08d6b5f880387a74c76d4b99ca0b8ed834dbde Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 9 Nov 2021 22:08:31 -0700 Subject: [PATCH 064/140] heisenbridge: 1.4.1 -> 1.5.0 --- pkgs/servers/heisenbridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index 67f6b976a079..2e3f415ff5dd 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "1.4.1"; + version = "1.5.0"; # Use the release tarball because it has the version set correctly using the # version.txt file. src = fetchurl { url = "https://github.com/hifi/heisenbridge/releases/download/v${version}/heisenbridge-${version}.tar.gz"; - sha256 = "sha256-+FnpECMDu7d7IM6vmiqP2mA/WJx2WVSzI01tLzkrvpk="; + sha256 = "sha256-hg0PnWbec/iQbv4eRVy6JDt/OJ+EOzN+o6VrUGL4YtE="; }; propagatedBuildInputs = with python3Packages; [ From 6cbf1d42410c844e8c472dd2ece4021c8145d81e Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Tue, 9 Nov 2021 17:11:24 -0600 Subject: [PATCH 065/140] keymapviz: init at 1.9.0 --- pkgs/tools/misc/keymapviz/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/keymapviz/default.nix diff --git a/pkgs/tools/misc/keymapviz/default.nix b/pkgs/tools/misc/keymapviz/default.nix new file mode 100644 index 000000000000..14c56d48dfc9 --- /dev/null +++ b/pkgs/tools/misc/keymapviz/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "keymapviz"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "yskoht"; + repo = pname; + rev = version; + sha256 = "sha256-lNpUH4BvlnHx0SDq5YSsHdcTeEnf6MH2WRUEsCWWHA0="; + }; + + propagatedBuildInputs = with python3.pkgs; [ regex ]; + + meta = with lib; { + description = "A qmk keymap.c visualizer"; + homepage = "https://github.com/yskoht/keymapviz"; + license = licenses.mit; + maintainers = with maintainers; [ legendofmiracles ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b823f4c16d6..03f4855fd487 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31450,6 +31450,8 @@ with pkgs; key = callPackage ../applications/science/logic/key { }; + keymapviz = callPackage ../tools/misc/keymapviz { }; + lean = callPackage ../applications/science/logic/lean {}; lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; From edc5b763a1dee35172c24ee3487a05f01380cc22 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Tue, 9 Nov 2021 13:16:30 -0600 Subject: [PATCH 066/140] tmpmail: unstable-2021-02-10 -> 1.1.4 --- pkgs/applications/networking/tmpmail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/applications/networking/tmpmail/default.nix index 433c6cf6fc24..70e144cb05ca 100644 --- a/pkgs/applications/networking/tmpmail/default.nix +++ b/pkgs/applications/networking/tmpmail/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "tmpmail"; - version = "unstable-2021-02-10"; + version = "1.1.4"; src = fetchFromGitHub { owner = "sdushantha"; repo = "tmpmail"; - rev = "150b32083d36006cf7f496e112715ae12ee87727"; - sha256 = "sha256-yQ9/UUxBTEXK5z3f+tvVRUzIGrAnrqurQ0x56Ad7RKE="; + rev = "v${version}"; + sha256 = "sha256-Rcu1qNmUZhMRvPiaWrDlzLtGksv09XBiF2GJUxXKs1Y="; }; dontConfigure = true; From 33c50db65d0590755db7c48786ba387e55a6a045 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Mon, 8 Nov 2021 12:07:55 -0600 Subject: [PATCH 067/140] cliscord: init at unstable-2020-12-08 --- pkgs/misc/cliscord/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/misc/cliscord/default.nix diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix new file mode 100644 index 000000000000..7307fc607009 --- /dev/null +++ b/pkgs/misc/cliscord/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, openssl, pkg-config, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cliscord"; + version = "unstable-2020-12-08"; + + src = fetchFromGitHub { + owner = "somebody1234"; + repo = pname; + rev = "b02fbe5516fd7f153d0b0e3c7d5d11e2ab651b43"; + sha256 = "sha256-hzZozgOkw8kFppuHiX9TQxHhxKRv8utWWbhEOIzKDLo="; + }; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ pkg-config ]; + + cargoSha256 = "12zfwdssyv0j83bff6s4376d99pv7z8ya8q8adwmf5ayvgmj4xz4"; + + meta = with lib; { + description = "Simple command-line tool to send text and files to discord"; + homepage = "https://github.com/somebody1234/cliscord"; + license = licenses.mit; + maintainers = with maintainers; [ legendofmiracles ]; + mainProgram = "cliscord"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03f4855fd487..4e9a8177db15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13160,6 +13160,8 @@ with pkgs; clips = callPackage ../development/interpreters/clips { }; + cliscord = callPackage ../misc/cliscord/default.nix { }; + clisp = callPackage ../development/interpreters/clisp { }; clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; From 99ee3ee2907f64c33eba06fd2f8c086b90204ee6 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Mon, 8 Nov 2021 12:32:00 -0600 Subject: [PATCH 068/140] present: init at 0.6.0 --- pkgs/misc/present/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/misc/present/default.nix diff --git a/pkgs/misc/present/default.nix b/pkgs/misc/present/default.nix new file mode 100644 index 000000000000..e087db6f8d2e --- /dev/null +++ b/pkgs/misc/present/default.nix @@ -0,0 +1,31 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "present"; + version = "0.6.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-l9W5L4LD9qRo3rLBkgd2I/aDaj+ucib5UYg+X4RYg6c="; + }; + + propagatedBuildInputs = with python3Packages; [ + click + pyyaml + pyfiglet + asciimatics + mistune_2_0 + ]; + + pythonImportsCheck = [ "present" ]; + + # TypeError: don't know how to make test from: 0.6.0 + doCheck = false; + + meta = with lib; { + description = "A terminal-based presentation tool with colors and effects."; + homepage = "https://github.com/vinayak-mehta/present"; + license = licenses.asl20; + maintainers = with maintainers; [ legendofmiracles ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e9a8177db15..64a2e12a9c00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18996,6 +18996,8 @@ with pkgs; presage = callPackage ../development/libraries/presage { }; + present = callPackage ../misc/present { }; + prime-server = callPackage ../development/libraries/prime-server { }; primesieve = callPackage ../development/libraries/science/math/primesieve { }; From bb7c17f1e1c29c153ca79f9853dd61c76ae74820 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 9 Nov 2021 22:31:08 -0800 Subject: [PATCH 069/140] roon-server: use makeBinPath instead of propagatedBuildInputs --- pkgs/servers/roon-server/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 16a47795d3e7..edf89b78398d 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - propagatedBuildInputs = [ alsa-utils cifs-utils ffmpeg ]; - installPhase = let # NB: While this might seem like odd behavior, it's what Roon expects. The @@ -57,6 +55,7 @@ stdenv.mkDerivation rec { --argv0 "$binName" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ icu66 openssl ]}" \ --prefix PATH : "$dotnetDir" \ + --prefix PATH : "${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]}" \ --run "cd $binDir" \ --set DOTNET_ROOT "$dotnetDir" ) From 76b697b7b67943505a7b9ffa84f3c38d3be81d09 Mon Sep 17 00:00:00 2001 From: Joel Date: Wed, 10 Nov 2021 16:56:40 +1000 Subject: [PATCH 070/140] octofetch: 0.3.1 -> 0.3.3 --- pkgs/tools/misc/octofetch/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix index b415b43d0cd3..8dd811e3d2f7 100644 --- a/pkgs/tools/misc/octofetch/default.nix +++ b/pkgs/tools/misc/octofetch/default.nix @@ -7,19 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "octofetch"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "azur1s"; repo = pname; rev = version; - sha256 = "sha256-ciBFTVdHotjifNAoXJjI9CumyK98OkMmfWMbrEldlNI="; + sha256 = "sha256-/AXE1e02NfxQzJZd0QX6gJDjmFFmuUTOndulZElgIMI="; }; - cargoSha256 = "sha256-Gzemm5HY6YwlxesQlil6R+34OtAeU2k7f/9+Lll3i8k="; + cargoSha256 = "sha256:1ddyzbpsiy54r13nb9yrm64cbbifixnhkskwg5fvhhzj4ri4ks4a"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; meta = with lib; { From 46d85da10e1f1c9a009108722a13197e2d11acfb Mon Sep 17 00:00:00 2001 From: Joel Date: Thu, 4 Nov 2021 17:50:45 +1000 Subject: [PATCH 071/140] apkeep: init at 0.6.0 apkeep: update buildInputs style: fix apkeep in all-packages.nix --- pkgs/tools/misc/apkeep/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/apkeep/default.nix diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix new file mode 100644 index 000000000000..41e6e32b8310 --- /dev/null +++ b/pkgs/tools/misc/apkeep/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchCrate, rustPlatform, openssl, pkg-config }: + +rustPlatform.buildRustPackage rec { + pname = "apkeep"; + version = "0.6.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-RTzYvDkmE0kgl4FSOSjDuQ5G1E0ugFU41zVAMMroofM="; + }; + + cargoSha256 = "sha256-YFs2AOMGp0WNrceK14AnigZdJl+UsQdUchpxaI7HSXw="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + meta = with lib; { + description = "A command-line tool for downloading APK files from various sources"; + homepage = "https://github.com/EFForg/apkeep"; + license = licenses.mit; + maintainers = with maintainers; [ jyooru ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a86c88a068b2..41af1b3673e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23771,6 +23771,8 @@ with pkgs; apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; + apkeep = callPackage ../tools/misc/apkeep { }; + apngasm = callPackage ../applications/graphics/apngasm {}; apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix {}; From 637efc8128e7506164a49125ce42864e3b3b4d84 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 10 Nov 2021 08:06:40 +0100 Subject: [PATCH 072/140] brave: 1.31.87 -> 1.31.91 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index ce69121c6cac..a60f9da39bc6 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -93,11 +93,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.31.87"; + version = "1.31.91"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "lfkTB8oXxZqgbO7d8cdktSd6ivQc3g5kiAYZKyrrLpw="; + sha256 = "LuzflA96UQehLHUVYdPDTXs+YuFLEkpzTdO2liGrWtE="; }; dontConfigure = true; From 4f3f62599d3892f496831ad4201cb732002ee1b9 Mon Sep 17 00:00:00 2001 From: Aadi Bajpai Date: Wed, 10 Nov 2021 01:14:30 -0600 Subject: [PATCH 073/140] add fortune as the main program this will make it work with nix run --- pkgs/tools/misc/fortune/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 350e28428d4b..6f77c54e30b4 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { '') ]; meta = with lib; { + mainProgram = "fortune"; description = "A program that displays a pseudorandom message from a database of quotations"; license = licenses.bsdOriginal; platforms = platforms.unix; From c5eef209f23d2df34596a81bffaaec5653843c06 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Tue, 9 Nov 2021 23:16:02 -0800 Subject: [PATCH 074/140] ocamlPackages.yuscii: fix tests on macOS --- pkgs/development/ocaml-modules/yuscii/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/yuscii/default.nix b/pkgs/development/ocaml-modules/yuscii/default.nix index 6e1fbd9a8747..9d7b5d3c4d6b 100644 --- a/pkgs/development/ocaml-modules/yuscii/default.nix +++ b/pkgs/development/ocaml-modules/yuscii/default.nix @@ -1,6 +1,7 @@ { alcotest , buildDunePackage , fetchzip +, gcc , fmt , lib , uutf @@ -18,6 +19,7 @@ buildDunePackage rec { useDune2 = true; checkInputs = [ + gcc alcotest fmt uutf From 06d11b099ea533e531f1df9446a55c9d954c19d1 Mon Sep 17 00:00:00 2001 From: Diffumist Date: Wed, 10 Nov 2021 16:27:32 +0800 Subject: [PATCH 075/140] nali: init at 0.3.2 --- pkgs/applications/networking/nali/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/networking/nali/default.nix diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix new file mode 100644 index 000000000000..9e0978c80d6e --- /dev/null +++ b/pkgs/applications/networking/nali/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "nali"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "zu1k"; + repo = "nali"; + rev = "v${version}"; + sha256 = "sha256-iRLoUBA+Kzv1/LZQ8HCvR79K1riYErxEWhB0OmvFy2g="; + }; + + vendorSha256 = "sha256-Kb2T+zDUuH+Rx8amYsTIhR5L3DIx5nGcDGqxHOn90NU="; + subPackages = [ "." ]; + runVend = true; + + meta = with lib; { + description = "An offline tool for querying IP geographic information and CDN provider"; + homepage = "https://github.com/zu1k/nali"; + license = licenses.mit; + maintainers = with maintainers; [ diffumist ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20aee3ff0962..548d6e3cefc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26709,6 +26709,8 @@ with pkgs; nload = callPackage ../applications/networking/nload { }; + nali = callPackage ../applications/networking/nali { }; + normalize = callPackage ../applications/audio/normalize { }; mailspring = callPackage ../applications/networking/mailreaders/mailspring {}; From 95b2f5d40b25544aa736b6ecbe7552e564ab0532 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 09:57:05 +0100 Subject: [PATCH 076/140] python3Packages.peewee: 3.14.4 -> 3.14.8 --- .../python-modules/peewee/default.nix | 58 +++++++++++-------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index fd057d24d31e..852ba5ffbcb7 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -1,50 +1,58 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, sqlite -, cython , apsw +, buildPythonPackage +, cython +, fetchFromGitHub , flask -, withPostgres ? false, psycopg2 -, withMysql ? false, mysql-connector +, python +, sqlite +, withMysql ? false +, mysql-connector +, withPostgres ? false +, psycopg2 }: buildPythonPackage rec { - pname = "peewee"; - version = "3.14.4"; + version = "3.14.8"; + format = "setuptools"; - # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "0x85swpaffysc05kka0mab87cnilzw1lpacfhcx5ayabh0i2qsh6"; + sha256 = "sha256-BJSM+7+VdW6SxN4/AXsX8NhQPdIFoYrVRVwR9OsJ3QE="; }; - - checkInputs = [ flask ]; - - checkPhase = '' - rm -r playhouse # avoid using the folder in the cwd - python runtests.py - ''; - buildInputs = [ sqlite - cython # compile speedups + cython ]; propagatedBuildInputs = [ - apsw # sqlite performance improvement - ] ++ (lib.optional withPostgres psycopg2) - ++ (lib.optional withMysql mysql-connector); + apsw + ] ++ lib.optional withPostgres psycopg2 + ++ lib.optional withMysql mysql-connector; + + checkInputs = [ + flask + ]; doCheck = withPostgres; + checkPhase = '' + rm -r playhouse # avoid using the folder in the cwd + ${python.interpreter} runtests.py + ''; + + pythonImportsCheck = [ + "peewee" + ]; + meta = with lib; { - description = "a small, expressive orm"; - homepage = "http://peewee-orm.com"; - license = licenses.mit; + description = "Python ORM with support for various database implementation"; + homepage = "http://peewee-orm.com"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 260a145cc5ab1dc62ee695e7837a07f7f60b6404 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 09:59:15 +0100 Subject: [PATCH 077/140] gdu: 5.9.0 -> 5.10.0 --- pkgs/tools/system/gdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 43d08b119656..730a5d6cd238 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.9.0"; + version = "5.10.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bJvIm2ZmbfSI+RtaBYlUYVVF7Q7vKwtKMCUC8tS8ZOI="; + sha256 = "sha256-JXjlK/XTIJeJj8do7JsoZQ8kE+bgy6czXAam/cj7IQo="; }; vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac"; From 951e23dddd4e22c45b1b65db91398acccc91729f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 10:04:07 +0100 Subject: [PATCH 078/140] kubescape: 1.0.128 -> 1.0.130 --- pkgs/tools/security/kubescape/default.nix | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 5a8e50c7096f..a191ea300470 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -1,20 +1,31 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "kubescape"; - version = "1.0.128"; + version = "1.0.130"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fHXT9vg7uenFDjYmdPkMu63dlmyIATEBCxOn39c80cg="; + sha256 = "sha256-NZqIqqDusfWMDLVtcdFAVOuIGMxr+I2xnNB3ckBI/cY="; }; + + nativeBuildInputs = [ + installShellFiles + ]; + vendorSha256 = "sha256-cOxjsujlpRbdw4098eMHe2oNAJXWGjKbPeYpKt0DCp8="; - ldflags = [ "-s" "-w" "-X github.com/armosec/kubescape/clihandler/cmd.BuildNumber=v${version}" ]; - - nativeBuildInputs = [ installShellFiles ]; + ldflags = [ + "-s" + "-w" + "-X github.com/armosec/kubescape/clihandler/cmd.BuildNumber=v${version}" + ]; postInstall = '' # Running kubescape to generate completions outputs error warnings From d60b95168e471178e7c7bb23f9c959e02d7330a2 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 10 Nov 2021 10:05:46 +0100 Subject: [PATCH 079/140] openttd: 12.0 -> 12.1 --- pkgs/games/openttd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 8953ff94e16c..3219ec50760d 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -11,8 +11,8 @@ let }; opensfx = fetchzip { - url = "https://cdn.openttd.org/opensfx-releases/1.0.2/opensfx-1.0.2-all.zip"; - sha256 = "sha256-yRCb49/k8uUUAe9VzUG0LQaBDFP7n9QdrLSJDIthdbA="; + url = "https://cdn.openttd.org/opensfx-releases/1.0.3/opensfx-1.0.3-all.zip"; + sha256 = "sha256-QmfXizrRTu/fUcVOY7tCndv4t4BVW+fb0yUi8LgSYzM="; }; openmsx = fetchzip { @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "12.0"; + version = "12.1"; src = fetchurl { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - sha256 = "sha256-u6D9OADfA3AlnmQtJR82LHwAtHii41Mfa6f4TBwrMtw="; + sha256 = "sha256-JYv1uZgwEIkLoQUYtQa8SrgPfAjM7FlJfpulWkqj5+M="; }; nativeBuildInputs = [ cmake makeWrapper ]; From cc29da0bc31bf667d140743c3d9c9b854251ed58 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 3 Nov 2021 15:47:03 +0100 Subject: [PATCH 080/140] ocamlPackages.ppx_cstubs: use default version of ppxlib --- pkgs/development/ocaml-modules/ppx_cstubs/default.nix | 2 ++ pkgs/top-level/ocaml-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index 6ad6c4cd8985..935d67f70845 100644 --- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -15,6 +15,8 @@ buildDunePackage rec { pname = "ppx_cstubs"; version = "0.6.1.2"; + minimalOCamlVersion = "4.08"; + useDune2 = true; src = fetchFromGitHub { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 87d6f4619bb7..1648f83aa000 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1152,9 +1152,7 @@ let ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix { }; - ppx_cstubs = callPackage ../development/ocaml-modules/ppx_cstubs { - ppxlib = ppxlib.override { version = "0.22.0"; }; - }; + ppx_cstubs = callPackage ../development/ocaml-modules/ppx_cstubs { }; ppx_derivers = callPackage ../development/ocaml-modules/ppx_derivers {}; From 93efc8846c0036ddc615ade13009d88428c893e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 10:08:08 +0100 Subject: [PATCH 081/140] python3Packages.vt-py: 0.7.6 -> 0.8.0 --- pkgs/development/python-modules/vt-py/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index 1542a447a1bc..fcd2c2452fe6 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,8 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.7.6"; + version = "0.8.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-Gf3hNCXioaLiQ0fZWPe9PO2YQeId4ZLmWsSZ5WvjSk0="; + sha256 = "sha256-j9TlZDzl9sWFPt8TeuyoJi01JhyPBVXs1w3YJMoVvLw="; }; propagatedBuildInputs = [ @@ -36,7 +37,9 @@ buildPythonPackage rec { --replace "'pytest-runner'" "" ''; - pythonImportsCheck = [ "vt" ]; + pythonImportsCheck = [ + "vt" + ]; meta = with lib; { description = "Python client library for VirusTotal"; From ed15fa0a4a1de78ffb12c2d77c76f7b8a63cefb2 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 10 Nov 2021 10:08:10 +0100 Subject: [PATCH 082/140] openttd-jgrpp: 0.43.1 -> 0.44.0 --- pkgs/games/openttd/jgrpp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index 280665389598..19f50ab780e3 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -2,12 +2,12 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.43.1"; + version = "0.44.0"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - sha256 = "sha256-nCZ3UN2BdpDGbW0CKX/ijxlA3cQ7FPflajQ5TBM1Hdk="; + sha256 = "sha256-/kqwMZGXUYWlCnjk6uShJ5UARtvBSZWPExVel5o4xA8="; }; }) From bcea841e10e134d5969b8816d032fd6cd1edd6b8 Mon Sep 17 00:00:00 2001 From: Bela Stoyan Date: Wed, 10 Nov 2021 10:10:47 +0100 Subject: [PATCH 083/140] vscode-extensions.valentjn.vscode-ltex: init at 13.0.0 (#145001) Co-authored-by: be7a Co-authored-by: Sandro --- pkgs/misc/vscode-extensions/default.nix | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 10fe88c06f11..2da7d23e0af0 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,6 +1,7 @@ { config , lib , buildEnv +, fetchurl , callPackage , vscode-utils , asciidoctor @@ -1609,6 +1610,34 @@ let vadimcn.vscode-lldb = callPackage ./vscode-lldb { }; + valentjn.vscode-ltex = vscode-utils.buildVscodeMarketplaceExtension rec { + mktplcRef = { + name = "vscode-ltex"; + publisher = "valentjn"; + version = "13.0.0"; + }; + + vsix = fetchurl { + name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; + url = "https://github.com/valentjn/vscode-ltex/releases/download/${mktplcRef.version}/vscode-ltex-${mktplcRef.version}-offline-linux-x64.vsix"; + sha256 = "6db4846dee4e394f7bcfb7e29520d45d6bc1534482ba73cf40cd5edf3f6ec266"; + }; + + nativeBuildInputs = [ jq moreutils ]; + + buildInputs = [ jdk ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."ltex.java.path".default = "${jdk}"' package.json | sponge package.json + ''; + + meta = with lib; { + license = licenses.mpl20; + maintainers = [ maintainers._0xbe7a ]; + }; + }; + viktorqvarfordt.vscode-pitch-black-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pitch-black-theme"; From f9817ccd57d0da836cb88fb5645d09ff904669b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 10:24:07 +0100 Subject: [PATCH 084/140] ioccheck: remove constraint of vt-py --- pkgs/tools/security/ioccheck/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/tools/security/ioccheck/default.nix index 1ad7bfd85fe2..455819ed1cf7 100644 --- a/pkgs/tools/security/ioccheck/default.nix +++ b/pkgs/tools/security/ioccheck/default.nix @@ -8,8 +8,6 @@ python3.pkgs.buildPythonApplication rec { version = "unstable-2021-09-29"; format = "pyproject"; - disabled = python3.pythonOlder "3.7"; - src = fetchFromGitHub { owner = "ranguli"; repo = pname; @@ -43,10 +41,13 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # Can be removed with the next release substituteInPlace pyproject.toml \ - --replace '"hurry.filesize" = "^0.9"' "" + --replace '"hurry.filesize" = "^0.9"' "" \ + --replace 'vt-py = ">=0.6.1,<0.8.0"' 'vt-py = ">=0.6.1"' ''; - pythonImportsCheck = [ "ioccheck" ]; + pythonImportsCheck = [ + "ioccheck" + ]; meta = with lib; { description = "Tool for researching IOCs"; From ab2f3c2ede9bf15f7ce1f4535bd72126a72b35f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 10:28:00 +0100 Subject: [PATCH 085/140] python3Packages.cachetools: 4.2.3 -> 4.2.4 --- pkgs/development/python-modules/cachetools/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 21529174eb2d..1bff572b6032 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -7,7 +7,8 @@ buildPythonPackage rec { pname = "cachetools"; - version = "4.2.3"; + version = "4.2.4"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,14 +16,16 @@ buildPythonPackage rec { owner = "tkem"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9CHXvb+Nn3N2oWHwNbqKguzDO/q+4EnMZ50+E+MWS/A="; + sha256 = "sha256-doPLl7Ooc2cKlTiS/dqLTKSkTlSgPFztIumAzciM0bc="; }; checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "cachetools" ]; + pythonImportsCheck = [ + "cachetools" + ]; meta = with lib; { description = "Extensible memoizing collections and decorators"; From b79219bf390ad1de1e801c4b33f3af48e9cb633b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 10:32:42 +0100 Subject: [PATCH 086/140] python3Packages.crownstone-cloud: 1.4.8 -> 1.4.9 --- .../python-modules/crownstone-cloud/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix index 882f7d95df57..8b02eaa58961 100644 --- a/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "crownstone-cloud"; - version = "1.4.8"; + version = "1.4.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "crownstone"; repo = "crownstone-lib-python-cloud"; rev = version; - sha256 = "sha256-iHn4g52/QM0TS/flKkcFrX6IFrCjiXUxcjVLHNg6tVo="; + sha256 = "sha256-CS1zeQiWPnsGCWixCsN9sz08mPORW5sVqIpSFPh0Qt0="; }; propagatedBuildInputs = [ @@ -32,11 +32,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # https://github.com/crownstone/crownstone-lib-python-cloud/issues/1 - "test_data_structure" - ]; - postPatch = '' sed -i '/codecov/d' requirements.txt ''; From 79643f831962640561159ba042039946e1bafb45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 10:38:09 +0100 Subject: [PATCH 087/140] python3Packages.mypy-boto3-s3: 1.20.0 -> 1.20.1 --- 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 d38c4a557876..c45ccaca013d 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.20.0"; + version = "1.20.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lCl3euh9o1MLQV1+DZiAh0h26CHauzjNNJPvtaRtHl8="; + sha256 = "sha256-RnWlDiXol074gikg8i449rx4ENG7Ac7kz9lMi12rkuw="; }; propagatedBuildInputs = [ From 0c3d1e841db8c4be791b28453b5db9ce9fb512f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 10:41:16 +0100 Subject: [PATCH 088/140] python3Packages.identify: 2.3.3 -> 2.3.5 --- 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 eb335d886e2c..926f84798ad0 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "identify"; - version = "2.3.3"; + version = "2.3.5"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mGTSl/aOPQpqFq5dqVDia/7NofO9Tz0N8nYXU2Pyi0c="; + sha256 = "sha256-XEwZ6OUEocE4dSDLCLagKqmJruvb9beC0u93SScrOho="; }; checkInputs = [ From 4436d1f6a2428aab75c099b0bc57ec98b17f6ee0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 10 Nov 2021 09:42:50 +0000 Subject: [PATCH 089/140] hstr: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: hstr.c:743:44: error: format not a string literal and no format arguments [-Werror=format-security] 743 | mvprintw(hstr->promptYNotification, 0, screenLine); | ^~~~~~~~~~ --- pkgs/applications/misc/hstr/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 3cda6d0a3181..888c7892514b 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, readline, ncurses +{ lib, stdenv, fetchFromGitHub, fetchpatch, readline, ncurses , autoreconfHook, pkg-config, gettext }: stdenv.mkDerivation rec { @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y"; }; + patches = [ + # pull pending upstream inclusion fix for ncurses-6.3: + # https://github.com/dvorka/hstr/pull/435 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/dvorka/hstr/commit/7fbd852c464ae3cfcd2f4fed9c62a21fb84c5439.patch"; + sha256 = "15f0ja4bsh4jnchcg0ray8ijpdraag7k07ss87a6ymfs1rg6i0jr"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ readline ncurses gettext ]; From 6e50a3fee360c621d33724736270c34d1e697fc7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 10:43:49 +0100 Subject: [PATCH 090/140] python3Packages.pycfdns: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/pycfdns/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pycfdns/default.nix b/pkgs/development/python-modules/pycfdns/default.nix index ca0b0fe5ecf0..7a4ae1cf7fa4 100644 --- a/pkgs/development/python-modules/pycfdns/default.nix +++ b/pkgs/development/python-modules/pycfdns/default.nix @@ -7,13 +7,14 @@ buildPythonPackage rec { pname = "pycfdns"; - version = "1.2.1"; + version = "1.2.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "0df4695cb0h6f2lnn6dx4h5al2ra93zp1hzfaz07nj2gvirswp83"; + sha256 = "sha256-bsalfZEkZrBG0/SyEXCWOZyrhOYU/3YJR/78FQTpXYk="; }; propagatedBuildInputs = [ @@ -23,7 +24,10 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pycfdns" ]; + + pythonImportsCheck = [ + "pycfdns" + ]; meta = with lib; { description = "Python module for updating Cloudflare DNS A records"; From 4225cf39035bf79f13b0c3df47f53ccab42a3c4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 10:59:39 +0100 Subject: [PATCH 091/140] python3Packages.pyiqvia: 1.1.0 -> 2021.10.0 --- .../python-modules/pyiqvia/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index 89df38b80c50..7f72c226dd82 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "1.1.0"; + version = "2021.10.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-uDcBpPHh+wQHI2vGjnumwVGt5ZOreVq+L3kOam97uW4="; + sha256 = "sha256-FCavSy33fkXlboRAmGr0BkEkXLTOzsyGXQkws0LqiJk="; }; nativeBuildInputs = [ @@ -41,10 +41,14 @@ buildPythonPackage rec { pytestCheckHook ]; - # Ignore the examples as they are prefixed with test_ - disabledTestPaths = [ "examples/" ]; + disabledTestPaths = [ + # Ignore the examples as they are prefixed with test_ + "examples/" + ]; - pythonImportsCheck = [ "pyiqvia" ]; + pythonImportsCheck = [ + "pyiqvia" + ]; meta = with lib; { description = "Python3 API for IQVIA data"; From 36ca19848ccbcf78a229830b787743f91c7df3e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 10 Nov 2021 11:02:11 +0100 Subject: [PATCH 092/140] mosh: minor formatting, add SuperSandor2000 as maintainer --- pkgs/tools/networking/mosh/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 00746a7afbd2..e87b550aa6fe 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { # Fix build with bash-completion 2.10 ./bash_completion_datadir.patch ]; + postPatch = '' # Fix build with Xcode 12.5 toolchain/case-insensitive filesystems # Backport of https://github.com/mobile-shell/mosh/commit/12199114fe4234f791ef4c306163901643b40538; @@ -40,12 +41,12 @@ stdenv.mkDerivation rec { }} substituteInPlace scripts/mosh.pl \ - --subst-var-by ssh "${openssh}/bin/ssh" - substituteInPlace scripts/mosh.pl \ - --subst-var-by mosh-client "$out/bin/mosh-client" + --subst-var-by ssh "${openssh}/bin/ssh" \ + --subst-var-by mosh-client "$out/bin/mosh-client" ''; - configureFlags = [ "--enable-completion" ] ++ lib.optional withUtempter "--with-utempter"; + configureFlags = [ "--enable-completion" ] + ++ lib.optional withUtempter "--with-utempter"; postInstall = '' wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { especially over Wi-Fi, cellular, and long-distance links. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ viric SuperSandro2000 ]; platforms = platforms.unix; }; } From 7148439d8965c3c7c9ed5b9ee0d329743b0df33c Mon Sep 17 00:00:00 2001 From: Diffumist Date: Wed, 10 Nov 2021 18:02:17 +0800 Subject: [PATCH 093/140] netease-cloud-music-gtk: init at 1.2.2 --- .../netease-cloud-music-gtk/cargo-lock.patch | 2007 +++++++++++++++++ .../audio/netease-cloud-music-gtk/default.nix | 61 + .../update-cargo-lock.sh | 20 + pkgs/top-level/all-packages.nix | 2 + 4 files changed, 2090 insertions(+) create mode 100644 pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch create mode 100644 pkgs/applications/audio/netease-cloud-music-gtk/default.nix create mode 100755 pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch b/pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch new file mode 100644 index 000000000000..7fc21c11ff7c --- /dev/null +++ b/pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch @@ -0,0 +1,2007 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..41d41a5 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,2001 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.45" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7" ++ ++[[package]] ++name = "async-channel" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" ++dependencies = [ ++ "concurrent-queue", ++ "event-listener", ++ "futures-core", ++] ++ ++[[package]] ++name = "async-executor" ++version = "1.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" ++dependencies = [ ++ "async-task", ++ "concurrent-queue", ++ "fastrand", ++ "futures-lite", ++ "once_cell", ++ "slab", ++] ++ ++[[package]] ++name = "async-global-executor" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6" ++dependencies = [ ++ "async-channel", ++ "async-executor", ++ "async-io", ++ "async-mutex", ++ "blocking", ++ "futures-lite", ++ "num_cpus", ++ "once_cell", ++] ++ ++[[package]] ++name = "async-io" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" ++dependencies = [ ++ "concurrent-queue", ++ "futures-lite", ++ "libc", ++ "log", ++ "once_cell", ++ "parking", ++ "polling", ++ "slab", ++ "socket2", ++ "waker-fn", ++ "winapi", ++] ++ ++[[package]] ++name = "async-lock" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" ++dependencies = [ ++ "event-listener", ++] ++ ++[[package]] ++name = "async-mutex" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" ++dependencies = [ ++ "event-listener", ++] ++ ++[[package]] ++name = "async-std" ++version = "1.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952" ++dependencies = [ ++ "async-channel", ++ "async-global-executor", ++ "async-io", ++ "async-lock", ++ "crossbeam-utils", ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-lite", ++ "gloo-timers", ++ "kv-log-macro", ++ "log", ++ "memchr", ++ "num_cpus", ++ "once_cell", ++ "pin-project-lite", ++ "pin-utils", ++ "slab", ++ "wasm-bindgen-futures", ++] ++ ++[[package]] ++name = "async-task" ++version = "4.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" ++ ++[[package]] ++name = "atk" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "812b4911e210bd51b24596244523c856ca749e6223c50a7fbbba3f89ee37c426" ++dependencies = [ ++ "atk-sys", ++ "bitflags", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++] ++ ++[[package]] ++name = "atk-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f530e4af131d94cc4fa15c5c9d0348f0ef28bac64ba660b6b2a1cf2605dedfce" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "atomic-waker" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "base64" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++ ++[[package]] ++name = "bincode" ++version = "1.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "blocking" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" ++dependencies = [ ++ "async-channel", ++ "async-task", ++ "atomic-waker", ++ "fastrand", ++ "futures-lite", ++ "once_cell", ++] ++ ++[[package]] ++name = "bumpalo" ++version = "3.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" ++ ++[[package]] ++name = "bytes" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" ++ ++[[package]] ++name = "cache-padded" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" ++ ++[[package]] ++name = "cairo-rs" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c5c0f2e047e8ca53d0ff249c54ae047931d7a6ebe05d00af73e0ffeb6e34bdb8" ++dependencies = [ ++ "bitflags", ++ "cairo-sys-rs", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "thiserror", ++] ++ ++[[package]] ++name = "cairo-sys-rs" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ed2639b9ad5f1d6efa76de95558e11339e7318426d84ac4890b86c03e828ca7" ++dependencies = [ ++ "glib-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "castaway" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ed247d1586918e46f2bbe0f13b06498db8dab5a8c1093f156652e9f2e0a73fc3" ++ ++[[package]] ++name = "cc" ++version = "1.0.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "chrono" ++version = "0.4.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" ++dependencies = [ ++ "libc", ++ "num-integer", ++ "num-traits", ++ "time", ++ "winapi", ++] ++ ++[[package]] ++name = "concurrent-queue" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" ++dependencies = [ ++ "cache-padded", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" ++dependencies = [ ++ "cfg-if", ++ "lazy_static", ++] ++ ++[[package]] ++name = "ctor" ++version = "0.1.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" ++dependencies = [ ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "curl" ++version = "0.4.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "877cc2f9b8367e32b6dabb9d581557e651cb3aa693a37f8679091bbf42687d5d" ++dependencies = [ ++ "curl-sys", ++ "libc", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "socket2", ++ "winapi", ++] ++ ++[[package]] ++name = "curl-sys" ++version = "0.4.50+curl-7.79.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4856b76919dd599f31236bb18db5f5bd36e2ce131e64f857ca5c259665b76171" ++dependencies = [ ++ "cc", ++ "libc", ++ "libnghttp2-sys", ++ "libz-sys", ++ "openssl-sys", ++ "pkg-config", ++ "vcpkg", ++ "winapi", ++] ++ ++[[package]] ++name = "custom_error" ++version = "1.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f8a51dd197fa6ba5b4dc98a990a43cc13693c23eb0089ebb0fcc1f04152bca6" ++ ++[[package]] ++name = "dbus" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819" ++dependencies = [ ++ "libc", ++ "libdbus-sys", ++] ++ ++[[package]] ++name = "dirs" ++version = "3.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" ++dependencies = [ ++ "dirs-sys", ++] ++ ++[[package]] ++name = "dirs" ++version = "4.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" ++dependencies = [ ++ "dirs-sys", ++] ++ ++[[package]] ++name = "dirs-sys" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" ++dependencies = [ ++ "libc", ++ "redox_users", ++ "winapi", ++] ++ ++[[package]] ++name = "either" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++ ++[[package]] ++name = "encoding_rs" ++version = "0.8.29" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "event-listener" ++version = "2.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" ++ ++[[package]] ++name = "fastrand" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" ++dependencies = [ ++ "instant", ++] ++ ++[[package]] ++name = "fnv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++dependencies = [ ++ "foreign-types-shared", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ ++[[package]] ++name = "form_urlencoded" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" ++dependencies = [ ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "fragile" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" ++ ++[[package]] ++name = "futures" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-io", ++ "futures-sink", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-channel" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" ++dependencies = [ ++ "futures-core", ++ "futures-sink", ++] ++ ++[[package]] ++name = "futures-core" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" ++ ++[[package]] ++name = "futures-executor" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" ++dependencies = [ ++ "futures-core", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-io" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" ++ ++[[package]] ++name = "futures-lite" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" ++dependencies = [ ++ "fastrand", ++ "futures-core", ++ "futures-io", ++ "memchr", ++ "parking", ++ "pin-project-lite", ++ "waker-fn", ++] ++ ++[[package]] ++name = "futures-macro" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" ++dependencies = [ ++ "autocfg", ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "futures-sink" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" ++ ++[[package]] ++name = "futures-task" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" ++ ++[[package]] ++name = "futures-util" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" ++dependencies = [ ++ "autocfg", ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-macro", ++ "futures-sink", ++ "futures-task", ++ "memchr", ++ "pin-project-lite", ++ "pin-utils", ++ "proc-macro-hack", ++ "proc-macro-nested", ++ "slab", ++] ++ ++[[package]] ++name = "gdk" ++version = "0.13.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db00839b2a68a7a10af3fa28dfb3febaba3a20c3a9ac2425a33b7df1f84a6b7d" ++dependencies = [ ++ "bitflags", ++ "cairo-rs", ++ "cairo-sys-rs", ++ "gdk-pixbuf", ++ "gdk-sys", ++ "gio", ++ "gio-sys", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "pango", ++] ++ ++[[package]] ++name = "gdk-pixbuf" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f6dae3cb99dd49b758b88f0132f8d401108e63ae8edd45f432d42cdff99998a" ++dependencies = [ ++ "gdk-pixbuf-sys", ++ "gio", ++ "gio-sys", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++] ++ ++[[package]] ++name = "gdk-pixbuf-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3bfe468a7f43e97b8d193a762b6c5cf67a7d36cacbc0b9291dbcae24bfea1e8f" ++dependencies = [ ++ "gio-sys", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gdk-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a9653cfc500fd268015b1ac055ddbc3df7a5c9ea3f4ccef147b3957bd140d69" ++dependencies = [ ++ "cairo-sys-rs", ++ "gdk-pixbuf-sys", ++ "gio-sys", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "pango-sys", ++ "pkg-config", ++ "system-deps", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "gio" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1fb60242bfff700772dae5d9e3a1f7aa2e4ebccf18b89662a16acb2822568561" ++dependencies = [ ++ "bitflags", ++ "futures", ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-util", ++ "gio-sys", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "once_cell", ++ "thiserror", ++] ++ ++[[package]] ++name = "gio-sys" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e24fb752f8f5d2cf6bbc2c606fd2bc989c81c5e2fe321ab974d54f8b6344eac" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++ "winapi", ++] ++ ++[[package]] ++name = "glib" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" ++dependencies = [ ++ "bitflags", ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-task", ++ "futures-util", ++ "glib-macros", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "once_cell", ++] ++ ++[[package]] ++name = "glib-macros" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" ++dependencies = [ ++ "anyhow", ++ "heck", ++ "itertools", ++ "proc-macro-crate", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "glib-sys" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" ++dependencies = [ ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gloo-timers" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", ++] ++ ++[[package]] ++name = "gobject-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c" ++dependencies = [ ++ "glib-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gstreamer" ++version = "0.16.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ff5d0f7ff308ae37e6eb47b6ded17785bdea06e438a708cd09e0288c1862f33" ++dependencies = [ ++ "bitflags", ++ "cfg-if", ++ "futures-channel", ++ "futures-core", ++ "futures-util", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer-sys", ++ "libc", ++ "muldiv", ++ "num-rational 0.3.2", ++ "once_cell", ++ "paste", ++ "pretty-hex", ++ "thiserror", ++] ++ ++[[package]] ++name = "gstreamer-base" ++version = "0.16.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bafd01c56f59cb10f4b5a10f97bb4bdf8c2b2784ae5b04da7e2d400cf6e6afcf" ++dependencies = [ ++ "bitflags", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer", ++ "gstreamer-base-sys", ++ "gstreamer-sys", ++ "libc", ++] ++ ++[[package]] ++name = "gstreamer-base-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4b7b6dc2d6e160a1ae28612f602bd500b3fa474ce90bf6bb2f08072682beef5" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gstreamer-player" ++version = "0.16.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34edf65e48e0d29c18101d77a2e004488a61f81a852a75e19d9c73e03d35cb77" ++dependencies = [ ++ "bitflags", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer", ++ "gstreamer-player-sys", ++ "gstreamer-sys", ++ "gstreamer-video", ++ "libc", ++] ++ ++[[package]] ++name = "gstreamer-player-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "53aaf79503e691a32266670bc631edb6c52bdb854984da76a0ce2756f49584a2" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer-sys", ++ "gstreamer-video-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gstreamer-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc1f154082d01af5718c5f8a8eb4f565a4ea5586ad8833a8fc2c2aa6844b601d" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gstreamer-video" ++version = "0.16.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7bbb1485d87469849ec45c08e03c2f280d3ea20ff3c439d03185be54e3ce98e" ++dependencies = [ ++ "bitflags", ++ "futures-channel", ++ "futures-util", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer", ++ "gstreamer-base", ++ "gstreamer-base-sys", ++ "gstreamer-sys", ++ "gstreamer-video-sys", ++ "libc", ++ "once_cell", ++] ++ ++[[package]] ++name = "gstreamer-video-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92347e46438007d6a2386302125f62cb9df6769cdacb931af5c0f12c1ee21de4" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer-base-sys", ++ "gstreamer-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gtk" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2f022f2054072b3af07666341984562c8e626a79daa8be27b955d12d06a5ad6a" ++dependencies = [ ++ "atk", ++ "bitflags", ++ "cairo-rs", ++ "cairo-sys-rs", ++ "cc", ++ "gdk", ++ "gdk-pixbuf", ++ "gdk-pixbuf-sys", ++ "gdk-sys", ++ "gio", ++ "gio-sys", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gtk-sys", ++ "libc", ++ "once_cell", ++ "pango", ++ "pango-sys", ++ "pkg-config", ++] ++ ++[[package]] ++name = "gtk-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "89acda6f084863307d948ba64a4b1ef674e8527dddab147ee4cdcc194c880457" ++dependencies = [ ++ "atk-sys", ++ "cairo-sys-rs", ++ "gdk-pixbuf-sys", ++ "gdk-sys", ++ "gio-sys", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "pango-sys", ++ "system-deps", ++] ++ ++[[package]] ++name = "heck" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" ++dependencies = [ ++ "unicode-segmentation", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "hex" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" ++ ++[[package]] ++name = "http" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" ++dependencies = [ ++ "bytes", ++ "fnv", ++ "itoa", ++] ++ ++[[package]] ++name = "idna" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" ++dependencies = [ ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "isahc" ++version = "1.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "40ef5402b1791c9fc479ef9871601a2f10e4cc0f14414a5c9c6e043fb51e5a56" ++dependencies = [ ++ "async-channel", ++ "castaway", ++ "chrono", ++ "crossbeam-utils", ++ "curl", ++ "curl-sys", ++ "encoding_rs", ++ "event-listener", ++ "futures-lite", ++ "http", ++ "log", ++ "mime", ++ "once_cell", ++ "polling", ++ "slab", ++ "sluice", ++ "tracing", ++ "tracing-futures", ++ "url", ++ "waker-fn", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" ++dependencies = [ ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "kv-log-macro" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" ++dependencies = [ ++ "log", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "libc" ++version = "0.2.107" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" ++ ++[[package]] ++name = "libdbus-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" ++dependencies = [ ++ "pkg-config", ++] ++ ++[[package]] ++name = "libnghttp2-sys" ++version = "0.1.7+1.45.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" ++dependencies = [ ++ "cc", ++ "libc", ++] ++ ++[[package]] ++name = "libz-sys" ++version = "1.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" ++dependencies = [ ++ "cfg-if", ++ "value-bag", ++] ++ ++[[package]] ++name = "loggerv" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60d8de15ae71e760bce7f05447f85f73624fe0d3b1e4c5a63ba5d4cb0748d374" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "log", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" ++ ++[[package]] ++name = "memchr" ++version = "2.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" ++ ++[[package]] ++name = "mime" ++version = "0.3.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" ++ ++[[package]] ++name = "mp4ameta" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "619f6fe86b8690efad1c53d2cc8b9c1af2a5f8b93247e0ba05ece1b7639b4e66" ++dependencies = [ ++ "lazy_static", ++ "mp4ameta_proc", ++] ++ ++[[package]] ++name = "mp4ameta_proc" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4975ce203cd69e96a89f803d87b7b53d1950a6e93668a666d177c28aebd15c8a" ++ ++[[package]] ++name = "mpris-player" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f6badd6ebe31be46eb2e2975cf3b34b183bace5f8a8db1d609fefc4d46fbb07" ++dependencies = [ ++ "dbus", ++ "glib", ++] ++ ++[[package]] ++name = "muldiv" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" ++ ++[[package]] ++name = "netease-cloud-music-gtk" ++version = "1.2.2" ++dependencies = [ ++ "async-std", ++ "base64", ++ "bincode", ++ "cairo-rs", ++ "chrono", ++ "custom_error", ++ "dirs 4.0.0", ++ "fragile", ++ "futures", ++ "gdk", ++ "gdk-pixbuf", ++ "gio", ++ "glib", ++ "gstreamer", ++ "gstreamer-player", ++ "gtk", ++ "hex", ++ "isahc", ++ "lazy_static", ++ "log", ++ "loggerv", ++ "mp4ameta", ++ "mpris-player", ++ "num", ++ "openssl", ++ "pango", ++ "rand", ++ "regex", ++ "serde", ++ "serde_json", ++ "urlqstring", ++ "xdg", ++] ++ ++[[package]] ++name = "num" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" ++dependencies = [ ++ "num-bigint", ++ "num-complex", ++ "num-integer", ++ "num-iter", ++ "num-rational 0.4.0", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-bigint" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-complex" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" ++dependencies = [ ++ "num-traits", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" ++dependencies = [ ++ "autocfg", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-iter" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-rational" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-rational" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" ++dependencies = [ ++ "autocfg", ++ "num-bigint", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" ++ ++[[package]] ++name = "openssl" ++version = "0.10.38" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" ++dependencies = [ ++ "bitflags", ++ "cfg-if", ++ "foreign-types", ++ "libc", ++ "once_cell", ++ "openssl-sys", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.70" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6517987b3f8226b5da3661dad65ff7f300cc59fb5ea8333ca191fc65fde3edf" ++dependencies = [ ++ "autocfg", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "pango" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9937068580bebd8ced19975938573803273ccbcbd598c58d4906efd4ac87c438" ++dependencies = [ ++ "bitflags", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "once_cell", ++ "pango-sys", ++] ++ ++[[package]] ++name = "pango-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24d2650c8b62d116c020abd0cea26a4ed96526afda89b1c4ea567131fdefc890" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "parking" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" ++ ++[[package]] ++name = "paste" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" ++ ++[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++ ++[[package]] ++name = "pin-project" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" ++dependencies = [ ++ "pin-project-internal", ++] ++ ++[[package]] ++name = "pin-project-internal" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pin-project-lite" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" ++ ++[[package]] ++name = "pin-utils" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" ++ ++[[package]] ++name = "polling" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92341d779fa34ea8437ef4d82d440d5e1ce3f3ff7f824aa64424cd481f9a1f25" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "log", ++ "wepoll-ffi", ++ "winapi", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" ++ ++[[package]] ++name = "pretty-hex" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" ++ ++[[package]] ++name = "proc-macro-crate" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" ++dependencies = [ ++ "toml", ++] ++ ++[[package]] ++name = "proc-macro-error" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" ++dependencies = [ ++ "proc-macro-error-attr", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-error-attr" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-hack" ++version = "0.5.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" ++ ++[[package]] ++name = "proc-macro-nested" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" ++dependencies = [ ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "redox_users" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" ++dependencies = [ ++ "getrandom", ++ "redox_syscall", ++] ++ ++[[package]] ++name = "regex" ++version = "1.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "schannel" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" ++dependencies = [ ++ "lazy_static", ++ "winapi", ++] ++ ++[[package]] ++name = "serde" ++version = "1.0.130" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.130" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e466864e431129c7e0d3476b92f20458e5879919a0596c6472738d9fa2d342f8" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "slab" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" ++ ++[[package]] ++name = "sluice" ++version = "0.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" ++dependencies = [ ++ "async-channel", ++ "futures-core", ++ "futures-io", ++] ++ ++[[package]] ++name = "socket2" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "strum" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" ++ ++[[package]] ++name = "strum_macros" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" ++dependencies = [ ++ "heck", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.81" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "system-deps" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" ++dependencies = [ ++ "heck", ++ "pkg-config", ++ "strum", ++ "strum_macros", ++ "thiserror", ++ "toml", ++ "version-compare", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "tinyvec" ++version = "1.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" ++dependencies = [ ++ "tinyvec_macros", ++] ++ ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" ++ ++[[package]] ++name = "toml" ++version = "0.5.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "tracing" ++version = "0.1.29" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" ++dependencies = [ ++ "cfg-if", ++ "log", ++ "pin-project-lite", ++ "tracing-attributes", ++ "tracing-core", ++] ++ ++[[package]] ++name = "tracing-attributes" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tracing-core" ++version = "0.1.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" ++dependencies = [ ++ "lazy_static", ++] ++ ++[[package]] ++name = "tracing-futures" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" ++dependencies = [ ++ "pin-project", ++ "tracing", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" ++dependencies = [ ++ "tinyvec", ++] ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" ++ ++[[package]] ++name = "url" ++version = "2.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" ++dependencies = [ ++ "form_urlencoded", ++ "idna", ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "urlqstring" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "25ef3473a06a065718d8ec7cd7acc6a35fc20f836dee7661ad3b64ea3cc2e0cc" ++ ++[[package]] ++name = "value-bag" ++version = "1.0.0-alpha.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" ++dependencies = [ ++ "ctor", ++ "version_check", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" ++ ++[[package]] ++name = "version-compare" ++version = "0.0.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" ++ ++[[package]] ++name = "version_check" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" ++ ++[[package]] ++name = "waker-fn" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" ++ ++[[package]] ++name = "wasi" ++version = "0.10.2+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" ++dependencies = [ ++ "cfg-if", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" ++dependencies = [ ++ "bumpalo", ++ "lazy_static", ++ "log", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-futures" ++version = "0.4.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" ++dependencies = [ ++ "cfg-if", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" ++ ++[[package]] ++name = "web-sys" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "wepoll-ffi" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "xdg" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3a23fe958c70412687039c86f578938b4a0bb50ec788e96bce4d6ab00ddd5803" ++dependencies = [ ++ "dirs 3.0.2", ++] diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix new file mode 100644 index 000000000000..76e1bc3923a8 --- /dev/null +++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, glib +, gtk3 +, curl +, dbus +, openssl +, gst_all_1 +, pkg-config +, rustPlatform +, wrapGAppsHook +, fetchurl +, fetchFromGitHub +, makeDesktopItem +}: +rustPlatform.buildRustPackage rec { + pname = "netease-cloud-music-gtk"; + version = "1.2.2"; + src = fetchFromGitHub { + owner = "gmg137"; + repo = "netease-cloud-music-gtk"; + rev = version; + sha256 = "sha256-42MaylfG5LY+TiYHWQMoh9CiVLShKXSBpMrxdWhujow="; + }; + cargoSha256 = "sha256-A9wIcESdaJwLY4g/QlOxMU5PBB9wjvIzaXBSqeiRJBM="; + cargoPatches = [ ./cargo-lock.patch ]; + + nativeBuildInputs = [ + glib + gtk3 + dbus + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + curl + dbus + openssl + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]); + + postPatch = '' + install -D netease-cloud-music-gtk.desktop $out/share/applications/netease-cloud-music-gtk.desktop + install -D icons/netease-cloud-music-gtk.svg $out/share/icons/hicolor/scalable/apps/netease-cloud-music-gtk.svg + ''; + + meta = with lib; { + description = "netease-cloud-music-gtk is a Rust + GTK based netease cloud music player"; + homepage = "https://github.com/gmg137/netease-cloud-music-gtk"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ diffumist ]; + }; +} diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh b/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh new file mode 100755 index 000000000000..75b04d1e77ca --- /dev/null +++ b/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils ripgrep git cargo + +# Ref: https://github.com/NixOS/nixpkgs/blob/nixos-21.05/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh + +set -eu -vx + +here=$PWD +version=$(cat default.nix | rg '^ version = "' | cut -d '"' -f 2) +checkout=$(mktemp -d) + +git clone -b "$version" --depth=1 https://github.com/gmg137/netease-cloud-music-gtk "$checkout" +cd "$checkout" + +cargo generate-lockfile +git add -f Cargo.lock +git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch + +cd "$here" +rm -rf "$checkout" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20aee3ff0962..12b733ef6ebb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23268,6 +23268,8 @@ with pkgs; netease-music-tui = callPackage ../applications/audio/netease-music-tui { }; + netease-cloud-music-gtk = callPackage ../applications/audio/netease-cloud-music-gtk { }; + nordic = callPackage ../data/themes/nordic { }; inherit (callPackages ../data/fonts/noto-fonts {}) From 379d24e478f4a14cdca4a46f777e07947f10f3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 10 Nov 2021 11:11:42 +0100 Subject: [PATCH 094/140] keychain: cleanup, formatting, add me as maintainer --- pkgs/tools/misc/keychain/default.nix | 45 +++++++++++++++------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 61abb3eee105..826c9d85579c 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg -, perl, procps, gnugrep, gawk, findutils, gnused }: +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, makeWrapper +, coreutils +, openssh +, gnupg +, perl +, procps +, gnugrep +, gawk +, findutils +, gnused +}: stdenv.mkDerivation rec { pname = "keychain"; @@ -12,33 +25,19 @@ stdenv.mkDerivation rec { sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ perl ]; installPhase = '' - mkdir -p $out/{bin,share/man/man1} + mkdir -p $out/bin cp keychain $out/bin/keychain - cp keychain.1 $out/share/man/man1 + installManPage keychain.1 wrapProgram $out/bin/keychain \ - --prefix PATH ":" "${coreutils}/bin" \ - --prefix PATH ":" "${openssh}/bin" \ - --prefix PATH ":" "${gnupg}/bin" \ - --prefix PATH ":" "${gnugrep}/bin" \ - --prefix PATH ":" "${gnused}/bin" \ - --prefix PATH ":" "${findutils}/bin" \ - --prefix PATH ":" "${gawk}/bin" \ - --prefix PATH ":" "${procps}/bin" + --prefix PATH ":" "${lib.makeBinPath [ coreutils findutils gawk gnupg gnugrep gnused openssh procps ]}" \ ''; - meta = { + meta = with lib; { description = "Keychain management tool"; - homepage = "https://www.funtoo.org/Keychain"; - license = lib.licenses.gpl2; - # other platforms are untested (AFAIK) - platforms = - with lib; - platforms.linux ++ platforms.darwin; - maintainers = with lib.maintainers; [ sigma ]; longDescription = '' Keychain helps you to manage SSH and GPG keys in a convenient and secure manner. It acts as a frontend to ssh-agent and ssh-add, but allows you @@ -51,5 +50,9 @@ stdenv.mkDerivation rec { for remote cron jobs to securely "hook in" to a long-running ssh-agent process, allowing your scripts to take advantage of key-based logins. ''; + homepage = "https://www.funtoo.org/Keychain"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ sigma SuperSandro2000 ]; }; } From 03a257e5a34db7dcf56e74a4da121843d5a17799 Mon Sep 17 00:00:00 2001 From: xaverdh Date: Wed, 10 Nov 2021 10:37:56 +0000 Subject: [PATCH 095/140] treewide: quote urls according to rfc 0045 (#145260) Co-authored-by: Sandro --- .../modules/services/web-apps/hledger-web.nix | 2 +- pkgs/applications/audio/freqtweak/default.nix | 2 +- .../audio/kapitonov-plugins-pack/default.nix | 2 +- .../blockchains/whirlpool-gui/default.nix | 2 +- pkgs/applications/misc/smos/default.nix | 2 +- .../networking/cluster/nixops/default.nix | 2 +- pkgs/applications/radio/dsd/default.nix | 2 +- .../machine-learning/starspace/default.nix | 2 +- .../science/physics/xflr5/default.nix | 2 +- .../commitizen/node-packages.nix | 2 +- pkgs/data/fonts/vista-fonts-cht/default.nix | 2 +- .../compilers/gnatboot/default.nix | 4 +- .../coq-modules/serapi/default.nix | 2 +- .../interpreters/jelly/default.nix | 2 +- .../libraries/LAStools/default.nix | 2 +- .../libraries/audio/mbelib/default.nix | 2 +- pkgs/development/libraries/blitz/default.nix | 2 +- .../libraries/libbacktrace/default.nix | 2 +- .../libraries/libsmartcols/default.nix | 2 +- .../libraries/science/math/itpp/default.nix | 2 +- pkgs/development/libraries/sqlite/tools.nix | 2 +- .../quicklisp-to-nix-overrides.nix | 2 +- pkgs/development/misc/msp430/mspds/binary.nix | 2 +- .../development/misc/msp430/mspds/default.nix | 2 +- .../ocaml-modules/genspio/default.nix | 2 +- .../ocaml-modules/hidapi/default.nix | 2 +- .../ocaml-modules/nonstd/default.nix | 2 +- .../ocaml-modules/sosa/default.nix | 2 +- .../ocaml-modules/uecc/default.nix | 2 +- .../python-modules/android-backup/default.nix | 2 +- .../python-modules/gviz-api/default.nix | 2 +- .../python-modules/ifcopenshell/default.nix | 2 +- .../python-modules/python-csxcad/default.nix | 2 +- .../python-modules/pyworld/default.nix | 2 +- .../tensorboard-plugin-profile/default.nix | 2 +- pkgs/development/tools/checkmake/default.nix | 2 +- .../tools/java/dex2jar/default.nix | 2 +- pkgs/servers/pleroma/default.nix | 2 +- pkgs/servers/search/meilisearch/default.nix | 2 +- .../web-apps/bookstack/php-packages.nix | 188 +++++++++--------- pkgs/servers/zigbee2mqtt/default.nix | 2 +- pkgs/servers/zigbee2mqtt/node-packages.nix | 2 +- pkgs/tools/audio/stt/default.nix | 2 +- pkgs/tools/misc/graylog/plugins.nix | 4 +- pkgs/tools/misc/livedl/default.nix | 2 +- .../extra-container/default.nix | 2 +- 46 files changed, 141 insertions(+), 141 deletions(-) diff --git a/nixos/modules/services/web-apps/hledger-web.nix b/nixos/modules/services/web-apps/hledger-web.nix index 9c66589dffd1..4f6a34e6d2fe 100644 --- a/nixos/modules/services/web-apps/hledger-web.nix +++ b/nixos/modules/services/web-apps/hledger-web.nix @@ -118,7 +118,7 @@ in { ++ extraOptions); in { description = "hledger-web - web-app for the hledger accounting tool."; - documentation = [ https://hledger.org/hledger-web.html ]; + documentation = [ "https://hledger.org/hledger-web.html" ]; wantedBy = [ "multi-user.target" ]; after = [ "networking.target" ]; serviceConfig = mkMerge [ diff --git a/pkgs/applications/audio/freqtweak/default.nix b/pkgs/applications/audio/freqtweak/default.nix index 113894a9357d..71bb0f6f05c8 100644 --- a/pkgs/applications/audio/freqtweak/default.nix +++ b/pkgs/applications/audio/freqtweak/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = http://essej.net/freqtweak/; + homepage = "http://essej.net/freqtweak/"; description = "Realtime audio frequency spectral manipulation"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix index 6e5cc0d51916..655fc6a9608c 100644 --- a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix +++ b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Set of LADSPA and LV2 plugins for guitar sound processing"; - homepage = https://github.com/olegkapitonov/Kapitonov-Plugins-Pack; + homepage = "https://github.com/olegkapitonov/Kapitonov-Plugins-Pack"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ magnetophon ]; diff --git a/pkgs/applications/blockchains/whirlpool-gui/default.nix b/pkgs/applications/blockchains/whirlpool-gui/default.nix index 62c7c3b3da47..d36715bd3066 100644 --- a/pkgs/applications/blockchains/whirlpool-gui/default.nix +++ b/pkgs/applications/blockchains/whirlpool-gui/default.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Desktop GUI for Whirlpool by Samourai-Wallet"; - homepage = https://www.samouraiwallet.com/whirlpool; + homepage = "https://www.samouraiwallet.com/whirlpool"; license = licenses.unlicense; maintainers = [ maintainers.offline ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/smos/default.nix b/pkgs/applications/misc/smos/default.nix index aa2f53b5a2c7..1039deb43a11 100644 --- a/pkgs/applications/misc/smos/default.nix +++ b/pkgs/applications/misc/smos/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A comprehensive self-management system"; - homepage = https://smos.online; + homepage = "https://smos.online"; license = licenses.mit; maintainers = with maintainers; [ norfair ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 9eabf0ac1b5d..87c4c2d6b2c8 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -23,7 +23,7 @@ let ''; meta = old.meta // { - homepage = https://github.com/NixOS/nixops; + homepage = "https://github.com/NixOS/nixops"; description = "NixOS cloud provisioning and deployment tool"; maintainers = with lib.maintainers; [ adisbladis aminechikhaoui eelco rob domenkozar ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/applications/radio/dsd/default.nix index 35a3e9f44bb2..46b851ec704e 100644 --- a/pkgs/applications/radio/dsd/default.nix +++ b/pkgs/applications/radio/dsd/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { tap audio and synthesize the decoded speech. Speech synthesis requires mbelib, which is a separate package. ''; - homepage = https://github.com/szechyjs/dsd; + homepage = "https://github.com/szechyjs/dsd"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ andrew-d ]; diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/applications/science/machine-learning/starspace/default.nix index ca7500cd5c35..81e0ccc71d66 100644 --- a/pkgs/applications/science/machine-learning/starspace/default.nix +++ b/pkgs/applications/science/machine-learning/starspace/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "General-purpose neural model for efficient learning of entity embeddings"; - homepage = https://ai.facebook.com/tools/starspace/; + homepage = "https://ai.facebook.com/tools/starspace/"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.mausch ]; diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix index 85e20f38b668..dd3fef5bf26c 100644 --- a/pkgs/applications/science/physics/xflr5/default.nix +++ b/pkgs/applications/science/physics/xflr5/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { meta = with lib; { description = "An analysis tool for airfoils, wings and planes"; - homepage = https://sourceforge.net/projects/xflr5/; + homepage = "https://sourceforge.net/projects/xflr5/"; license = licenses.gpl3; maintainers = [ maintainers.esclear ]; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/commitizen/node-packages.nix b/pkgs/applications/version-management/commitizen/node-packages.nix index 396dedf56fd9..bee45d1727ce 100644 --- a/pkgs/applications/version-management/commitizen/node-packages.nix +++ b/pkgs/applications/version-management/commitizen/node-packages.nix @@ -9061,7 +9061,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Git commit, but play nice with conventions."; - homepage = https://github.com/commitizen/cz-cli; + homepage = "https://github.com/commitizen/cz-cli"; license = "MIT"; }; production = false; diff --git a/pkgs/data/fonts/vista-fonts-cht/default.nix b/pkgs/data/fonts/vista-fonts-cht/default.nix index 264d5a41bf48..78271e2f1e93 100644 --- a/pkgs/data/fonts/vista-fonts-cht/default.nix +++ b/pkgs/data/fonts/vista-fonts-cht/default.nix @@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation { version = "1"; src = fetchurl { - url = https://download.microsoft.com/download/7/6/b/76bd7a77-be02-47f3-8472-fa1de7eda62f/VistaFont_CHT.EXE; + url = "https://download.microsoft.com/download/7/6/b/76bd7a77-be02-47f3-8472-fa1de7eda62f/VistaFont_CHT.EXE"; sha256 = "sha256-fSnbbxlMPzbhFSQyKxQaS5paiWji8njK7tS8Eppsj6g="; }; diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index c68c4fd4ba03..a23398d2e19d 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation { src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2; + url = "mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2"; sha256 = "0665zk71598204bf521vw68i5y6ccqarq9fcxsqp7ccgycb4lysr"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2; + url = "mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2"; sha256 = "1li4d52lmbnfs6llcshlbqyik2q2q4bvpir0f7n38nagp0h6j0d4"; } else diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index 01954dff6554..f70cdcc9322a 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -57,7 +57,7 @@ in ''; meta = with lib; { - homepage = https://github.com/ejgallego/coq-serapi; + homepage = "https://github.com/ejgallego/coq-serapi"; description = "SerAPI is a library for machine-to-machine interaction with the Coq proof assistant"; license = licenses.lgpl21Plus; maintainers = [ maintainers.Zimmi48 ]; diff --git a/pkgs/development/interpreters/jelly/default.nix b/pkgs/development/interpreters/jelly/default.nix index a317f35d2a78..46c27e91a02a 100644 --- a/pkgs/development/interpreters/jelly/default.nix +++ b/pkgs/development/interpreters/jelly/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication { meta = with lib; { description = "A recreational programming language inspired by J"; - homepage = https://github.com/DennisMitchell/jellylanguage; + homepage = "https://github.com/DennisMitchell/jellylanguage"; license = licenses.mit; maintainers = [ maintainers.tckmn ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix index 61a39aa8e76d..f9f3b09ba0ac 100644 --- a/pkgs/development/libraries/LAStools/default.nix +++ b/pkgs/development/libraries/LAStools/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software for rapid LiDAR processing"; - homepage = http://lastools.org/; + homepage = "http://lastools.org/"; license = licenses.unfree; maintainers = with maintainers; [ stephenwithph ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/development/libraries/audio/mbelib/default.nix index f13f6d7063cb..dc01027c4693 100644 --- a/pkgs/development/libraries/audio/mbelib/default.nix +++ b/pkgs/development/libraries/audio/mbelib/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "P25 Phase 1 and ProVoice vocoder"; - homepage = https://github.com/szechyjs/mbelib; + homepage = "https://github.com/szechyjs/mbelib"; license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ andrew-d ]; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index f47b051caadf..0b06bfd64834 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast multi-dimensional array library for C++"; - homepage = https://sourceforge.net/projects/blitz/; + homepage = "https://sourceforge.net/projects/blitz/"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = with maintainers; [ ToxicFrog ]; diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix index 93927807af85..549ed0c29e86 100644 --- a/pkgs/development/libraries/libbacktrace/default.nix +++ b/pkgs/development/libraries/libbacktrace/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { ]; meta = with lib; { description = "A C library that may be linked into a C/C++ program to produce symbolic backtraces"; - homepage = https://github.com/ianlancetaylor/libbacktrace; + homepage = "https://github.com/ianlancetaylor/libbacktrace"; maintainers = with maintainers; [ twey ]; license = with licenses; [ bsd3 ]; }; diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix index 3ef1f3148994..bcd1573e2038 100644 --- a/pkgs/development/libraries/libsmartcols/default.nix +++ b/pkgs/development/libraries/libsmartcols/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "smart column output alignment library"; - homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols; + homepage = "https://github.com/karelzak/util-linux/tree/master/libsmartcols"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ rb2k ]; diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index 81303a3653ec..88560e0cd983 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions"; - homepage = http://itpp.sourceforge.net/; + homepage = "http://itpp.sourceforge.net/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ andrew-d ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 6d60321a3044..352577fd2dae 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -20,7 +20,7 @@ let meta = with lib; { inherit description homepage; - downloadPage = http://sqlite.org/download.html; + downloadPage = "http://sqlite.org/download.html"; license = licenses.publicDomain; maintainers = with maintainers; [ johnazoidberg ]; platforms = platforms.unix; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index b9054baab1d1..e9cdf50b15ab 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -298,7 +298,7 @@ $out/lib/common-lisp/query-fs" patch -p1 < ${ pkgs.fetchurl { # https://github.com/sabracrolleton/uax-15/pull/12 - url = https://github.com/nuddyco/uax-15/commit/d553181669f488636df03d60ad7f5bec64d566bf.diff; + url = "https://github.com/nuddyco/uax-15/commit/d553181669f488636df03d60ad7f5bec64d566bf.diff"; sha256 = "sha256:1608jzw7giy18vlw7pz4pl8prwlprgif8zcl9hwa0wf5gdxwd7gn"; }} ''; diff --git a/pkgs/development/misc/msp430/mspds/binary.nix b/pkgs/development/misc/msp430/mspds/binary.nix index 690ed3e45e71..2fc306f8e5ff 100644 --- a/pkgs/development/misc/msp430/mspds/binary.nix +++ b/pkgs/development/misc/msp430/mspds/binary.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { meta = { description = "Unfree binary release of the TI MSP430 FET debug driver"; - homepage = https://www.ti.com/tool/MSPDS; + homepage = "https://www.ti.com/tool/MSPDS"; license = licenses.unfree; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aerialx ]; diff --git a/pkgs/development/misc/msp430/mspds/default.nix b/pkgs/development/misc/msp430/mspds/default.nix index 2481b50bfbef..891e7d980b4a 100644 --- a/pkgs/development/misc/msp430/mspds/default.nix +++ b/pkgs/development/misc/msp430/mspds/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { meta = { description = "TI MSP430 FET debug driver"; - homepage = https://www.ti.com/tool/MSPDS; + homepage = "https://www.ti.com/tool/MSPDS"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aerialx ]; diff --git a/pkgs/development/ocaml-modules/genspio/default.nix b/pkgs/development/ocaml-modules/genspio/default.nix index 7e7b3a0b9aee..db3c42bca36c 100644 --- a/pkgs/development/ocaml-modules/genspio/default.nix +++ b/pkgs/development/ocaml-modules/genspio/default.nix @@ -24,7 +24,7 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = https://smondet.gitlab.io/genspio-doc/; + homepage = "https://smondet.gitlab.io/genspio-doc/"; description = "Typed EDSL to generate POSIX Shell scripts"; license = licenses.asl20; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix index 0de997881c2c..2caa25654e39 100644 --- a/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/pkgs/development/ocaml-modules/hidapi/default.nix @@ -21,7 +21,7 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = https://github.com/vbmithr/ocaml-hidapi; + homepage = "https://github.com/vbmithr/ocaml-hidapi"; description = "Bindings to Signal11's hidapi library"; license = licenses.isc; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix index a584f7bc9ed1..9de535154eeb 100644 --- a/pkgs/development/ocaml-modules/nonstd/default.nix +++ b/pkgs/development/ocaml-modules/nonstd/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = https://bitbucket.org/smondet/nonstd; + homepage = "https://bitbucket.org/smondet/nonstd"; description = "Non-standard mini-library"; license = licenses.isc; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/sosa/default.nix b/pkgs/development/ocaml-modules/sosa/default.nix index 3687f2be9974..f244ad550bf1 100644 --- a/pkgs/development/ocaml-modules/sosa/default.nix +++ b/pkgs/development/ocaml-modules/sosa/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = http://www.hammerlab.org/docs/sosa/master/index.html; + homepage = "http://www.hammerlab.org/docs/sosa/master/index.html"; description = "Sane OCaml String API"; license = licenses.isc; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/uecc/default.nix b/pkgs/development/ocaml-modules/uecc/default.nix index a9ba880531c4..f67980db2ff4 100644 --- a/pkgs/development/ocaml-modules/uecc/default.nix +++ b/pkgs/development/ocaml-modules/uecc/default.nix @@ -27,7 +27,7 @@ buildDunePackage rec { meta = { description = "Bindings for ECDH and ECDSA for 8-bit, 32-bit, and 64-bit processors"; - homepage = https://gitlab.com/nomadic-labs/ocaml-uecc; + homepage = "https://gitlab.com/nomadic-labs/ocaml-uecc"; license = lib.licenses.isc; maintainers = [ lib.maintainers.ulrikstrid ]; }; diff --git a/pkgs/development/python-modules/android-backup/default.nix b/pkgs/development/python-modules/android-backup/default.nix index 319c9514183e..df2096582ccd 100644 --- a/pkgs/development/python-modules/android-backup/default.nix +++ b/pkgs/development/python-modules/android-backup/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unpack and repack android backups"; - homepage = https://github.com/bluec0re/android-backup-tools; + homepage = "https://github.com/bluec0re/android-backup-tools"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/gviz-api/default.nix b/pkgs/development/python-modules/gviz-api/default.nix index 92f33abb594a..3ec69d686952 100644 --- a/pkgs/development/python-modules/gviz-api/default.nix +++ b/pkgs/development/python-modules/gviz-api/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for Google Visualization"; - homepage = https://developers.google.com/chart/interactive/docs/dev/gviz_api_lib; + homepage = "https://developers.google.com/chart/interactive/docs/dev/gviz_api_lib"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; }; diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 33816631584e..8448e273b01d 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open source IFC library and geometry engine"; - homepage = http://ifcopenshell.org/; + homepage = "http://ifcopenshell.org/"; license = licenses.lgpl3; maintainers = with maintainers; [ fehnomenal ]; }; diff --git a/pkgs/development/python-modules/python-csxcad/default.nix b/pkgs/development/python-modules/python-csxcad/default.nix index 885208e0e61c..e6f22d37b55d 100644 --- a/pkgs/development/python-modules/python-csxcad/default.nix +++ b/pkgs/development/python-modules/python-csxcad/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to CSXCAD"; - homepage = http://openems.de/index.php/Main_Page.html; + homepage = "http://openems.de/index.php/Main_Page.html"; license = licenses.gpl3; maintainers = with maintainers; [ matthuszagh ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pyworld/default.nix b/pkgs/development/python-modules/pyworld/default.nix index bbe5a4c135e6..9833a29593e8 100644 --- a/pkgs/development/python-modules/pyworld/default.nix +++ b/pkgs/development/python-modules/pyworld/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "PyWorld is a Python wrapper for WORLD vocoder"; - homepage = https://github.com/JeremyCCHsu/Python-Wrapper-for-World-Vocoder; + homepage = "https://github.com/JeremyCCHsu/Python-Wrapper-for-World-Vocoder"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix index 843b9d6c3199..f31c42e774b7 100644 --- a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix +++ b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Profile Tensorboard Plugin."; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; }; diff --git a/pkgs/development/tools/checkmake/default.nix b/pkgs/development/tools/checkmake/default.nix index 3c21af8ff38d..78d193a12925 100644 --- a/pkgs/development/tools/checkmake/default.nix +++ b/pkgs/development/tools/checkmake/default.nix @@ -37,7 +37,7 @@ buildGoPackage rec { meta = with lib; { description = "Experimental tool for linting and checking Makefiles"; - homepage = https://github.com/mrtazz/checkmake; + homepage = "https://github.com/mrtazz/checkmake"; license = licenses.mit; maintainers = with maintainers; [ vidbina ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/java/dex2jar/default.nix b/pkgs/development/tools/java/dex2jar/default.nix index b20a80355a02..6ac1d0dbb1ca 100644 --- a/pkgs/development/tools/java/dex2jar/default.nix +++ b/pkgs/development/tools/java/dex2jar/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://sourceforge.net/projects/dex2jar/; + homepage = "https://sourceforge.net/projects/dex2jar/"; description = "Tools to work with android .dex and java .class files"; maintainers = with maintainers; [ makefu ]; license = licenses.asl20; diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 21d65b40aace..f8092419215d 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -204,7 +204,7 @@ beamPackages.mixRelease rec { meta = with lib; { description = "ActivityPub microblogging server"; - homepage = https://git.pleroma.social/pleroma/pleroma; + homepage = "https://git.pleroma.social/pleroma/pleroma"; license = licenses.agpl3; maintainers = with maintainers; [ petabyteboy ninjatrappeur yuka ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 03af810cbed0..9165a4713d4e 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ]; meta = with lib; { description = "Powerful, fast, and an easy to use search engine "; - homepage = https://docs.meilisearch.com/; + homepage = "https://docs.meilisearch.com/"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index 2841ff2a5f9d..a17c84f5b5e5 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -7,7 +7,7 @@ let src = composerEnv.buildZipPackage { name = "aws-aws-crt-php-3942776a8c99209908ee0b287746263725685732"; src = fetchurl { - url = https://api.github.com/repos/awslabs/aws-crt-php/zipball/3942776a8c99209908ee0b287746263725685732; + url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/3942776a8c99209908ee0b287746263725685732"; sha256 = "0g4vjln6s1419ydljn5m64kzid0b7cplbc0nwn3y4cj72408fyiz"; }; }; @@ -17,7 +17,7 @@ let src = composerEnv.buildZipPackage { name = "aws-aws-sdk-php-fda176884d2952cffc7e67209470bff49609339c"; src = fetchurl { - url = https://api.github.com/repos/aws/aws-sdk-php/zipball/fda176884d2952cffc7e67209470bff49609339c; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/fda176884d2952cffc7e67209470bff49609339c"; sha256 = "07cjzhbw4qv7jvi7lly5zg15dcvpgd1py604pas68al7k1lg4343"; }; }; @@ -27,7 +27,7 @@ let src = composerEnv.buildZipPackage { name = "bacon-bacon-qr-code-f73543ac4e1def05f1a70bcd1525c8a157a1ad09"; src = fetchurl { - url = https://api.github.com/repos/Bacon/BaconQrCode/zipball/f73543ac4e1def05f1a70bcd1525c8a157a1ad09; + url = "https://api.github.com/repos/Bacon/BaconQrCode/zipball/f73543ac4e1def05f1a70bcd1525c8a157a1ad09"; sha256 = "1df22bfrc8q62qz8brrs8p2rmmv5gsaxdyjrd2ln6d6j7i4jkjpk"; }; }; @@ -37,7 +37,7 @@ let src = composerEnv.buildZipPackage { name = "barryvdh-laravel-dompdf-5b99e1f94157d74e450f4c97e8444fcaffa2144b"; src = fetchurl { - url = https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/5b99e1f94157d74e450f4c97e8444fcaffa2144b; + url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/5b99e1f94157d74e450f4c97e8444fcaffa2144b"; sha256 = "1r82fzrnjrjy5jgpyc071miiw1rwhwys9ccj81gs3yydq9hi4crw"; }; }; @@ -47,7 +47,7 @@ let src = composerEnv.buildZipPackage { name = "barryvdh-laravel-snappy-1903ab84171072b6bff8d98eb58d38b2c9aaf645"; src = fetchurl { - url = https://api.github.com/repos/barryvdh/laravel-snappy/zipball/1903ab84171072b6bff8d98eb58d38b2c9aaf645; + url = "https://api.github.com/repos/barryvdh/laravel-snappy/zipball/1903ab84171072b6bff8d98eb58d38b2c9aaf645"; sha256 = "1awr5kwj482qsh5wpg0q44fjqi7a9q26ghcc9wp1n9zm97y0rx7a"; }; }; @@ -57,7 +57,7 @@ let src = composerEnv.buildZipPackage { name = "dasprid-enum-5abf82f213618696dda8e3bf6f64dd042d8542b2"; src = fetchurl { - url = https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2; + url = "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2"; sha256 = "0rs7i1xiwhssy88s7bwnp5ri5fi2xy3fl7pw6l5k27xf2f1hv7q6"; }; }; @@ -67,7 +67,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-cache-331b4d5dbaeab3827976273e9356b3b453c300ce"; src = fetchurl { - url = https://api.github.com/repos/doctrine/cache/zipball/331b4d5dbaeab3827976273e9356b3b453c300ce; + url = "https://api.github.com/repos/doctrine/cache/zipball/331b4d5dbaeab3827976273e9356b3b453c300ce"; sha256 = "1ksr3460a5dpqgq5kgy2l7kdz7fairpvmip8nwaz9y833r5hnnyz"; }; }; @@ -77,7 +77,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-dbal-2411a55a2a628e6d8dd598388ab13474802c7b6e"; src = fetchurl { - url = https://api.github.com/repos/doctrine/dbal/zipball/2411a55a2a628e6d8dd598388ab13474802c7b6e; + url = "https://api.github.com/repos/doctrine/dbal/zipball/2411a55a2a628e6d8dd598388ab13474802c7b6e"; sha256 = "19vyv64ikbzk0pm9nn67a2kidhfvfcm9s5d91h0hk6kbq85f292v"; }; }; @@ -87,7 +87,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-deprecations-9504165960a1f83cc1480e2be1dd0a0478561314"; src = fetchurl { - url = https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314; + url = "https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314"; sha256 = "04kpbzk5iw86imspkg7dgs54xx877k9b5q0dfg2h119mlfkvxil6"; }; }; @@ -97,7 +97,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-event-manager-41370af6a30faa9dc0368c4a6814d596e81aba7f"; src = fetchurl { - url = https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f; + url = "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f"; sha256 = "0pn2aiwl4fvv6fcwar9alng2yrqy8bzc58n4bkp6y2jnpw5gp4m8"; }; }; @@ -107,7 +107,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-inflector-8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"; src = fetchurl { - url = https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89; + url = "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"; sha256 = "1l83jbj4k59m1agi041gzx1rxix1wzxw9mvnivmg1hqr158149n7"; }; }; @@ -117,7 +117,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-lexer-e864bbf5904cb8f5bb334f99209b48018522f042"; src = fetchurl { - url = https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042; + url = "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042"; sha256 = "11lg9fcy0crb8inklajhx3kyffdbx7xzdj8kwl21xsgq9nm9iwvv"; }; }; @@ -127,7 +127,7 @@ let src = composerEnv.buildZipPackage { name = "dompdf-dompdf-8768448244967a46d6e67b891d30878e0e15d25c"; src = fetchurl { - url = https://api.github.com/repos/dompdf/dompdf/zipball/8768448244967a46d6e67b891d30878e0e15d25c; + url = "https://api.github.com/repos/dompdf/dompdf/zipball/8768448244967a46d6e67b891d30878e0e15d25c"; sha256 = "0mgsry4mq5bx6b74h3akay1bp03rnsl8ppcjxjkfjlq4svq7m5yf"; }; }; @@ -137,7 +137,7 @@ let src = composerEnv.buildZipPackage { name = "dragonmantank-cron-expression-65b2d8ee1f10915efb3b55597da3404f096acba2"; src = fetchurl { - url = https://api.github.com/repos/dragonmantank/cron-expression/zipball/65b2d8ee1f10915efb3b55597da3404f096acba2; + url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/65b2d8ee1f10915efb3b55597da3404f096acba2"; sha256 = "07yqbhf6n4d818gvla60mgg23gichwiafd5ypd70w4b4dlbcxcpl"; }; }; @@ -147,7 +147,7 @@ let src = composerEnv.buildZipPackage { name = "egulias-email-validator-0dbf5d78455d4d6a41d186da50adc1122ec066f4"; src = fetchurl { - url = https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4; + url = "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4"; sha256 = "00kwb8rhk1fq3a1i152xniipk3y907q1v5r3szqbkq5rz82dwbck"; }; }; @@ -157,7 +157,7 @@ let src = composerEnv.buildZipPackage { name = "fideloper-proxy-c073b2bd04d1c90e04dc1b787662b558dd65ade0"; src = fetchurl { - url = https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0; + url = "https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0"; sha256 = "05jzgjj4fy5p1smqj41b5qxj42zn0mnczvsaacni4fmq174mz4gy"; }; }; @@ -167,7 +167,7 @@ let src = composerEnv.buildZipPackage { name = "filp-whoops-f056f1fe935d9ed86e698905a957334029899895"; src = fetchurl { - url = https://api.github.com/repos/filp/whoops/zipball/f056f1fe935d9ed86e698905a957334029899895; + url = "https://api.github.com/repos/filp/whoops/zipball/f056f1fe935d9ed86e698905a957334029899895"; sha256 = "1qqznxsrlvjlnxlnr786a39igvq3pslxrvm5ks1v09ni88w44g7g"; }; }; @@ -177,7 +177,7 @@ let src = composerEnv.buildZipPackage { name = "guzzlehttp-guzzle-868b3571a039f0ebc11ac8f344f4080babe2cb94"; src = fetchurl { - url = https://api.github.com/repos/guzzle/guzzle/zipball/868b3571a039f0ebc11ac8f344f4080babe2cb94; + url = "https://api.github.com/repos/guzzle/guzzle/zipball/868b3571a039f0ebc11ac8f344f4080babe2cb94"; sha256 = "1n8kng76v4gb51z1qq7wx63pwlyiz3pa44shfla4mcxl2js0r6r0"; }; }; @@ -187,7 +187,7 @@ let src = composerEnv.buildZipPackage { name = "guzzlehttp-promises-fe752aedc9fd8fcca3fe7ad05d419d32998a06da"; src = fetchurl { - url = https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da; + url = "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da"; sha256 = "09ivi77y49bpc2sy3xhvgq22rfh2fhv921mn8402dv0a8bdprf56"; }; }; @@ -197,7 +197,7 @@ let src = composerEnv.buildZipPackage { name = "guzzlehttp-psr7-089edd38f5b8abba6cb01567c2a8aaa47cec4c72"; src = fetchurl { - url = https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72; + url = "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72"; sha256 = "1k29gax82rf82sbw2cbcp4qn3s3096csvmw9848l94q6ryc4j2rb"; }; }; @@ -207,7 +207,7 @@ let src = composerEnv.buildZipPackage { name = "intervention-image-9a8cc99d30415ec0b3f7649e1647d03a55698545"; src = fetchurl { - url = https://api.github.com/repos/Intervention/image/zipball/9a8cc99d30415ec0b3f7649e1647d03a55698545; + url = "https://api.github.com/repos/Intervention/image/zipball/9a8cc99d30415ec0b3f7649e1647d03a55698545"; sha256 = "1fvfhxr8jyh6jjg3imacgvddgn222g822fq5p9yz8lqlw2ymcfnz"; }; }; @@ -217,7 +217,7 @@ let src = composerEnv.buildZipPackage { name = "knplabs-knp-snappy-349c2e872bbeb15dff825a17dd92ea9c6ae4120e"; src = fetchurl { - url = https://api.github.com/repos/KnpLabs/snappy/zipball/349c2e872bbeb15dff825a17dd92ea9c6ae4120e; + url = "https://api.github.com/repos/KnpLabs/snappy/zipball/349c2e872bbeb15dff825a17dd92ea9c6ae4120e"; sha256 = "12fsslr3k1zn7rw9xnma3pvlmm4qvrapizhn4il4zqcmw51lgnl7"; }; }; @@ -227,7 +227,7 @@ let src = composerEnv.buildZipPackage { name = "laravel-framework-10f6bfaec9efb68aa88d7196b8b1b162d83040ae"; src = fetchurl { - url = https://api.github.com/repos/laravel/framework/zipball/10f6bfaec9efb68aa88d7196b8b1b162d83040ae; + url = "https://api.github.com/repos/laravel/framework/zipball/10f6bfaec9efb68aa88d7196b8b1b162d83040ae"; sha256 = "1r04396755jixbhbw1zzmyz74ng8np0ysv7g7mgcvv01s6wxw66l"; }; }; @@ -237,7 +237,7 @@ let src = composerEnv.buildZipPackage { name = "laravel-socialite-fd0f6a3dd963ca480b598649b54f92d81a43617f"; src = fetchurl { - url = https://api.github.com/repos/laravel/socialite/zipball/fd0f6a3dd963ca480b598649b54f92d81a43617f; + url = "https://api.github.com/repos/laravel/socialite/zipball/fd0f6a3dd963ca480b598649b54f92d81a43617f"; sha256 = "08x0pn4ib5nhh9jkkb5brf8yj0fq6v6gn1qg97hss3mvnhazk5wx"; }; }; @@ -247,7 +247,7 @@ let src = composerEnv.buildZipPackage { name = "league-commonmark-c4228d11e30d7493c6836d20872f9582d8ba6dcf"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/commonmark/zipball/c4228d11e30d7493c6836d20872f9582d8ba6dcf; + url = "https://api.github.com/repos/thephpleague/commonmark/zipball/c4228d11e30d7493c6836d20872f9582d8ba6dcf"; sha256 = "0x18k1qmvskd5x1b3jkkmig6l734sxffj5xyfb82yrzgpw9lrld5"; }; }; @@ -257,7 +257,7 @@ let src = composerEnv.buildZipPackage { name = "league-flysystem-18634df356bfd4119fe3d6156bdb990c414c14ea"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/flysystem/zipball/18634df356bfd4119fe3d6156bdb990c414c14ea; + url = "https://api.github.com/repos/thephpleague/flysystem/zipball/18634df356bfd4119fe3d6156bdb990c414c14ea"; sha256 = "1cy0xmnl3ck7cb6ibl9jjw5pmbw15mww5q06vacgq5lnx8r5w700"; }; }; @@ -267,7 +267,7 @@ let src = composerEnv.buildZipPackage { name = "league-flysystem-aws-s3-v3-4e25cc0582a36a786c31115e419c6e40498f6972"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972; + url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972"; sha256 = "1q2vkgyaz7h6z3q0z3v3l5rsvhv4xc45prgzr214cgm656i2h1ab"; }; }; @@ -277,7 +277,7 @@ let src = composerEnv.buildZipPackage { name = "league-html-to-markdown-e5600a2c5ce7b7571b16732c7086940f56f7abec"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/html-to-markdown/zipball/e5600a2c5ce7b7571b16732c7086940f56f7abec; + url = "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/e5600a2c5ce7b7571b16732c7086940f56f7abec"; sha256 = "1a46ki1lbhnc9gqddrka2hypw0h8zcd8dhi8gc1jf5bflhb1wmqk"; }; }; @@ -287,7 +287,7 @@ let src = composerEnv.buildZipPackage { name = "league-mime-type-detection-b38b25d7b372e9fddb00335400467b223349fd7e"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b38b25d7b372e9fddb00335400467b223349fd7e; + url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b38b25d7b372e9fddb00335400467b223349fd7e"; sha256 = "02ywmarr58z5w9pf5qvk6hyrnykdh6v7n5jdkgb4ykdn2plinmlz"; }; }; @@ -297,7 +297,7 @@ let src = composerEnv.buildZipPackage { name = "league-oauth1-client-88dd16b0cff68eb9167bfc849707d2c40ad91ddc"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/oauth1-client/zipball/88dd16b0cff68eb9167bfc849707d2c40ad91ddc; + url = "https://api.github.com/repos/thephpleague/oauth1-client/zipball/88dd16b0cff68eb9167bfc849707d2c40ad91ddc"; sha256 = "1b0zza3qxqgn57105wbfw2fzphj3l3f7iqh7v3w98pdvaiapaf5d"; }; }; @@ -307,7 +307,7 @@ let src = composerEnv.buildZipPackage { name = "league-oauth2-client-badb01e62383430706433191b82506b6df24ad98"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/oauth2-client/zipball/badb01e62383430706433191b82506b6df24ad98; + url = "https://api.github.com/repos/thephpleague/oauth2-client/zipball/badb01e62383430706433191b82506b6df24ad98"; sha256 = "1j2bmvy39k8wafisxdc0xn58gga5w9jpwp5hqjy51sk1s2ssws8i"; }; }; @@ -317,7 +317,7 @@ let src = composerEnv.buildZipPackage { name = "monolog-monolog-fd4380d6fc37626e2f799f29d91195040137eba9"; src = fetchurl { - url = https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9; + url = "https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9"; sha256 = "1k56si01sjl93mxq1pk599yqqqhldqz34qi73y5jaga0m9iq07wk"; }; }; @@ -327,7 +327,7 @@ let src = composerEnv.buildZipPackage { name = "mtdowling-jmespath.php-9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; src = fetchurl { - url = https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb; + url = "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; sha256 = "1ig3gi6f8gisagcn876598ps48s86s6m0c82diyksylarg3yn0yd"; }; }; @@ -337,7 +337,7 @@ let src = composerEnv.buildZipPackage { name = "nesbot-carbon-f4655858a784988f880c1b8c7feabbf02dfdf045"; src = fetchurl { - url = https://api.github.com/repos/briannesbitt/Carbon/zipball/f4655858a784988f880c1b8c7feabbf02dfdf045; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/f4655858a784988f880c1b8c7feabbf02dfdf045"; sha256 = "18px9mynqabrhgss5nyhadncdcf7aq1mzbbyrxfqbvyv54zq4zjh"; }; }; @@ -347,7 +347,7 @@ let src = composerEnv.buildZipPackage { name = "nunomaduro-collision-f7c45764dfe4ba5f2618d265a6f1f9c72732e01d"; src = fetchurl { - url = https://api.github.com/repos/nunomaduro/collision/zipball/f7c45764dfe4ba5f2618d265a6f1f9c72732e01d; + url = "https://api.github.com/repos/nunomaduro/collision/zipball/f7c45764dfe4ba5f2618d265a6f1f9c72732e01d"; sha256 = "1cazbjxl5rqw4cl783nrymhcvjhvwwwjswr5w0si1wfhmpvr349q"; }; }; @@ -357,7 +357,7 @@ let src = composerEnv.buildZipPackage { name = "onelogin-php-saml-f30f5062f3653c4d2082892d207f4dc3e577d979"; src = fetchurl { - url = https://api.github.com/repos/onelogin/php-saml/zipball/f30f5062f3653c4d2082892d207f4dc3e577d979; + url = "https://api.github.com/repos/onelogin/php-saml/zipball/f30f5062f3653c4d2082892d207f4dc3e577d979"; sha256 = "0nl431rx1gngc2g92w4hjf2y26vjvscgbrwhq0m6kzm9kq043qzh"; }; }; @@ -367,7 +367,7 @@ let src = composerEnv.buildZipPackage { name = "opis-closure-06e2ebd25f2869e54a306dda991f7db58066f7f6"; src = fetchurl { - url = https://api.github.com/repos/opis/closure/zipball/06e2ebd25f2869e54a306dda991f7db58066f7f6; + url = "https://api.github.com/repos/opis/closure/zipball/06e2ebd25f2869e54a306dda991f7db58066f7f6"; sha256 = "0fpa1w0rmwywj67jgaldmw563p7gycahs8gpkpjvrra9zhhj4yyc"; }; }; @@ -377,7 +377,7 @@ let src = composerEnv.buildZipPackage { name = "paragonie-constant_time_encoding-f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c"; src = fetchurl { - url = https://api.github.com/repos/paragonie/constant_time_encoding/zipball/f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c; + url = "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c"; sha256 = "1r1xj3j7s5mskw5gh3ars4dfhvcn7d252gdqgpif80026kj5fvrp"; }; }; @@ -387,7 +387,7 @@ let src = composerEnv.buildZipPackage { name = "paragonie-random_compat-996434e5492cb4c3edcb9168db6fbb1359ef965a"; src = fetchurl { - url = https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a; + url = "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a"; sha256 = "0ky7lal59dihf969r1k3pb96ql8zzdc5062jdbg69j6rj0scgkyx"; }; }; @@ -397,7 +397,7 @@ let src = composerEnv.buildZipPackage { name = "phenx-php-font-lib-ca6ad461f032145fff5971b5985e5af9e7fa88d8"; src = fetchurl { - url = https://api.github.com/repos/PhenX/php-font-lib/zipball/ca6ad461f032145fff5971b5985e5af9e7fa88d8; + url = "https://api.github.com/repos/PhenX/php-font-lib/zipball/ca6ad461f032145fff5971b5985e5af9e7fa88d8"; sha256 = "0kl9lks1kpniby8dn8racjcjp6xjnhl3065y7ivarbl6ni6hyyxw"; }; }; @@ -407,7 +407,7 @@ let src = composerEnv.buildZipPackage { name = "phenx-php-svg-lib-5fa61b65e612ce1ae15f69b3d223cb14ecc60e32"; src = fetchurl { - url = https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32; + url = "https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32"; sha256 = "1ppi3hs2r4cbd6b2xwf4znci6hpbs8469kqxk3msf7vi6vfnybbj"; }; }; @@ -417,7 +417,7 @@ let src = composerEnv.buildZipPackage { name = "php-parallel-lint-php-console-color-b6af326b2088f1ad3b264696c9fd590ec395b49e"; src = fetchurl { - url = https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e; + url = "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e"; sha256 = "030449mkpxs35y8dk336ls3bfdq3zjnxswnk5khlg45z5147cr3k"; }; }; @@ -427,7 +427,7 @@ let src = composerEnv.buildZipPackage { name = "php-parallel-lint-php-console-highlighter-21bf002f077b177f056d8cb455c5ed573adfdbb8"; src = fetchurl { - url = https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8; + url = "https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8"; sha256 = "013phmp5n6hp6mvlpbqbrih0zd8h7xc152dpzxxf49b0jczxh8y4"; }; }; @@ -437,7 +437,7 @@ let src = composerEnv.buildZipPackage { name = "phpoption-phpoption-5455cb38aed4523f99977c4a12ef19da4bfe2a28"; src = fetchurl { - url = https://api.github.com/repos/schmittjoh/php-option/zipball/5455cb38aed4523f99977c4a12ef19da4bfe2a28; + url = "https://api.github.com/repos/schmittjoh/php-option/zipball/5455cb38aed4523f99977c4a12ef19da4bfe2a28"; sha256 = "009q2afjkjl8psisr8jsw9k08qnkb0f4hgd6izrjmm06bd7bk9ah"; }; }; @@ -447,7 +447,7 @@ let src = composerEnv.buildZipPackage { name = "phpseclib-phpseclib-6e794226a35159eb06f355efe59a0075a16551dd"; src = fetchurl { - url = https://api.github.com/repos/phpseclib/phpseclib/zipball/6e794226a35159eb06f355efe59a0075a16551dd; + url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/6e794226a35159eb06f355efe59a0075a16551dd"; sha256 = "1jjgzckgpr6myf4lcngsgmmqib5x2rv93yj7syg1xyawls4qj3yb"; }; }; @@ -457,7 +457,7 @@ let src = composerEnv.buildZipPackage { name = "pragmarx-google2fa-26c4c5cf30a2844ba121760fd7301f8ad240100b"; src = fetchurl { - url = https://api.github.com/repos/antonioribeiro/google2fa/zipball/26c4c5cf30a2844ba121760fd7301f8ad240100b; + url = "https://api.github.com/repos/antonioribeiro/google2fa/zipball/26c4c5cf30a2844ba121760fd7301f8ad240100b"; sha256 = "1jmc7s3hbczvb0h4kfmya67l969nfww3lmc4slvzsz0zd769434h"; }; }; @@ -467,7 +467,7 @@ let src = composerEnv.buildZipPackage { name = "predis-predis-c50c3393bb9f47fa012d0cdfb727a266b0818259"; src = fetchurl { - url = https://api.github.com/repos/predis/predis/zipball/c50c3393bb9f47fa012d0cdfb727a266b0818259; + url = "https://api.github.com/repos/predis/predis/zipball/c50c3393bb9f47fa012d0cdfb727a266b0818259"; sha256 = "09riabf99jmxydrqn8cm6nsw3fbp307fqcpc9iw4ag2qfhwm2v73"; }; }; @@ -477,7 +477,7 @@ let src = composerEnv.buildZipPackage { name = "psr-container-8622567409010282b7aeebe4bb841fe98b58dcaf"; src = fetchurl { - url = https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf; + url = "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf"; sha256 = "0qfvyfp3mli776kb9zda5cpc8cazj3prk0bg0gm254kwxyfkfrwn"; }; }; @@ -487,7 +487,7 @@ let src = composerEnv.buildZipPackage { name = "psr-http-client-2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; src = fetchurl { - url = https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621; + url = "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; sha256 = "0cmkifa3ji1r8kn3y1rwg81rh8g2crvnhbv2am6d688dzsbw967v"; }; }; @@ -497,7 +497,7 @@ let src = composerEnv.buildZipPackage { name = "psr-http-factory-12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; src = fetchurl { - url = https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be; + url = "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; sha256 = "0inbnqpc5bfhbbda9dwazsrw9xscfnc8rdx82q1qm3r446mc1vds"; }; }; @@ -507,7 +507,7 @@ let src = composerEnv.buildZipPackage { name = "psr-http-message-f6561bf28d520154e4b0ec72be95418abe6d9363"; src = fetchurl { - url = https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363; + url = "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363"; sha256 = "195dd67hva9bmr52iadr4kyp2gw2f5l51lplfiay2pv6l9y4cf45"; }; }; @@ -517,7 +517,7 @@ let src = composerEnv.buildZipPackage { name = "psr-log-d49695b909c3b7628b6289db5479a1c204601f11"; src = fetchurl { - url = https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11; + url = "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11"; sha256 = "0sb0mq30dvmzdgsnqvw3xh4fb4bqjncx72kf8n622f94dd48amln"; }; }; @@ -527,7 +527,7 @@ let src = composerEnv.buildZipPackage { name = "psr-simple-cache-408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; src = fetchurl { - url = https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b; + url = "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; sha256 = "1djgzclkamjxi9jy4m9ggfzgq1vqxaga2ip7l3cj88p7rwkzjxgw"; }; }; @@ -537,7 +537,7 @@ let src = composerEnv.buildZipPackage { name = "ralouphie-getallheaders-120b605dfeb996808c31b6477290a714d356e822"; src = fetchurl { - url = https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822; + url = "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822"; sha256 = "1bv7ndkkankrqlr2b4kw7qp3fl0dxi6bp26bnim6dnlhavd6a0gg"; }; }; @@ -547,7 +547,7 @@ let src = composerEnv.buildZipPackage { name = "ramsey-uuid-ffa80ab953edd85d5b6c004f96181a538aad35a3"; src = fetchurl { - url = https://api.github.com/repos/ramsey/uuid/zipball/ffa80ab953edd85d5b6c004f96181a538aad35a3; + url = "https://api.github.com/repos/ramsey/uuid/zipball/ffa80ab953edd85d5b6c004f96181a538aad35a3"; sha256 = "043g1nwpbvqrvq6ri2517254d72538h5jfzv9miafnws4ajwfpzg"; }; }; @@ -557,7 +557,7 @@ let src = composerEnv.buildZipPackage { name = "robrichards-xmlseclibs-f8f19e58f26cdb42c54b214ff8a820760292f8df"; src = fetchurl { - url = https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df; + url = "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df"; sha256 = "01zlpm36rrdj310cfmiz2fnabszxd3fq80fa8x8j3f9ki7dvhh5y"; }; }; @@ -567,7 +567,7 @@ let src = composerEnv.buildZipPackage { name = "sabberworm-php-css-parser-d217848e1396ef962fb1997cf3e2421acba7f796"; src = fetchurl { - url = https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796; + url = "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796"; sha256 = "17jkly8k02p54qa004spikakxis8syjw3vhwgrsi9g1cb4wsg3g9"; }; }; @@ -577,7 +577,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-discord-c6eddeb07ace7473e82d02d4db852dfacf5ef574"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Discord/zipball/c6eddeb07ace7473e82d02d4db852dfacf5ef574; + url = "https://api.github.com/repos/SocialiteProviders/Discord/zipball/c6eddeb07ace7473e82d02d4db852dfacf5ef574"; sha256 = "1w8m7jmlsdk94cqckgd75mwblh3jj6j16w3g4hzysyms25g091xc"; }; }; @@ -587,7 +587,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-gitlab-a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/GitLab/zipball/a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d; + url = "https://api.github.com/repos/SocialiteProviders/GitLab/zipball/a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d"; sha256 = "1blv2h69dmm0r0djz3h0l0cxkxmzd1fzgg13r3npxx7c80xjpw3a"; }; }; @@ -597,7 +597,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-manager-0f5e82af0404df0080bdc5c105cef936c1711524"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Manager/zipball/0f5e82af0404df0080bdc5c105cef936c1711524; + url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/0f5e82af0404df0080bdc5c105cef936c1711524"; sha256 = "0ppmln72khli94ylnsjarnhzkqzpkc32pn3zf3ljahm1yghccczx"; }; }; @@ -607,7 +607,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-microsoft-azure-9b23e02ff711de42e513aa55f768a4f1c67c0e41"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/9b23e02ff711de42e513aa55f768a4f1c67c0e41; + url = "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/9b23e02ff711de42e513aa55f768a4f1c67c0e41"; sha256 = "01i53v1pcr3nfpydpy0ka5jrdyygpi4vc5w24022913nfjqg3bqm"; }; }; @@ -617,7 +617,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-okta-e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Okta/zipball/e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8; + url = "https://api.github.com/repos/SocialiteProviders/Okta/zipball/e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8"; sha256 = "1a3anw5di5nqiabvqpmsjv5x0jasmsn4y876qsv77gazxja880ng"; }; }; @@ -627,7 +627,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-slack-2b781c95daf06ec87a8f3deba2ab613d6bea5e8d"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Slack/zipball/2b781c95daf06ec87a8f3deba2ab613d6bea5e8d; + url = "https://api.github.com/repos/SocialiteProviders/Slack/zipball/2b781c95daf06ec87a8f3deba2ab613d6bea5e8d"; sha256 = "1xilg7l1wc1vgwyakhfl8dpvgkjqx90g4khvzi411j9xa2wvpprh"; }; }; @@ -637,7 +637,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-twitch-7accf30ae7a3139b757b4ca8f34989c09a3dbee7"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Twitch/zipball/7accf30ae7a3139b757b4ca8f34989c09a3dbee7; + url = "https://api.github.com/repos/SocialiteProviders/Twitch/zipball/7accf30ae7a3139b757b4ca8f34989c09a3dbee7"; sha256 = "089i4fwxb32zmbxib0544jfs48wzjyp7bsqss2bf2xx89dsrx4ah"; }; }; @@ -647,7 +647,7 @@ let src = composerEnv.buildZipPackage { name = "ssddanbrown-htmldiff-f60d5cc278b60305ab980a6665f46117c5b589c0"; src = fetchurl { - url = https://api.github.com/repos/ssddanbrown/HtmlDiff/zipball/f60d5cc278b60305ab980a6665f46117c5b589c0; + url = "https://api.github.com/repos/ssddanbrown/HtmlDiff/zipball/f60d5cc278b60305ab980a6665f46117c5b589c0"; sha256 = "12h3swr8rjf5w78kfgwzkf0zb59b4a8mjwf65fgcgvjg115wha9x"; }; }; @@ -657,7 +657,7 @@ let src = composerEnv.buildZipPackage { name = "swiftmailer-swiftmailer-8a5d5072dca8f48460fce2f4131fcc495eec654c"; src = fetchurl { - url = https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c; + url = "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c"; sha256 = "1p9m4fw9y9md9a7msbmnc0hpdrky8dwrllnyg1qf1cdyp9d70x1d"; }; }; @@ -667,7 +667,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-console-8dbd23ef7a8884051482183ddee8d9061b5feed0"; src = fetchurl { - url = https://api.github.com/repos/symfony/console/zipball/8dbd23ef7a8884051482183ddee8d9061b5feed0; + url = "https://api.github.com/repos/symfony/console/zipball/8dbd23ef7a8884051482183ddee8d9061b5feed0"; sha256 = "1p03ls8djpyhplf1irbg5ym3rjqviknwvg1mz9v6kdvnr694vzxn"; }; }; @@ -677,7 +677,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-css-selector-7fb120adc7f600a59027775b224c13a33530dd90"; src = fetchurl { - url = https://api.github.com/repos/symfony/css-selector/zipball/7fb120adc7f600a59027775b224c13a33530dd90; + url = "https://api.github.com/repos/symfony/css-selector/zipball/7fb120adc7f600a59027775b224c13a33530dd90"; sha256 = "03jblgg300imj7s731ynxm579a6qj87lhd4lnhahbf4m7y65vj7w"; }; }; @@ -687,7 +687,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-debug-43ede438d4cb52cd589ae5dc070e9323866ba8e0"; src = fetchurl { - url = https://api.github.com/repos/symfony/debug/zipball/43ede438d4cb52cd589ae5dc070e9323866ba8e0; + url = "https://api.github.com/repos/symfony/debug/zipball/43ede438d4cb52cd589ae5dc070e9323866ba8e0"; sha256 = "1min1v940rrv83w4fan9ypw4zj62wmi5nwn76pq618pdi8z00kpn"; }; }; @@ -697,7 +697,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-deprecation-contracts-5f38c8804a9e97d23e0c8d63341088cd8a22d627"; src = fetchurl { - url = https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627; + url = "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627"; sha256 = "11k6a8v9b6p0j788fgykq6s55baba29lg37fwvmn4igxxkfwmbp3"; }; }; @@ -707,7 +707,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-error-handler-51f98f7aa99f00f3b1da6bafe934e67ae6ba6dc5"; src = fetchurl { - url = https://api.github.com/repos/symfony/error-handler/zipball/51f98f7aa99f00f3b1da6bafe934e67ae6ba6dc5; + url = "https://api.github.com/repos/symfony/error-handler/zipball/51f98f7aa99f00f3b1da6bafe934e67ae6ba6dc5"; sha256 = "1qy8j16crb271pz6frjxyy2b41f1ap8w2mwb2n5zr3gmg0iqm487"; }; }; @@ -717,7 +717,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-event-dispatcher-2fe81680070043c4c80e7cedceb797e34f377bac"; src = fetchurl { - url = https://api.github.com/repos/symfony/event-dispatcher/zipball/2fe81680070043c4c80e7cedceb797e34f377bac; + url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/2fe81680070043c4c80e7cedceb797e34f377bac"; sha256 = "0qf59l1a1h25hl6bp1wwfl5s825f8ybw2jiwhalw7gfnrx8x68fb"; }; }; @@ -727,7 +727,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-event-dispatcher-contracts-84e23fdcd2517bf37aecbd16967e83f0caee25a7"; src = fetchurl { - url = https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7; + url = "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7"; sha256 = "1pcfrlc0rg8vdnp23y3y1p5qzng5nxf5i2c36g9x9f480xrnc1fw"; }; }; @@ -737,7 +737,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-finder-70362f1e112280d75b30087c7598b837c1b468b6"; src = fetchurl { - url = https://api.github.com/repos/symfony/finder/zipball/70362f1e112280d75b30087c7598b837c1b468b6; + url = "https://api.github.com/repos/symfony/finder/zipball/70362f1e112280d75b30087c7598b837c1b468b6"; sha256 = "0f75c5mjig5ypigb4s1av3w67xizx6pl15wrqbyxa39a9qq58x6v"; }; }; @@ -747,7 +747,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-http-client-contracts-7e82f6084d7cae521a75ef2cb5c9457bbda785f4"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-client-contracts/zipball/7e82f6084d7cae521a75ef2cb5c9457bbda785f4; + url = "https://api.github.com/repos/symfony/http-client-contracts/zipball/7e82f6084d7cae521a75ef2cb5c9457bbda785f4"; sha256 = "04mszmb94y0xjs0cwqxzhpf65kfqhhqznldifbxvrrlxb9nn23qc"; }; }; @@ -757,7 +757,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-http-foundation-b9a91102f548e0111f4996e8c622fb1d1d479850"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-foundation/zipball/b9a91102f548e0111f4996e8c622fb1d1d479850; + url = "https://api.github.com/repos/symfony/http-foundation/zipball/b9a91102f548e0111f4996e8c622fb1d1d479850"; sha256 = "0f6hxzrcijpjiwfjlw0bgn17a6d7bdfr7bc8nlmhfig7v945rbwq"; }; }; @@ -767,7 +767,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-http-kernel-6f1fcca1154f782796549f4f4e5090bae9525c0e"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-kernel/zipball/6f1fcca1154f782796549f4f4e5090bae9525c0e; + url = "https://api.github.com/repos/symfony/http-kernel/zipball/6f1fcca1154f782796549f4f4e5090bae9525c0e"; sha256 = "1i9bd9kp1yz55922hf95chdnzxbaavx87hxjzy6dysg81sjw89fw"; }; }; @@ -777,7 +777,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-mime-a756033d0a7e53db389618653ae991eba5a19a11"; src = fetchurl { - url = https://api.github.com/repos/symfony/mime/zipball/a756033d0a7e53db389618653ae991eba5a19a11; + url = "https://api.github.com/repos/symfony/mime/zipball/a756033d0a7e53db389618653ae991eba5a19a11"; sha256 = "06awwbkbg6fkkbls4rk4qkdzrigik3zm68cwa8bazsy7izqrh3nj"; }; }; @@ -787,7 +787,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-ctype-46cd95797e9df938fdd2b03693b5fca5e64b01ce"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce; + url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce"; sha256 = "0z4iiznxxs4r72xs4irqqb6c0wnwpwf0hklwn2imls67haq330zn"; }; }; @@ -797,7 +797,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-iconv-63b5bb7db83e5673936d6e3b8b3e022ff6474933"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933; + url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933"; sha256 = "1jyjsjprsgb3r6cbc4x1wg1q1zqakqm8a62ah5lppxnjgq1sgjc5"; }; }; @@ -807,7 +807,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-intl-idn-65bd267525e82759e7d8c4e8ceea44f398838e65"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65; + url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65"; sha256 = "1cx2cjx0vzni297l7avd3cb1q4c8d2hylkvdqcjlpxjqdimn4jkn"; }; }; @@ -817,7 +817,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-intl-normalizer-8590a5f561694770bdcd3f9b5c69dde6945028e8"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8; + url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8"; sha256 = "1c60xin00q0d2gbyaiglxppn5hqwki616v5chzwyhlhf6aplwsh3"; }; }; @@ -827,7 +827,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-mbstring-9174a3d80210dca8daa7f31fec659150bbeabfc6"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6; + url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6"; sha256 = "17bhba3093di6xgi8f0cnf3cdd7fnbyp9l76d9y33cym6213ayx1"; }; }; @@ -837,7 +837,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-php72-9a142215a36a3888e30d0a9eeea9766764e96976"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976; + url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976"; sha256 = "06ipbcvrxjzgvraf2z9fwgy0bzvzjvs5z1j67grg1gb15x3d428b"; }; }; @@ -847,7 +847,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-php73-fba8933c384d6476ab14fb7b8526e5287ca7e010"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010; + url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010"; sha256 = "0fc1d60iw8iar2zcvkzwdvx0whkbw8p6ll0cry39nbkklzw85n1h"; }; }; @@ -857,7 +857,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-php80-1100343ed1a92e3a38f9ae122fc0eb21602547be"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be; + url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be"; sha256 = "0kwk2qgwswsmbfp1qx31ahw3lisgyivwhw5dycshr5v2iwwx3rhi"; }; }; @@ -867,7 +867,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-process-13d3161ef63a8ec21eeccaaf9a4d7f784a87a97d"; src = fetchurl { - url = https://api.github.com/repos/symfony/process/zipball/13d3161ef63a8ec21eeccaaf9a4d7f784a87a97d; + url = "https://api.github.com/repos/symfony/process/zipball/13d3161ef63a8ec21eeccaaf9a4d7f784a87a97d"; sha256 = "1h41y2k100fmrjz90m0vafpfgg2da6byy9m6vf1j9q41bhv6zccl"; }; }; @@ -877,7 +877,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-routing-9ddf033927ad9f30ba2bfd167a7b342cafa13e8e"; src = fetchurl { - url = https://api.github.com/repos/symfony/routing/zipball/9ddf033927ad9f30ba2bfd167a7b342cafa13e8e; + url = "https://api.github.com/repos/symfony/routing/zipball/9ddf033927ad9f30ba2bfd167a7b342cafa13e8e"; sha256 = "1l3b5z0kn7f9q0whrm2wnxv0l038w3la75bf95pbs74szlnibfhz"; }; }; @@ -887,7 +887,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-service-contracts-f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"; src = fetchurl { - url = https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb; + url = "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"; sha256 = "1i573rmajc33a9nrgwgc4k3svg29yp9xv17gp133rd1i705hwv1y"; }; }; @@ -897,7 +897,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-translation-db0ba1e85280d8ff11e38d53c70f8814d4d740f5"; src = fetchurl { - url = https://api.github.com/repos/symfony/translation/zipball/db0ba1e85280d8ff11e38d53c70f8814d4d740f5; + url = "https://api.github.com/repos/symfony/translation/zipball/db0ba1e85280d8ff11e38d53c70f8814d4d740f5"; sha256 = "08qxma91sffj8vqzb8dshwsxqf80y9kym3bsxx3gz05ksi01hk1d"; }; }; @@ -907,7 +907,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-translation-contracts-95c812666f3e91db75385749fe219c5e494c7f95"; src = fetchurl { - url = https://api.github.com/repos/symfony/translation-contracts/zipball/95c812666f3e91db75385749fe219c5e494c7f95; + url = "https://api.github.com/repos/symfony/translation-contracts/zipball/95c812666f3e91db75385749fe219c5e494c7f95"; sha256 = "073l1pbmwbkaviwwjq9ypb1w7dk366nn2vn1vancbal0zqk0zx7b"; }; }; @@ -917,7 +917,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-var-dumper-50286e2b7189bfb4f419c0731e86632cddf7c5ee"; src = fetchurl { - url = https://api.github.com/repos/symfony/var-dumper/zipball/50286e2b7189bfb4f419c0731e86632cddf7c5ee; + url = "https://api.github.com/repos/symfony/var-dumper/zipball/50286e2b7189bfb4f419c0731e86632cddf7c5ee"; sha256 = "05yb04dvb5higlbhgdl2hv4wnnmxi6l53xvls5v56wj21ddsk6vf"; }; }; @@ -927,7 +927,7 @@ let src = composerEnv.buildZipPackage { name = "tijsverkoyen-css-to-inline-styles-b43b05cf43c1b6d849478965062b6ef73e223bb5"; src = fetchurl { - url = https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/b43b05cf43c1b6d849478965062b6ef73e223bb5; + url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/b43b05cf43c1b6d849478965062b6ef73e223bb5"; sha256 = "0lc6jviz8faqxxs453dbqvfdmm6l2iczxla22v2r6xhakl58pf3w"; }; }; @@ -937,7 +937,7 @@ let src = composerEnv.buildZipPackage { name = "vlucas-phpdotenv-a1bf4c9853d90ade427b4efe35355fc41b3d6988"; src = fetchurl { - url = https://api.github.com/repos/vlucas/phpdotenv/zipball/a1bf4c9853d90ade427b4efe35355fc41b3d6988; + url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/a1bf4c9853d90ade427b4efe35355fc41b3d6988"; sha256 = "04cks58khh2rx1ni5p1v8i37k4hy6zwkazlas0jqlrxhznmd50wi"; }; }; diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 7f561c493e66..3f66afae901a 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -20,7 +20,7 @@ package.override rec { meta = with pkgs.lib; { description = "Zigbee to MQTT bridge using zigbee-shepherd"; license = licenses.gpl3; - homepage = https://github.com/Koenkk/zigbee2mqtt; + homepage = "https://github.com/Koenkk/zigbee2mqtt"; maintainers = with maintainers; [ sweber ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index a9da40e3fe42..6b1e86d30a95 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -10076,7 +10076,7 @@ let buildInputs = globalBuildInputs; meta = { description = "Zigbee to MQTT bridge using Zigbee-herdsman"; - homepage = https://koenkk.github.io/zigbee2mqtt; + homepage = "https://koenkk.github.io/zigbee2mqtt"; license = "GPL-3.0"; }; production = true; diff --git a/pkgs/tools/audio/stt/default.nix b/pkgs/tools/audio/stt/default.nix index 7834f87a0517..c8fff7ddbb4a 100644 --- a/pkgs/tools/audio/stt/default.nix +++ b/pkgs/tools/audio/stt/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/coqui-ai/STT; + homepage = "https://github.com/coqui-ai/STT"; description = "Deep learning toolkit for Speech-to-Text, battle-tested in research and production"; license = licenses.mpl20; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 8df7f34bb234..45c4441ea2d6 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -107,7 +107,7 @@ in { cp ${pluginName}-${version}.jar $out/bin/${pluginName}-${version}.jar ''; meta = { - homepage = https://github.com/Graylog2/graylog-plugin-integrations; + homepage = "https://github.com/Graylog2/graylog-plugin-integrations"; description = "A collection of open source Graylog integrations that will be released together"; }; }; @@ -224,7 +224,7 @@ in { sha256 = "1hkaklwzcsvqq45b98chwqxqdgnnbj4dg68agsll13yq4zx37qpp"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-snmp; + homepage = "https://github.com/graylog-labs/graylog-plugin-snmp"; description = "Graylog plugin to receive SNMP traps"; }; }; diff --git a/pkgs/tools/misc/livedl/default.nix b/pkgs/tools/misc/livedl/default.nix index b989fe27a659..ef298fbc6464 100644 --- a/pkgs/tools/misc/livedl/default.nix +++ b/pkgs/tools/misc/livedl/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sourceRoot = "source/src"; - vendorSha256 = sha256:g5Y1IH1U1zOOHygTzAJuBnUj+MyPe64KHTYikipt3TY=; + vendorSha256 = "g5Y1IH1U1zOOHygTzAJuBnUj+MyPe64KHTYikipt3TY="; meta = with lib; { description = "Command-line tool to download nicovideo.jp livestreams"; diff --git a/pkgs/tools/virtualization/extra-container/default.nix b/pkgs/tools/virtualization/extra-container/default.nix index ad0601a5243a..dad7a3d1be72 100644 --- a/pkgs/tools/virtualization/extra-container/default.nix +++ b/pkgs/tools/virtualization/extra-container/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Run declarative containers without full system rebuilds"; - homepage = https://github.com/erikarvstedt/extra-container; + homepage = "https://github.com/erikarvstedt/extra-container"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.earvstedt ]; From 8f6a04992077bc30c80ca636e1b316a053a3a98a Mon Sep 17 00:00:00 2001 From: uniquepointer <71751817+uniquepointer@users.noreply.github.com> Date: Wed, 10 Nov 2021 10:40:54 +0000 Subject: [PATCH 096/140] your-editor: 1203 -> 1206 (#145241) Co-authored-by: figsoda --- pkgs/applications/editors/your-editor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index a191943c3fd6..dd3bde160c37 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1203"; + version = "1206"; src = fetchFromGitHub { owner = "kammerdienerb"; repo = "yed"; - rev = "608418f2037dc4ef5647e69fcef45302c50f138c"; - sha256 = "KqK2lcDTn91aCFJIDg+h+QsTrl7745So5aiKCxPkeh4="; + rev = "6cdd99fe1359899b26d8967bd376fd5caa5451eb"; + sha256 = "0XECSolW/xPXd1v3sv9HbJMWuHGnwCOwmHoPNCUsE+w="; }; installPhase = '' From 17ae4163e38515b16090552299b4b24670bfb70c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 12:27:14 +0100 Subject: [PATCH 097/140] python3Packages.starkbank-ecdsa: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/starkbank-ecdsa/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starkbank-ecdsa/default.nix b/pkgs/development/python-modules/starkbank-ecdsa/default.nix index c22862f53df9..e7e114dadd6a 100644 --- a/pkgs/development/python-modules/starkbank-ecdsa/default.nix +++ b/pkgs/development/python-modules/starkbank-ecdsa/default.nix @@ -6,13 +6,14 @@ buildPythonPackage rec { pname = "starkbank-ecdsa"; - version = "2.0.1"; + version = "2.0.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "starkbank"; repo = "ecdsa-python"; rev = "v${version}"; - sha256 = "sha256-TYp8eIzO8Bn1hgye7PpIywVEV0tQtJ3HaYjCnn4/57w="; + sha256 = "sha256-4QFAtGqHJZSVyrGPuMdJwvF761/P6YAHjjKmCpPyGdU="; }; checkInputs = [ From 1b36833f2c1bf1f9972c1f745966ed3a3f66f40d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 9 Nov 2021 20:59:02 +0000 Subject: [PATCH 098/140] pkgsMusl.libieee1284: fix build When building for Linux, it assumes that Glibc-specific functionality is available even though it has a fallback for when it isn't. This patch teaches it to only use Glibc-specific functionality on Glibc. --- pkgs/development/libraries/libieee1284/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/development/libraries/libieee1284/default.nix index 7c20d1b4947c..a2cbd6e4096f 100644 --- a/pkgs/development/libraries/libieee1284/default.nix +++ b/pkgs/development/libraries/libieee1284/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch +, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl +}: stdenv.mkDerivation rec { pname = "libieee1284"; @@ -11,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0wfv1prmhhpyll9l4g1ij3im7hk9mm96ydw3l9fvhjp3993cdn2x"; }; + patches = [ + # Fix build on Musl. + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libieee1284/patches/musl.patch"; + sha256 = "03xivd6z7m51i5brlmzs60pjrlqyr4561qlnh182wa7rrm01x5y6"; + }) + ]; + nativeBuildInputs = [ autoconf automake @@ -24,7 +34,7 @@ stdenv.mkDerivation rec { "--without-python" ]; - preConfigure = '' + prePatch = '' ./bootstrap ''; From 0cf19745a641c590c65f6eb6169e5cbb94bdf213 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 12:31:19 +0100 Subject: [PATCH 099/140] python3Packages.pyairvisual: 5.0.9 -> 2021.10.0 --- .../python-modules/pyairvisual/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index fadb3f58d509..c4db96bca759 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -15,19 +15,21 @@ buildPythonPackage rec { pname = "pyairvisual"; - version = "5.0.9"; + version = "2021.10.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "1jfbwnipklpgxjgsgsx4j53anbqyrbgvj0wb84fvsm32jq9m8avf"; + sha256 = "sha256-Wj+ReRTYsP/XMrr74XPHrkHYT0sXfqcW/shbG3zNuH0="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp @@ -43,9 +45,14 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ "examples/" ]; + disabledTestPaths = [ + # Ignore the examples directory as the files are prefixed with test_. + "examples/" + ]; - pythonImportsCheck = [ "pyairvisual" ]; + pythonImportsCheck = [ + "pyairvisual" + ]; meta = with lib; { description = "Python library for interacting with AirVisual"; From 8d016c63d76ca89fce894b03cd8f5a62e0387da8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 12:35:20 +0100 Subject: [PATCH 100/140] python3Packages.types-requests: 2.25.12 -> 2.26.0 --- .../python-modules/types-requests/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 5070ebf988ae..f151b0086282 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -5,17 +5,20 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.25.12"; + version = "2.26.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BVhjwKrPj48pzSyg0zIO/fOfKOcd5o0yd2F1HS9iu1c="; + sha256 = "sha256-317Iw0tBOkLrs45Plr3raAkLh1vfzFE43IKYnJVEWIM="; }; - # Modules doesn't have tests + # Module doesn't have tests doCheck = false; - pythonImportsCheck = [ "requests-stubs" ]; + pythonImportsCheck = [ + "requests-stubs" + ]; meta = with lib; { description = "Typing stubs for requests"; From a192536d7c0b74bc07d84e79b76057b096717564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Tue, 9 Nov 2021 18:01:24 -0300 Subject: [PATCH 101/140] plasma5: 5.23.2 -> 5.23.3 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 432 ++++++++++++++++---------------- 2 files changed, 217 insertions(+), 217 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index d6b54869122c..91031ac618fb 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.2/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.3/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 9e45140d2b62..70cb748709e9 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/bluedevil-5.23.2.tar.xz"; - sha256 = "0whg8d95vm6zc4vzdlffyvm5kqhi5b501z3749zx743jx8r125nb"; - name = "bluedevil-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/bluedevil-5.23.3.tar.xz"; + sha256 = "1n6h2m4z67vl0mv0hs0g5xff1vcj03w0nhx4hkhy66hly556nq8x"; + name = "bluedevil-5.23.3.tar.xz"; }; }; breeze = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/breeze-5.23.2.tar.xz"; - sha256 = "1b2n0wcwfp96k76cmm8llr6cvdxvpb6h17r0r4rnl4ypg36i03sb"; - name = "breeze-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/breeze-5.23.3.tar.xz"; + sha256 = "1514y4k52bc71nljihj655d7swk2qvr168i0j2xqcm0w4aiz4jmv"; + name = "breeze-5.23.3.tar.xz"; }; }; breeze-grub = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/breeze-grub-5.23.2.tar.xz"; - sha256 = "0zbych6hyfxjc4rl0m9nij6vgyg66s4b51vm5rjd9p0s6zhipzrl"; - name = "breeze-grub-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/breeze-grub-5.23.3.tar.xz"; + sha256 = "1nwhjw0nkdg94znh7h80byrq8vpa1f20ph1m4fhlj233nfskw0zy"; + name = "breeze-grub-5.23.3.tar.xz"; }; }; breeze-gtk = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/breeze-gtk-5.23.2.tar.xz"; - sha256 = "1ays2z6gmy1yx4ka5fjcmymlvq67p2wjwijciw4ambx1bxz6s5ci"; - name = "breeze-gtk-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/breeze-gtk-5.23.3.tar.xz"; + sha256 = "0wq313laj7nlsw3d6p1prq1d4gic5lz2ipklj4dq4vsvsh99ggvn"; + name = "breeze-gtk-5.23.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/breeze-plymouth-5.23.2.tar.xz"; - sha256 = "1lpri3rnfip9a24wrdm5b959l9lqkgk48l5ngisfly3619jz5aml"; - name = "breeze-plymouth-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/breeze-plymouth-5.23.3.tar.xz"; + sha256 = "047clfgqcrplwi3158pw1r868yyqlxs7iqqy861wzlsmjz9qzqdl"; + name = "breeze-plymouth-5.23.3.tar.xz"; }; }; discover = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/discover-5.23.2.tar.xz"; - sha256 = "0560qrq6c7hd29cjhxvl9qyn4a97vzp5hwgdlbzmrw6kcyjy83cy"; - name = "discover-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/discover-5.23.3.tar.xz"; + sha256 = "056wcvk44r11rycnn12xf8r5psxqnm0f6i6z6nc5100sqkhip6p0"; + name = "discover-5.23.3.tar.xz"; }; }; drkonqi = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/drkonqi-5.23.2.tar.xz"; - sha256 = "0ilg9x2ipncsbjms2l97dd0vdnay4jpsrbvamvfavdffqvzibd9f"; - name = "drkonqi-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/drkonqi-5.23.3.tar.xz"; + sha256 = "14yc6nq3z6jm8siq2r15nzsqxpawk5iqy9ghmmwy9xa4vf18dxy5"; + name = "drkonqi-5.23.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kactivitymanagerd-5.23.2.tar.xz"; - sha256 = "1y4bmwwakz9k9rkqslh1n9cnn4jvmrdc0hd760fqsf80z1v7k2dh"; - name = "kactivitymanagerd-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kactivitymanagerd-5.23.3.tar.xz"; + sha256 = "0rizk05v19qqymrjh7vswcp80a4rpyffmq7kg88pv5k11fcjqw5b"; + name = "kactivitymanagerd-5.23.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kde-cli-tools-5.23.2.tar.xz"; - sha256 = "1zphp97g3mpz86h00d1blkj568dwfdgvl4jqx81v1s6p7dcr1wl7"; - name = "kde-cli-tools-5.23.2.tar.xz"; - }; - }; - kdecoration = { - version = "5.23.2"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kdecoration-5.23.2.tar.xz"; - sha256 = "0p36grnjfnl71kqqrkvr18pr72mia81x8rnvnzb3r5abc5kbna6k"; - name = "kdecoration-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kde-cli-tools-5.23.3.tar.xz"; + sha256 = "0f8wab6n4klxj4yy4l4k3q3pdqlz9718mbjydnsmn1jgn20shsa0"; + name = "kde-cli-tools-5.23.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kde-gtk-config-5.23.2.tar.xz"; - sha256 = "0bwwlqnzdn2w9dsx64hlmy1rgc69549c89lqj0yj858prncb82d6"; - name = "kde-gtk-config-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kde-gtk-config-5.23.3.tar.xz"; + sha256 = "12w2jv0mi39c2g1w3g3c68m80ailcm98hibk1mg885r36gx9kskb"; + name = "kde-gtk-config-5.23.3.tar.xz"; + }; + }; + kdecoration = { + version = "5.23.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.23.3/kdecoration-5.23.3.tar.xz"; + sha256 = "134jmp5l2bvl042a5a1f1d66mqi4g7vrpmrn3gi7ysi34w1ylfc8"; + name = "kdecoration-5.23.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kdeplasma-addons-5.23.2.tar.xz"; - sha256 = "0jqbhkmq2w2q6my1vhw07j6lqxmcpb5cn5vaz7pl4ax8rqiy5i76"; - name = "kdeplasma-addons-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kdeplasma-addons-5.23.3.tar.xz"; + sha256 = "139wzfj21k32m36014sas3ad5qdc0df4131ckj1shlz882w4l3dw"; + name = "kdeplasma-addons-5.23.3.tar.xz"; }; }; kgamma5 = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kgamma5-5.23.2.tar.xz"; - sha256 = "168pc6rnxbmwrkpsghfaqjvza0m3cnvzcvlr860lkp91vqqq32b6"; - name = "kgamma5-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kgamma5-5.23.3.tar.xz"; + sha256 = "06wzcpsjqy5pw3s6qg32l6qg9jf61bbpjwh802182balfq2jl0y5"; + name = "kgamma5-5.23.3.tar.xz"; }; }; khotkeys = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/khotkeys-5.23.2.tar.xz"; - sha256 = "1pd2p46cc955z1s34jccqw81ps07nl4q4s4qzra0i831j7xsa9ib"; - name = "khotkeys-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/khotkeys-5.23.3.tar.xz"; + sha256 = "1ccjlr3q1lsmmdmh30wbrdaardvhivdzm9vrd46d301rdz6gyv86"; + name = "khotkeys-5.23.3.tar.xz"; }; }; kinfocenter = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kinfocenter-5.23.2.tar.xz"; - sha256 = "0bgdgd0n68fb5kaqdqyng9fvf3mjparrnjdp246i68kkclci5nym"; - name = "kinfocenter-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kinfocenter-5.23.3.tar.xz"; + sha256 = "09yz5grzwzgs1cg39j18zy7af8azy2lbg4bkkmh7wayv8pngj4gv"; + name = "kinfocenter-5.23.3.tar.xz"; }; }; kmenuedit = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kmenuedit-5.23.2.tar.xz"; - sha256 = "1jr25zdplndjhw8qb6c2xf255v73c85pcy7ps7x80g0y34pz2h1x"; - name = "kmenuedit-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kmenuedit-5.23.3.tar.xz"; + sha256 = "006kkg7jzwp4icik1hv95wcpw5sb1l1s94wnljvxdfdjkgzjxq55"; + name = "kmenuedit-5.23.3.tar.xz"; }; }; kscreen = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kscreen-5.23.2.tar.xz"; - sha256 = "1wc0ydyi5vbm3mpjqrkcxjz22gsz2xzw3xw48161z9aikfhhn44v"; - name = "kscreen-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kscreen-5.23.3.tar.xz"; + sha256 = "1x4qlycb1dxw36s3zyyrjfmfvwvwk8f8r0jls6hq8gqkl810abhw"; + name = "kscreen-5.23.3.tar.xz"; }; }; kscreenlocker = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kscreenlocker-5.23.2.tar.xz"; - sha256 = "1yfqj5g7zvayah53pz0bgmmz8q8hd2rmk5ndzacfl7qrz3dxq2g6"; - name = "kscreenlocker-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kscreenlocker-5.23.3.tar.xz"; + sha256 = "0wjcrikx3q533qz9wi0z3jm4k0lc09w2xsxr4iw1hh3afsd6jr34"; + name = "kscreenlocker-5.23.3.tar.xz"; }; }; ksshaskpass = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/ksshaskpass-5.23.2.tar.xz"; - sha256 = "1icb5z7hnyrhh29krp5pgxm214w4lkq4k29laa8a1jryp3igqm1l"; - name = "ksshaskpass-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/ksshaskpass-5.23.3.tar.xz"; + sha256 = "0dcych5zcv8fqmy1lhwpbfzj75ihs648d8ppfr0nj15mm2pgnvhx"; + name = "ksshaskpass-5.23.3.tar.xz"; }; }; ksystemstats = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/ksystemstats-5.23.2.tar.xz"; - sha256 = "0m1ijvqr5b09b4hmr81hi5wvf8d79vg36hkmq9r2digr76pf1ni4"; - name = "ksystemstats-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/ksystemstats-5.23.3.tar.xz"; + sha256 = "13jic16480rxhdwz0z49di19sxdi7rgvg61lg5i00w9mm6mbph3l"; + name = "ksystemstats-5.23.3.tar.xz"; }; }; kwallet-pam = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kwallet-pam-5.23.2.tar.xz"; - sha256 = "105dpcb6zskqkbnhd5sl4igb0r87dza383m0qqffqfriwvjf9v6z"; - name = "kwallet-pam-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kwallet-pam-5.23.3.tar.xz"; + sha256 = "0axxk7szp5kn5hhlxh2mjzbwzaj4g1yn40ymgb6dga10h1nfdkd8"; + name = "kwallet-pam-5.23.3.tar.xz"; }; }; kwayland-integration = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kwayland-integration-5.23.2.tar.xz"; - sha256 = "0fchl5bjyn9vkj2rzqhlg3jzi2gp993l3c6skviyfqkvp3fq91bl"; - name = "kwayland-integration-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kwayland-integration-5.23.3.tar.xz"; + sha256 = "01gm3xbaih22v33bd9142xnrli13yxmib42pj8rnczhczrpnc3z3"; + name = "kwayland-integration-5.23.3.tar.xz"; }; }; kwayland-server = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kwayland-server-5.23.2.tar.xz"; - sha256 = "03cc0hm99gyr07kbk6vkqxs3nngsnl51smbpwg5rb3lycij38f1j"; - name = "kwayland-server-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kwayland-server-5.23.3.tar.xz"; + sha256 = "1hjh278iaz3ydf9bqy2fmm4hsvc60hrqw4hlc3ddcadp28dhg3gx"; + name = "kwayland-server-5.23.3.tar.xz"; }; }; kwin = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kwin-5.23.2.tar.xz"; - sha256 = "1fpq3r93lk0wmzckd8jkw4fcdggl75mjyj59j9ivijnb8an7vfpz"; - name = "kwin-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kwin-5.23.3.tar.xz"; + sha256 = "04w8vnz3rzd9g1j1f4fbgyxjvxqrhasx6f2vqkrrh4cd56ndmcbz"; + name = "kwin-5.23.3.tar.xz"; }; }; kwrited = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/kwrited-5.23.2.tar.xz"; - sha256 = "1czaq3gzyb5v153626rxb54512nkhlpsypf4aghdr9c32n12vgd4"; - name = "kwrited-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/kwrited-5.23.3.tar.xz"; + sha256 = "0156syandkq0s76xrrcz6nkxa6jgpf1a6nbkdw0a8biyxs5md644"; + name = "kwrited-5.23.3.tar.xz"; }; }; layer-shell-qt = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/layer-shell-qt-5.23.2.tar.xz"; - sha256 = "0pw9k1g7g5fjq6hkmri546pph1rycyay97gvw8ngzx67v0n9phlg"; - name = "layer-shell-qt-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/layer-shell-qt-5.23.3.tar.xz"; + sha256 = "15y7p0a59779aqxnsryqirsxslbvbig733i5s3n5jmg98y40712a"; + name = "layer-shell-qt-5.23.3.tar.xz"; }; }; libkscreen = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/libkscreen-5.23.2.tar.xz"; - sha256 = "1shlw9wa01ilfhh57i6752mm62qjhj0w0q5qz6kvga3gmzmwp6sf"; - name = "libkscreen-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/libkscreen-5.23.3.tar.xz"; + sha256 = "0kazvsahnk7ngld12lp1c07c34x9kal03fy8g7w9bgdha3j7xmdq"; + name = "libkscreen-5.23.3.tar.xz"; }; }; libksysguard = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/libksysguard-5.23.2.tar.xz"; - sha256 = "1knbik3r2bv11vzc17k9971bgrd7dsk9d7j4s5323schymmbzypq"; - name = "libksysguard-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/libksysguard-5.23.3.tar.xz"; + sha256 = "0ma4b0w08j0f46ivh9grci7wfh4z5j8nml83kcvnain1nwzprha0"; + name = "libksysguard-5.23.3.tar.xz"; }; }; milou = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/milou-5.23.2.tar.xz"; - sha256 = "0nshc6bbbjyrs2sah1q0y5msrdhhrzz24fbgqvh871csb9lh3idz"; - name = "milou-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/milou-5.23.3.tar.xz"; + sha256 = "0myvm9bkq189cfla7yqiwmbb5z2cm90rq5ll655n2c7zk3lqnn0d"; + name = "milou-5.23.3.tar.xz"; }; }; oxygen = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/oxygen-5.23.2.tar.xz"; - sha256 = "1k2bibgwdzwad87xyr31231b5jfk2m2x348layz41f3zl33mj1cp"; - name = "oxygen-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/oxygen-5.23.3.tar.xz"; + sha256 = "0r79xadvg7l4nsziy78wydhn4f0223fjc2xd60zih1dwmgapgf0z"; + name = "oxygen-5.23.3.tar.xz"; }; }; plasma-browser-integration = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-browser-integration-5.23.2.tar.xz"; - sha256 = "08zf8qjcq538fg7zpw73qdcvp4a88vxvvm297y7gch37h9nrbmgg"; - name = "plasma-browser-integration-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-browser-integration-5.23.3.tar.xz"; + sha256 = "0r3sq6w73qn246nddf4f8lbym8k4wp2ycfr2laz888b5cjf9df97"; + name = "plasma-browser-integration-5.23.3.tar.xz"; }; }; plasma-desktop = { - version = "5.23.2.1"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-desktop-5.23.2.1.tar.xz"; - sha256 = "0d2r6bxj04078acdlv6dzvy4jamcj1d49bafa4430hcqrxjy8scg"; - name = "plasma-desktop-5.23.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-desktop-5.23.3.tar.xz"; + sha256 = "01259pqncx3gcpanrmhal51dn4y8xcrs16pl5bjnasdn9r8mlhs3"; + name = "plasma-desktop-5.23.3.tar.xz"; }; }; plasma-disks = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-disks-5.23.2.tar.xz"; - sha256 = "0phv135v4jav17nb2f7cwvmcxk6sqr582jvw1y34vfphjgg8z3kw"; - name = "plasma-disks-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-disks-5.23.3.tar.xz"; + sha256 = "1qwxhasmycn6ah2pv46z8vvls85lfwxm4z61q13l63a50489a05b"; + name = "plasma-disks-5.23.3.tar.xz"; }; }; plasma-firewall = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-firewall-5.23.2.tar.xz"; - sha256 = "1h0zjzx7anhsbpx64q6pg3nh3w329nap3d1sqz5jg2iishql8jnz"; - name = "plasma-firewall-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-firewall-5.23.3.tar.xz"; + sha256 = "0kqb7sxysh6gq143rmmznv95mx4275bp1xfrlys518yn97clnwqq"; + name = "plasma-firewall-5.23.3.tar.xz"; }; }; plasma-integration = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-integration-5.23.2.tar.xz"; - sha256 = "116hnkfwh4q1ssmayqjx1slam3fmhmdqwd89bc5rzhw0amf1vvy8"; - name = "plasma-integration-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-integration-5.23.3.tar.xz"; + sha256 = "0q53b43yl5s1pvlqpmic2x8q5inawk66n8wng7rzgcfv9d3imhrn"; + name = "plasma-integration-5.23.3.tar.xz"; }; }; plasma-nano = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-nano-5.23.2.tar.xz"; - sha256 = "110d5qwlfg6jngxf19kqgzj0j8izqyqid0pvd10dwahp7sbsrq3q"; - name = "plasma-nano-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-nano-5.23.3.tar.xz"; + sha256 = "0ijygajn78c97s8ys8m2zn52zx45kxhk857hppkxp4jqpd5psf34"; + name = "plasma-nano-5.23.3.tar.xz"; }; }; plasma-nm = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-nm-5.23.2.tar.xz"; - sha256 = "0pphzdm5ccl045jvzp83lrcscrhrng12a7sl3mjqa1ghzfbyg2x0"; - name = "plasma-nm-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-nm-5.23.3.tar.xz"; + sha256 = "157almdi3br1qdfr0lwfdwc60fbizkwmpw3j2czk2sdsvm58rhgf"; + name = "plasma-nm-5.23.3.tar.xz"; }; }; plasma-pa = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-pa-5.23.2.tar.xz"; - sha256 = "05f3hfvp387l968w1h8mwydzvm4kdvyyz1zvphpws8x2izwgjksn"; - name = "plasma-pa-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-pa-5.23.3.tar.xz"; + sha256 = "0md3vb2iffn4qdnj4msyn6j3hvidnsxzp2dfsnb3n0yp29niwxqk"; + name = "plasma-pa-5.23.3.tar.xz"; }; }; plasma-phone-components = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-phone-components-5.23.2.tar.xz"; - sha256 = "1rfkxs3v37768fw51wm850smj75c3bcyl3xxl256kqm9rcb4n1gk"; - name = "plasma-phone-components-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-phone-components-5.23.3.tar.xz"; + sha256 = "1w8yqczr0933vhca5id32vg1k2np6n6hkh58n4x3z3xpdxpb5d4c"; + name = "plasma-phone-components-5.23.3.tar.xz"; }; }; plasma-sdk = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-sdk-5.23.2.tar.xz"; - sha256 = "043qpvx6kwzpm80cqvr40y5dhw45ivb5qzc902jfc1288l3qgh1s"; - name = "plasma-sdk-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-sdk-5.23.3.tar.xz"; + sha256 = "0fb9g6vhsaxd6h6889jyhnxp86g7rwkmyiafq72hx6ikv69wyvbi"; + name = "plasma-sdk-5.23.3.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-systemmonitor-5.23.2.tar.xz"; - sha256 = "0nsva84h46kx7hyv3qz2jmqgiw9mdglyxlhz3x1ywl0m4g91mgq7"; - name = "plasma-systemmonitor-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-systemmonitor-5.23.3.tar.xz"; + sha256 = "1jlgfrkdw785x9bib2hzxjyd70b9aqgcp1w6lk75bhgkrz85kz8p"; + name = "plasma-systemmonitor-5.23.3.tar.xz"; }; }; plasma-tests = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-tests-5.23.2.tar.xz"; - sha256 = "0b8mb39vgxlrrsllyq8x83ny4i302w0hs9dgbjg909fmwddlz3k3"; - name = "plasma-tests-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-tests-5.23.3.tar.xz"; + sha256 = "1fgl09c0ir8w128z4l0bggszjsvsqncb42k44vn6i6d0qdisxdgh"; + name = "plasma-tests-5.23.3.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-thunderbolt-5.23.2.tar.xz"; - sha256 = "13h5ai0bq3nafsaa2bmgdsy10ychlqm8rnvfqypkx9y52jy9jcwc"; - name = "plasma-thunderbolt-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-thunderbolt-5.23.3.tar.xz"; + sha256 = "0vzdzsl6isg24j0830lg7is47kpmpvsni7gf4vri2l8a6fy7ibav"; + name = "plasma-thunderbolt-5.23.3.tar.xz"; }; }; plasma-vault = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-vault-5.23.2.tar.xz"; - sha256 = "0d9iynky3fxsd6lr7db51aynjz7yz51n21brgwghld4dyfyh0hsf"; - name = "plasma-vault-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-vault-5.23.3.tar.xz"; + sha256 = "061zq00mz1aamam4pc4kbbzdx4mi07iiach6w52n0c9d1bz16ym2"; + name = "plasma-vault-5.23.3.tar.xz"; }; }; plasma-workspace = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-workspace-5.23.2.tar.xz"; - sha256 = "0wivjcl5s6llsq8vhi2qiw6gj0a6vppaqvmd1qihpsxgrb763lnv"; - name = "plasma-workspace-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-workspace-5.23.3.tar.xz"; + sha256 = "0mz2aanm46s88lwm1s2nwm8yfanj78rnx1y14ppzm4dx0lrjx046"; + name = "plasma-workspace-5.23.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plasma-workspace-wallpapers-5.23.2.tar.xz"; - sha256 = "00aam10k8zmlzw0v9jv5k0gwcjizrvpcyd3nx8m3zyiv6b2jw1g9"; - name = "plasma-workspace-wallpapers-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plasma-workspace-wallpapers-5.23.3.tar.xz"; + sha256 = "1kz4xqzgwnhp1wmqmgadn0jjc9033i2bm8hiycqkahhj603k552s"; + name = "plasma-workspace-wallpapers-5.23.3.tar.xz"; }; }; plymouth-kcm = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/plymouth-kcm-5.23.2.tar.xz"; - sha256 = "1qgg2d5lrnv5g42ikjnyby3lkxm6iaa1kxw13sdzyv5s6234q7qp"; - name = "plymouth-kcm-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/plymouth-kcm-5.23.3.tar.xz"; + sha256 = "1fa26h19g4f2fhpisp1jsl1niis50fbkdss7j1nqg44jih0g0qyf"; + name = "plymouth-kcm-5.23.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.23.2"; + version = "1-5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/polkit-kde-agent-1-5.23.2.tar.xz"; - sha256 = "1fldyflcpwhjym9z3rsi90mfjan15w28gwd1s53kiy2fzvmvj0a0"; - name = "polkit-kde-agent-1-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/polkit-kde-agent-1-5.23.3.tar.xz"; + sha256 = "1r5sqxzj5r9xqn3iwsfj06f1w69q41j4wq2z11kndnjad0pwrf3r"; + name = "polkit-kde-agent-1-5.23.3.tar.xz"; }; }; powerdevil = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/powerdevil-5.23.2.tar.xz"; - sha256 = "0f6nhla8gsxil4i0f6np9vjs7f4hgikfw0m6zwp67qqlh9n83mxi"; - name = "powerdevil-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/powerdevil-5.23.3.tar.xz"; + sha256 = "0hcb22dy4hslzrk3md6amzm51hlmv08747f34x5drdl10cg98mzb"; + name = "powerdevil-5.23.3.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/qqc2-breeze-style-5.23.2.tar.xz"; - sha256 = "09bpvydpinqhc5vrx92fzw9ga6xynpvzxhwrq95dwdp3801kwkgy"; - name = "qqc2-breeze-style-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/qqc2-breeze-style-5.23.3.tar.xz"; + sha256 = "0716mw6dgpzwkaiinp8vphvxj3vrb95v7zckh4pgdky8ahxv655l"; + name = "qqc2-breeze-style-5.23.3.tar.xz"; }; }; sddm-kcm = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/sddm-kcm-5.23.2.tar.xz"; - sha256 = "0xq9qyy56vhrwa0m4yvhp0all8m13jzhyhflc2y0d82cb4sn10yh"; - name = "sddm-kcm-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/sddm-kcm-5.23.3.tar.xz"; + sha256 = "0sb9sjdbhafjcx2nf2ffzjh14gyambj1w32gjz29fl15xjbmvqnr"; + name = "sddm-kcm-5.23.3.tar.xz"; }; }; systemsettings = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/systemsettings-5.23.2.tar.xz"; - sha256 = "0vr22bj0nwp55qximbdn47y4208nhybqiz8pc6fqr2hdg9582s8i"; - name = "systemsettings-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/systemsettings-5.23.3.tar.xz"; + sha256 = "0i8vc1y95jd3g5vcgzixd73mn1r9s2jg9ix5nwfq4i5ihi0a0ph1"; + name = "systemsettings-5.23.3.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.23.2"; + version = "5.23.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.2/xdg-desktop-portal-kde-5.23.2.tar.xz"; - sha256 = "0ji02bscvdjcifibrjx5mk1ga91892hj3f6jcyiycd2xj4sqbcnf"; - name = "xdg-desktop-portal-kde-5.23.2.tar.xz"; + url = "${mirror}/stable/plasma/5.23.3/xdg-desktop-portal-kde-5.23.3.tar.xz"; + sha256 = "1aajlgccl1z9m49a016ixr2hiy231wyx6xnmpbvjx9h1b52b3rpz"; + name = "xdg-desktop-portal-kde-5.23.3.tar.xz"; }; }; } From b654f383f9e7759d7ad842b5dccc8c4b82313e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Wed, 10 Nov 2021 07:40:03 -0300 Subject: [PATCH 102/140] plasma-workspace: remove patch merged upstream --- .../0003-startkde-unit-detection.patch | 17 ----------------- .../plasma-5/plasma-workspace/default.nix | 1 - 2 files changed, 18 deletions(-) delete mode 100644 pkgs/desktops/plasma-5/plasma-workspace/0003-startkde-unit-detection.patch diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0003-startkde-unit-detection.patch b/pkgs/desktops/plasma-5/plasma-workspace/0003-startkde-unit-detection.patch deleted file mode 100644 index 57779b3f559d..000000000000 --- a/pkgs/desktops/plasma-5/plasma-workspace/0003-startkde-unit-detection.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index a17967b47..6e6141b48 100644 ---- a/startkde/startplasma.cpp -+++ b/startkde/startplasma.cpp -@@ -431,7 +431,11 @@ bool hasSystemdService(const QString &serviceName) - QStringLiteral("/org/freedesktop/systemd1"), - QStringLiteral("org.freedesktop.systemd1.Manager"), - QStringLiteral("ListUnitFilesByPatterns")); -- msg << QStringList({QStringLiteral("enabled"), QStringLiteral("static")}) << QStringList({serviceName}); -+ msg << QStringList({QStringLiteral("enabled"), -+ QStringLiteral("static"), -+ QStringLiteral("linked"), -+ QStringLiteral("linked-runtime")}); -+ msg << QStringList({serviceName}); - QDBusReply>> reply = QDBusConnection::sessionBus().call(msg); - if (!reply.isValid()) { - return false; diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 927ca7debc29..fac10cf31d41 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -52,7 +52,6 @@ mkDerivation { patches = [ ./0001-startkde.patch ./0002-absolute-wallpaper-install-dir.patch - ./0003-startkde-unit-detection.patch ]; # QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools From 7d9f89fb0543375b62766e44952312e84f00bd31 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 13:05:52 +0100 Subject: [PATCH 103/140] python3Packages.aiorecollect: 1.0.8 -> 2021.10.0 --- .../python-modules/aiorecollect/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index 2f62a31e129c..79bc2a787b96 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -6,20 +6,22 @@ , freezegun , poetry-core , pytest-asyncio -, pytest-cov , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aiorecollect"; - version = "1.0.8"; + version = "2021.10.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-5+v+TlLOgaIA8svpbgFSEWZAUVBRq3zqf8QbidKgygI="; + sha256 = "sha256-cLutszJ8VXGcqb8kZv7Qn1ZD/LRYjVgQWQxNMHNd0UQ="; }; nativeBuildInputs = [ @@ -34,13 +36,17 @@ buildPythonPackage rec { aresponses freezegun pytest-asyncio - pytest-cov pytestCheckHook ]; - disabledTestPaths = [ "examples/" ]; + disabledTestPaths = [ + # Ignore the examples directory as the files are prefixed with test_. + "examples/" + ]; - pythonImportsCheck = [ "aiorecollect" ]; + pythonImportsCheck = [ + "aiorecollect" + ]; meta = with lib; { description = "Python library for the Recollect Waste API"; From bb17e2c937f1873c3aaea92f4ec2b3bd418d1ce3 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Wed, 10 Nov 2021 12:10:54 +0000 Subject: [PATCH 104/140] vscodium: 1.62.0 -> 1.62.1 --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 8f383563bfc2..c7048014bdcf 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "17vrz16q4fhc6b2rlddhz3m6y780gi9vzk28l0fcj12l9z5iprn9"; - x86_64-darwin = "1hn8sjmndmicl3gjrsb163wn5j36ij5b68mw7n6v6lqaf0a75xah"; - aarch64-linux = "0ikdy9c2ldrxyh8ij2qskv4m7j5azr1hbi53ddzgj1j6nms68lkh"; - armv7l-linux = "07a3kz4c8wzid0rd1rdzndy8c1cdg4hba7p1jmdf7zclr702i2j7"; + x86_64-linux = "1xblrp4xyw2pcifmzjmlbnmk7lhmlj002sfk28kyf1k5wdp54yv9"; + x86_64-darwin = "0ivvdxc4hmv9sh8ap0qy8yciz9pjkm1p1j60dh57y4ll6fdzbbrd"; + aarch64-linux = "0ssm27i12d7gkq31d1zma4zx5n5mgg0a8pj3sdk9jjjsa68b3pyr"; + armv7l-linux = "029shxcwnap28ys6lxml3yiiavw4lhnizf35f0a664vdzy1x5dpv"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.62.0"; + version = "1.62.1"; pname = "vscodium"; executableName = "codium"; From a57f864975cee5ad867e26d292a1aca2097108d2 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 10 Nov 2021 13:39:51 +0100 Subject: [PATCH 105/140] carp: 0.5.0 -> 0.5.3 (#145281) Co-authored-by: Sandro --- pkgs/development/compilers/carp/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix index d83e70a703aa..fa2b4ebd620f 100644 --- a/pkgs/development/compilers/carp/default.nix +++ b/pkgs/development/compilers/carp/default.nix @@ -1,15 +1,14 @@ { lib, fetchFromGitHub, makeWrapper, clang, haskellPackages }: haskellPackages.mkDerivation rec { - pname = "carp"; - version = "0.5.0"; + version = "0.5.3"; src = fetchFromGitHub { owner = "carp-lang"; repo = "Carp"; rev = "v${version}"; - sha256 = "sha256-nTSMY8bq0b/JvE/XQGDC4St2sqdni12E5WQU5FXnuCg="; + sha256 = "08ryk30ii24qsdpdq7bqi406ynv9nr8zy2pcv9n70ar8fxfw0859"; }; buildTools = [ makeWrapper ]; From d97bf8f68d86ea11307317060a5d9fd9e6194679 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 10 Nov 2021 08:01:26 -0500 Subject: [PATCH 106/140] cargo-deny: 0.10.0 -> 0.10.1 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 02bc561b1573..7fe476c842c5 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-YXIEM8COtjc3yD8gxoeoJwkGyJwMCCn40591iO6ERxc="; + sha256 = "sha256-ZpTwqwxh1/Yz5MBlv1KvD/sBTaFb5m7cQXLkUAGZegc="; }; - cargoSha256 = "sha256-4PcYnpoRvl01n4Y4usrlLejWwcB5BJnFGqqfbqLD1gI="; + cargoSha256 = "sha256-JwljoLTEolKCaob7IPYan5N9YIZvnlj1uRZ1mNACGbQ="; doCheck = false; From 65072f8018ca5d09b3d9d816676d914af844e50c Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 10 Nov 2021 14:02:17 +0100 Subject: [PATCH 107/140] warzone2100: 4.2.0 -> 4.2.1 --- pkgs/games/warzone2100/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 28a4b7d1a97c..0c5c5112f506 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-1M77zuAqunfAjK2Jvu08Z7inCMdBYX92AmyMD9eaue8="; + sha256 = "sha256-N9D4K3+/Nt3N3/uHDD+jD6tzL0FMwmV7l+WGjGYa3Yk="; }; buildInputs = [ From b50d43cc947fe45aa9d8d266c2ea665c903e1934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Povi=C5=A1er?= Date: Wed, 10 Nov 2021 14:25:59 +0100 Subject: [PATCH 108/140] yosys: remove pointless patching This fixes the patch introduced in: 94a047ca74cb (yosys: fix build on darwin, 2021-11-09) Because we supply yosys with an external build of ABC, the patched ABCMKARGS variable is without influence. Even if we were building with in-tree ABC, that part of the patch is wrong, so drop it altogether. --- .../compilers/yosys/fix-clang-build.patch | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/development/compilers/yosys/fix-clang-build.patch b/pkgs/development/compilers/yosys/fix-clang-build.patch index 685841e0f750..f44d60d7e6ec 100644 --- a/pkgs/development/compilers/yosys/fix-clang-build.patch +++ b/pkgs/development/compilers/yosys/fix-clang-build.patch @@ -2,19 +2,6 @@ diff --git a/Makefile b/Makefile index 86abc6958..a72f7b792 100644 --- a/Makefile +++ b/Makefile -@@ -145,7 +145,12 @@ bumpversion: - ABCREV = 4f5f73d - ABCPULL = 1 - ABCURL ?= https://github.com/YosysHQ/abc -+ -+ifneq ($(CONFIG),clang) -+ABCMKARGS = CC=clang CXX="$(CXX)" LD=clang ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q) -+else - ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q) -+endif - - # set ABCEXTERNAL = to use an external ABC instance - # Note: The in-tree ABC (yosys-abc) will not be installed when ABCEXTERNAL is set. @@ -187,7 +192,7 @@ endif endif From d0c864cf8ee8dc94d2618a235fae326a6139e5d7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 10 Nov 2021 16:46:07 +0200 Subject: [PATCH 109/140] puppet-lint: 2.3.6 -> 2.5.2 --- pkgs/development/tools/puppet/puppet-lint/Gemfile.lock | 4 ++-- pkgs/development/tools/puppet/puppet-lint/gemset.nix | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock index 870652b567a4..7569b5e2d13c 100644 --- a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock +++ b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - puppet-lint (2.3.6) + puppet-lint (2.5.2) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES puppet-lint BUNDLED WITH - 2.1.4 + 2.2.24 diff --git a/pkgs/development/tools/puppet/puppet-lint/gemset.nix b/pkgs/development/tools/puppet/puppet-lint/gemset.nix index d42626f1cd59..e3911e63536a 100644 --- a/pkgs/development/tools/puppet/puppet-lint/gemset.nix +++ b/pkgs/development/tools/puppet/puppet-lint/gemset.nix @@ -1,10 +1,12 @@ { puppet-lint = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wyk2l440d96ps3x127r52n51kqpqi2nzb3xlg92qn6aksqhnkis"; + sha256 = "1rcj3cb6lf90g6vvhh3c9p8yn7pgibglf9k5878bzd6pn5ag0h9v"; type = "gem"; }; - version = "2.3.6"; + version = "2.5.2"; }; } From bfd4f21603e4fee775d567321b03a9c6cd6fd8a9 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Wed, 10 Nov 2021 15:52:00 +0100 Subject: [PATCH 110/140] gradle: 7.2 -> 7.3 --- maintainers/maintainer-list.nix | 6 ++++++ .../tools/build-managers/gradle/default.nix | 16 ++++++---------- .../gradle/gradle-7.3-rc-3-spec.nix | 5 ----- .../build-managers/gradle/gradle-7.3-spec.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 18 insertions(+), 16 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/gradle/gradle-7.3-rc-3-spec.nix create mode 100644 pkgs/development/tools/build-managers/gradle/gradle-7.3-spec.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index feebff4884f3..1e03529bf1de 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6666,6 +6666,12 @@ fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; }]; }; + lorenzleutgeb = { + email = "lorenz@leutgeb.xyz"; + github = "lorenzleutgeb"; + githubId = 542154; + name = "Lorenz Leutgeb"; + }; luis = { email = "luis.nixos@gmail.com"; github = "Luis-Hebendanz"; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index c0c576d6d462..877f28419055 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -47,7 +47,7 @@ rec { nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ java ]; - meta = { + meta = with lib; { description = "Enterprise-grade build system"; longDescription = '' Gradle is a build system which offers you ease, power and freedom. @@ -58,18 +58,14 @@ rec { build-by-convention behavior. ''; homepage = "http://www.gradle.org/"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ lorenzleutgeb ]; }; }; - gradle_latest = gradle_7; - - # NOTE: 7.3 is a candidate. - gradle_7 = gradle_7_2; - - gradle_7_3 = gradleGen (gradleSpec (import ./gradle-7.3-rc-3-spec.nix)); - gradle_7_2 = gradleGen (gradleSpec (import ./gradle-7.2-spec.nix)); + gradle_latest = gradle_7_3; + gradle_7_3 = gradleGen (gradleSpec (import ./gradle-7.3-spec.nix)); gradle_6_9 = gradleGen (gradleSpec (import ./gradle-6.9.1-spec.nix)); # NOTE: No GitHub Release for this release, so update.sh does not work. diff --git a/pkgs/development/tools/build-managers/gradle/gradle-7.3-rc-3-spec.nix b/pkgs/development/tools/build-managers/gradle/gradle-7.3-rc-3-spec.nix deleted file mode 100644 index c9542d98e816..000000000000 --- a/pkgs/development/tools/build-managers/gradle/gradle-7.3-rc-3-spec.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - version = "7.3-rc-3"; - nativeVersion = "0.22-milestone-21"; - sha256 = "0401q4qpl36a2vnlrlsblflfiiy3b95gyj2wj62hzc1x00hbfznm"; -} diff --git a/pkgs/development/tools/build-managers/gradle/gradle-7.3-spec.nix b/pkgs/development/tools/build-managers/gradle/gradle-7.3-spec.nix new file mode 100644 index 000000000000..2e7b00732970 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/gradle-7.3-spec.nix @@ -0,0 +1,5 @@ +{ + version = "7.3"; + nativeVersion = "0.22-milestone-21"; + sha256 = "04741q7avmn7rv9h5s6dqj4ibnvdylxrlhvj9wb5kixx96nm53yy"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d245531054d..59eafb28c9e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14575,7 +14575,7 @@ with pkgs; gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; gradle_6 = res.gradleGen.gradle_6_9; - gradle_7 = res.gradleGen.gradle_7; + gradle_7 = res.gradleGen.gradle_7_3; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. From 313d5ff8566117d142dfef69dab23341935cfbbe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 15:55:56 +0100 Subject: [PATCH 111/140] exploitdb: 2021-11-06 -> 2021-11-09 --- 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 7d15fc8bc65e..5241d773c3ab 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 = "2021-11-06"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-pyzK6Z62gvuvi8FilNySyp78i4A2SLSFLY8WsSNdFQ0="; + sha256 = "sha256-V/iQvA2jxeddzmzoVNJ4eoyEjkrkfws7pLw6akbBDaA="; }; nativeBuildInputs = [ makeWrapper ]; From abd21e27005b892d309df2e4cf8caf7c2b9af4e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 16:10:01 +0100 Subject: [PATCH 112/140] python3Packages.pyopenuv: 2.2.1 -> 2021.10.0 --- .../python-modules/pyopenuv/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index f30f3758f31b..edd34c237d20 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -8,23 +8,27 @@ , poetry-core , pytest-aiohttp , pytest-asyncio -, pytest-cov , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyopenuv"; - version = "2.2.1"; + version = "2021.10.0"; format = "pyproject"; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-9hpXVKCpVbUAoTxd5mHP9NK1dZxbrQUxrQrOEVHpaPo="; + sha256 = "sha256-3zTyW3eXOA9frSAy4g7iWhymc1hBo0hrxIgPLMqrLTs="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp @@ -36,13 +40,18 @@ buildPythonPackage rec { asynctest pytest-asyncio pytest-aiohttp - pytest-cov pytestCheckHook ]; # Ignore the examples as they are prefixed with test_ - pytestFlagsArray = [ "--ignore examples/" ]; - pythonImportsCheck = [ "pyopenuv" ]; + disabledTestPaths = [ + # Ignore the examples as they are prefixed with test_ + "examples/" + ]; + + pythonImportsCheck = [ + "pyopenuv" + ]; meta = with lib; { description = "Python API to retrieve data from openuv.io"; From fc7244587262aa5d8d8f291a955bb763486a5688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 9 Nov 2021 00:39:01 -0600 Subject: [PATCH 113/140] =?UTF-8?q?gnome.mutter:=2041.0=20=E2=86=92=2041.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 78b90a379c38..209d9fbdb92a 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -46,13 +46,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "41.0"; + version = "41.1"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-+oChp0QETYjr/Wd/8DID1ncF7SzWJOoGy7i1iUjN+J4="; + sha256 = "WOY/0LxD81E08hMTr/Suv5LIKdbfTcmaBEoeN2aR4/M="; }; patches = [ From 8d5118b1ea3054377375ede642b9488a5abbf9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 9 Nov 2021 09:23:13 -0600 Subject: [PATCH 114/140] =?UTF-8?q?tracker-miners:=203.2.0=20=E2=86=92=203?= =?UTF-8?q?.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/tracker-miners/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 2668de9b4612..e3c74bd2fe45 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Bi+C3VSKYq7IUQWFAROskBpiK8UcbPxjIFY2Xof4GYE="; + sha256 = "RDafU+Lt70FDdAbb7s1Hepf4qa/dkTSDLqRdG6KqLEc="; }; nativeBuildInputs = [ From 412ee75d07dcc862151a9c44c85c50189b51776b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 9 Nov 2021 00:37:23 -0600 Subject: [PATCH 115/140] =?UTF-8?q?gnome.gnome-shell:=2041.0=20=E2=86=92?= =?UTF-8?q?=2041.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 04a4b0984ecb..d9eeb9a8d8b1 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -66,13 +66,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "41.0"; + version = "41.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Uvlx6FFA5d50uTae9mVuSc6Vrx8jL8Hg3x8EYSmrT2U="; + sha256 = "X3QkVt/gBgXA8JCjcoymJ5e8SeUK+FK71yhdoaBRf/Y="; }; patches = [ @@ -103,13 +103,6 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw="; }) - - # Make color picker in GTK work again - # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1990 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/a3dcdaae30bdcbadec7ba3fa31c9eb0bb2a4c8c2.patch"; - sha256 = "1UTWGZ5CiVJVCYcepaf+A6/8X/s6jUMsYB4BJ7VTjxk="; - }) ]; nativeBuildInputs = [ From 4ad135cb7ff6effb137661bda7a924713531a354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 9 Nov 2021 09:14:15 -0600 Subject: [PATCH 116/140] =?UTF-8?q?gnome.gnome-desktop:=2041.0=20=E2=86=92?= =?UTF-8?q?=2041.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-desktop/default.nix index 6ab45283c852..766ed1b7cfb5 100644 --- a/pkgs/desktops/gnome/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-desktop/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "41.0"; + version = "41.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-acsdPZoQcA62Y0jvHA5mqFX8WpeuYpAt+XpJnaEVYtI="; + sha256 = "sha256-voqvpk17ov0xB57tY505/aHqd+9301pnjwGcTZHUc8I="; }; patches = [ From c8054351344c65b636781dbfbc4a760d123c9d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 9 Nov 2021 09:16:54 -0600 Subject: [PATCH 117/140] =?UTF-8?q?simple-scan:=2040.5=20=E2=86=92=2040.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/simple-scan/default.nix b/pkgs/desktops/gnome/core/simple-scan/default.nix index 9514caa1e9b1..f5a28ead33c1 100644 --- a/pkgs/desktops/gnome/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "40.5"; + version = "40.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-61N55MtspgUJLJQiEMGEJdA2dz2nZUHkO4nYIj+CuaQ="; + sha256 = "sha256-8v8wWZjMRGNsH93iDNirHUQdSGOgWeLXpg+Od6/o8XE="; }; nativeBuildInputs = [ From a5f1139b5423c818b8fd5fe58c6cff43ae29a134 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 9 Nov 2021 22:04:20 +0100 Subject: [PATCH 118/140] routinator: 0.10.1 -> 0.10.2 --- pkgs/servers/routinator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index aff0499b98bd..edff95d2e11b 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ThgTGtTZ0LGm9nHJoy0KhnBFWNvKRjk7hoNTVVTeL/Y="; + sha256 = "0a2iwpmljkha6qlbw0373wph7pxz05qym5712vzbszw0z42f82l2"; }; - cargoSha256 = "sha256-mcx+qUtTUxeYP0PeJp1eOQwsdS6PPUx/m7TfAyqFiIM="; + cargoSha256 = "0l3fhwgrdvjrlmiqdy90sfd8kb2s7y0lbfswlrr560ly0bi1lfbx"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From c0ffaefb89164003b52c16a9543a19900b816271 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 17:00:45 +0100 Subject: [PATCH 119/140] python3Packages.faraday-plugins: 1.5.5 -> 1.5.6 --- .../python-modules/faraday-plugins/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 1116ea046a42..4701e481b31a 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -16,13 +16,14 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.5.5"; + version = "1.5.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_plugins"; rev = "v${version}"; - sha256 = "sha256-dnd6q/L3yh/9XkrWC4ETccSO6zr31wBsuumDvwemKyA="; + sha256 = "sha256-RTHhCSOqtdPsgZgeziAYm+9NoR72Jfm+42fyyKqjFpA="; }; propagatedBuildInputs = [ @@ -53,7 +54,9 @@ buildPythonPackage rec { "test_process_report_summary" ]; - pythonImportsCheck = [ "faraday_plugins" ]; + pythonImportsCheck = [ + "faraday_plugins" + ]; meta = with lib; { description = "Security tools report parsers for Faraday"; From b5dafef72e232728b1dba385e64377816c8aef1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 10 Nov 2021 17:14:30 +0100 Subject: [PATCH 120/140] top-level: remove extra /default.nix --- pkgs/top-level/all-packages.nix | 84 +++++++++++++++--------------- pkgs/top-level/python-packages.nix | 8 +-- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 612d432be31a..0052963d2479 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -321,7 +321,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit IOKit; }; - mix2nix = callPackage ../development/tools/mix2nix/default.nix { }; + mix2nix = callPackage ../development/tools/mix2nix { }; prisma-engines = callPackage ../development/tools/database/prisma-engines { inherit (darwin.apple_sdk.frameworks) Security; @@ -493,7 +493,7 @@ with pkgs; prefer-remote-fetch = import ../build-support/prefer-remote-fetch; - global-platform-pro = callPackage ../development/tools/global-platform-pro/default.nix { }; + global-platform-pro = callPackage ../development/tools/global-platform-pro { }; graph-easy = callPackage ../tools/graphics/graph-easy { }; @@ -1373,7 +1373,7 @@ with pkgs; awless = callPackage ../tools/virtualization/awless { }; - berglas = callPackage ../tools/admin/berglas/default.nix { }; + berglas = callPackage ../tools/admin/berglas { }; betterdiscordctl = callPackage ../tools/misc/betterdiscordctl { }; @@ -1669,7 +1669,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; + fitnesstrax = callPackage ../applications/misc/fitnesstrax { }; flavours = callPackage ../applications/misc/flavours { }; @@ -4766,7 +4766,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - timeline = callPackage ../applications/office/timeline/default.nix { }; + timeline = callPackage ../applications/office/timeline { }; tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; @@ -8079,7 +8079,7 @@ with pkgs; offlineimap = callPackage ../tools/networking/offlineimap { }; - ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim/default.nix { }; + ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { }; ogdf = callPackage ../development/libraries/ogdf { }; @@ -9424,7 +9424,7 @@ with pkgs; slides = callPackage ../applications/misc/slides { }; - slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; + slirp4netns = callPackage ../tools/networking/slirp4netns { }; slsnif = callPackage ../tools/misc/slsnif { }; @@ -9725,7 +9725,7 @@ with pkgs; swagger-codegen3 = callPackage ../tools/networking/swagger-codegen3 { }; - swapview = callPackage ../os-specific/linux/swapview/default.nix { }; + swapview = callPackage ../os-specific/linux/swapview { }; swtpm = callPackage ../tools/security/swtpm { }; @@ -11452,7 +11452,7 @@ with pkgs; scry = callPackage ../development/tools/scry { }; - dasm = callPackage ../development/compilers/dasm/default.nix { }; + dasm = callPackage ../development/compilers/dasm { }; dbmate = callPackage ../development/tools/database/dbmate { }; @@ -12287,7 +12287,7 @@ with pkgs; javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; - juniper = callPackage ../development/compilers/juniper/default.nix { }; + juniper = callPackage ../development/compilers/juniper { }; julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; @@ -12890,7 +12890,7 @@ with pkgs; sbcl_2_1_9 = callPackage ../development/compilers/sbcl/2.1.9.nix {}; sbcl = sbcl_2_1_9; - roswell = callPackage ../development/tools/roswell/default.nix { }; + roswell = callPackage ../development/tools/roswell { }; scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; }; scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; }; @@ -12898,7 +12898,7 @@ with pkgs; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; jre = jdk8; }; scala = scala_2_13; - scala-runners = callPackage ../development/compilers/scala-runners/default.nix { + scala-runners = callPackage ../development/compilers/scala-runners { coursier = coursier.override { jre = jdk8; }; }; @@ -13161,7 +13161,7 @@ with pkgs; clips = callPackage ../development/interpreters/clips { }; - cliscord = callPackage ../misc/cliscord/default.nix { }; + cliscord = callPackage ../misc/cliscord { }; clisp = callPackage ../development/interpreters/clisp { }; clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; @@ -13499,7 +13499,7 @@ with pkgs; setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {}; # These pyside tools do not provide any Python modules and are meant to be here. - # See ../development/python-modules/pyside/default.nix for details. + # See ../development/python-modules/pyside for details. pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; @@ -13740,7 +13740,7 @@ with pkgs; or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; - rappel = callPackage ../development/misc/rappel/default.nix { }; + rappel = callPackage ../development/misc/rappel { }; pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; @@ -14531,9 +14531,9 @@ with pkgs; gnome-usage = callPackage ../applications/misc/gnome-usage {}; - gnome-inform7 = callPackage ../applications/editors/gnome-inform7/default.nix { }; + gnome-inform7 = callPackage ../applications/editors/gnome-inform7 { }; - gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; + gnome-latex = callPackage ../applications/editors/gnome-latex { }; gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { }; @@ -15545,7 +15545,7 @@ with pkgs; assimp = callPackage ../development/libraries/assimp { }; asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { }; - asio = callPackage ../development/libraries/asio/default.nix { }; + asio = callPackage ../development/libraries/asio { }; aspell = callPackage ../development/libraries/aspell { }; @@ -16550,7 +16550,7 @@ with pkgs; then callPackage ../development/libraries/gnu-efi { } else null; - gnutls = callPackage ../development/libraries/gnutls/default.nix { + gnutls = callPackage ../development/libraries/gnutls { inherit (darwin.apple_sdk.frameworks) Security; util-linux = util-linuxMinimal; # break the cyclic dependency autoconf = buildPackages.autoconf269; @@ -20134,7 +20134,7 @@ with pkgs; cppzmq = callPackage ../development/libraries/cppzmq {}; - czmq = callPackage ../development/libraries/czmq/default.nix {}; + czmq = callPackage ../development/libraries/czmq {}; zmqpp = callPackage ../development/libraries/zmqpp { }; @@ -22150,7 +22150,7 @@ with pkgs; enableCmdlib = true; }; - maddy = callPackage ../servers/maddy/default.nix { }; + maddy = callPackage ../servers/maddy { }; mbelib = callPackage ../development/libraries/audio/mbelib { }; @@ -24031,7 +24031,7 @@ with pkgs; gtk = gtk3; }; - bluej = callPackage ../applications/editors/bluej/default.nix { + bluej = callPackage ../applications/editors/bluej { jdk = jetbrains.jdk; }; @@ -24665,7 +24665,7 @@ with pkgs; gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; - greenfoot = callPackage ../applications/editors/greenfoot/default.nix { + greenfoot = callPackage ../applications/editors/greenfoot { jdk = jetbrains.jdk; }; @@ -24819,7 +24819,7 @@ with pkgs; genxword = callPackage ../applications/misc/genxword { }; - geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; + geoipupdate = callPackage ../applications/misc/geoipupdate { }; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; @@ -25311,7 +25311,7 @@ with pkgs; linssid = libsForQt5.callPackage ../applications/networking/linssid { }; - deadd-notification-center = callPackage ../applications/misc/deadd-notification-center/default.nix { }; + deadd-notification-center = callPackage ../applications/misc/deadd-notification-center { }; lollypop = callPackage ../applications/audio/lollypop { }; @@ -25564,7 +25564,7 @@ with pkgs; hpack = haskell.lib.justStaticExecutables haskellPackages.hpack; - hpcg = callPackage ../tools/misc/hpcg/default.nix { }; + hpcg = callPackage ../tools/misc/hpcg { }; hpl = callPackage ../tools/misc/hpl { }; @@ -25637,7 +25637,7 @@ with pkgs; pixelnuke = callPackage ../applications/graphics/pixelnuke { }; - pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap/default.nix { }; + pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; shepherd = nodePackages."@nerdwallet/shepherd"; @@ -25767,11 +25767,11 @@ with pkgs; workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; - windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; + windowchef = callPackage ../applications/window-managers/windowchef { }; wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; - wmfs = callPackage ../applications/window-managers/wmfs/default.nix { }; + wmfs = callPackage ../applications/window-managers/wmfs { }; i810switch = callPackage ../os-specific/linux/i810switch { }; @@ -25877,7 +25877,7 @@ with pkgs; img2pdf = with python3Packages; toPythonApplication img2pdf; - imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber/default.nix { + imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { typescript = nodePackages.typescript; }; @@ -26633,7 +26633,7 @@ with pkgs; mop = callPackage ../applications/misc/mop { }; - mopidyPackages = callPackages ../applications/audio/mopidy/default.nix { + mopidyPackages = callPackages ../applications/audio/mopidy { python = python3; }; @@ -27113,9 +27113,9 @@ with pkgs; muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; - nufraw = callPackage ../applications/graphics/nufraw/default.nix { }; + nufraw = callPackage ../applications/graphics/nufraw { }; - nufraw-thumbnailer = callPackage ../applications/graphics/nufraw/default.nix { + nufraw-thumbnailer = callPackage ../applications/graphics/nufraw { addThumbnailer = true; }; @@ -28607,7 +28607,7 @@ with pkgs; vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; - vimv = callPackage ../tools/misc/vimv/default.nix { }; + vimv = callPackage ../tools/misc/vimv { }; qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; @@ -29316,7 +29316,7 @@ with pkgs; inherit (gnome2) scrollkeeper libglade; }; - xygrib = libsForQt514.callPackage ../applications/misc/xygrib/default.nix {}; + xygrib = libsForQt514.callPackage ../applications/misc/xygrib {}; xzgv = callPackage ../applications/graphics/xzgv { }; @@ -29793,7 +29793,7 @@ with pkgs; crispyDoom = callPackage ../games/crispy-doom { }; - vintagestory = callPackage ../games/vintagestory/default.nix { }; + vintagestory = callPackage ../games/vintagestory { }; cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; @@ -31088,7 +31088,7 @@ with pkgs; snpeff = callPackage ../applications/science/biology/snpeff { }; - somafm-cli = callPackage ../tools/misc/somafm-cli/default.nix { }; + somafm-cli = callPackage ../tools/misc/somafm-cli { }; somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; @@ -32430,7 +32430,7 @@ with pkgs; nixosTesting.makeTest calledTest; nixosOptionsDoc = attrs: - (import ../../nixos/lib/make-options-doc/default.nix) + (import ../../nixos/lib/make-options-doc) ({ inherit pkgs lib; } // attrs); nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { }; @@ -32746,8 +32746,8 @@ with pkgs; mfcl2740dwlpr = callPackage ../misc/cups/drivers/mfcl2740dwlpr { }; # This driver is only available as a 32 bit proprietary binary driver - mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw/default.nix { }).driver; - mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw/default.nix { }).cupswrapper; + mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).driver; + mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).cupswrapper; mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { }; mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { }; @@ -32755,7 +32755,7 @@ with pkgs; mfc9140cdncupswrapper = callPackage ../misc/cups/drivers/mfc9140cdncupswrapper { }; mfc9140cdnlpr = callPackage ../misc/cups/drivers/mfc9140cdnlpr { }; - samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36/default.nix { }; + samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36 { }; samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; @@ -33599,7 +33599,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; }; - cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { }; + cagebreak = callPackage ../applications/window-managers/cagebreak { }; psftools = callPackage ../os-specific/linux/psftools {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b97a7007ead8..d24f52972dcd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4633,7 +4633,7 @@ in { mathlibtools = callPackage ../development/python-modules/mathlibtools { }; - matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { + matplotlib = callPackage ../development/python-modules/matplotlib { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; @@ -5305,7 +5305,7 @@ in { openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; - openrouteservice = callPackage ../development/python-modules/openrouteservice/default.nix { }; + openrouteservice = callPackage ../development/python-modules/openrouteservice { }; opensensemap-api = callPackage ../development/python-modules/opensensemap-api { }; @@ -5516,7 +5516,7 @@ in { pathvalidate = callPackage ../development/python-modules/pathvalidate { }; - pathy = callPackage ../development/python-modules/pathy/default.nix { }; + pathy = callPackage ../development/python-modules/pathy { }; patiencediff = callPackage ../development/python-modules/patiencediff { }; @@ -8548,7 +8548,7 @@ in { signify = callPackage ../development/python-modules/signify { }; - sip = callPackage ../development/python-modules/sip/default.nix { }; + sip = callPackage ../development/python-modules/sip { }; sip_4 = callPackage ../development/python-modules/sip/4.x.nix { }; From 9ce9722bb094042de4ad8981184b61e721a2751f Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Wed, 10 Nov 2021 09:08:03 -0800 Subject: [PATCH 121/140] cargo-outdated: 0.9.17 -> 0.9.18 --- .../package-management/cargo-outdated/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index beb04041861e..106622706f00 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -1,22 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libiconv, curl, darwin }: +{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, libiconv, curl, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.17"; + version = "0.9.18"; - src = fetchFromGitHub { - owner = "kbknapp"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Ian/vXGoPHecguQUp2IUgdLW6Ll8OdCA2W0WmoYPDrI="; + src = fetchCrate { + inherit pname version; + sha256 = "19r4nv28iq4cmzs5j127qgvdf7y3pfmgjp6jzzbb8b5xj7w06jhl"; }; - cargoSha256 = "sha256-eDu1dAs543AryUEsCY9COHrvuamQocCk0nBXDIdFmYs="; + cargoSha256 = "1rf3sxprra9s76iip2xf82kclgs83fhnlx9ykl9hhn2y0z8r3342"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration libiconv curl ]; From cdcc4307dfba4c2ab59a6c8fbc7db20392dd9983 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Wed, 10 Nov 2021 17:26:27 +0000 Subject: [PATCH 122/140] rmapi: 0.0.15 -> 0.0.17 (#145369) --- pkgs/applications/misc/remarkable/rmapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 11373756f8d0..8482f85d927a 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.15"; + version = "0.0.17"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "sha256-ju54JSd3Zyye5YGLPEOkhY93ONh0b7eDSnvJlIawizE="; + sha256 = "sha256-KFoaZ0OAqwJm4tEUaEAGJ+70nHJUbxg0kvhm71mQB6E="; }; - vendorSha256 = "sha256-SE/0a8QUJsWoGwkSiZqYx1eXuOIL3avJujyg8iSdcBU="; + vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU="; doCheck = false; From a904faa362c6497b2eb0d403307cd50be9cafa40 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 10 Nov 2021 12:47:44 -0500 Subject: [PATCH 123/140] wrangler: 1.19.4 -> 1.19.5 --- pkgs/development/tools/wrangler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index 3c16977ae7ba..1a0bd1ffe13c 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.19.4"; + version = "1.19.5"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Qe/bl5H+ieHGC2GXdWlXCR+ZI1SNfy4l+VIGMy193lk="; + sha256 = "sha256-r8Ni6r1NpHJ0UVEV+aG1RkGn0GQijTiWWZyQWJRXPi8="; }; - cargoSha256 = "sha256-KYxqir/wxvyn9sgLF0OjM2Zn42Wt9eUqIX0Xbsvq1c4="; + cargoSha256 = "sha256-GWBY4diq6VFpBcb1ROmJcXX/zJGwanja8eoaxxm+ij8="; nativeBuildInputs = [ pkg-config ]; From 4e75ca5bae03449edc4915c8b78267976d719d6e Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 28 Oct 2021 01:13:32 +0200 Subject: [PATCH 124/140] coreboot-toolchain: Disable fetching of submodules Submodules are not needed. Thus, disable fetching of the submodules. Signed-off-by: Felix Singer --- pkgs/development/tools/misc/coreboot-toolchain/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index fc8277625a9d..5c64a4cc6dd6 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { url = "https://review.coreboot.org/coreboot"; rev = version; sha256 = "00xr74yc0kj9rrqa1a8b7bih865qlp9i4zs67ysavkfrjrwwssxm"; + fetchSubmodules = false; }; nativeBuildInputs = [ bison curl git perl ]; From 60d1033025add04c1f5e14dadeb3180ddef8f0cd Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 28 Oct 2021 01:32:43 +0200 Subject: [PATCH 125/140] coreboot-toolchain: Rework update script Rework update script so that it needs to be run from the root directory of nixpkgs and get rid of relative paths. Also, move the resulting file `sources.nix` into the package directory. Signed-off-by: Felix Singer --- .../tools/misc/coreboot-toolchain/update.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/coreboot-toolchain/update.sh b/pkgs/development/tools/misc/coreboot-toolchain/update.sh index 6f248359c69b..d4c348a5d0c7 100755 --- a/pkgs/development/tools/misc/coreboot-toolchain/update.sh +++ b/pkgs/development/tools/misc/coreboot-toolchain/update.sh @@ -1,9 +1,14 @@ #!/usr/bin/env nix-shell #!nix-shell --pure -i bash -p nix cacert git getopt -rootdir="../../../../../" +if [ ! -d .git ]; then + echo "This script needs to be run from the root directory of nixpkgs. Exiting." + exit 1 +fi -src="$(nix-build $rootdir --no-out-link -A coreboot-toolchain.src)" +pkg_dir="$(dirname "$0")" + +src="$(nix-build . --no-out-link -A coreboot-toolchain.src)" urls=$($src/util/crossgcc/buildgcc -u) tmp=$(mktemp) @@ -28,4 +33,4 @@ echo ']' >> $tmp sed -ie 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' $tmp -mv $tmp sources.nix +mv $tmp $pkg_dir/sources.nix From ee2417a226c8631576a508d634b120702a1c9679 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 24 Oct 2021 21:14:30 +0200 Subject: [PATCH 126/140] coreboot-toolchain: 4.14 -> 4.15 Update to latest release. Signed-off-by: Felix Singer --- .../tools/misc/coreboot-toolchain/default.nix | 18 +++++++---- .../tools/misc/coreboot-toolchain/stable.nix | 30 +++++++++---------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 5c64a4cc6dd6..66f67bf2fd7a 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -1,16 +1,24 @@ -{ callPackage, fetchgit, lib, stdenvNoCC -, bison, curl, git, perl -, flex, gnat11, zlib +{ bison +, callPackage +, curl +, fetchgit +, flex +, git +, gnat11 +, lib +, perl +, stdenvNoCC +, zlib }: stdenvNoCC.mkDerivation rec { pname = "coreboot-toolchain"; - version = "4.14"; + version = "4.15"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = version; - sha256 = "00xr74yc0kj9rrqa1a8b7bih865qlp9i4zs67ysavkfrjrwwssxm"; + sha256 = "0y137dhfi0zf9nmyq49ksrad69yspbnsmzc4wjkw3hjwvzgi8j27"; fetchSubmodules = false; }; diff --git a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index 62c3043cc6cb..9460353873e4 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -1,9 +1,9 @@ { fetchurl }: [ { - name = "gmp-6.2.0.tar.xz"; + name = "gmp-6.2.1.tar.xz"; archive = fetchurl { - sha256 = "09hmg8k63mbfrx1x3yy6y1yzbbq85kw5avbibhcgrg9z3ganr3i5"; - url = "mirror://gnu/gmp/gmp-6.2.0.tar.xz"; + sha256 = "1wml97fdmpcynsbw9yl77rj29qibfp652d0w3222zlfx5j8jjj7x"; + url = "mirror://gnu/gmp/gmp-6.2.1.tar.xz"; }; } { @@ -14,31 +14,31 @@ }; } { - name = "mpc-1.2.0.tar.gz"; + name = "mpc-1.2.1.tar.gz"; archive = fetchurl { - sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9"; - url = "mirror://gnu/mpc/mpc-1.2.0.tar.gz"; + sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p"; + url = "mirror://gnu/mpc/mpc-1.2.1.tar.gz"; }; } { - name = "gcc-8.3.0.tar.xz"; + name = "gcc-11.2.0.tar.xz"; archive = fetchurl { - sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4"; - url = "mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz"; + sha256 = "12zs6vd2rapp42x154m479hg3h3lsafn3xhg06hp5hsldd9xr3nh"; + url = "mirror://gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz"; }; } { - name = "binutils-2.35.1.tar.xz"; + name = "binutils-2.37.tar.xz"; archive = fetchurl { - sha256 = "01w6xvfy7sjpw8j08k111bnkl27j760bdsi0wjvq44ghkgdr3v9w"; - url = "mirror://gnu/binutils/binutils-2.35.1.tar.xz"; + sha256 = "0b53hhgfnafw27y0c3nbmlfidny2cc5km29pnfffd8r0y0j9f3c2"; + url = "mirror://gnu/binutils/binutils-2.37.tar.xz"; }; } { - name = "acpica-unix2-20200925.tar.gz"; + name = "acpica-unix2-20210331.tar.gz"; archive = fetchurl { - sha256 = "18n6129fkgj85piid7v4zxxksv3h0amqp4p977vcl9xg3bq0zd2w"; - url = "https://acpica.org/sites/acpica/files/acpica-unix2-20200925.tar.gz"; + sha256 = "1h98pvc9iy1c49cid0ppjwk5zsy2m1xbvfqb72pkwkrd4rn35arx"; + url = "https://acpica.org/sites/acpica/files/acpica-unix2-20210331.tar.gz"; }; } { From 5e74077c3fef465c8b4ded7b3c50638f49dc4f3c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 10 Nov 2021 18:55:03 +0000 Subject: [PATCH 127/140] python3Packages.deepdiff: fix tests on darwin problems arising from assuming a fixed tmp location --- pkgs/development/python-modules/deepdiff/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 199894f13201..67f5347e1e7e 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { sha256 = "sha256-ysaIeVefsTX7ZubOXaEzeS1kMyBp4/w3SHNFxsGVhzY="; }; + postPatch = '' + substituteInPlace tests/test_command.py \ + --replace '/tmp/' "$TMPDIR/" + ''; + propagatedBuildInputs = [ click ordered-set From b834903c0d9b9d15bdc237dbec98e71b4dae239f Mon Sep 17 00:00:00 2001 From: Matthew Mazzanti Date: Wed, 10 Nov 2021 14:10:52 -0500 Subject: [PATCH 128/140] Fix "session-management-for-emacs" license - Change "license" to "licenses" - Change to "gpl2", rather than non-existant "gpl" attr --- .../elisp-packages/session-management-for-emacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix index afc51e8fcc2a..71f9981f461a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { */ description = "Small session management for emacs"; homepage = "http://emacs-session.sourceforge.net/"; - license = license.gpl; + license = licenses.gpl2; maintainers = with maintainers; [ ]; }; } From 0faf3230fbb26775d836362867ab5066942e0882 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 28 Oct 2021 00:41:21 +0200 Subject: [PATCH 129/140] coreboot-toolchain: Improve reproducibility For reproducibility, the toolchain build system appends a specific version string to the usual version string of the tools. Before 4.15, the build system used git for that at runtime and since the .git directory is removed by the NixOS build system, the version string was empty and resulted in `v_`. Now, the toolchain build system prefers using the environment variable `CROSSGCC_VERSION` if set. Thus, extract the version string in the postFetch phase and set `CROSSGCC_VERSION` in the build phase. Signed-off-by: Felix Singer --- .../tools/misc/coreboot-toolchain/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 66f67bf2fd7a..8042fc2522b3 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -3,6 +3,7 @@ , curl , fetchgit , flex +, getopt , git , gnat11 , lib @@ -18,8 +19,14 @@ stdenvNoCC.mkDerivation rec { src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = version; - sha256 = "0y137dhfi0zf9nmyq49ksrad69yspbnsmzc4wjkw3hjwvzgi8j27"; + sha256 = "1qsb2ca22h5f0iwc254qsfm7qcn8967ir8aybdxa1pakgmnfsyp9"; fetchSubmodules = false; + leaveDotGit = true; + postFetch = '' + patchShebangs $out/util/crossgcc/buildgcc + PATH=${lib.makeBinPath [ getopt ]}:$PATH $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version + rm -rf $out/.git + ''; }; nativeBuildInputs = [ bison curl git perl ]; @@ -37,10 +44,11 @@ stdenvNoCC.mkDerivation rec { ) (callPackage ./stable.nix { }) } - patchShebangs util/genbuild_h/genbuild_h.sh util/crossgcc/buildgcc + patchShebangs util/genbuild_h/genbuild_h.sh ''; buildPhase = '' + export CROSSGCC_VERSION=$(cat .crossgcc_version) make crossgcc-i386 CPUS=$NIX_BUILD_CORES DEST=$out ''; From c4e467e4c865ad3a677146d5384a86ef30673d9d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 10 Nov 2021 20:21:50 +0100 Subject: [PATCH 130/140] chromiumDev: 97.0.4688.2 -> 97.0.4692.8 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d10615fdec27..a36b160c5f94 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "97.0.4688.2", - "sha256": "0a5i64gxb24z5mfvmf50g4fafvqqbj7k5077arnhwzp3xiznld88", - "sha256bin64": "0l70qlna8x05rrlcfgv2xyl8g5nlmd42i8n0yc9dw3mwq8m4c4db", + "version": "97.0.4692.8", + "sha256": "0n47jfxs05g55p69f5939jf5pgyw88n4cpg78k019n3zr2vlv1qf", + "sha256bin64": "1gisqc6dz7yfigj0dji7cnx5jdcjz0gmn248cp2a6zs9mfvwwbqv", "deps": { "gn": { - "version": "2021-10-30", + "version": "2021-11-03", "url": "https://gn.googlesource.com/gn", - "rev": "8926696a4186279489cc2b8d768533e61bba73d7", - "sha256": "1084lnyb0a1khbgjvak05fcx6jy973wqvsf77n0alxjys18sg2yk" + "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", + "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" } } }, From dbe6e96d0a25ca1df89dfa25253c641aca755438 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 10 Nov 2021 11:37:34 -0800 Subject: [PATCH 131/140] lib/systems: add x86_64-darwin hostPlatform --- lib/systems/examples.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 8dfa22ac787e..f2469f9bf7ff 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -258,6 +258,12 @@ rec { platform = {}; }; + x86_64-darwin = { + config = "x86_64-apple-darwin"; + xcodePlatform = "MacOSX"; + platform = {}; + }; + # # Windows # From 995569833b1591f06ba1670359bbfd085505ce07 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 10 Nov 2021 20:52:40 +0100 Subject: [PATCH 132/140] signal-desktop: 5.23.0 -> 5.23.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 70ada1d08d14..c8797423bedb 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -58,7 +58,7 @@ let }); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.23.0"; # Please backport all updates to the stable channel. + version = "5.23.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0jan203zbrkb9scfdldwnvyvk4657a3pn0ws51xf53jhvvywhpg0"; + sha256 = "0scbnkkbaqyqiz6bfvhdrc0yqnccjsf66iggjpa7kjyk3cy61s6c"; }; nativeBuildInputs = [ From c3456b0e3cf72c4489491ac227734aef2aa4e5d5 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Sat, 6 Nov 2021 03:47:46 +0100 Subject: [PATCH 133/140] maintainers: add sagikazarmark Signed-off-by: Mark Sagi-Kazar --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1e03529bf1de..ec5fdb19cf16 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10074,6 +10074,17 @@ github = "s1341"; githubId = 5682183; }; + sagikazarmark = { + name = "Mark Sagi-Kazar"; + email = "mark.sagikazar@gmail.com"; + matrix = "@mark.sagikazar:matrix.org"; + github = "sagikazarmark"; + githubId = 1226384; + keys = [{ + longkeyid = "rsa4096/0xF251ADDC9D041C7E"; + fingerprint = "E628 C811 6FB8 1657 F706 4EA4 F251 ADDC 9D04 1C7E"; + }]; + }; samalws = { email = "sam@samalws.com"; name = "Sam Alws"; From b3f59f2089722ec4f0d4a032d329d33ddd63a226 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Sat, 6 Nov 2021 03:58:17 +0100 Subject: [PATCH 134/140] helm-docs: init at 1.5.0 Signed-off-by: Mark Sagi-Kazar --- .../networking/cluster/helm-docs/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/networking/cluster/helm-docs/default.nix diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix new file mode 100644 index 000000000000..346284d3eab0 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "helm-docs"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "norwoodj"; + repo = "helm-docs"; + rev = "v${version}"; + sha256 = "sha256-eyFuF03rqwfXyjEkqNRkjrJlHBazGYij1EtN0LAKdFk="; + }; + + vendorSha256 = "sha256-aAn969C4UhFGu5/qXIG/rc1cErQIDtPwEA+f0d43y0w="; + + subPackages = [ "cmd/helm-docs" ]; + ldflags = [ + "-w" + "-s" + "-X main.version=v${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/norwoodj/helm-docs"; + description = "A tool for automatically generating markdown documentation for Helm charts"; + platforms = platforms.unix; + license = licenses.gpl3Only; + maintainers = with maintainers; [ sagikazarmark ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6b56bae6a7a..ef5abe3724e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26188,6 +26188,8 @@ with pkgs; chart-testing = callPackage ../applications/networking/cluster/helm/chart-testing { }; + helm-docs = callPackage ../applications/networking/cluster/helm-docs { }; + kubetail = callPackage ../applications/networking/cluster/kubetail { } ; kupfer = callPackage ../applications/misc/kupfer { }; From 47d794a7e26ed35d8d76332373ec7113a88d2508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 10 Nov 2021 17:17:52 +0100 Subject: [PATCH 135/140] zita-resampler: patchPhase -> postPatch --- pkgs/development/libraries/audio/zita-resampler/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 6395ff10683f..075ce33ef9e2 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -3,6 +3,7 @@ stdenv.mkDerivation rec { pname = "zita-resampler"; version = "1.8.0"; + src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "sha256-5XRPI8VN0Vs/eDpoe9h57uKmkKRUWhW0nEzwN6pGSqI="; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { "SUFFIX=" ]; - patchPhase = '' + postPatch = '' cd source substituteInPlace Makefile \ --replace 'ldconfig' "" From aabbed57e7fa75ed396626f5ac693b98883f89e2 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 10 Nov 2021 22:03:40 +0100 Subject: [PATCH 136/140] proj: Patch test OPEN_MAX limit assumption (#145371) One of the tests had a Linux-based assumption on the number of files that can be opened. I have submitted this patch upstream here, https://github.com/OSGeo/PROJ/pull/2934, and it's been merged but I don't expect to be able to update to a release before ZHF ends. Fixes #142875 --- pkgs/development/libraries/proj/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index caa270bcf60f..134532308c88 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , sqlite @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-Z2nruyowC3NG4Wb8AFBL0PME/zp9D7SwQdMSl6VjH/w="; }; + patches = [ + (fetchpatch { + name = "Make-CApi-test-cross-platform.patch"; + url = "https://github.com/OSGeo/PROJ/commit/ac113a8898cded7f5359f1edd3abc17a78eee9b4.patch"; + sha256 = "0gz2xa5nxzck5c0yr7cspv3kw4cz3fxb2yic76w7qfvxidi7z1s1"; + }) + ]; + outputs = [ "out" "dev"]; nativeBuildInputs = [ cmake pkg-config ]; From f5c12e831178d43db794b78c52c87fca83288d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BChler?= Date: Wed, 10 Nov 2021 22:21:47 +0100 Subject: [PATCH 137/140] treewide: replace '-git' packages with 'unstable-' in version (#145396) --- pkgs/applications/audio/foo-yc20/default.nix | 6 +-- .../audio/mod-distortion/default.nix | 4 +- pkgs/applications/audio/orca-c/default.nix | 3 +- .../editors/supertux-editor/default.nix | 4 +- .../graphics/smartdeblur/default.nix | 10 ++--- .../misc/dfilemanager/default.nix | 2 +- pkgs/applications/misc/yarssr/default.nix | 31 ++++++++++--- .../instant-messengers/tensor/default.nix | 33 ++++++++------ pkgs/applications/networking/znc/modules.nix | 44 ++++++++++--------- pkgs/development/compilers/eql/default.nix | 4 +- .../development/libraries/jabcode/default.nix | 24 +++++----- .../development/libraries/libqtav/default.nix | 40 ++++++++++++----- pkgs/development/ocaml-modules/lwt/camlp4.nix | 2 +- pkgs/games/quake3/ioquake/default.nix | 37 +++++++++++++--- pkgs/games/vdrift/default.nix | 23 +++++++--- pkgs/misc/drivers/moltengamepad/default.nix | 4 +- .../tt-rss/plugin-ff-instagram/default.nix | 2 +- .../fish/plugins/foreign-env/default.nix | 2 +- pkgs/tools/X11/run-scaled/default.nix | 8 ++-- pkgs/tools/X11/skippy-xd/default.nix | 35 +++++++++++---- pkgs/tools/X11/xprintidle-ng/default.nix | 41 +++++++++++++---- pkgs/tools/cd-dvd/vobsub2srt/default.nix | 4 +- pkgs/tools/graphics/qrcode/default.nix | 10 ++--- pkgs/tools/misc/clipnotify/default.nix | 6 +-- pkgs/tools/misc/colorpicker/default.nix | 6 +-- .../connman/connman_dmenu/default.nix | 12 ++--- pkgs/tools/security/tpm-luks/default.nix | 8 ++-- pkgs/tools/system/das_watchdog/default.nix | 2 +- 28 files changed, 268 insertions(+), 139 deletions(-) diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index f7abeb2a91e8..abb13b021c04 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }: +{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }: stdenv.mkDerivation { - version = "git-2015-05-21"; + version = "unstable-2015-05-21"; pname = "foo-yc20"; src = fetchFromGitHub { owner = "sampov2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7 description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = "https://github.com/sampov2/foo-yc20"; - license = with licenses; [ bsd3 lgpl21 mpl11 ] ; + license = with licenses; [ bsd3 lgpl21 mpl11 ]; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix index 7c9f2acfd844..7e2b2bf6cfbd 100644 --- a/pkgs/applications/audio/mod-distortion/default.nix +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation { - pname = "mod-distortion-git"; - version = "2016-08-19"; + pname = "mod-distortion"; + version = "unstable-2016-08-19"; src = fetchFromGitHub { owner = "portalmod"; diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/applications/audio/orca-c/default.nix index 4bad49603373..420055884b45 100644 --- a/pkgs/applications/audio/orca-c/default.nix +++ b/pkgs/applications/audio/orca-c/default.nix @@ -1,8 +1,7 @@ { lib, stdenv, fetchgit, ncurses, portmidi }: stdenv.mkDerivation { pname = "orca-c"; - - version = "git-2021-02-13"; + version = "unstable-2021-02-13"; src = fetchgit { url = "https://git.sr.ht/~rabbits/orca"; diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index ec713d99371b..6888cebec2d0 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkg-config, makeWrapper, gnome2, gtk2 }: stdenv.mkDerivation { - version = "git-2014-08-20"; + version = "unstable-2014-08-20"; pname = "supertux-editor"; src = fetchFromGitHub { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [mono gtk-sharp-2_0 gnome2.libglade gtk2 ]; + buildInputs = [ mono gtk-sharp-2_0 gnome2.libglade gtk2 ]; installPhase = '' mkdir -p $out/bin $out/lib/supertux-editor diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 6a835fb3c71a..ccde0c0d9ecb 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -1,14 +1,12 @@ { fetchurl, lib, stdenv, cmake, qt4, fftw }: -let - rev = "9895036d26"; -in stdenv.mkDerivation rec { - name = "smartdeblur-git-${rev}"; + pname = "smartdeblur"; + version = "unstable-2013-01-09"; src = fetchurl { - url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/${rev}"; - name = "${name}.tar.gz"; + url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/9895036d26"; + name = "smartdeblur-${version}.tar.gz"; sha256 = "126x9x1zhqdarjz9in0p1qhmqg3jwz7frizadjvx723g2ppi33s4"; }; diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 19cfa95a88e4..6a9453eb583a 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -2,7 +2,7 @@ mkDerivation { pname = "dfilemanager"; - version = "git-2020-09-04"; + version = "unstable-2020-09-04"; src = fetchFromGitHub { owner = "probonopd"; diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix index 93e8f1fc9d75..d031f63a097a 100644 --- a/pkgs/applications/misc/yarssr/default.nix +++ b/pkgs/applications/misc/yarssr/default.nix @@ -2,16 +2,33 @@ let perlDeps = with perlPackages; [ - Glib Gtk2 Gnome2 Pango Cairo Gnome2Canvas Gnome2VFS Gtk2GladeXML Gtk2TrayIcon - XMLLibXML XMLSAXBase XMLParser XMLRSS + Glib + Gtk2 + Gnome2 + Pango + Cairo + Gnome2Canvas + Gnome2VFS + Gtk2GladeXML + Gtk2TrayIcon + XMLLibXML + XMLSAXBase + XMLParser + XMLRSS HTMLParser - DateTime DateTimeFormatMail DateTimeFormatW3CDTF DateTimeLocale DateTimeTimeZone + DateTime + DateTimeFormatMail + DateTimeFormatW3CDTF + DateTimeLocale + DateTimeTimeZone ParamsValidate - ModuleImplementation ModuleRuntime + ModuleImplementation + ModuleRuntime TryTiny ClassSingleton URI - AnyEvent AnyEventHTTP + AnyEvent + AnyEventHTTP commonsense FileSlurp JSON @@ -24,7 +41,7 @@ let ]; in stdenv.mkDerivation { - version = "git-2017-12-01"; + version = "unstable-2017-12-01"; pname = "yarssr"; src = fetchFromGitHub { @@ -35,7 +52,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ perlPackages.perl gettext makeWrapper ]; - buildInputs = perlDeps ++ [gnome2.libglade]; + buildInputs = perlDeps ++ [ gnome2.libglade ]; propagatedBuildInputs = libs ++ perlDeps; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 477e5442b829..943ec299cdbd 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,17 +1,24 @@ -{ mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake -, makeDesktopItem }: +{ mkDerivation +, lib +, stdenv +, fetchgit +, qtbase +, qtquickcontrols +, qmake +, makeDesktopItem +}: # we now have libqmatrixclient so a future version of tensor that supports it # should use that mkDerivation rec { - pname = "tensor-git"; - version = "2017-02-21"; + pname = "tensor"; + version = "unstable-2017-02-21"; src = fetchgit { - url = "https://github.com/davidar/tensor.git"; - rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; - sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; + url = "https://github.com/davidar/tensor.git"; + rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; + sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; fetchSubmodules = true; }; @@ -19,14 +26,14 @@ mkDerivation rec { nativeBuildInputs = [ qmake ]; desktopItem = makeDesktopItem { - name = "tensor"; - exec = "@bin@"; - icon = "tensor.png"; - comment = meta.description; + name = "tensor"; + exec = "@bin@"; + icon = "tensor.png"; + comment = meta.description; desktopName = "Tensor Matrix Client"; genericName = meta.description; - categories = "Chat;Utility"; - mimeType = "application/x-chat"; + categories = "Chat;Utility"; + mimeType = "application/x-chat"; }; installPhase = if stdenv.isDarwin then '' diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 562372b1bb70..ddd94bff522a 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -1,25 +1,29 @@ { lib, stdenv, fetchFromGitHub, znc }: let - zncDerivation = a@{ - pname, src, module_name, - buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp", - installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so", ... - } : stdenv.mkDerivation (a // { - inherit buildPhase; - inherit installPhase; + zncDerivation = + a@{ pname + , src + , module_name + , buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp" + , installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so" + , ... + }: stdenv.mkDerivation (a // { + inherit buildPhase; + inherit installPhase; - buildInputs = znc.buildInputs; + buildInputs = znc.buildInputs; - meta = a.meta // { platforms = lib.platforms.unix; }; - passthru.module_name = module_name; - }); + meta = a.meta // { platforms = lib.platforms.unix; }; + passthru.module_name = module_name; + }); -in { +in +{ backlog = zncDerivation rec { pname = "znc-backlog"; - version = "git-2017-06-13"; + version = "unstable-2017-06-13"; module_name = "backlog"; src = fetchFromGitHub { @@ -39,7 +43,7 @@ in { clientbuffer = zncDerivation rec { pname = "znc-clientbuffer"; - version = "git-2020-04-24"; + version = "unstable-2020-04-24"; module_name = "clientbuffer"; src = fetchFromGitHub { @@ -59,7 +63,7 @@ in { clientaway = zncDerivation rec { pname = "znc-clientaway"; - version = "git-2017-04-28"; + version = "unstable-2017-04-28"; module_name = "clientaway"; src = fetchFromGitHub { @@ -79,7 +83,7 @@ in { fish = zncDerivation rec { pname = "znc-fish"; - version = "git-2017-06-26"; + version = "unstable-2017-06-26"; module_name = "fish"; src = fetchFromGitHub { @@ -99,7 +103,7 @@ in { ignore = zncDerivation rec { pname = "znc-ignore"; - version = "git-2017-04-28"; + version = "unstable-2017-04-28"; module_name = "ignore"; src = fetchFromGitHub { @@ -139,7 +143,7 @@ in { playback = zncDerivation rec { pname = "znc-playback"; - version = "git-2015-08-04"; + version = "unstable-2015-08-04"; module_name = "playback"; src = fetchFromGitHub { @@ -159,7 +163,7 @@ in { privmsg = zncDerivation rec { pname = "znc-privmsg"; - version = "git-2015-02-22"; + version = "unstable-2015-02-22"; module_name = "privmsg"; src = fetchFromGitHub { @@ -177,7 +181,7 @@ in { push = zncDerivation rec { pname = "znc-push"; - version = "git-2016-10-12"; + version = "unstable-2016-10-12"; module_name = "push"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix index a3fefbc1f480..e0ef27ce2372 100644 --- a/pkgs/development/compilers/eql/default.nix +++ b/pkgs/development/compilers/eql/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchgit, qt4, ecl, xorgserver, xkbcomp, xkeyboard_config }: stdenv.mkDerivation rec { - version = src.rev; - pname = "eql-git"; + version = "unstable-2012-12-10"; + pname = "eql"; src = fetchgit { rev = "9097bf98446ee33c07bb155d800395775ce0d9b2"; url = "https://gitlab.com/eql/eql.git"; diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix index 36c4c8c61c53..314a0cdf7eff 100644 --- a/pkgs/development/libraries/jabcode/default.nix +++ b/pkgs/development/libraries/jabcode/default.nix @@ -2,7 +2,9 @@ , fetchFromGitHub , lib , subproject ? "library" # one of "library", "reader" or "writer" -, zlib, libpng, libtiff +, zlib +, libpng +, libtiff , jabcode }: let @@ -11,9 +13,10 @@ let "reader" = "jabcodeReader"; "writer" = "jabcodeWriter"; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "jabcode-${subproject}"; - version = "git-2020-05-13"; + version = "unstable-2020-05-13"; src = fetchFromGitHub { repo = "jabcode"; owner = "jabcode"; @@ -27,13 +30,14 @@ in stdenv.mkDerivation rec { preConfigure = "cd src/${subdir}"; - installPhase = if subproject == "library" then '' - mkdir -p $out/lib - cp build/* $out/lib - '' else '' - mkdir -p $out/bin - cp -RT bin $out/bin - ''; + installPhase = + if subproject == "library" then '' + mkdir -p $out/lib + cp build/* $out/lib + '' else '' + mkdir -p $out/bin + cp -RT bin $out/bin + ''; meta = with lib; { description = "A high-capacity 2D color bar code (${subproject})"; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index e9a54dc478cd..090291a120f7 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -1,22 +1,42 @@ -{ mkDerivation, lib, fetchFromGitHub, extra-cmake-modules -, qtbase, qtmultimedia, qtquick1, qttools -, libGL, libX11 -, libass, openal, ffmpeg, libuchardet -, alsa-lib, libpulseaudio, libva +{ mkDerivation +, lib +, fetchFromGitHub +, extra-cmake-modules +, qtbase +, qtmultimedia +, qtquick1 +, qttools +, libGL +, libX11 +, libass +, openal +, ffmpeg +, libuchardet +, alsa-lib +, libpulseaudio +, libva }: with lib; mkDerivation rec { pname = "libqtav"; - version = "git-2020-09-10"; + version = "unstable-2020-09-10"; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ - qtbase qtmultimedia qtquick1 - libGL libX11 - libass openal ffmpeg libuchardet - alsa-lib libpulseaudio libva + qtbase + qtmultimedia + qtquick1 + libGL + libX11 + libass + openal + ffmpeg + libuchardet + alsa-lib + libpulseaudio + libva ]; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/lwt/camlp4.nix b/pkgs/development/ocaml-modules/lwt/camlp4.nix index fbf920d9621d..88bb3d6759a0 100644 --- a/pkgs/development/ocaml-modules/lwt/camlp4.nix +++ b/pkgs/development/ocaml-modules/lwt/camlp4.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "lwt_camlp4"; - version = "git-20180325"; + version = "unstable-2018-03-25"; src = fetchFromGitHub { owner = "ocsigen"; diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 1ac8a41ca1a7..2bbbb43c963c 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -1,10 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, which, pkg-config, SDL2, libGL, openalSoft -, curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype +{ lib +, stdenv +, fetchFromGitHub +, which +, pkg-config +, SDL2 +, libGL +, openalSoft +, curl +, speex +, opusfile +, libogg +, libvorbis +, libopus +, libjpeg +, mumble +, freetype }: stdenv.mkDerivation { - pname = "ioquake3-git"; - version = "2021-07-20"; + pname = "ioquake3"; + version = "unstable-2021-07-20"; src = fetchFromGitHub { owner = "ioquake"; @@ -15,8 +30,18 @@ stdenv.mkDerivation { nativeBuildInputs = [ which pkg-config ]; buildInputs = [ - SDL2 libGL openalSoft curl speex opusfile libogg libvorbis libopus libjpeg - freetype mumble + SDL2 + libGL + openalSoft + curl + speex + opusfile + libogg + libvorbis + libopus + libjpeg + freetype + mumble ]; enableParallelBuilding = true; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 407603687ba5..04f65cf79379 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchsvn, pkg-config, sconsPackages, libGLU, libGL, SDL2, SDL2_image -, libvorbis, bullet, curl, gettext, writeTextFile +{ lib +, stdenv +, fetchFromGitHub +, fetchsvn +, pkg-config +, sconsPackages +, libGLU +, libGL +, SDL2 +, SDL2_image +, libvorbis +, bullet +, curl +, gettext +, writeTextFile , data ? fetchsvn { url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data"; @@ -8,7 +21,7 @@ } }: let - version = "git"; + version = "unstable-2017-12-09"; bin = stdenv.mkDerivation { pname = "vdrift"; inherit version; @@ -36,7 +49,7 @@ let description = "Car racing game"; homepage = "http://vdrift.net/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = lib.platforms.linux; }; }; @@ -54,7 +67,7 @@ in writeTextFile { ''; } // { meta = bin.meta // { - hydraPlatforms = []; + hydraPlatforms = [ ]; }; unwrapped = bin; inherit bin data; diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix index 486e4e96dd41..747866b9cfc9 100644 --- a/pkgs/misc/drivers/moltengamepad/default.nix +++ b/pkgs/misc/drivers/moltengamepad/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, udev }: stdenv.mkDerivation { - pname = "moltengamepad-git"; - version = "2016-05-04"; + pname = "moltengamepad"; + version = "unstable-2016-05-04"; src = fetchFromGitHub { owner = "jgeumlek"; diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix index 1accac5bf6f8..96dfaa7f29b7 100644 --- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix +++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "tt-rss-plugin-ff-instagram"; - version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6 + version = "unstable-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6 src = fetchFromGitHub { owner = "wltb"; diff --git a/pkgs/shells/fish/plugins/foreign-env/default.nix b/pkgs/shells/fish/plugins/foreign-env/default.nix index 03435340d179..d0b5b77a03b1 100644 --- a/pkgs/shells/fish/plugins/foreign-env/default.nix +++ b/pkgs/shells/fish/plugins/foreign-env/default.nix @@ -2,7 +2,7 @@ buildFishPlugin { pname = "foreign-env"; - version = "git-20200209"; + version = "unstable-2020-02-09"; src = fetchFromGitHub { owner = "oh-my-fish"; diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix index 012eedf07791..d62b38bdf287 100644 --- a/pkgs/tools/X11/run-scaled/default.nix +++ b/pkgs/tools/X11/run-scaled/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, bc, xorgserver, xpra, xrandr }: stdenv.mkDerivation { - version = "git-2018-06-03"; + version = "unstable-2018-06-03"; pname = "run-scaled"; src = fetchFromGitHub { - owner = "kaueraal"; - repo = "run_scaled"; - rev = "fa71b3c17e627a96ff707ad69f1def5361f2245c"; + owner = "kaueraal"; + repo = "run_scaled"; + rev = "fa71b3c17e627a96ff707ad69f1def5361f2245c"; sha256 = "1ma4ax7ydq4xvyzrc4zapihmf7v3d9zl9mbi8bgpps7nlgz544ys"; }; diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix index 0519f2c42044..255d4c34e58d 100644 --- a/pkgs/tools/X11/skippy-xd/default.nix +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -1,14 +1,33 @@ -{lib, stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage -, libXext, libXinerama, libjpeg, giflib, pkg-config +{ lib +, stdenv +, fetchgit +, xorgproto +, libX11 +, libXft +, libXcomposite +, libXdamage +, libXext +, libXinerama +, libjpeg +, giflib +, pkg-config }: let buildInputs = [ - xorgproto libX11 libXft libXcomposite libXdamage libXext - libXinerama libjpeg giflib pkg-config + xorgproto + libX11 + libXft + libXcomposite + libXdamage + libXext + libXinerama + libjpeg + giflib + pkg-config ]; in stdenv.mkDerivation rec { - version = "git-2015-03-01"; + version = "unstable-2015-03-01"; pname = "skippy-xd"; inherit buildInputs; src = fetchgit { @@ -16,14 +35,14 @@ stdenv.mkDerivation rec { rev = "397216ca67"; sha256 = "0zcjacilmsv69rv85j6nfr6pxy8z36w1sjz0dbjg6s5m4kga1zl8"; }; - makeFlags = ["PREFIX=$(out)"]; + makeFlags = [ "PREFIX=$(out)" ]; preInstall = '' sed -e "s@/etc/xdg@$out&@" -i Makefile ''; meta = { description = "Expose-style compositing-based standalone window switcher"; - license = lib.licenses.gpl2Plus ; - maintainers = [lib.maintainers.raskin]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index 61e48de7f5e1..fdb3b7c58a56 100644 --- a/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -1,11 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib - , autoconf, automake, libtool, gettext, pkg-config - , git, perl, texinfo, help2man +{ lib +, stdenv +, fetchFromGitHub +, libX11 +, libXScrnSaver +, libXext +, gnulib +, autoconf +, automake +, libtool +, gettext +, pkg-config +, git +, perl +, texinfo +, help2man }: stdenv.mkDerivation rec { pname = "xprintidle-ng"; - version = "git-2015-09-01"; + version = "unstable-2015-09-01"; src = fetchFromGitHub { owner = "taktoa"; @@ -20,8 +33,16 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - autoconf automake gettext git gnulib - help2man libtool perl pkg-config texinfo + autoconf + automake + gettext + git + gnulib + help2man + libtool + perl + pkg-config + texinfo ]; configurePhase = '' @@ -30,15 +51,17 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - libX11 libXScrnSaver libXext + libX11 + libXScrnSaver + libXext ]; meta = { - inherit version; + inherit version; description = "A command-line tool to print idle time from libXss"; homepage = "http://taktoa.me/xprintidle-ng/"; license = lib.licenses.gpl2; - maintainers = [lib.maintainers.raskin]; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index 54df481cd676..624bcc08b41f 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }: stdenv.mkDerivation rec { - pname = "vobsub2srt-git"; - version = "20140817-${builtins.substring 0 7 rev}"; + pname = "vobsub2srt"; + version = "unstable-2014-08-17"; rev = "a6abbd61127a6392d420bbbebdf7612608c943c2"; src = fetchgit { diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix index 93a620b57792..2067d1a97e2e 100644 --- a/pkgs/tools/graphics/qrcode/default.nix +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - pname = "qrcode-git"; - version = "20160804"; + pname = "qrcode"; + version = "unstable-2016-08-04"; src = fetchFromGitHub { - owner = "qsantos"; - repo = "qrcode"; - rev = "ad0fdb4aafd0d56b903f110f697abaeb27deee73"; + owner = "qsantos"; + repo = "qrcode"; + rev = "ad0fdb4aafd0d56b903f110f697abaeb27deee73"; sha256 = "0v81745nx5gny2g05946k8j553j18a29ikmlyh6c3syq6c15k8cf"; }; diff --git a/pkgs/tools/misc/clipnotify/default.nix b/pkgs/tools/misc/clipnotify/default.nix index 5cb3a5114d8a..51a67f6983f8 100644 --- a/pkgs/tools/misc/clipnotify/default.nix +++ b/pkgs/tools/misc/clipnotify/default.nix @@ -1,12 +1,12 @@ { libX11, libXfixes, lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "clipnotify"; - version = "git-2018-02-20"; + version = "unstable-2018-02-20"; src = fetchFromGitHub { owner = "cdown"; - repo = "clipnotify"; - rev = "9cb223fbe494c5b71678a9eae704c21a97e3bddd"; + repo = "clipnotify"; + rev = "9cb223fbe494c5b71678a9eae704c21a97e3bddd"; sha256 = "1x9avjq0fgw0svcbw6b6873qnsqxbacls9sipmcv86xia4bxh8dn"; }; diff --git a/pkgs/tools/misc/colorpicker/default.nix b/pkgs/tools/misc/colorpicker/default.nix index 07d15469383d..475041b4f682 100644 --- a/pkgs/tools/misc/colorpicker/default.nix +++ b/pkgs/tools/misc/colorpicker/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "colorpicker"; - version = "git-2018-01-14"; + version = "unstable-2018-01-14"; src = fetchFromGitHub { owner = "Ancurio"; - repo = "colorpicker"; - rev = "287676947e6e3b5b0cee784aeb1638cf22f0ce17"; + repo = "colorpicker"; + rev = "287676947e6e3b5b0cee784aeb1638cf22f0ce17"; sha256 = "1kj1dpb79llrfpszraaz6r7ci114zqi5rmqxwsvq2dnnpjxyi29r"; }; diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix index 3ac730f471f7..86e5a62fb8de 100644 --- a/pkgs/tools/networking/connman/connman_dmenu/default.nix +++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "connman_dmenu"; - version = "git-29-9-2015"; + version = "unstable-2015-09-29"; src = fetchFromGitHub { owner = "march-linux"; @@ -26,10 +26,10 @@ stdenv.mkDerivation { ''; meta = { - description = "A dmenu wrapper for connmann"; - homepage = "https://github.com/march-linux/connman_dmenu"; - license = lib.licenses.free; - maintainers = [ lib.maintainers.magnetophon ]; - platforms = lib.platforms.all; + description = "A dmenu wrapper for connmann"; + homepage = "https://github.com/march-linux/connman_dmenu"; + license = lib.licenses.free; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index 2af4a742208c..4aab72cb5dfc 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "tpm-luks"; - version = "git-2015-07-11"; + version = "unstable-2015-07-11"; src = fetchgit { url = "https://github.com/momiji/tpm-luks"; @@ -23,14 +23,14 @@ stdenv.mkDerivation { make install DESTDIR=$out mv $out/$out/sbin $out/bin rm -r $out/nix - ''; + ''; meta = with lib; { description = "LUKS key storage in TPM NVRAM"; - homepage = "https://github.com/shpedoikal/tpm-luks/"; + homepage = "https://github.com/shpedoikal/tpm-luks/"; maintainers = [ maintainers.tstrobel ]; license = with licenses; [ gpl2Only ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix index d9332acc898f..65be63bffe12 100644 --- a/pkgs/tools/system/das_watchdog/default.nix +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "das_watchdog"; - version = "git-2015-09-12"; + version = "unstable-2015-09-12"; src = fetchgit { url = "https://github.com/kmatheussen/das_watchdog.git"; From 9174a03677b7065082a32cab8bac7e2a027fd7d0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 10 Nov 2021 22:40:49 +0100 Subject: [PATCH 138/140] svtplay-dl: 4.8 -> 4.9 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index fff5c25cd6e6..ba065d322b86 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "4.8"; + version = "4.9"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1mlf0yvj3zy3df0ip7qb6g4v7032rsz038a7d25zn6yfzsz04br3"; + sha256 = "01jbhydj6q1zgzsrs9prpsc3ycqzisx4jqm70dikkmsr5b64hhni"; }; pythonPaths = [ cryptography pyyaml requests ]; From 391fac4148b5d2b3f040cd1e149e7ba25ad45893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Wed, 10 Nov 2021 23:58:37 +0100 Subject: [PATCH 139/140] clojure: 1.10.3.1013 -> 1.10.3.1029 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 2a44ca4161c3..a412aafe2ac0 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.1013"; + version = "1.10.3.1029"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "EmIdcQ7ANbDjOBUX/UQwdd1C+JzeCZaC4XaNdW49E/A="; + sha256 = "14c08xva1r6sl3h78vhckwx5dd8kqwi7457prygh9330b7r8caa2"; }; nativeBuildInputs = [ From 5b636e4715050052ca36edc79a75cddebd8d3b1c Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Wed, 10 Nov 2021 20:25:37 -0300 Subject: [PATCH 140/140] jet: init at 0.1.0 --- pkgs/development/tools/jet/default.nix | 59 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/tools/jet/default.nix diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix new file mode 100644 index 000000000000..9ba85cb8fc4f --- /dev/null +++ b/pkgs/development/tools/jet/default.nix @@ -0,0 +1,59 @@ +{ stdenv, lib, graalvm11-ce, fetchurl }: + +stdenv.mkDerivation rec { + pname = "jet"; + version = "0.1.0"; + + src = fetchurl { + url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; + sha256 = "sha256-RCEIIZfPmOLW3akjEgaEas4xOtYxL6lQsxDv2szB8K4"; + }; + + reflectionJson = fetchurl { + url = "https://raw.githubusercontent.com/borkdude/${pname}/v${version}/reflection.json"; + sha256 = "sha256-mOUiKEM5tYhtpBpm7KtslyPYFsJ+Wr+4ul6Zi4aS09Q="; + }; + + dontUnpack = true; + + buildInputs = [ graalvm11-ce ]; + + buildPhase = '' + runHook preBuild + + # https://github.com/borkdude/jet/blob/v0.1.0/script/compile#L16-L29 + args=("-jar" "$src" + "-H:CLibraryPath=${graalvm11-ce.lib}/lib" + # Required to build jet on darwin. Do not remove. + "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}" + "-H:Name=jet" + "-H:+ReportExceptionStackTraces" + "-J-Dclojure.spec.skip-macros=true" + "-J-Dclojure.compiler.direct-linking=true" + "-H:IncludeResources=JET_VERSION" + "-H:ReflectionConfigurationFiles=${reflectionJson}" + "--initialize-at-build-time" + "-H:Log=registerResource:" + "--verbose" + "--no-fallback" + "--no-server" + "-J-Xmx3g") + + native-image ''${args[@]} + + runHook postBuild + ''; + + installPhase = '' + mkdir -p $out/bin + cp jet $out/bin/jet + ''; + + meta = with lib; { + description = "CLI to transform between JSON, EDN and Transit, powered with a minimal query language"; + homepage = "https://github.com/borkdude/jet"; + license = licenses.epl10; + platforms = graalvm11-ce.meta.platforms; + maintainers = with maintainers; [ ericdallo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef5abe3724e2..34f18f795d36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6531,6 +6531,8 @@ with pkgs; jekyll = callPackage ../applications/misc/jekyll { }; + jet = callPackage ../development/tools/jet { }; + jfsutils = callPackage ../tools/filesystems/jfsutils { }; jhead = callPackage ../tools/graphics/jhead { };