From 723b22e41687dc6ebc05986728fd0715b07e8b90 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Mon, 10 May 2021 22:25:15 +0200 Subject: [PATCH 01/94] networkmanagerapplet: 1.20.0 -> 1.22.0 --- pkgs/tools/networking/networkmanager/applet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index cffacddf8bd..2defa37cc6e 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.20.0"; + version = "1.22.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0lsjkbv66hn7acl2pg9h6hz4b700zzv4cjwrwjvy7043blw0bcla"; + sha256 = "sha256-xw2AtI1AqcuZ7JZ8xDifZ+fwMBUopp1IFXIEEzGmRr4="; }; mesonFlags = [ From a669f2a0e447db236e22ac19244ed03c276d0a42 Mon Sep 17 00:00:00 2001 From: Matheus de Souza Pessanha Date: Sun, 2 May 2021 13:30:24 -0300 Subject: [PATCH 02/94] earthly: init at 0.5.11 Update pkgs/top-level/all-packages.nix; Added earthly Do check tests created personal handle in maintainers/maintainer-list.nix preppended "debugger" and "shellrepeater" binaries with earthly-* to avoid collisions fixed earthly package maintainer name --- maintainers/maintainer-list.nix | 6 +++++ pkgs/development/tools/earthly/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/tools/earthly/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b8de823c9af..c11ef4d589d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11162,6 +11162,12 @@ githubId = 26458780; name = "Matthew Croughan"; }; + mdsp = { + github = "Mdsp9070"; + githubId = 44469426; + name = "Matheus de Souza Pessanha"; + email = "matheus_pessanha_2001@outlook.com"; + }; ngerstle = { name = "Nicholas Gerstle"; email = "ngerstle@gmail.com"; diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix new file mode 100644 index 00000000000..58ca9107c54 --- /dev/null +++ b/pkgs/development/tools/earthly/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "earthly"; + version = "0.5.11"; + + src = fetchFromGitHub { + owner = "earthly"; + repo = "earthly"; + rev = "v${version}"; + sha256 = "1d9p2f79f2k7nnka9qja3dlqvvl240l09frkb17ff2f5kyi1qabv"; + }; + + vendorSha256 = "1wfm55idlxf6cbm6b5z3fip0j94nwr7m0zxx6a2nsr03d4x0ad0k"; + + postInstall = '' + mv $out/bin/debugger $out/bin/earthly-debugger + mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater + ''; + + meta = with lib; { + description = "Build automation for the container era"; + homepage = "https://earthly.dev/"; + changelog = "https://github.com/earthly/earthly/releases/tag/v${version}"; + license = licenses.mpl20; + maintainers = with maintainers; [ mdsp ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d0ae69db6d..d3910f4ed32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2374,6 +2374,8 @@ in dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { }; + earthly = callPackage ../development/tools/earthly { }; + earlybird = callPackage ../tools/security/earlybird { }; earlyoom = callPackage ../os-specific/linux/earlyoom { }; From 2b9d79b12effd52621cc27991d2c9ead4cf64b1c Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Mon, 10 May 2021 17:31:35 -0400 Subject: [PATCH 03/94] librealsense2: 2.43.0 -> 2.45.0 --- .../libraries/librealsense/default.nix | 7 ++-- .../py_pybind11_no_external_download.patch | 39 +++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 6607a4d00fb..4015ab02a3a 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.43.0"; + version = "2.45.0"; outputs = [ "out" "dev" ]; @@ -15,17 +15,18 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N7EvpcJjtK3INHK7PgoiEVIMq9zGcHKMeI+/dwZ3bNs="; + sha256 = "0aqf48zl7825v7x8c3x5w4d17m4qq377f1mn6xyqzf9b0dnk4i1j"; }; buildInputs = [ libusb1 gcc.cc.lib ] ++ lib.optional cudaSupport cudatoolkit - ++ lib.optional enablePython pythonPackages.python; + ++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]); patches = lib.optionals enablePython [ ./py_sitepackage_dir.patch + ./py_pybind11_no_external_download.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch b/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch new file mode 100644 index 00000000000..2b48edb62e3 --- /dev/null +++ b/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch @@ -0,0 +1,39 @@ +From 01e51b9c90ba51b2d0ca797dde676812cf3db415 Mon Sep 17 00:00:00 2001 +From: "Robert T. McGibbon" +Date: Mon, 10 May 2021 17:26:04 -0400 +Subject: [PATCH 1/1] V1 + +--- + wrappers/python/CMakeLists.txt | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt +index aa83e4c77..4ec92ccfa 100644 +--- a/wrappers/python/CMakeLists.txt ++++ b/wrappers/python/CMakeLists.txt +@@ -8,21 +8,8 @@ if (NOT BUILD_PYTHON_BINDINGS) + endif() + + set(DEPENDENCIES realsense2) +-# In order for the external project clone to occur during cmake configure step(rather than during compilation, as would normally happen), +-# we copy the external project declaration to the build folder and then execute it +-configure_file(${CMAKE_SOURCE_DIR}/third-party/pybind11/CMakeLists.txt ${CMAKE_BINARY_DIR}/external-projects/pybind11/CMakeLists.txt) +-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11" +-) +-execute_process(COMMAND "${CMAKE_COMMAND}" --build . +- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11" +-) + +-# Add pybind11 makefile +-add_subdirectory("${CMAKE_BINARY_DIR}/third-party/pybind11" +- "${CMAKE_BINARY_DIR}/third-party/pybind11" +- EXCLUDE_FROM_ALL +-) ++find_package(pybind11 REQUIRED) + + set(PYBIND11_CPP_STANDARD -std=c++11) + # Force Pybind11 not to share pyrealsense2 resources with other pybind modules. +-- +2.29.3 + From 7443049b93b6ca4c96c9ba1d610a6de3d2b4ca26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 May 2021 06:57:36 +0200 Subject: [PATCH 04/94] pyright: also add to all-packages for better visibility --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ac69482216..be1d8ff31b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25083,6 +25083,8 @@ in ptex = callPackage ../development/libraries/ptex {}; + pyright = nodePackages.pyright; + qbec = callPackage ../applications/networking/cluster/qbec { }; qemacs = callPackage ../applications/editors/qemacs { }; From 8c24e79c15ad83c424c36708d7d1e1b9a8fa57cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sun, 9 May 2021 22:58:41 +0200 Subject: [PATCH 05/94] libfive: fix darwin build --- pkgs/development/libraries/libfive/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 0f6ad84fe75..3833a7fe880 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -10,6 +10,7 @@ , libpng , boost , guile +, stdenv }: mkDerivation { @@ -26,8 +27,19 @@ mkDerivation { nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ]; buildInputs = [ eigen zlib libpng boost guile ]; - # Link "Studio" binary to "libfive-studio" to be more obvious: - postFixup = '' + postInstall = if stdenv.isDarwin then '' + # No rules to install the mac app, so do it manually. + mkdir -p $out/Applications + cp -r studio/Studio.app $out/Applications/Studio.app + + install_name_tool \ + -change libfive.dylib $out/lib/libfive.dylib \ + -change libfive-guile.dylib $out/lib/libfive-guile.dylib \ + $out/Applications/Studio.app/Contents/MacOS/Studio + + wrapQtApp $out/Applications/Studio.app/Contents/MacOS/Studio + '' else '' + # Link "Studio" binary to "libfive-studio" to be more obvious: ln -s "$out/bin/Studio" "$out/bin/libfive-studio" ''; From a10ede5a5a33f1113b1323ffb01d69f8a5b327c7 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 11 May 2021 06:36:41 -0300 Subject: [PATCH 06/94] k3s: 1.20.6+k3s1 -> 1.21.0+k3s1 --- .../networking/cluster/k3s/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 4053a042bfa..878d7e1184f 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -44,14 +44,16 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.20.6+k3s1"; # k3s git tag - traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag - k3sRootVersion = "0.8.1"; # taken from ./scripts/download at the above k3s tag - k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag + k3sVersion = "1.21.0+k3s1"; # k3s git tag + k3sCommit = "2705431d9645d128441c578309574cd262285ae6"; # k3s git commit at the above version + + traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION + k3sRootVersion = "0.8.1"; # taken from ./scripts/download at ROOT_VERSION + k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS # bundled into the k3s binary traefikChart = fetchurl { - url = "https://kubernetes-charts.storage.googleapis.com/traefik-${traefikChartVersion}.tgz"; - sha256 = "1aqpzgjlvqhil0g3angz94zd4xbl4iq0qmpjcy5aq1xv9qciwdi9"; + url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; + sha256 = "sha256-9d7p0ngyMN27u4OPgz7yI14Zj9y36t9o/HMX5wyDpUI="; }; # so, k3s is a complicated thing to package # This derivation attempts to avoid including any random binaries from the @@ -95,8 +97,7 @@ let k3sRepo = fetchgit { url = "https://github.com/k3s-io/k3s"; rev = "v${k3sVersion}"; - leaveDotGit = true; # ./scripts/version.sh depends on git - sha256 = "sha256-IIZotJKQ/+WNmfcEJU5wFtZBufWjUp4MeVCRk4tSjyQ="; + sha256 = "sha256-xsXxf2ZYrkpOHlSFqTsHwWF3kChUjxWRjyDR3Dhg2ho="; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. @@ -134,9 +135,13 @@ let # those. patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkg-config ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp ]; + # Versioning info for build script + DRONE_TAG = "v${version}"; + DRONE_COMMIT = k3sCommit; + buildPhase = '' pushd go/src/${goPackagePath} @@ -175,7 +180,7 @@ let # See the above comment in k3sBuildStage1 patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkg-config zstd ]; + nativeBuildInputs = [ pkg-config zstd ]; # These dependencies are embedded as compressed files in k3s at runtime. # Propagate them to avoid broken runtime references to libraries. propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ]; @@ -186,6 +191,9 @@ let else if stdenv.hostPlatform.system == "aarch64-linux" then "-arm64" else throw "k3s isn't being built for ${stdenv.hostPlatform.system} yet."; + DRONE_TAG = "v${version}"; + DRONE_COMMIT = k3sCommit; + # In order to build the thick k3s binary (which is what # ./scripts/package-cli does), we need to get all the binaries that script # expects in place. From 99396a48a5ade1b6349ecb7cb17e8cc278804545 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 11 May 2021 15:42:41 +0200 Subject: [PATCH 07/94] tbb: clean up MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Drop compiler and stdver arguments – if someone needs to provide them, they can just use overrideAttrs - Update repo source - Narrow scope of `with lib` declaration - Change optional → optionals - Use one input per line - Build on all unix platforms - Re-order attributes --- pkgs/development/libraries/tbb/default.nix | 39 +++++++++++++--------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 97ce24a8398..93750621275 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,22 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: +{ lib +, stdenv +, fetchFromGitHub +, fixDarwinDylibNames +}: -with lib; stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "tbb"; - version = "2020_U3"; + version = "2020.3"; src = fetchFromGitHub { - owner = "01org"; - repo = "tbb"; - rev = version; - sha256 = "sha256-prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU="; + owner = "oneapi-src"; + repo = "oneTBB"; + rev = "v${version}"; + sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU="; }; - nativeBuildInputs = optional stdenv.isDarwin fixDarwinDylibNames; + patches = lib.optionals stdenv.hostPlatform.isMusl [ + ./glibc-struct-mallinfo.patch + ]; - makeFlags = optional (compiler != null) "compiler=${compiler}" - ++ optional (stdver != null) "stdver=${stdver}"; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]; - patches = lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; + makeFlags = lib.optionals stdenv.cc.isClang [ + "compiler=clang" + ]; + + enableParallelBuilding = true; installPhase = '' runHook preInstall @@ -29,9 +40,7 @@ with lib; stdenv.mkDerivation rec { runHook postInstall ''; - enableParallelBuilding = true; - - meta = { + meta = with lib; { description = "Intel Thread Building Blocks C++ Library"; homepage = "http://threadingbuildingblocks.org/"; license = licenses.asl20; @@ -43,7 +52,7 @@ with lib; stdenv.mkDerivation rec { represents a higher-level, task-based parallelism that abstracts platform details and threading mechanisms for scalability and performance. ''; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice dizfer ]; }; } From d2f30b0b11e66f8064132357892340fd814f8338 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 11 May 2021 15:53:44 +0200 Subject: [PATCH 08/94] pkgsMusl.tbb: fix build Use patches from openembedded: https://github.com/openembedded/meta-openembedded/tree/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb Also apply the patches unconditionally so that it is obvious when they do not apply any more. --- pkgs/development/libraries/tbb/default.nix | 15 ++++++- .../libraries/tbb/glibc-struct-mallinfo.patch | 43 ------------------- 2 files changed, 13 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 93750621275..af22361f7a2 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchurl , fetchFromGitHub , fixDarwinDylibNames }: @@ -15,8 +16,18 @@ stdenv.mkDerivation rec { sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU="; }; - patches = lib.optionals stdenv.hostPlatform.isMusl [ - ./glibc-struct-mallinfo.patch + patches = [ + # Fixes build with Musl. + (fetchurl { + url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch"; + sha256 = "gUfXQ9OZQ82qD6brgauBCsKdjLvyHafMc18B+KxZoYs="; + }) + + # Fixes build with Musl. + (fetchurl { + url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch"; + sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74="; + }) ]; nativeBuildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch b/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch deleted file mode 100644 index 64056ecb146..00000000000 --- a/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b577153a10c98f4e13405dc93ea2ab1a7b990e07 Mon Sep 17 00:00:00 2001 -From: David Huffman -Date: Wed, 6 Jan 2016 07:09:30 -0500 -Subject: [PATCH] hard-code glibc's definition of struct mallinfo - ---- - src/tbbmalloc/proxy.h | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/src/tbbmalloc/proxy.h b/src/tbbmalloc/proxy.h -index 781cadc..e1ea1ae 100644 ---- a/src/tbbmalloc/proxy.h -+++ b/src/tbbmalloc/proxy.h -@@ -32,6 +32,26 @@ - - #include - -+// The following definition was taken from /usr/include/malloc.h as provided by -+// the glibc-devel-2.19-17.4.x86_64 package on openSUSE Leap 42.1; it is -+// made available under the GNU Lesser General Public License v2.1 or later. -+// See . -+// -+// Copyright (C) 1996-2014 Free Software Foundation, Inc. -+struct mallinfo -+{ -+ int arena; /* non-mmapped space allocated from system */ -+ int ordblks; /* number of free chunks */ -+ int smblks; /* number of fastbin blocks */ -+ int hblks; /* number of mmapped regions */ -+ int hblkhd; /* space in mmapped regions */ -+ int usmblks; /* maximum total allocated space */ -+ int fsmblks; /* space available in freed fastbin blocks */ -+ int uordblks; /* total allocated space */ -+ int fordblks; /* total free space */ -+ int keepcost; /* top-most, releasable (via malloc_trim) space */ -+}; -+ - extern "C" { - void * scalable_malloc(size_t size); - void * scalable_calloc(size_t nobj, size_t size); --- -2.6.2 - From d8258b513d6a4b0f7776876f9c5a6b406f8ec9af Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 11 May 2021 16:00:03 +0200 Subject: [PATCH 09/94] tbb: add pkg-config file Gazebo does not list the tbb dependency in its pkg-config file otherwise. --- pkgs/development/libraries/tbb/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index af22361f7a2..7aef5ba7476 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -51,6 +51,23 @@ stdenv.mkDerivation rec { runHook postInstall ''; + postInstall = let + pcTemplate = fetchurl { + url = "https://github.com/oneapi-src/oneTBB/raw/master/integration/pkg-config/tbb.pc.in"; + sha256 = "2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI="; + }; + in '' + # Generate pkg-config file based on upstream template. + # It should not be necessary with tbb after 2021.2. + mkdir -p "$out/lib/pkgconfig" + substitute "${pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \ + --subst-var-by CMAKE_INSTALL_PREFIX "$out" \ + --subst-var-by CMAKE_INSTALL_LIBDIR "lib" \ + --subst-var-by CMAKE_INSTALL_INCLUDEDIR "include" \ + --subst-var-by TBB_VERSION "${version}" \ + --subst-var-by TBB_LIB_NAME "tbb" + ''; + meta = with lib; { description = "Intel Thread Building Blocks C++ Library"; homepage = "http://threadingbuildingblocks.org/"; From 07dc385e07adb52ac4cc8e461bc77658f4fec00f Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 11 May 2021 19:14:32 +0200 Subject: [PATCH 10/94] wire-desktop: linux 3.24.2939 -> 3.25.2940 --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 4d94801df95..7cfed84d872 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -23,12 +23,12 @@ let version = { x86_64-darwin = "3.24.4059"; - x86_64-linux = "3.24.2939"; + x86_64-linux = "3.25.2940"; }.${system} or throwSystem; sha256 = { x86_64-darwin = "1zjv3d8jp0wldrzl02q9kir7q3y5bcb6hsfli6wip8bmaq78dksy"; - x86_64-linux = "1k9n58pr5fnqv9vacay5vrbs4pvq2p36c0dpg9rjdcnb2fwaqg5p"; + x86_64-linux = "1vb2fy8hijjp0193d32d8hw7h00w6wympf3zc96skk8hz3ks6xz8"; }.${system} or throwSystem; meta = with lib; { From 462c21b53391dd7451efe9ed783b4791754232d0 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 11 May 2021 19:17:07 +0200 Subject: [PATCH 11/94] wire-desktop: mac 3.24.4059 -> 3.25.4095 --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 7cfed84d872..3a22ea0681e 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -22,12 +22,12 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.24.4059"; + x86_64-darwin = "3.25.4095"; x86_64-linux = "3.25.2940"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "1zjv3d8jp0wldrzl02q9kir7q3y5bcb6hsfli6wip8bmaq78dksy"; + x86_64-darwin = "01gbmbxs3w7lwsy5wjpr7fgqkb20rj5fv1r3dsmjkfwy45pd835j"; x86_64-linux = "1vb2fy8hijjp0193d32d8hw7h00w6wympf3zc96skk8hz3ks6xz8"; }.${system} or throwSystem; From 9e8b1b0755b4992880698c8083b692c331874c8e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 11 May 2021 19:44:42 +0200 Subject: [PATCH 12/94] terraform-providers: bump Azure providers Specifically, - azuread: 0.10.0 -> 1.4.0 - azurerm: 2.13.0 -> 2.58.0 - azurestack: 0.9.0 -> 0.10.0 --- .../terraform-providers/providers.json | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 33fba6e5a0f..73ca34969bb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -76,28 +76,31 @@ "version": "3.27.0" }, "azuread": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v0.10.0", - "sha256": "0i9xrsqgh1024189hihm2nqrcy2pcyf1bwxnamwmwph5cas6hfb3", - "version": "0.10.0" + "rev": "v1.4.0", + "sha256": "13y0h8af37gfsjhccbfsnj6kqcn61lr1znmsxipjr5h9ka5lc209", + "vendorSha256": null, + "version": "1.4.0" }, "azurerm": { "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.13.0", - "sha256": "0aj19vy1flpb2233rxaypjcfimjr1wfqri1m3p15dy1r108q84r7", - "version": "2.13.0" + "rev": "v2.58.0", + "sha256": "1zy3q5d63pz2rdczcs9xnxzasb2jbzhyg8nbk2r252mdnhx6h9vh", + "vendorSha256": null, + "version": "2.58.0" }, "azurestack": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurestack", "repo": "terraform-provider-azurestack", - "rev": "v0.9.0", - "sha256": "1msm7jwzry0vmas3l68h6p0migrsm6d18zpxcncv197m8xbvg324", - "version": "0.9.0" + "rev": "v0.10.0", + "sha256": "0lcwrp6n3l1nink06wq2nrirs6k3wwjmya1w06x14pvqqdj1d5c8", + "vendorSha256": null, + "version": "0.10.0" }, "baiducloud": { "owner": "terraform-providers", From 34d988e673ac351b0daee5875c1a461ffbef53d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 11 May 2021 17:43:54 +0200 Subject: [PATCH 13/94] apacheHttpdPackages.mod_python: fix darwin build --- .../servers/http/apache-modules/mod_python/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 3d9d4b21c40..1b8ef94fae9 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv, fetchurl, apacheHttpd, python2 }: +{ lib, stdenv, fetchurl, apacheHttpd, python2, libintl }: stdenv.mkDerivation rec { - name = "mod_python-3.5.0"; + pname = "mod_python"; + version = "3.5.0"; src = fetchurl { - url = "http://dist.modpython.org/dist/${name}.tgz"; + url = "http://dist.modpython.org/dist/${pname}-${version}.tgz"; sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f"; }; @@ -24,7 +25,8 @@ stdenv.mkDerivation rec { passthru = { inherit apacheHttpd; }; - buildInputs = [ apacheHttpd python2 ]; + buildInputs = [ apacheHttpd python2 ] + ++ lib.optional stdenv.isDarwin libintl; meta = { homepage = "http://modpython.org/"; From c16bc8043287461f75f96ef0326ca96f740174d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 11 May 2021 20:28:44 +0200 Subject: [PATCH 14/94] agate: fix darwin build --- pkgs/servers/gemini/agate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index b41153caeb8..95308772165 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-EOxklOiazxhhIIv6c+N4uuItY/oFMAG0r/ATZ3Anlko="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; checkFlags = [ # Username and Password use the same ports and causes collision From 967c6d8640974808cd618673de9ce3de366d0e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 11 May 2021 20:40:33 +0200 Subject: [PATCH 15/94] anevicon: fix darwin build --- pkgs/tools/networking/anevicon/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/anevicon/default.nix b/pkgs/tools/networking/anevicon/default.nix index 95a4bbe9fb8..cff22fa71e6 100644 --- a/pkgs/tools/networking/anevicon/default.nix +++ b/pkgs/tools/networking/anevicon/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , rustPlatform +, libiconv , Security }: @@ -19,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1g15v13ysx09fy0b8qddw5fwql2pvwzc2g2h1ndhzpxvfy7fzpr1"; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; cargoPatches = [ # Add Cargo.lock file, https://github.com/rozgo/anevicon/pull/1 @@ -30,6 +31,9 @@ rustPlatform.buildRustPackage rec { }) ]; + # Tries to send large UDP packets that Darwin rejects. + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "UDP-based load generator"; homepage = "https://github.com/rozgo/anevicon"; From 03108183829d0ac6d1052bc44edd4c44ea87e93b Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Tue, 11 May 2021 20:54:50 +0200 Subject: [PATCH 16/94] watson: 2.0.0 -> 2.0.1 --- pkgs/applications/office/watson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index c305c771417..b6e318ec083 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -4,13 +4,13 @@ with pythonPackages; buildPythonApplication rec { pname = "watson"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "TailorDev"; repo = "Watson"; rev = version; - sha256 = "1yxqjirv7cpg4hqj4l3a53p3p3kl82bcx6drgvl9v849vcc3l7s0"; + sha256 = "0radf5afyphmzphfqb4kkixahds2559nr3yaqvni4xrisdaiaymz"; }; postInstall = '' From 7c609936c5b0b754f3fd2e87b6c9a2d1df9f1482 Mon Sep 17 00:00:00 2001 From: Babbaj Date: Tue, 11 May 2021 15:08:22 -0400 Subject: [PATCH 17/94] gb-backup: 2021-03-06 -> 2021-04-07 --- pkgs/tools/backup/gamerbackup/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/gamerbackup/default.nix b/pkgs/tools/backup/gamerbackup/default.nix index f236a80547c..5512ce2b7b1 100644 --- a/pkgs/tools/backup/gamerbackup/default.nix +++ b/pkgs/tools/backup/gamerbackup/default.nix @@ -1,24 +1,30 @@ -{ lib, buildGoModule, fetchFromGitHub, lepton }: +{ lib, makeWrapper, buildGoModule, fetchFromGitHub, lepton }: buildGoModule { pname = "gb-backup"; - version = "unstable-2021-03-06"; + version = "unstable-2021-04-07"; src = fetchFromGitHub { owner = "leijurv"; repo = "gb"; - rev = "5a94e60148628fc7796d15c53d0ed87184322053"; - sha256 = "07skhwnxvm6yngb2665gkh5qbiyp7hb7av8dkckzypmd4k8z93cm"; + rev = "904813bf0bbce048af5795618d58c0b1953f9ff8"; + sha256 = "111jrcv4x38sc19xha5q3pd2297s13qh1maa7sa1k09hgypvgsxf"; }; vendorSha256 = "0m2aa6p04b4fs7zncar1mlykc94pp527phv71cdsbx58jgsm1jnx"; - buildInputs = [ lepton ]; + nativeBuildInputs = [ makeWrapper ]; + + checkInputs = [ lepton ]; + + postFixup = '' + wrapProgram $out/bin/gb --prefix PATH : ${lib.makeBinPath [ lepton ]} + ''; meta = with lib; { description = "Gamer Backup, a super opinionated cloud backup system"; license = licenses.agpl3Only; maintainers = with maintainers; [ babbaj ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 3cf4c5d09b0c972c1fe5d15c23cfc9c75276064b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 11 May 2021 21:10:57 +0200 Subject: [PATCH 18/94] swiProlog: fix darwin build --- pkgs/development/compilers/swi-prolog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index addf6413801..cb4cf580a0e 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { # Add the packInstall path to the swipl pack search path postPatch = '' - echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> /build/$sourceRoot/boot/init.pl + echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> boot/init.pl ''; nativeBuildInputs = [ cmake pkg-config ]; From a3c9fd29fe88fb9e1dbf34513907cf5bb991cbca Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 11 May 2021 22:29:56 +0200 Subject: [PATCH 19/94] tailscale: 1.8.0 -> 1.8.3 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index a645977f8a3..b71d0eb3d5e 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.8.0"; + version = "1.8.3"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "urgXbfXEVu5ES140pIAZnQTjU3xWkkk9MPDmlRXa544="; + sha256 = "0q0nk0ychb00xhycq3kda57dzrswl8yhci7fzv8yiqzrv3ygpvyd"; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "NBdPGCmUyGKNr76CKwkXmqSVo502ZVrsbboNc+xnB04="; + vendorSha256 = "0cppblz1mnyb3c8xcry5mnf566s6l9409vf9572n1rs1bg91dvgn"; doCheck = false; From 1d863bf4160204a5045145b21c53f1cc0a1fa39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Tue, 11 May 2021 22:52:10 +0200 Subject: [PATCH 20/94] poedit: 2.4.2 -> 2.4.3 --- pkgs/tools/text/poedit/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 185b2a41c46..9a5226d98b2 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3, boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "poedit"; - version = "2.4.2"; + version = "2.4.3"; - src = fetchurl { - url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz"; - sha256 = "1kry3xphrdccx8znfm9pw5872c5w0ri7cknlad4qcps54b25nnzk"; + src = fetchFromGitHub { + owner = "vslavik"; + repo = "poedit"; + rev = "v${version}-oss"; + sha256 = "02xf2w3d2lnr3vqmil9vvg9pir7d21x4zrj9xwpgb7dhs0gimj0x"; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook @@ -41,6 +43,6 @@ stdenv.mkDerivation rec { homepage = "https://www.poedit.net/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dasj19 ]; }; } From c7b3d9522b1f9845ebdd65f36091b21ac465c271 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Tue, 11 May 2021 16:54:27 -0400 Subject: [PATCH 21/94] vips: fix darwin --- pkgs/tools/graphics/vips/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 9319fa9b610..18025f92e31 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -15,6 +15,7 @@ , libheif , librsvg , ApplicationServices +, Foundation , python27 , libpng , fetchFromGitHub @@ -68,7 +69,7 @@ stdenv.mkDerivation rec { python27 libpng expat - ] ++ lib.optional stdenv.isDarwin ApplicationServices; + ] ++ lib.optionals stdenv.isDarwin [ApplicationServices Foundation]; # Required by .pc file propagatedBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99786e6837e..2ddab332dc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30833,7 +30833,7 @@ in vimb = wrapFirefox vimb-unwrapped { }; vips = callPackage ../tools/graphics/vips { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }; nip2 = callPackage ../tools/graphics/nip2 { }; From d8094789f34e201c65d8593f5962b9ef1717a237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 11 May 2021 23:02:05 +0200 Subject: [PATCH 22/94] atuin: fix darwin build --- pkgs/tools/misc/atuin/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/atuin/default.nix b/pkgs/tools/misc/atuin/default.nix index 75a5fc57410..3157fc51b58 100644 --- a/pkgs/tools/misc/atuin/default.nix +++ b/pkgs/tools/misc/atuin/default.nix @@ -1,6 +1,10 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform +, libiconv +, Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { @@ -16,6 +20,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0vy6q3hjp374lyg00zxim8aplh83iq3f4rrmpz5vnpwbag1fdql3"; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ]; + meta = with lib; { description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines"; homepage = "https://github.com/ellie/atuin"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b76f1b53f9e..95eb5ce6183 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -156,7 +156,9 @@ in antsimulator = callPackage ../games/antsimulator { }; - atuin = callPackage ../tools/misc/atuin { }; + atuin = callPackage ../tools/misc/atuin { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; fiche = callPackage ../servers/fiche { }; From 4c8edd64e8e781b851b61356ece3a27b2ef30a39 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 11 May 2021 23:17:55 +0200 Subject: [PATCH 23/94] terraform-providers: set keycloak provider source address --- .../networking/cluster/terraform-providers/providers.json | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 73ca34969bb..f941b83eb70 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -498,6 +498,7 @@ }, "keycloak": { "owner": "mrparkers", + "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", "rev": "v3.0.0", "sha256": "1q9vzmj9c7mznv6al58d3rs5kk1fh28k1qccx46hcbk82z52da3a", From 273ab793b655b0a20c27c43218b185dc609a9189 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 11 May 2021 22:23:02 +0100 Subject: [PATCH 24/94] octant: 0.19.0 -> 0.20.0 --- pkgs/applications/networking/cluster/octant/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 6f97be468f5..ff86b64fec7 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "octant"; - version = "0.19.0"; + version = "0.20.0"; src = let @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-TKvUBof4TLcHr9hg6AOLjVd1NcAX9HHVuuABdFKRNQA="; - aarch64-linux = "sha256-BJb7h6kJZ3QhdlEqNHkiFp91uYLXzYHvKftxEAhjY38="; - x86_64-darwin = "sha256-Ig98IqLmlN9D4iXrP9SXYwTrQOvbtQ/tQW+uEmntm+I="; + x86_64-linux = "sha256-VFlZP5d6/YhzVIhveqMc4HfapBt0K/XjtqjCQNc514A="; + aarch64-linux = "sha256-RfdMfimmoHG4ixBtUVJ/V+mDhQ9aD+yeohkeUMUP8Zg="; + x86_64-darwin = "sha256-2Qgl3RdA4mMRTqR7o3Q86Zip5wtgvFp1vZn689FUtSI="; }; dontConfigure = true; From ed012af8f8fed4ce9925a3acb3251242cd7cc2a7 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 11 May 2021 22:23:34 +0100 Subject: [PATCH 25/94] octant-desktop: 0.19.0 -> 0.20.0 --- pkgs/applications/networking/cluster/octant/desktop.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/octant/desktop.nix b/pkgs/applications/networking/cluster/octant/desktop.nix index 5917d9ce033..8bc76834752 100644 --- a/pkgs/applications/networking/cluster/octant/desktop.nix +++ b/pkgs/applications/networking/cluster/octant/desktop.nix @@ -2,7 +2,7 @@ let pname = "octant-desktop"; - version = "0.19.0"; + version = "0.20.0"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -15,8 +15,8 @@ let src = fetchurl { url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-1XFb0zuyOy8XEUd9hoexItjq4assuWlWIzqw7pZxHx0="; - x86_64-darwin = "sha256-e3v5BFX7wnx4sAQrOq+dBIDVPJYzQZKKvKjSX+dis2U="; + x86_64-linux = "sha256-mPD5qa/IYsakjcoPnWVpkmhgkhnRK0qTGQ6hanzDt/Y="; + x86_64-darwin = "sha256-nxpwBRUeLSPqNEFjF8hKzRhA2ahqh/KyAitnSxYdyJ8="; }.${system}; }; From ee727dfdb73bc1cf56eb2c15bb8333ccd163a740 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 11 May 2021 23:57:54 +0200 Subject: [PATCH 26/94] chromiumDev: 92.0.4496.0 -> 92.0.4503.0 --- .../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 cbd45bfbd19..42b3feebfe2 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": "92.0.4496.0", - "sha256": "1kk1bybl6nx3z80agyljsvdb7yi3nna14aag71xhv4n6pygqfgdi", - "sha256bin64": "0b12ab20g5vay9x8j1zpj9zapdmm3him7rrm15jvsdakn60czdpr", + "version": "92.0.4503.0", + "sha256": "1fp4xz6x80m3ipcy4myzazyy1yj95qamyl6wf38mk2i6302gi2gb", + "sha256bin64": "0fwq8rn3v1dijj9xh6z7jw3xx2ihq0qcyh3bbcdd066w5ny6padm", "deps": { "gn": { - "version": "2021-04-29", + "version": "2021-05-07", "url": "https://gn.googlesource.com/gn", - "rev": "6771ce569fb4803dad7a427aa2e2c23e960b917e", - "sha256": "0lv1zs38qr862hwxrd3g6wz3l6v8j6p7b60nxyc5fhiglqxqz0im" + "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", + "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" } } }, From 85aa041a066f3c50c94b4a9e614b579809d031c8 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Tue, 11 May 2021 16:10:42 -0600 Subject: [PATCH 27/94] croc: 9.1.2 -> 9.1.3 --- pkgs/tools/networking/croc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index e57409fe558..1ce22c2ee2a 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.1.2"; + version = "9.1.3"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7v8vz0n35ATWdmMcM2U7z1sONbmsaWQahHsramivm88="; + sha256 = "rVR2KfrK7M74kZUm5q23Lbj7hTLCN+p12RBaf3JAEXM="; }; - vendorSha256 = "sha256-IAyiD4v2UEGlWj8oZ0E3YhqyThJTjwjWjOzQKuj6Q9s="; + vendorSha256 = "sha256-f0KiXHspGX96k5ViCwI62Qs+rHowpqm+gLy7/iqdnE4="; doCheck = false; From ee6e39fdb81c2d1b4fc2d46e38964e31e443f3e8 Mon Sep 17 00:00:00 2001 From: Matheus de Souza Pessanha Date: Mon, 10 May 2021 15:33:23 -0300 Subject: [PATCH 28/94] maintainers: add mdsp removed non alphabetically sorted mdsp maintainer remove trailing whitespace in pkgs/top-level/all-packages.nix:2377 Co-authored-by: Sandro --- maintainers/maintainer-list.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c11ef4d589d..2a9a48704b9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6306,6 +6306,12 @@ fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; + mdsp = { + github = "Mdsp9070"; + githubId = 44469426; + name = "Matheus de Souza Pessanha"; + email = "matheus_pessanha2001@outlook.com"; + }; meatcar = { email = "nixpkgs@denys.me"; github = "meatcar"; @@ -11162,12 +11168,6 @@ githubId = 26458780; name = "Matthew Croughan"; }; - mdsp = { - github = "Mdsp9070"; - githubId = 44469426; - name = "Matheus de Souza Pessanha"; - email = "matheus_pessanha_2001@outlook.com"; - }; ngerstle = { name = "Nicholas Gerstle"; email = "ngerstle@gmail.com"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3910f4ed32..4c740dfd67d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2374,7 +2374,7 @@ in dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { }; - earthly = callPackage ../development/tools/earthly { }; + earthly = callPackage ../development/tools/earthly { }; earlybird = callPackage ../tools/security/earlybird { }; From e5d8c19f707d6e6b2526b0457de55955dc8fee28 Mon Sep 17 00:00:00 2001 From: Bradley Walters Date: Tue, 11 May 2021 17:22:52 -0600 Subject: [PATCH 29/94] maintainers: add bmwalters --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7ff4d03b765..17d88872f75 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1322,6 +1322,12 @@ github = "bmilanov"; githubId = 30090366; }; + bmwalters = { + name = "Bradley Walters"; + email = "oss@walters.app"; + github = "bmwalters"; + githubId = 4380777; + }; bobakker = { email = "bobakk3r@gmail.com"; github = "bobakker"; From ffaa5312395e7ad8b84ce886eea9f67de21135d6 Mon Sep 17 00:00:00 2001 From: Bradley Walters Date: Tue, 11 May 2021 17:53:37 -0600 Subject: [PATCH 30/94] minipro: init at 0.5 --- pkgs/tools/misc/minipro/default.nix | 35 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/misc/minipro/default.nix diff --git a/pkgs/tools/misc/minipro/default.nix b/pkgs/tools/misc/minipro/default.nix new file mode 100644 index 00000000000..95385a47e59 --- /dev/null +++ b/pkgs/tools/misc/minipro/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitLab +, pkg-config +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "minipro"; + version = "0.5"; + + src = fetchFromGitLab { + owner = "DavidGriffith"; + repo = "minipro"; + rev = version; + sha256 = "sha256-Hyj2LyY7W8opjigH+QLHHbDyelC0LMgGgdN+u3nNoJc="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libusb1 ]; + makeFlags = [ + "PREFIX=$(out)" + "UDEV_DIR=$(out)/lib/udev" + "COMPLETIONS_DIR=$(out)/share/bash-completion/completions" + "PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + meta = with lib; { + homepage = "https://gitlab.com/DavidGriffith/minipro"; + description = "An open source program for controlling the MiniPRO TL866xx series of chip programmers"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.bmwalters ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b76f1b53f9e..37ce338a107 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6203,6 +6203,8 @@ in minidlna = callPackage ../tools/networking/minidlna { }; + minipro = callPackage ../tools/misc/minipro { }; + minisign = callPackage ../tools/security/minisign { }; ministat = callPackage ../tools/misc/ministat { }; From 2ca5a4e2b656fcc1d48711e1fc1360e7a1030728 Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Wed, 12 May 2021 00:25:40 +0000 Subject: [PATCH 31/94] vscode: 1.56.0 -> 1.56.1 --- pkgs/applications/editors/vscode/vscode.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index e15585d7bcf..12995d3c5fe 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0v1g7j5q2j86c3r7jib8xs1sf2h3xvwv1s0xsqbig480fchlshjg"; - x86_64-darwin = "109529acrvyassq00mbhnwbxq7rfq9n69rgcw4n0rysgp8n58386"; - aarch64-linux = "0p6pz9apbfmr4pf7fikp2rmvk5gr87md1zrhr6hhd1qwgpc9kl07"; - armv7l-linux = "1qrp75nbzgqp7mv42m6wbj000l33rhfv7cnxdv6lp6cy05381aq6"; + x86_64-linux = "0l4lx5h2daw9c5vl4kz6sq2i58b45xy4948x4q0wnwbqdqlqc9s4"; + x86_64-darwin = "0qqgs7vns52bz9xkys822sjjkvyq4l20iipz6sx5kinxg6h04jyy"; + aarch64-linux = "1gnh5kk4r0kfik9yfvvcbavhws4n8kn89kyl2qzpa2ryy52kk81j"; + armv7l-linux = "0zz5fn9nxq58i3svhgc25s6fdz7i3rxc0naflyx1jzmpzipp4v6n"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.56.0"; + version = "1.56.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 360f43277f08565fe08566a23f1ed73f9dc06674 Mon Sep 17 00:00:00 2001 From: Jeffery Utter Date: Tue, 11 May 2021 20:08:42 -0500 Subject: [PATCH 32/94] _1password: Fix Darwin Builds The latest update to 1.9.1 broke builds on darwin, due to some paths changing in the unpacked darwin package. This updates the darwin unpackPhase to use the updated path. --- pkgs/applications/misc/1password/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index f45bff666cf..afe15949ee8 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { unpackPhase = lib.optionalString stdenv.isDarwin '' xar -xf $src - zcat Payload | cpio -i + zcat op.pkg/Payload | cpio -i ''; installPhase = '' From 67a2f545cab1c39715211e448e9b92b3f8febadd Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 10 May 2021 00:43:13 -0300 Subject: [PATCH 33/94] eterm: 0.9.6 -> 0.9.6-unstable=2020-03-03 --- .../terminal-emulators/eterm/default.nix | 41 +++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix index 9e2afe57907..70b8311b105 100644 --- a/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/pkgs/applications/terminal-emulators/eterm/default.nix @@ -1,24 +1,41 @@ -{ lib, stdenv, fetchurl -, libX11, libXext, libXaw -, pkg-config, imlib2, libast }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, imlib2 +, libX11 +, libXaw +, libXext +, libast +, pkg-config +}: stdenv.mkDerivation rec { pname = "eterm"; - version = "0.9.6"; - srcName = "Eterm-${version}"; + version = "0.9.6-unstable=2020-03-03"; - src = fetchurl { - url = "http://www.eterm.org/download/${srcName}.tar.gz"; - sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj"; + src = fetchFromGitHub { + owner = "mej"; + repo = pname; + rev = "e8fb85b56da21113aaf0f5f7987ae647c4413b6c"; + sha256 = "sha256-pfXYrd6BamBTcnarvXj+C6D1WyGtj87GrW+Dl6AeiDE="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext libXaw imlib2 ]; - propagatedBuildInputs = [ libast ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + imlib2 + libX11 + libXaw + libXext + libast + ]; meta = with lib; { - description = "Terminal emulator"; homepage = "http://www.eterm.org"; + description = "Terminal emulator"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; From 5d8c8c6c90c2dda5d81ad9c1b2b018ad9a939dc0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 11 May 2021 09:39:22 -0300 Subject: [PATCH 34/94] icewm: 2.2.0 -> 2.3.4 --- pkgs/applications/window-managers/icewm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 8f1a920296a..0dc962e84c5 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "icewm"; - version = "2.2.0"; + version = "2.3.4"; src = fetchFromGitHub { - owner = "bbidulock"; + owner = "ice-wm"; repo = pname; rev = version; - hash = "sha256-STM8t311lf0xIqs2Onmwg48xgE7V9VZrUfJrUzYRxL4="; + hash = "sha256-UyLefj0eY/m3Of51NdhMNMq3z+kaLK28zDe63hbDK5A="; }; nativeBuildInputs = [ From 5ad65d4eb8aac91c2e5c99f0eded39890ece37b0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 11 May 2021 11:22:51 -0300 Subject: [PATCH 35/94] emacasPackages.sunrise-commander: 6r435 -> 0.0.0-unstable=2021-04-23 --- .../emacs-modes/sunrise-commander/default.nix | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index 412ed59f2ac..a45238fd191 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -1,30 +1,42 @@ -{ lib, stdenv, fetchgit, emacs }: +{ lib +, stdenv +, fetchFromGitHub +, emacs +}: -stdenv.mkDerivation { - name = "sunrise-commander-6r435"; +stdenv.mkDerivation rec { + pname = "sunrise-commander"; + version = "0.0.0-unstable=2021-04-23"; - src = fetchgit { - url = "https://github.com/escherdragon/sunrise-commander.git"; - rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1"; - sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "db880fbea03d2db00db1398c91918c3c6f0392e3"; + hash = "sha256-IGHCKYQaGUapaA9vxq0xO58KCpBPOiQpHqrEaHK0usE="; }; - buildInputs = [ emacs ]; + buildInputs = [ + emacs + ]; buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el + runHook preBuild + emacs -q --no-splash --directory=. --batch --file=batch-byte-compile *.el + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/share/emacs/site-lisp install *.el* $out/share/emacs/site-lisp + runHook postInstall ''; - meta = { + meta = with lib; { + homepage = "https://github.com/sunrise-commander/sunrise-commander/"; description = "Two-pane file manager for Emacs based on Dired and inspired by MC"; - homepage = "http://www.emacswiki.org/emacs/Sunrise_Commander"; - license = lib.licenses.gpl3Plus; - - platforms = lib.platforms.all; + license = licenses.gpl3Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.all; }; } From 12d5b760ae519bf25d72fa9a8a7263a6584227d1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 11 May 2021 09:10:03 -0300 Subject: [PATCH 36/94] skribilo: rewrite --- pkgs/tools/typesetting/skribilo/default.nix | 83 ++++++++++++--------- 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index 755909f2b33..e80c4326651 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -1,64 +1,75 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, pkg-config , gettext -, guile -, guile-reader -, guile-lib -, ploticus -, imagemagick , ghostscript -, transfig -, enableEmacs ? false, emacs ? null -, enableLout ? true, lout ? null -, enableTex ? true, tex ? null +, guile +, guile-lib +, guile-reader +, imagemagick , makeWrapper +, pkg-config +, ploticus +, transfig +, enableEmacs ? false, emacs +, enableLout ? true, lout +, enableTex ? true, tex }: let + inherit (lib) optional; +in stdenv.mkDerivation rec{ pname = "skribilo"; version = "0.9.5"; - inherit (lib) optional; -in stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz"; sha256 = "sha256-AIJqIcRjT7C0EO6J60gGjERdgAglh0ZU49U9XKPwvwk="; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; - - buildInputs = [ gettext guile ploticus imagemagick ghostscript transfig ] + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + buildInputs = [ + gettext + ghostscript + guile + guile-lib + guile-reader + imagemagick + ploticus + transfig + ] ++ optional enableEmacs emacs ++ optional enableLout lout ++ optional enableTex tex; - propagatedBuildInputs = [ guile-reader guile-lib ]; + postInstall = + let + guileVersion = lib.versions.majorMinor guile.version; + in + '' + wrapProgram $out/bin/skribilo \ + --prefix GUILE_LOAD_PATH : "$out/share/guile/site/${guileVersion}:$GUILE_LOAD_PATH" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/lib/guile/${guileVersion}/site-ccache:$GUILE_LOAD_COMPILED_PATH" + ''; - postInstall = '' - wrapProgram $out/bin/skribilo \ - --prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" \ - --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" - ''; - - meta = with lib;{ + meta = with lib; { + homepage = "https://www.nongnu.org/skribilo/"; description = "The Ultimate Document Programming Framework"; longDescription = '' - Skribilo is a free document production tool that takes a - structured document representation as its input and renders that - document in a variety of output formats: HTML and Info for - on-line browsing, and Lout and LaTeX for high-quality hard - copies. + Skribilo is a free document production tool that takes a structured + document representation as its input and renders that document in a + variety of output formats: HTML and Info for on-line browsing, and Lout + and LaTeX for high-quality hard copies. The input document can use Skribilo's markup language to provide - information about the document's structure, which is similar to - HTML or LaTeX and does not require expertise. Alternatively, it - can use a simpler, "markup-less" format that borrows from Emacs' - outline mode and from other conventions used in emails, Usenet - and text. + information about the document's structure, which is similar to HTML or + LaTeX and does not require expertise. Alternatively, it can use a simpler, + "markup-less" format that borrows from Emacs' outline mode and from other + conventions used in emails, Usenet and text. ''; - homepage = "https://www.nongnu.org/skribilo/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; From 941c14f345c73cd5fc5f4ad6033fcb50cf575989 Mon Sep 17 00:00:00 2001 From: "J. Neto" Date: Wed, 12 May 2021 04:58:25 -0300 Subject: [PATCH 37/94] sqsh: fix build with freetds --- pkgs/development/tools/sqsh/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index 9c56efcb59f..ba4a681a594 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -14,9 +14,6 @@ in stdenv.mkDerivation rec { preConfigure = '' export SYBASE=${freetds} - - substituteInPlace src/cmd_connect.c \ - --replace CS_TDS_80 CS_TDS_73 '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "libct.so" "libct.dylib" ''; @@ -27,6 +24,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + patches = [ + (fetchurl { + # https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/databases/sqsh/patches/patch-src_cmd_connect_c + name = "patch-src_cmd_connect_c.patch"; + url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/databases/sqsh/patches/patch-src_cmd_connect_c?rev=1.2&content-type=text/plain"; + sha256 = "1dz97knr2h0a0ca1vq2mx6h8s3ns9jb1a0qraa4wkfmcdi3aqw0j"; + }) + ]; + + patchFlags = [ "-p0" ]; + meta = with lib; { description = "Command line tool for querying Sybase/MSSQL databases"; longDescription = '' From e8ab2b3eebf5e9484c6eee1ee165c1d5c941d57a Mon Sep 17 00:00:00 2001 From: David Wood Date: Tue, 11 May 2021 10:14:41 +0100 Subject: [PATCH 38/94] py-dmidecode: init at 0.1.0 Signed-off-by: David Wood --- .../python-modules/py-dmidecode/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/py-dmidecode/default.nix diff --git a/pkgs/development/python-modules/py-dmidecode/default.nix b/pkgs/development/python-modules/py-dmidecode/default.nix new file mode 100644 index 00000000000..e74a8d7ac29 --- /dev/null +++ b/pkgs/development/python-modules/py-dmidecode/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, dmidecode }: + +buildPythonPackage rec { + pname = "py-dmidecode"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bv1vmhj8h520kj6slwpz16xfmgp117yjjkfyihkl5ix6mn5zkpa"; + }; + + propagatedBuildInputs = [ dmidecode ]; + + # Project has no tests. + doCheck = false; + pythonImportsCheck = [ "dmidecode" ]; + + meta = with lib; { + homepage = "https://github.com/zaibon/py-dmidecode/"; + description = "Python library that parses the output of dmidecode"; + license = licenses.asl20; + maintainers = with maintainers; [ davidtwco ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d75625019b..37b70c3e0f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5300,6 +5300,8 @@ in { py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { }; + py-dmidecode = callPackage ../development/python-modules/py-dmidecode { }; + py2bit = callPackage ../development/python-modules/py2bit { }; py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); From 1998a4243b53b3187bac44c93ee8231fb9c24663 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 May 2021 10:44:32 +0200 Subject: [PATCH 39/94] python3Packages.mdformat: init at 0.7.6 --- .../python-modules/mdformat/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/mdformat/default.nix diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix new file mode 100644 index 00000000000..159310035b8 --- /dev/null +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, importlib-metadata +, markdown-it-py +, poetry-core +, pytestCheckHook +, pythonOlder +, typing-extensions +}: + +buildPythonPackage rec { + pname = "mdformat"; + version = "0.7.6"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = pname; + rev = version; + sha256 = "0mnbi3vp7zgllpcpf6vrjw9y6jas95shphn99ayr8b8wgxsaqkif"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + markdown-it-py + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ] ++ lib.optionals (pythonOlder "3.7") [ + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "mdformat" ]; + + meta = with lib; { + description = "CommonMark compliant Markdown formatter"; + homepage = "https://mdformat.rtfd.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d75625019b..a1825d4cd24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4125,6 +4125,8 @@ in { md2gemini = callPackage ../development/python-modules/md2gemini { }; + mdformat = callPackage ../development/python-modules/mdformat { }; + mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { }; MDP = callPackage ../development/python-modules/mdp { }; From c5f430a1660ad9a6b4d31cfd6944b213bad19763 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 May 2021 11:05:25 +0200 Subject: [PATCH 40/94] python3Packages.fpyutils: init at 2.0.0 --- .../python-modules/fpyutils/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/fpyutils/default.nix diff --git a/pkgs/development/python-modules/fpyutils/default.nix b/pkgs/development/python-modules/fpyutils/default.nix new file mode 100644 index 00000000000..0120391aee1 --- /dev/null +++ b/pkgs/development/python-modules/fpyutils/default.nix @@ -0,0 +1,46 @@ +{ lib +, atomicwrites +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "fpyutils"; + version = "2.0.0"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "frnmst"; + repo = pname; + rev = version; + sha256 = "1n15fvd6191ixxsza49fdd8j43hs0agagg8k9v6rc7by1ffqnl2b"; + }; + + propagatedBuildInputs = [ + atomicwrites + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "fpyutils/tests/*.py" ]; + + disabledTests = [ + # Don't run test which requires bash + "test_execute_command_live_output" + ]; + + pythonImportsCheck = [ "fpyutils" ]; + + meta = with lib; { + description = "Collection of useful non-standard Python functions"; + homepage = "https://github.com/frnmst/fpyutils"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a1825d4cd24..77c2f4b83cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2567,6 +2567,8 @@ in { fpylll = callPackage ../development/python-modules/fpylll { }; + fpyutils = callPackage ../development/python-modules/fpyutils { }; + freebox-api = callPackage ../development/python-modules/freebox-api { }; freetype-py = callPackage ../development/python-modules/freetype-py { }; From 67ef7772a1655fa794a590d99ce3d65d7bfc1324 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Wed, 12 May 2021 10:53:59 +0200 Subject: [PATCH 41/94] exim: fix enableMySQL (use libmysqlclient.dev) --- pkgs/servers/mail/exim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 6c1e05bbdbd..122d00c5f0a 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1: s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: - s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient.dev}/include/mysql/: ''} ${lib.optionalString enableAuthDovecot '' s:^# \(AUTH_DOVECOT\)=.*:\1=yes: From 28dbe247f95dd33fc841aca6c5af50deceaeaa1e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 May 2021 11:20:33 +0200 Subject: [PATCH 42/94] python3Packages.md-toc: init 7.2.0 --- .../python-modules/md-toc/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/md-toc/default.nix diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix new file mode 100644 index 00000000000..aaec77a9ace --- /dev/null +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fpyutils +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "md-toc"; + version = "7.2.0"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "frnmst"; + repo = pname; + rev = version; + sha256 = "1v74iddfk5d6170frg89vzrkz9xrycl1f50g59imc7x7g50i6c2x"; + }; + + propagatedBuildInputs = [ + fpyutils + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py --replace "fpyutils>=1.2,<1.3" "fpyutils>=1.2" + ''; + + pytestFlagsArray = [ "md_toc/tests/*.py" ]; + + pythonImportsCheck = [ "md_toc" ]; + + meta = with lib; { + description = "Table of contents generator for Markdown"; + homepage = "https://docs.franco.net.eu.org/md-toc/"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77c2f4b83cc..37c212c8be7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4125,6 +4125,8 @@ in { mcstatus = callPackage ../development/python-modules/mcstatus { }; + md-toc = callPackage ../development/python-modules/md-toc { }; + md2gemini = callPackage ../development/python-modules/md2gemini { }; mdformat = callPackage ../development/python-modules/mdformat { }; From bde27b4e971e0ef206911e8e524a9e4d6ca53964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 12 May 2021 12:55:41 +0200 Subject: [PATCH 43/94] knot-dns: 3.0.5 -> 3.0.6 https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.6 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 2b407074caf..11adceb0f74 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "695e7d7a0abefc5a8fd01f3b3080f030f33b0948215f84cd4892c6d904390802"; + sha256 = "63756ac5a00c3e4a066ed231a287faef5963a9183d77326e30bf0644cdf74f86"; }; outputs = [ "bin" "out" "dev" ]; From c9bfa3c10ba22bf0301f59378d5afcdfff1d1136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 May 2021 13:08:10 +0200 Subject: [PATCH 44/94] python3Packages.imap-tools: 0.40.0 -> 0.41.0 https://github.com/ikvk/imap_tools/releases/tag/v0.41.0 --- pkgs/development/python-modules/imap-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 700c23827fa..75de29b233d 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.40.0"; + version = "0.41.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "sha256-7qLiVN3pBkbZQlA12ZOkgpiV/JybrPTmEIeJjy4ZS3A="; + sha256 = "sha256-gtfVZTHeiYamKkcu9n/CJ4O4X1YneY2QB3XZnvtNL3U="; }; checkInputs = [ From 7dd35786f37501643b2eca9347cd397b734d25a5 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Wed, 12 May 2021 04:21:32 -0600 Subject: [PATCH 45/94] steam-tui: init at 0.1.0 --- pkgs/games/steam-tui/default.nix | 44 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/games/steam-tui/default.nix diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/games/steam-tui/default.nix new file mode 100644 index 00000000000..219bac701dc --- /dev/null +++ b/pkgs/games/steam-tui/default.nix @@ -0,0 +1,44 @@ +{ lib +, rustPlatform +, steamcmd +, fetchFromGitHub +, steam-run-native +, runtimeShell +, withWine ? false +, wine +}: + +rustPlatform.buildRustPackage rec { + pname = "steam-tui"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "dmadisetti"; + repo = pname; + rev = version; + sha256 = "sha256-UTXYlPecv0MVonr9zZwfwopfC/Fdch/ZSCxqgUsem40="; + }; + + cargoSha256 = "sha256-VYBzwDLSV4N4qt2dNgIS399T2HIbPTdQ2rDIeheLlfo="; + + buildInputs = [ steamcmd steam-run-native ] + ++ lib.optional withWine wine; + + preFixup = '' + mv $out/bin/steam-tui $out/bin/.steam-tui-unwrapped + cat > $out/bin/steam-tui < Date: Wed, 12 May 2021 12:07:36 +0200 Subject: [PATCH 46/94] gencfsm: 1.8.19 -> 1.9 ZHF: #122042 --- pkgs/tools/security/gencfsm/default.nix | 36 ++++++++++++++++++------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index edec05272b9..4cf5338ca2e 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -1,21 +1,39 @@ -{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs -, glib , libgee, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection +{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config +, encfs, libsecret , glib , libgee, gtk3, vala, wrapGAppsHook, xorg +, gobject-introspection }: stdenv.mkDerivation rec { - version = "1.8.19"; + version = "1.9"; pname = "gnome-encfs-manager"; src = fetchurl { - url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz"; - sha256 = "1h6x8dyp1fvxvr8fwki98ppf4sa20qf7g59jc9797b2vrgm60h1i"; + url = with lib.versions; + "https://launchpad.net/gencfsm/trunk/${major version}.${minor version}/+download/gnome-encfs-manager_${version}.tar.xz"; + sha256 = "RXVwg/xhfAQv3pWp3UylOhMKDh9ZACTuKM4lPrn1dk8="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake intltool libtool vala glib encfs - gtk3 libgnome-keyring libgee xorg.libSM xorg.libICE - wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ + autoconf + automake + intltool + libtool + pkg-config + vala + wrapGAppsHook + ]; + buildInputs = [ + glib + encfs + gtk3 + libgee + xorg.libSM + xorg.libICE + gobject-introspection + libsecret + ]; + # Fix hardcoded paths to /bin/mkdir patches = [ ./makefile-mkdir.patch ]; preConfigure = '' From 89263112386467419a4ddc7bd54b39318a21d788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 May 2021 14:00:05 +0200 Subject: [PATCH 47/94] vsftpd: fix build with gcc9 We still use that version on aarch64. --- pkgs/servers/ftp/vsftpd/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 1a5bd4370d7..b87d11809b1 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -24,7 +24,11 @@ stdenv.mkDerivation rec { ''; NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap"; - NIX_CFLAGS_COMPILE = "-Wno-error=enum-conversion"; + + # On gcc9, this would produce + # error: '-Werror=enum-conversion': no option -Wenum-conversion + NIX_CFLAGS_COMPILE = lib.optionalString (lib.versionAtLeast stdenv.cc.version "10") + "-Wno-error=enum-conversion"; enableParallelBuilding = true; From 9bd967cdfebae56edd7966078dfcf362c285c9ab Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Wed, 12 May 2021 12:16:12 +0000 Subject: [PATCH 48/94] vscodium: 1.56.0 -> 1.56.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 9bd8e0f245b..decd4b10042 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 = "01bg6bjjbbdywd7r13safa5nxx1y9a8zia7q6z5anc60hfylvhd2"; - x86_64-darwin = "0xkzxlp45f9vl9yrrk8fynwpsv85yjmsp6ylm2fbmfddf9bqkjsb"; - aarch64-linux = "028g359jrbs1hbxwq4gqq1s08vv38i3x52vjalqrpc6b0wc5cc2w"; - armv7l-linux = "06w5h7q799b9kwagi6w3320yjdp66cwr6d0dd7sl4sirqnrap0i4"; + x86_64-linux = "1p68fvlr2fwrwr61gfrna3hjzgyazacr373hldbc4fxca3fdij76"; + x86_64-darwin = "0wyihr2yfzjaypsa682zdklfxn3m7zca81brkzdvrndw24hdcl8m"; + aarch64-linux = "0iw471n1fl8m2x06n2rdbkiwzhlc7lhk99vyql3z4fi0zyjy3pbn"; + armv7l-linux = "0dx1icp245cfx3hkkpzzgfg9y8sv45llx35s03w1zzga2h2vhm3a"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.56.0"; + version = "1.56.1"; pname = "vscodium"; executableName = "codium"; From 80969cc4ec0ac4aa1bcb677263cdd0ad2085158f Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 12 May 2021 21:13:05 +1000 Subject: [PATCH 49/94] haskellPackages.taffybar: fix build Add patches to allow building with gi-gdkpixbuf_2_0_26 Upstream PRs: - https://github.com/taffybar/gtk-sni-tray/pull/25 - https://github.com/taffybar/taffybar/pull/507 --- .../haskell-modules/configuration-common.nix | 14 ++++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../transitive-broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 3 --- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a7a72f09cf8..473c2a45bfc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1271,6 +1271,20 @@ self: super: { # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119 jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch; + # 2021-05-12: gi-gdkpixbuf_2_0_26 fix + # https://github.com/taffybar/gtk-sni-tray/pull/25 + gtk-sni-tray = appendPatch super.gtk-sni-tray (pkgs.fetchpatch { + url = "https://github.com/taffybar/gtk-sni-tray/pull/25/commits/4afd84654cb3f2bd2bb7d39451706c5914fd3cdf.patch"; + sha256 = "1xjxlh58vnykqsjq4qw8mliq3gk17mwxi4h9z8dvjyav8zqg05rn"; + }); + + # 2021-05-12: gi-gdkpixbuf_2_0_26 fix + # https://github.com/taffybar/taffybar/pull/507 + taffybar = appendPatch super.taffybar (pkgs.fetchpatch { + url = "https://github.com/taffybar/taffybar/pull/507/commits/14a650d0954000cbd2cb1018a2f3bcd40ecb564f.patch"; + sha256 = "01rm8zida5858j5r0mw7bpmv24b03mb3rw34lbkaw3i7g62bx3a0"; + }); + # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) # https://github.com/lehins/massiv/pull/104 massiv = dontCheck super.massiv; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 256857b033c..5419e3f16e3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1699,7 +1699,6 @@ broken-packages: - gtk2hs-rpn - gtk3-mac-integration - gtkglext - - gtk-sni-tray - gtksourceview2 - gtksourceview3 - gtk-toy diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 5e6f9510011..e37785a6795 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2886,7 +2886,6 @@ dont-distribute-packages: - systemstats - t3-client - ta - - taffybar - tagged-list - tagged-th - tagsoup-navigate diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 472730a45f1..5e934b23f92 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -111794,8 +111794,6 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "gtk-strut" = callPackage @@ -252598,7 +252596,6 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage From c8283cedb729c3849214570471553b479991d19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danie=CC=88l=20de=20Kok?= Date: Wed, 12 May 2021 14:58:39 +0200 Subject: [PATCH 50/94] python3Packages.pytorch-bin: use CUDA 11 wheels --- .../python-modules/pytorch/binary-hashes.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix index 3e93eb2f789..4855d135710 100644 --- a/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -1,17 +1,17 @@ version: { x86_64-linux-37 = { name = "torch-${version}-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-79JK2gGlV5Lhbim7GgPCjk++brwpUQE7g7vsrBu06eE="; + url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-lxj066PiB+S88GqQnXKgd9RCiKkMk3mctx/eBieZjAk="; }; x86_64-linux-38 = { name = "torch-${version}-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-16h90SdxAgFxmPpgUPA3rBGxs9dtFaCeAgeSpKmtnmQ="; + url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-qvTQMLz4CQPgalzUyYwz6rm+ExyWlIzI+FSMQhxM4eM="; }; x86_64-linux-39 = { name = "torch-${version}-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-E3RLWpGYbRuKsz0pQv7npmC7WTbdvlYFaxXQYBKT2/8="; + url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-z0pzEiljU+E2x2SuOEAg86dmVY1iFZSDOCfoOAFhLQo="; }; } From c49f63cddfd63a41e764e4e6686a89d916088983 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 12 May 2021 09:39:02 -0300 Subject: [PATCH 51/94] i3status-rust: 0.20.0 -> 0.20.1 Signed-off-by: Otavio Salvador --- pkgs/applications/window-managers/i3/status-rust.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 7a58db2bbd9..043c9f44bcf 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rio+3S3bA8KfosKAE9Txzftr/q2PVyd8Z9crz1O/ysc="; + sha256 = "00gzm3g297s9bfp13vnb623p7dfac3g6cdhz2b3lc6l0kmnnqs1s"; }; - cargoSha256 = "sha256-17bIeK/mPE+rAO/c65IWvMGqAU6sOClJQC8z+O36cmU="; + cargoSha256 = "1dpklyv1b9h4n4k3ar5qbzivds8r4mml76986ic8zj71fy5fxn08"; nativeBuildInputs = [ pkg-config makeWrapper ]; From 22401596678e584364b6f10ee0dac9de5444d3a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 May 2021 13:27:50 +0000 Subject: [PATCH 52/94] exoscale-cli: 1.28.0 -> 1.29.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 3f0aca33d61..d717c249fee 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-YbWh4ZIlcxAD/8F/fsYIWjv5hKaHNNi+sNrD7Ax/xDw="; + sha256 = "sha256-yTsmgRs3H5do1lG28RU/OY5QJFcwvkrsV/HGuVzD+3M="; }; goPackagePath = "github.com/exoscale/cli"; From 3b36371ccd9e6618edff782ca2d93a16bda915bc Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 12 May 2021 14:52:47 +0100 Subject: [PATCH 53/94] deno: 1.9.2 -> 1.10.1 --- pkgs/development/web/deno/default.nix | 11 +++++------ pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 9b645fb55e3..d1632ebcf5d 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -16,19 +16,21 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.9.2"; + version = "1.10.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FKhSFqFZhqzrXrJcBc0YBNHoUq0/1+ULZ9sE+LyNQTI="; + sha256 = "sha256-aNStR86biNHwyg3dSI+CGib3XFhL5ZJ55d29E2K9qd0="; }; - cargoSha256 = "sha256-Pp322D7YtdpeNnKWcE78tvLh5nFNcrh9oGYX2eCiPzI="; + cargoSha256 = "sha256-JXjiI+fTB0YlnhKO6QfGl4YOEQNfpuWsza2TsM9fwIk="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; + buildAndTestSubdir = "cli"; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv libobjc Security CoreServices Metal Foundation ]; # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem @@ -51,9 +53,6 @@ rustPlatform.buildRustPackage rec { doCheck = false; postInstall = '' - # remove test plugin and test server - rm -r $out/lib $out/bin/test_server $out/bin/denort - installShellCompletion --cmd deno \ --bash <($out/bin/deno completions bash) \ --fish <($out/bin/deno completions fish) \ diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index c1dbd0f773a..8ae163f2c90 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.22.1"; + version = "0.22.2"; shas = { - x86_64-linux = "sha256-rHI5qzwmDvlIdjUCZwvl6/s2Oe6d3/V7TJwfP1AFjik="; - aarch64-linux = "sha256-7VhrOkzWayZFTsq0II5uh+TxXaIDSkc0E19ZwT3Hl6c="; - x86_64-darwin = "sha256-zXXL2YqgjFmuDHGReIGWVxfSS3PMND0J0qlHRV/rKs8="; - aarch64-darwin = "sha256-X/CCJn5yWJH2x6lCGAFllrQUj7XLA3TICRP3aiWytjk="; + x86_64-linux = "sha256-bLGSt9a+drzXMy64iiERFHfdDsIR2YqwwNlkpzIM07Q="; + aarch64-linux = "sha256-MtCB7XaFho+a64fidPO88URIq7X9HvGqN5a9hzuCX4s="; + x86_64-darwin = "sha256-aLeZ0cIdmQHDxSGPx6IBwweZWwDI/m/1kFQTC7dQ3bs="; + aarch64-darwin = "sha256-SZGx/kRvp88mfMqDX+d4GNDs4t+P383kjnNPqwkqkHI="; }; } From a613984d8a4f58dfe387501716b04cfaa8df8ae1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 May 2021 16:11:39 +0200 Subject: [PATCH 54/94] python3Packages.mypy-boto3-builder: init at 4.12.0 --- .../mypy-boto3-builder/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/mypy-boto3-builder/default.nix diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix new file mode 100644 index 00000000000..860646af9c6 --- /dev/null +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -0,0 +1,49 @@ +{ lib +, black +, boto3 +, buildPythonPackage +, fetchFromGitHub +, jinja2 +, md-toc +, isort +, mdformat +, pyparsing +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mypy-boto3-builder"; + version = "4.12.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "vemel"; + repo = "mypy_boto3_builder"; + rev = version; + sha256 = "09kbmrpnph5kbxlqqavpxg3l85dmk3vzmwawa4s09y9gknxxkcv9"; + }; + + propagatedBuildInputs = [ + black + boto3 + isort + jinja2 + md-toc + mdformat + pyparsing + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "mypy_boto3_builder" ]; + + meta = with lib; { + description = "Type annotations builder for boto3"; + homepage = "https://vemel.github.io/mypy_boto3_builder/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37c212c8be7..cce41ccce7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4375,6 +4375,8 @@ in { mypy = callPackage ../development/python-modules/mypy { }; + mypy-boto3-builder = callPackage ../development/python-modules/mypy-boto3-builder { }; + mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { }; mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; From 33faf27e3197872b32d5747fe10a00c87df3de6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 May 2021 16:12:25 +0200 Subject: [PATCH 55/94] python3Packages.mypy-boto3-s3: init at 1.17.71 --- .../python-modules/mypy-boto3-s3/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/mypy-boto3-s3/default.nix diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix new file mode 100644 index 00000000000..af97c5e103f --- /dev/null +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -0,0 +1,35 @@ +{ lib +, boto3 +, buildPythonPackage +, fetchPypi +, pythonOlder +, typing-extensions +}: + +buildPythonPackage rec { + pname = "mypy-boto3-s3"; + version = "1.17.71"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zgx3f41j80xy203jwms7j72svxy10ry5v9w3ql817ai4lcrspnn"; + }; + + propagatedBuildInputs = [ + boto3 + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "mypy_boto3_s3" ]; + + meta = with lib; { + description = "Type annotations for boto3"; + homepage = "https://vemel.github.io/boto3_stubs_docs/mypy_boto3_s3/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cce41ccce7e..1bfd445cdd4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4377,6 +4377,8 @@ in { mypy-boto3-builder = callPackage ../development/python-modules/mypy-boto3-builder { }; + mypy-boto3-s3 = callPackage ../development/python-modules/mypy-boto3-s3 { }; + mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { }; mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; From 96b0e6fe5f23b6e8c6c3c6b8b731386931319881 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 12 May 2021 15:19:27 +0100 Subject: [PATCH 56/94] trivy: 0.17.2 -> 0.18.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 927c4ea033a..f9f34311653 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.17.2"; + version = "0.18.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ub3rIiOJUh3vNCC+82rCSzKSovMnRW2jo8HbI02ouws="; + sha256 = "sha256-D4oqLyH5JU8AycRZuA0isQmE3UP/0WmBmKW3xvSzk2M="; }; - vendorSha256 = "sha256-xL0wqKFMQksaLkTAxV72SWh0PPTbOqWcd6deJ9RVeEA="; + vendorSha256 = "sha256-R50alGFyb2ZR7PT1jIsYWMIO45CPet+A5wq+clC1NIY="; excludedPackages = "misc"; From b02724b9038862e80e2a4a3e007e9f88d8b99095 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 May 2021 14:27:32 +0000 Subject: [PATCH 57/94] go-toml: 1.9.0 -> 1.9.1 --- pkgs/development/tools/go-toml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 9a0fa54fb2d..355f468237c 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "go-toml"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m8VgjfNDxSX6fRG2/gEJlVc9hCnua+o79ttrd8P20kU="; + sha256 = "sha256-O3gfQon8ktObLVED4A5sCSOw8K1NIXP3a5AsLq3Svb4="; }; goPackagePath = "github.com/pelletier/go-toml"; From 29ff6e85f4deefa31c63cb71b5c73e839b696fb6 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Wed, 12 May 2021 18:18:11 +0300 Subject: [PATCH 58/94] terraform-ls: 0.16.0 -> 0.16.2 --- pkgs/development/tools/misc/terraform-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index cafa63e96bd..0c52a89229d 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8Bo6ZSpecdMX/Hoj0N1/iptfqybPUoQ0T9IQima+Bbo="; + sha256 = "sha256-5+h1fyTCp1jUZeKRCeDhfqAA11SMyR5nw2Y2x6JyIwY="; }; - vendorSha256 = "sha256-oP7ZekG7YdRhUvt48wxalt8y8QmVFkAw9GRIKBmi9sg="; + vendorSha256 = "sha256-m5ddUwuTX0mSihkoGIMQKidptwUL8Bao5HgHJBWX0os="; # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; From 863509151d7a263967ebf77fe7c112e88fcc73da Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 May 2021 17:23:42 +0200 Subject: [PATCH 59/94] python3Packages.aiohue: 2.3.0 -> 2.3.1 --- pkgs/development/python-modules/aiohue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 5ef9092fe96..65baaec3719 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1xinllv2cvxl9fxi15nayzw9lfzijb3m7i49gkkr46qr8xvsavyk"; + sha256 = "1qxvqqsflcn263yg7r8vvfc2c2fl3rh4dkzwzh926ijnbc2sk4nm"; }; propagatedBuildInputs = [ From 07805915693713b22b64102b5ea30e06889a4ef9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 May 2021 17:23:58 +0200 Subject: [PATCH 60/94] python3Packages.denonavr: 0.10.7 -> 0.10.8 --- pkgs/development/python-modules/denonavr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 57a1b9b582d..e4e36a196fe 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.10.7"; + version = "0.10.8"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "scarface-4711"; repo = pname; rev = version; - sha256 = "sha256-IGfU9nnlfZf8U6pCzG7cegmqxmDNONom0U14PZHHaYY="; + sha256 = "02q76mbmg2rkm4shy2apwbw9pvicy9j5v4zgpjwzxif9yf7m8aqk"; }; propagatedBuildInputs = [ From b7cc0d6d7345eebc16742334c75c65518c1fb6ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 May 2021 17:38:20 +0200 Subject: [PATCH 61/94] home-assistant: 2021.5.2 -> 2021.5.3 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index afaef82d372..844ea8976d7 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.5.2"; + version = "2021.5.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 11bf2c744d3..a9d3ae02ea1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -114,7 +114,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.5.2"; + hassVersion = "2021.5.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -133,7 +133,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1v1ah0kdkhx0pkma2qnk56iv00r2lb4i3sfpwlcr64gfkpzpakv8"; + sha256 = "1zc21d70n24sk8y42xq3gzisj44kn6w6fhgqrcani470hhph24ba"; }; # leave this in, so users don't have to constantly update their downstream patch handling From d49e7dd0f4bd38ed50ea7818522314f3d1072851 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 12 May 2021 16:43:21 +0000 Subject: [PATCH 62/94] squashfs-tools-ng: 1.1.0 -> 1.1.1; add bzip2 support; enableParallelBuilding (#122649) --- pkgs/tools/filesystems/squashfs-tools-ng/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 265495389b0..d0ad7803c79 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -1,18 +1,20 @@ { stdenv, lib, fetchurl, doxygen, graphviz, perl, pkg-config -, lz4, lzo, xz, zlib, zstd +, bzip2, lz4, lzo, xz, zlib, zstd }: stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "1swsw5j8rrjxdxsfyd446f6g8f0k3mwg15baivi953i69c9981qi"; + sha256 = "07c8vpzgwvqr9ycww1769ya40cf077c6igdg1b4akwszz2nw0bxq"; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; - buildInputs = [ zlib xz lz4 lzo zstd ]; + buildInputs = [ bzip2 zlib xz lz4 lzo zstd ]; + + enableParallelBuilding = true; meta = with lib; { homepage = "https://github.com/AgentD/squashfs-tools-ng"; From acd49fab8ece11a89ef8ee49903e1cd7bb50f4b7 Mon Sep 17 00:00:00 2001 From: critbase <12738442+critbase@users.noreply.github.com> Date: Wed, 12 May 2021 12:58:15 -0400 Subject: [PATCH 63/94] python3Packages.requests-http-signature: fix error in tests (#120987) --- .../python-modules/requests-http-signature/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index 225a8f149e4..f4b2efbc2ba 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , requests +, cryptography , python }: @@ -17,7 +18,7 @@ buildPythonPackage rec { sha256 = "0y96wsbci296m1rcxx0ybx8r44rdvyb59p1jl27p7rgz7isr3kx1"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests cryptography ]; checkPhase = '' ${python.interpreter} test/test.py From 9b03a74fb5366e5b4153a0870c6ecbd97ae7f2f2 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 11 May 2021 16:21:08 -0700 Subject: [PATCH 64/94] 0verkill: fix darwin build --- pkgs/games/0verkill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/0verkill/default.nix b/pkgs/games/0verkill/default.nix index 69a371f09d9..fa654832e2e 100644 --- a/pkgs/games/0verkill/default.nix +++ b/pkgs/games/0verkill/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, gccStdenv , fetchFromGitHub , autoreconfHook , xorgproto @@ -7,7 +7,7 @@ , libXpm }: -stdenv.mkDerivation rec { +gccStdenv.mkDerivation rec { pname = "0verkill"; version = "unstable-2011-01-13"; From 8a32c47586c75093ff15aace7e3d31b23786083e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 10 May 2021 14:10:50 +0200 Subject: [PATCH 65/94] .github/labeler.yml: Update GNOME file patterns MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This got missed in the move (https://github.com/NixOS/nixpkgs/pull/122107) because it is in a “hidden” directory. --- .github/labeler.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 3637d05f48b..5dd885552d6 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -36,11 +36,11 @@ "6.topic: GNOME": - doc/languages-frameworks/gnome.section.md - - nixos/modules/services/desktops/gnome3/**/* - - nixos/modules/services/x11/desktop-managers/gnome3.nix - - nixos/tests/gnome3-xorg.nix - - nixos/tests/gnome3.nix - - pkgs/desktops/gnome-3/**/* + - nixos/modules/services/desktops/gnome/**/* + - nixos/modules/services/x11/desktop-managers/gnome.nix + - nixos/tests/gnome-xorg.nix + - nixos/tests/gnome.nix + - pkgs/desktops/gnome/**/* "6.topic: golang": - doc/languages-frameworks/go.section.md From fd4f20bce4fd0b08fcc704eab54c6bf07dffd3e9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 12 May 2021 19:38:31 +0200 Subject: [PATCH 66/94] signal-desktop: 5.0.0 -> 5.1.0 This is the most important Signal-Desktop release in a while as we finally have Wayland support via Electron 12 \o/ #YAY :D https://github.com/signalapp/Signal-Desktop/issues/3411 https://github.com/signalapp/Signal-Desktop/commit/5bcf50ede96fed18dccc207e89bbae7ceb2d2dff#diff-7ae45ad102eab3b6d7e7896acd08c427a9b25b346470d7bc6507b6481575d519R231 https://github.com/signalapp/Signal-Desktop/commit/c6d5d852a9f9668268803bb5a20d94b4a505dd87#diff-7ae45ad102eab3b6d7e7896acd08c427a9b25b346470d7bc6507b6481575d519R232 https://en.wikipedia.org/wiki/Electron_(software_framework)#Versions --- .../networking/instant-messengers/signal-desktop/default.nix | 5 +++-- 1 file changed, 3 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 d4a72e657cd..50161f1be14 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.0.0"; # Please backport all updates to the stable channel. + version = "5.1.0"; # 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: @@ -35,7 +35,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 = "17hxg61m9kk1kph6ifqy6507kzx5hi6yafr2mj8n0a6c39vc8f9g"; + sha256 = "1cirnnxy63jfkl98472k25bn1yp5apa7b5s74r42sxhlwzwkplw1"; }; nativeBuildInputs = [ @@ -79,6 +79,7 @@ in stdenv.mkDerivation rec { pango systemd xorg.libxcb + xorg.libxshmfence ]; runtimeDependencies = [ From ce6d0772903011fce08e347663eedf01d7b153d9 Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 6 May 2021 18:55:40 -0400 Subject: [PATCH 67/94] libtorrent-jesec: init at 0.13.8-r1 --- .../p2p/libtorrent-jesec/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/networking/p2p/libtorrent-jesec/default.nix diff --git a/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix b/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix new file mode 100644 index 00000000000..3858d87e7ed --- /dev/null +++ b/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake, gtest, openssl, zlib }: + +stdenv.mkDerivation rec { + pname = "libtorrent-jesec"; + version = "0.13.8-r1"; + + src = fetchFromGitHub { + owner = "jesec"; + repo = "libtorrent"; + rev = "v${version}"; + sha256 = "sha256-Eh5pMkSe9uO0dPRWDg2BbbRxxuvX9FM2/OReq/61ojc="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl zlib ]; + + # https://github.com/jesec/libtorrent/issues/1 + doCheck = false; + checkInputs = [ gtest ]; + + meta = with lib; { + description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)"; + homepage = "https://github.com/jesec/libtorrent"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ winterqt ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e57409a0b91..881c505c502 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5955,6 +5955,8 @@ in libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; + libtorrent-jesec = callPackage ../tools/networking/p2p/libtorrent-jesec { }; + libmpack = callPackage ../development/libraries/libmpack { }; libiberty = callPackage ../development/libraries/libiberty { }; From 0c6b4f2c75e56798d9fd8dd1f0bd37c4fd960972 Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 6 May 2021 18:57:02 -0400 Subject: [PATCH 68/94] rtorrent-jesec: init at 0.9.8-r11 --- .../networking/p2p/rtorrent-jesec/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/tools/networking/p2p/rtorrent-jesec/default.nix diff --git a/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix b/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix new file mode 100644 index 00000000000..4d19a82eb3c --- /dev/null +++ b/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +, libtorrent-jesec +, curl +, ncurses +, xmlrpc_c +, nlohmann_json +, xmlRpcSupport ? true +, jsonRpcSupport ? true +}: +let + inherit (lib) optional; +in +stdenv.mkDerivation rec { + pname = "rtorrent-jesec"; + version = "0.9.8-r10"; + + src = fetchFromGitHub { + owner = "jesec"; + repo = "rtorrent"; + rev = "v${version}"; + sha256 = "sha256-Ge5W1rLaneUA7LxnBuMO/jQlqLOUKFf3gaAAlRr/qeM="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libtorrent-jesec curl ncurses ] + ++ optional xmlRpcSupport xmlrpc_c + ++ optional jsonRpcSupport nlohmann_json; + + cmakeFlags = [ "-DUSE_RUNTIME_CA_DETECTION=NO" ] + ++ optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO" + ++ optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO"; + + doCheck = true; + checkInputs = [ gtest ]; + + prePatch = '' + substituteInPlace src/main.cc \ + --replace "/etc/rtorrent/rtorrent.rc" "${placeholder "out"}/etc/rtorrent/rtorrent.rc" + ''; + + postFixup = '' + mkdir -p $out/etc/rtorrent + cp $src/doc/rtorrent.rc $out/etc/rtorrent/rtorrent.rc + ''; + + meta = with lib; { + description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)"; + homepage = "https://github.com/jesec/rtorrent"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ winterqt ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 881c505c502..bfbe970074b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7585,6 +7585,8 @@ in rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; + rtorrent-jesec = callPackage ../tools/networking/p2p/rtorrent-jesec { }; + rubber = callPackage ../tools/typesetting/rubber { }; rubocop = callPackage ../development/tools/rubocop { }; From 5c4c71c31aa2e9285e1851afe1a8ccdbaa740144 Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 12 May 2021 19:44:06 +0200 Subject: [PATCH 69/94] linux_lqx: 5.11.19 -> 5.11.20 --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 1494508cb01..1b9dc8efc9c 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.11.19"; + version = "5.11.20"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "17gdlkixsy68j6c7lpkkk242x71rqj78hpqg3kp01fckj633za5n"; + sha256 = "0pdn3p9v3jasgf4xffirijlx20qp9gglzlksk2gmyzg9lmf5dygi"; }; extraMeta = { From 92a2e684bc30f713651d1caca51f307dcdfc37d1 Mon Sep 17 00:00:00 2001 From: Ivar <41924494+IvarWithoutBones@users.noreply.github.com> Date: Wed, 12 May 2021 19:56:23 +0200 Subject: [PATCH 70/94] sndio: 1.7.0 -> 1.8.0 (#122352) --- pkgs/misc/sndio/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index c86198a6985..3b4c34702d3 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { pname = "sndio"; - version = "1.7.0"; - enableParallelBuilding = true; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib; + version = "1.8.0"; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "0ljmac0lnjn61admgbcwjfcr5fwccrsblx9rj9bys8wlhz8f796x"; + sha256 = "027hlqji0h2cm96rb8qvkdmwxl56l59bgn828nvmwak2c2i5k703"; }; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib; + + enableParallelBuilding = true; + meta = with lib; { homepage = "http://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; From 65670311112f09f8e36b5ec714de0c222e61a09f Mon Sep 17 00:00:00 2001 From: midchildan Date: Thu, 13 May 2021 02:57:49 +0900 Subject: [PATCH 71/94] nixos/mirakurun: add polkit rule for smart card access (#122066) Fixes #122039 --- nixos/modules/services/video/mirakurun.nix | 23 +++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/video/mirakurun.nix b/nixos/modules/services/video/mirakurun.nix index ce1dabe6bfa..6ea73fa5c67 100644 --- a/nixos/modules/services/video/mirakurun.nix +++ b/nixos/modules/services/video/mirakurun.nix @@ -8,6 +8,18 @@ let username = config.users.users.mirakurun.name; groupname = config.users.users.mirakurun.group; settingsFmt = pkgs.formats.yaml {}; + + polkitRule = pkgs.writeTextDir "share/polkit-1/rules.d/10-mirakurun.rules" '' + polkit.addRule(function (action, subject) { + if ( + (action.id == "org.debian.pcsc-lite.access_pcsc" || + action.id == "org.debian.pcsc-lite.access_card") && + subject.user == "${username}" + ) { + return polkit.Result.YES; + } + }); + ''; in { options = { @@ -48,6 +60,15 @@ in ''; }; + allowSmartCardAccess = mkOption { + type = types.bool; + default = true; + description = '' + Install polkit rules to allow Mirakurun to access smart card readers + which is commonly used along with tuner devices. + ''; + }; + serverSettings = mkOption { type = settingsFmt.type; default = {}; @@ -110,7 +131,7 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ mirakurun ]; + environment.systemPackages = [ mirakurun ] ++ optional cfg.allowSmartCardAccess polkitRule; environment.etc = { "mirakurun/server.yml".source = settingsFmt.generate "server.yml" cfg.serverSettings; "mirakurun/tuners.yml" = mkIf (cfg.tunerSettings != null) { From 8d0b9934a28901d28cfb72f01ee39ac90ca1fc93 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 May 2021 20:29:25 +0200 Subject: [PATCH 72/94] python3Packages.aioesphomeapi: 2.6.6 -> 2.7.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 7525e4dcca6..686163f3574 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.6.6"; + version = "2.7.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-LdBUtU5rNoixh7DPIFkHxLMvBeI6MZH57sO0IjuOQAw="; + sha256 = "sha256-PCoSJnt8EptVq5u0+NgEBwY6zLkD87XqVRBDdqBziM8="; }; propagatedBuildInputs = [ attrs protobuf zeroconf ]; From c94913045f12d52d3514a05a5eedbfe14fb345f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Wed, 12 May 2021 21:02:50 +0200 Subject: [PATCH 73/94] python37.pkgs.prettytable: Fix build --- pkgs/development/python-modules/prettytable/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index d349a58960a..50b9eb57630 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -4,6 +4,8 @@ , glibcLocales , setuptools_scm , wcwidth +, importlib-metadata +, pythonOlder }: buildPythonPackage rec { @@ -18,7 +20,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ wcwidth ]; + propagatedBuildInputs = [ + wcwidth + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; preCheck = '' export LANG="en_US.UTF-8" From ee1cfa2df1b9354cce2ffe6daea22da673666c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 May 2021 21:57:49 +0200 Subject: [PATCH 74/94] abcmidi: 2021.05.09 -> 2021.05.10 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index cfb5ff125e2..62b45b65dc1 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.05.09"; + version = "2021.05.10"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-LgtS7IOGkw0K70UAP2a57ghIiJujVnQO5+j4ZanPZp4="; + sha256 = "sha256-ID27OdtuSYtD8bOPb6b0vUDdRqJvRX5TsjRBILTom4o="; }; meta = with lib; { From 42ee87ee796cbd3eadb16d55477bbd280774929e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 May 2021 22:13:19 +0200 Subject: [PATCH 75/94] pythonPackages.django-pipeline: drop It is marked as broken since October 2019. --- .../django-pipeline/default.nix | 37 ------------------- pkgs/top-level/python-packages.nix | 2 - 2 files changed, 39 deletions(-) delete mode 100644 pkgs/development/python-modules/django-pipeline/default.nix diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix deleted file mode 100644 index 92aefe4a408..00000000000 --- a/pkgs/development/python-modules/django-pipeline/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k -, django, futures ? null, mock ? null, jinja2, jsmin, slimit }: - -buildPythonPackage rec { - pname = "django-pipeline"; - version = "1.6.14"; - - # no tests on PyPI - src = fetchFromGitHub { - owner = "jazzband"; - repo = pname; - rev = version; - sha256 = "1xf732bd17mgha75jfhlnms46ib2pffhpfa0ca7bmng9jhbvsl9j"; - }; - - postPatch = '' - substituteInPlace tests/tests/test_compiler.py \ - --replace "/usr/bin/env" "" - ''; - - propagatedBuildInputs = [ django ] ++ lib.optional (!isPy3k) futures; - - checkInputs = [ jinja2 jsmin slimit ] ++ lib.optional (!isPy3k) mock; - - checkPhase = '' - export PYTHONPATH=.:$PYTHONPATH - export DJANGO_SETTINGS_MODULE=tests.settings - ${django}/bin/django-admin.py test tests - ''; - - meta = with lib; { - description = "Pipeline is an asset packaging library for Django"; - homepage = "https://github.com/cyberdelia/django-pipeline"; - license = licenses.mit; - broken = true; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d75625019b..ee800b2490b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1928,8 +1928,6 @@ in { django-picklefield = callPackage ../development/python-modules/django-picklefield { }; - django_pipeline = callPackage ../development/python-modules/django-pipeline { }; - django_polymorphic = callPackage ../development/python-modules/django-polymorphic { }; django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { }; From 65380bc3389f6749acdc362d3f52445bf74bc32b Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Wed, 12 May 2021 14:27:28 -0600 Subject: [PATCH 76/94] steam-tui: adds missing runtime dependencies --- pkgs/games/steam-tui/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/games/steam-tui/default.nix index 219bac701dc..968f529421d 100644 --- a/pkgs/games/steam-tui/default.nix +++ b/pkgs/games/steam-tui/default.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { mv $out/bin/steam-tui $out/bin/.steam-tui-unwrapped cat > $out/bin/steam-tui < Date: Wed, 12 May 2021 22:09:37 +0200 Subject: [PATCH 77/94] bitwarden-cli: set meta.mainProgram --- pkgs/development/node-packages/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index ff9b4747e68..3654d7b5296 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -60,8 +60,9 @@ let }; }); - bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: { + bitwarden-cli = super."@bitwarden/cli".override (drv: { name = "bitwarden-cli-${drv.version}"; + meta.mainProgram = "bw"; }); fast-cli = super."fast-cli-1.x".override { From 854207d16c3c228ff42096e12af4e33233a0590a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Wed, 12 May 2021 22:33:02 +0200 Subject: [PATCH 78/94] castty: fix darwin build --- pkgs/tools/misc/castty/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/castty/default.nix b/pkgs/tools/misc/castty/default.nix index ddda737c8b5..075c6d739b3 100644 --- a/pkgs/tools/misc/castty/default.nix +++ b/pkgs/tools/misc/castty/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation { buildInputs = [ libsoundio lame ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "PREFIX=$(out)" + ]; meta = with lib; { description = "CLI tool to record audio-enabled screencasts of your terminal, for the web"; From e90057a4a56f6a9cc9ddb9fd7ed61ee1781e2651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Wed, 12 May 2021 22:41:50 +0200 Subject: [PATCH 79/94] chafa: fix darwin build --- pkgs/tools/misc/chafa/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 51fbba8d706..d830b8d81fc 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: - +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which +, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick +, Foundation +}: stdenv.mkDerivation rec { version = "1.6.0"; @@ -23,7 +25,8 @@ stdenv.mkDerivation rec { docbook_xsl ]; - buildInputs = [ glib imagemagick ] ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ]; + buildInputs = [ glib imagemagick ] + ++ lib.optional stdenv.isDarwin Foundation; patches = [ ./xmlcatalog_patch.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d64dcc5f176..bb1280f84b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3658,7 +3658,9 @@ in cfssl = callPackage ../tools/security/cfssl { }; - chafa = callPackage ../tools/misc/chafa { }; + chafa = callPackage ../tools/misc/chafa { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; From e2adee682725044ddc24ad731a54d6f84e314066 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 8 May 2021 19:55:29 +0200 Subject: [PATCH 80/94] chromiumDev: Fix the build python.withPackages avoids the problem with mixed Python 2 and Python 3 dependencies. --- .../networking/browsers/chromium/common.nix | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a2bc293eaaf..f84ce23309f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -7,7 +7,7 @@ , xdg-utils, yasm, nasm, minizip, libwebp , libusb1, pciutils, nss, re2 -, python2Packages, python3Packages, perl, pkg-config +, python2, python3, perl, pkg-config , nspr, systemd, libkrb5 , util-linux, alsaLib , bison, gperf @@ -43,16 +43,12 @@ with lib; let jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - # TODO: Python 3 support is incomplete and "python3 ../../build/util/python2_action.py" - # currently doesn't work due to mixed Python 2/3 dependencies: - pythonPackages = if chromiumVersionAtLeast "93" - then python3Packages - else python2Packages; - forcePython3Patch = (githubPatch - # Reland #8 of "Force Python 3 to be used in build."": - "a2d3c362802d9e6b62f895fcda75a3695b77b1b8" - "1r9spr2wmjk9x9l3m1gzn6692mlvbxdz0r5hlr5rfwiwr900rxi2" - ); + python2WithPackages = python2.withPackages(ps: with ps; [ + ply jinja2 setuptools + ]); + python3WithPackages = python3.withPackages(ps: with ps; [ + ply jinja2 setuptools + ]); # The additional attributes for creating derivations based on the chromium # source tree. @@ -138,10 +134,12 @@ let }; nativeBuildInputs = [ + ninja pkg-config + python2WithPackages perl nodejs + gnutar which llvmPackages.lldClang.bintools - ninja which pythonPackages.python perl pkg-config - pythonPackages.ply pythonPackages.jinja2 nodejs - gnutar pythonPackages.setuptools + ] ++ lib.optionals (chromiumVersionAtLeast "92") [ + python3WithPackages ]; buildInputs = defaultDependencies ++ [ @@ -174,8 +172,6 @@ let postPatch = lib.optionalString (chromiumVersionAtLeast "91") '' # Required for patchShebangs (unsupported): chmod -x third_party/webgpu-cts/src/tools/deno - '' + optionalString (chromiumVersionAtLeast "92") '' - patch -p1 --reverse < ${forcePython3Patch} '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do @@ -313,7 +309,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" - python build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} + ${python2}/bin/python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. From 362bc6785a2f74de5291dd00c81eaa4a3a37668d Mon Sep 17 00:00:00 2001 From: Alexander Krimm Date: Wed, 12 May 2021 16:41:18 +0200 Subject: [PATCH 81/94] Fix conan build caused by failing pyjwt Ignore a failing thest in the downgraded pyjwt dependency. See #122461 for another instance of the same problem. --- pkgs/development/tools/build-managers/conan/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index bf780985bc4..9c3e99e23ad 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -35,6 +35,9 @@ let newPython = python3.override { inherit version; sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; }; + disabledTests = [ + "test_ec_verify_should_return_false_if_signature_invalid" + ]; }); }; }; From 32ea6bfe74894e50ed919d9677c8ddb0b8da2955 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 12 May 2021 14:12:08 -0700 Subject: [PATCH 82/94] dcs: use yuicompressor instead of slimit and CSSMinifier (#122764) slimit appears to be unmaintained (and broken on Python 3.9), but we have yuicompressor packaged which supercedes both slimit and CSSMinifier. Let's use that instead. --- pkgs/tools/text/dcs/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/dcs/default.nix b/pkgs/tools/text/dcs/default.nix index 610b494439c..511931f0380 100644 --- a/pkgs/tools/text/dcs/default.nix +++ b/pkgs/tools/text/dcs/default.nix @@ -1,8 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, python3Packages -, perl +, yuicompressor , zopfli , stdenv }: @@ -23,8 +22,7 @@ buildGoModule { doCheck = false; nativeBuildInputs = [ - python3Packages.slimit - (perl.withPackages (p: [ p.CSSMinifier ])) + yuicompressor zopfli ]; From 83a8517e5a3ac9a1fb14e6f9d95bc2bf67994273 Mon Sep 17 00:00:00 2001 From: Victor Roest Date: Wed, 12 May 2021 21:56:55 +0000 Subject: [PATCH 83/94] rtorrent-jesec: 0.9.8-r10 -> 0.9.8-r13 --- pkgs/tools/networking/p2p/rtorrent-jesec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix b/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix index 4d19a82eb3c..5b973a84ebc 100644 --- a/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "rtorrent-jesec"; - version = "0.9.8-r10"; + version = "0.9.8-r13"; src = fetchFromGitHub { owner = "jesec"; repo = "rtorrent"; rev = "v${version}"; - sha256 = "sha256-Ge5W1rLaneUA7LxnBuMO/jQlqLOUKFf3gaAAlRr/qeM="; + sha256 = "1srn1ms7dvsn994zvb8i4m6gc144ygc7wc2a23bma79cqpl7drlw"; }; nativeBuildInputs = [ cmake ]; From b6475a8f907053a9e742fab46d34c123876d18fd Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 5 May 2021 13:02:52 +0200 Subject: [PATCH 84/94] gonic: fix transcoding support ffmpeg is not needed as a library at build time, but rather as an executable at runtime. --- pkgs/servers/gonic/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index fbefca063a8..b807a1ff757 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -20,9 +20,19 @@ buildGoModule rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ taglib alsaLib ] ++ lib.optionals transcodingSupport [ ffmpeg ]; + buildInputs = [ taglib alsaLib ]; vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9"; + # TODO(Profpatsch): write a test for transcoding support, + # since it is prone to break + postPatch = lib.optionalString transcodingSupport '' + substituteInPlace \ + server/encode/encode.go \ + --replace \ + '"ffmpeg"' \ + '"${lib.getBin ffmpeg}/bin/ffmpeg"' + ''; + meta = { homepage = "https://github.com/sentriz/gonic"; description = "Music streaming server / subsonic server API implementation"; From bf434ca1a1601ac790c5bde57a7d3af5ebd48d2a Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sun, 2 May 2021 22:04:10 +0200 Subject: [PATCH 85/94] libnixxml: fix build + support cross + enable tests Run the symlinking of the ./bootstrap script in the preAutoreconf hook. Remove the tests that are broken and enable testing again. Put correct dependencies in nativeBuildInputs vs buildInputs vs checkInputs to support cross-compilation. --- .../libraries/libnixxml/default.nix | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix index 40459dbca22..62440487e0f 100644 --- a/pkgs/development/libraries/libnixxml/default.nix +++ b/pkgs/development/libraries/libnixxml/default.nix @@ -11,17 +11,40 @@ stdenv.mkDerivation { sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; }; - preConfigure = '' - ./bootstrap + postPatch = '' + # Remove broken test + substituteInPlace tests/draw/Makefile.am \ + --replace "draw-wrong.sh" "" + rm tests/draw/draw-wrong.sh + ''; + + preAutoreconf = '' + # Copied from bootstrap script + ln -s README.md README + mkdir -p config ''; configureFlags = [ "--with-gd" "--with-glib" ]; CFLAGS = "-Wall"; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ]; + strictDeps = true; + nativeBuildInputs = [ + autoreconfHook + pkg-config + getopt + libxslt + ]; + buildInputs = [ + libxml2 + gd.dev + glib + nix + ]; + checkInputs = [ + nix + ]; - doCheck = false; + doCheck = true; meta = with lib; { description = "XML-based Nix-friendly data integration library"; From 3d770c1aa563923be9c1dabc5b11963c0cb3f528 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 4 May 2021 19:30:16 +0200 Subject: [PATCH 86/94] libnixxml: patch /bin/bash path --- pkgs/development/libraries/libnixxml/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix index 62440487e0f..48edfbfce2c 100644 --- a/pkgs/development/libraries/libnixxml/default.nix +++ b/pkgs/development/libraries/libnixxml/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix, bash}: stdenv.mkDerivation { pname = "libnixxml"; @@ -11,11 +11,15 @@ stdenv.mkDerivation { sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; }; - postPatch = '' + prePatch = '' # Remove broken test substituteInPlace tests/draw/Makefile.am \ --replace "draw-wrong.sh" "" rm tests/draw/draw-wrong.sh + + # Fix bash path + substituteInPlace scripts/nixexpr2xml.in \ + --replace "/bin/bash" "${bash}/bin/bash" ''; preAutoreconf = '' @@ -35,6 +39,7 @@ stdenv.mkDerivation { libxslt ]; buildInputs = [ + bash libxml2 gd.dev glib From 32c14664e8d00c5739b86aa3a534895c1c67d7ba Mon Sep 17 00:00:00 2001 From: David Date: Tue, 11 May 2021 23:33:58 +0200 Subject: [PATCH 87/94] erlang-ls: init at 0.15.0 --- pkgs/development/beam-modules/default.nix | 2 + .../beam-modules/erlang-ls/default.nix | 34 +++++++ .../beam-modules/erlang-ls/rebar-deps.nix | 90 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 127 insertions(+) create mode 100644 pkgs/development/beam-modules/erlang-ls/default.nix create mode 100644 pkgs/development/beam-modules/erlang-ls/rebar-deps.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 19b5c122d9e..f63ecd95083 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -35,6 +35,8 @@ let fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; mixRelease = callPackage ./mix-release.nix { }; + erlang-ls = callPackage ./erlang-ls { }; + # BEAM-based languages. elixir = elixir_1_11; diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix new file mode 100644 index 00000000000..3f2ae6e7e2f --- /dev/null +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -0,0 +1,34 @@ +{ fetchFromGitHub, fetchHex, stdenv, rebar3WithPlugins, lib }: +let + version = "0.15.0"; + owner = "erlang-ls"; + repo = "erlang_ls"; + deps = import ./rebar-deps.nix { inherit fetchHex fetchFromGitHub; }; +in stdenv.mkDerivation { + inherit version; + pname = "erlang-ls"; + buildInputs = [ (rebar3WithPlugins { }) ]; + src = fetchFromGitHub { + inherit owner repo; + sha256 = "1s6zk8r5plm7ajifz17mvfrnk5mzbhj7alayink9phqbmzrypnfg"; + rev = version; + }; + buildPhase = '' + mkdir _checkouts + ${toString (lib.mapAttrsToList (k: v: '' + cp -R ${v} _checkouts/${k} + '') deps)} + make + ''; + installPhase = '' + mkdir -p $out/bin + cp _build/default/bin/erlang_ls $out/bin/ + cp _build/dap/bin/els_dap $out/bin/ + ''; + meta = with lib; { + homepage = "https://github.com/erlang-ls/erlang_ls"; + description = "The Erlang Language Server"; + platforms = platforms.unix; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix new file mode 100644 index 00000000000..9de79e52be6 --- /dev/null +++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -0,0 +1,90 @@ +# Generated by rebar3_nix +{ fetchHex, fetchFromGitHub }: +{ + getopt = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + }; + zipper = fetchHex { + pkg = "zipper"; + version = "1.0.1"; + sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0="; + }; + quickrand = fetchHex { + pkg = "quickrand"; + version = "2.0.1"; + sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY="; + }; + providers = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + katana_code = fetchHex { + pkg = "katana_code"; + version = "0.2.1"; + sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI="; + }; + bucs = fetchHex { + pkg = "bucs"; + version = "1.0.16"; + sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI="; + }; + yamerl = fetchHex { + pkg = "yamerl"; + version = "0.8.1"; + sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; + }; + uuid = fetchHex { + pkg = "uuid_erl"; + version = "2.0.1"; + sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs="; + }; + tdiff = fetchHex { + pkg = "tdiff"; + version = "0.1.2"; + sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU="; + }; + redbug = fetchHex { + pkg = "redbug"; + version = "2.0.6"; + sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ="; + }; + rebar3_format = fetchHex { + pkg = "rebar3_format"; + version = "0.8.2"; + sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM="; + }; + ranch = fetchHex { + pkg = "ranch"; + version = "1.7.1"; + sha256 = "sha256-RR2FJ3h99xbZncNhYvygWTSRXbC2FBu9rC6o08evx9c="; + }; + jsx = fetchHex { + pkg = "jsx"; + version = "3.0.0"; + sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0="; + }; + erlfmt = fetchFromGitHub { + owner = "whatsapp"; + repo = "erlfmt"; + rev = "2e93fc4a646111357642b0179a2a63151868d890"; + sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr"; + }; + ephemeral = fetchHex { + pkg = "ephemeral"; + version = "2.0.4"; + sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA="; + }; + elvis_core = fetchHex { + pkg = "elvis_core"; + version = "1.1.1"; + sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; + }; + docsh = fetchHex { + pkg = "docsh"; + version = "0.7.2"; + sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ="; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb7290c3bec..84b5f41d31d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11880,6 +11880,7 @@ in erlang_nox = beam_nox.interpreters.erlang; inherit (beam.packages.erlang) + erlang-ls rebar rebar3 rebar3WithPlugins fetchHex beamPackages relxExe; From c46059f732af696357e59043a771282a610130eb Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 12 May 2021 22:15:17 +1000 Subject: [PATCH 88/94] taffybar: restore ability to override ghcWithPackages arg --- .../window-managers/taffybar/default.nix | 15 ++++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index da495606930..7d9e5f9c1cb 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, haskellPackages, makeWrapper, packages ? (x: []) }: +{ lib, stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }: let - taffybarEnv = haskellPackages.ghc.withPackages (self: [ + taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self); in stdenv.mkDerivation { @@ -15,5 +15,14 @@ in stdenv.mkDerivation { --set NIX_GHC "${taffybarEnv}/bin/ghc" ''; - inherit (haskellPackages.taffybar) meta; + # Trivial derivation + preferLocalBuild = true; + allowSubstitutes = false; + + # For hacking purposes + passthru.env = taffybarEnv; + buildInputs = [ taffybarEnv ]; + shellHook = "eval $(egrep ^export ${taffybarEnv}/bin/ghc)"; + + inherit (taffybar) meta; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7cfe7eaf95..f126e817b6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26320,7 +26320,9 @@ in # customConfig = builtins.readFile ./tabbed.config.h; }; - taffybar = callPackage ../applications/window-managers/taffybar {}; + taffybar = callPackage ../applications/window-managers/taffybar { + inherit (haskellPackages) ghcWithPackages taffybar; + }; tagainijisho = callPackage ../applications/office/tagainijisho {}; From a7d76a6cf03c8ed1034b966684100626de672e20 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 12 May 2021 22:21:17 +1000 Subject: [PATCH 89/94] haskellPackages.taffybar: add rvl to meta.maintainers Add myself as a "maintainer" of taffybar, and also arbtt and lentil, for which I have made build fixes in the past. --- .../haskell-modules/configuration-hackage2nix/main.yaml | 4 ++++ pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 2 files changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index e1031bc7255..1fb67026d11 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -233,6 +233,10 @@ package-maintainers: - hinit bdesham: - pinboard-notes-backup + rvl: + - taffybar + - arbtt + - lentil unsupported-platforms: Allure: [ x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5e934b23f92..edf0d51783e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -32045,6 +32045,7 @@ self: { ]; description = "Automatic Rule-Based Time Tracker"; license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ rvl ]; }) {}; "arcgrid" = callPackage @@ -160371,6 +160372,7 @@ self: { ]; description = "frugal issue tracker"; license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ rvl ]; }) {}; "lenz" = callPackage @@ -252596,6 +252598,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + maintainers = with lib.maintainers; [ rvl ]; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage From d8438b875f5696bd5765078603cb5ad91df0d018 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 May 2021 09:49:14 +0200 Subject: [PATCH 90/94] python3Packages.dependency-injector: 4.31.1 -> 4.32.2 --- .../dependency-injector/default.nix | 60 +++++++++++++------ 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 9c977ecc5f0..8958566070e 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -1,27 +1,53 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }: - -let - testPath = - if isPy3k - then "test_*_py3.py" - else "test_*_py2_py3.py"; -in +{ lib +, aiohttp +, buildPythonPackage +, fastapi +, fetchFromGitHub +, flask +, httpx +, mypy-boto3-s3 +, numpy +, scipy +, pydantic +, pytestCheckHook +, pyyaml +, six +}: buildPythonPackage rec { pname = "dependency-injector"; - version = "4.31.1"; + version = "4.32.2"; - src = fetchPypi { - inherit pname version; - sha256 = "b6b28b9571f44d575367c6005ba8aaa9fd2b70310e1c15410925d6f1ee2769ad"; + src = fetchFromGitHub { + owner = "ets-labs"; + repo = "python-dependency-injector"; + rev = version; + sha256 = "1gkkka0hl2hl4axf3gfm58mzv92bg0frr5jikw8g32hd4q4aagcg"; }; - propagatedBuildInputs = [ six ]; - checkInputs = [ unittest2 pyyaml flask ]; + propagatedBuildInputs = [ + six + ]; - checkPhase = '' - unit2 discover -s tests/unit -p "${testPath}" - ''; + checkInputs = [ + aiohttp + fastapi + flask + httpx + mypy-boto3-s3 + numpy + pydantic + scipy + pytestCheckHook + pyyaml + ]; + + disabledTestPaths = [ + # There is no unique identifier to disable the one failing test + "tests/unit/ext/test_aiohttp_py35.py" + ]; + + pythonImportsCheck = [ "dependency_injector" ]; meta = with lib; { description = "Dependency injection microframework for Python"; From d1601a40c48426ae460eede1675fd1d6ee23e198 Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Thu, 13 May 2021 04:19:30 -0600 Subject: [PATCH 91/94] supertux-editor: mark as broken (#122781) SuperTux now uses an in-game editor, so there's no point in trying to build this old C# monstrosity. --- pkgs/applications/editors/supertux-editor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index 6e3580a563c..ec713d99371 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "Level editor for SuperTux"; homepage = "https://github.com/SuperTux/supertux-editor"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ mathnerd314 ]; platforms = platforms.linux; + broken = true; }; } From 621a242a1a29857a1b3019ba9c4ebb2b9fdfe653 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 13 May 2021 12:54:36 +0200 Subject: [PATCH 92/94] jekyll: Remove myself as maintainer I don't use it much anymore. --- pkgs/applications/misc/jekyll/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 54857d61420..57ff510d86e 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -49,7 +49,7 @@ in bundlerApp { homepage = "https://jekyllrb.com/"; #changelog = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown"; license = licenses.mit; - maintainers = with maintainers; [ primeos pesterhazy ]; + maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; }; } From 63ff7e430b0de7b5649de49f47a8d7fdc4584477 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 13 May 2021 12:50:18 +0200 Subject: [PATCH 93/94] chromiumBeta: 91.0.4472.38 -> 91.0.4472.57 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 42b3feebfe2..b086523e7b8 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "91.0.4472.38", - "sha256": "13kikqyxs7p25j7mxnr42614y92vmwsjqfd51dwdjh7wc2hb644a", - "sha256bin64": "1kjawp7q6r1r50h69jwrw84gqrya1jc8bq6x7bdplxlzgvy9qs3z", + "version": "91.0.4472.57", + "sha256": "1kbd5zyi5ndbln5pibdg3yhv65m84arfwfv4v00js3cbr13pyjzv", + "sha256bin64": "1bk30b9kn5bxp4yywdiy3dqd6km5q3rrf2z82kd1qyr9cc45hz8s", "deps": { "gn": { "version": "2021-04-06", From 0b14ea44a62b4724dc27ad70e4a6181a3d912c94 Mon Sep 17 00:00:00 2001 From: DavHau Date: Thu, 13 May 2021 18:44:08 +0700 Subject: [PATCH 94/94] auditwheel: init at 4.0.0 (#122607) --- .../package-management/auditwheel/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/tools/package-management/auditwheel/default.nix diff --git a/pkgs/tools/package-management/auditwheel/default.nix b/pkgs/tools/package-management/auditwheel/default.nix new file mode 100644 index 00000000000..7c633698e38 --- /dev/null +++ b/pkgs/tools/package-management/auditwheel/default.nix @@ -0,0 +1,56 @@ +{ lib +, bzip2 +, patchelf +, python3 +, gnutar +, unzip +}: + +python3.pkgs.buildPythonApplication rec { + pname = "auditwheel"; + version = "4.0.0"; + + disabled = python3.pkgs.pythonOlder "3.6"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "03a079fe273f42336acdb5953ff5ce7578f93ca6a832b16c835fe337a1e2bd4a"; + }; + + nativeBuildInputs = with python3.pkgs; [ + pbr + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pyelftools + setuptools + ]; + + # integration tests require docker and networking + disabledTestPaths = [ "tests/integration" ]; + + checkInputs = with python3.pkgs; [ + pretend + pytestCheckHook + ]; + + # ensure that there are no undeclared deps + postCheck = '' + PATH= PYTHONPATH= $out/bin/auditwheel --version > /dev/null + ''; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ bzip2 gnutar patchelf unzip ]) + ]; + + meta = with lib; { + description = "Auditing and relabeling cross-distribution Linux wheels"; + homepage = "https://github.com/pypa/auditwheel"; + license = with licenses; [ + mit # auditwheel and nibabel + bsd2 # from https://github.com/matthew-brett/delocate + bsd3 # from https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py + ]; + maintainers = with maintainers; [ davhau ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d695650e354..cb9b5506b25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -806,6 +806,8 @@ in albert = libsForQt5.callPackage ../applications/misc/albert {}; + auditwheel = callPackage ../tools/package-management/auditwheel { }; + gobgp = callPackage ../tools/networking/gobgp { }; metapixel = callPackage ../tools/graphics/metapixel { };