diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index da785a8d162b..a6a5ff3af2b7 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -28,10 +28,6 @@ jobs: pairs: - from: master into: haskell-updates - - from: release-21.11 - into: staging-next-21.11 - - from: staging-next-21.11 - into: staging-21.11 - from: release-22.05 into: staging-next-22.05 - from: staging-next-22.05 diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 3f9eaf83050f..d83a90b0466f 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "101.0.1-1", + "packageVersion": "102.0-2", "source": { - "rev": "101.0.1-1", - "sha256": "1b4zrfi5ig2aywsrfblxznds894ib8gx66yjm8n4hxmpsinmqfp9" + "rev": "102.0-2", + "sha256": "1gr17sk9ans6f2w3y6zr2cy5pz84br2b0kfi9pqz58yjz94q7jm2" }, "firefox": { - "version": "101.0.1", - "sha512": "435a7f6013582933e75c41e554a45beda30b5affd7d3ed7d2876026609ba7f17b2c20b507d9d0c9ce2379e335ec09b021257ba30ac55fabf02dca54b03ea70b4" + "version": "102.0", + "sha512": "c7dd6d8d74c46573b16d097a5e5d230669e5778cd680b3b6f30510e989d21543138ced3bb013998b76614aa380b28efd8542450c591d8b724e03bd163d012057" } } diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index f1a5e57039af..c2b313d442e3 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-0hQ+FicY74I5Fpl4FQsYMtQyBgzRnUeXl/vsNQ6GHZw="; + sha256 = "sha256-Nnfy8KOMJqg2sXrNDZlrcrpWfc70sXL1tNlXSgg5ZZg="; }; - vendorSha256 = "sha256-PLUN9d+oo7vHUUpiIBUgU1snPlsHOMt+8q+jQZzZC+8="; + vendorSha256 = "sha256-zRdtd/mE9AQtqw9Z/Tatd9vEx9l/XSFge8sOLbS/Wrs="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index 0c614f43f850..4daf11595efa 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -1,29 +1,36 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, gettext, gdk-pixbuf -, gobject-introspection, gtk3, wrapGAppsHook }: - -with lib; +{ lib +, stdenv +, fetchFromGitHub +, wrapGAppsHook +, gdk-pixbuf +, gettext +, gobject-introspection +, gtk3 +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "nicotine-plus"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { - owner = "Nicotine-Plus"; + owner = "nicotine-plus"; repo = "nicotine-plus"; rev = version; - hash = "sha256-3NXlNd3Zy++efnvcnfIOUP83mdJ5h8BmE4a2uWn5CPQ="; + sha256 = "sha256-aD5LQ0l6bet/iQKiu1mta4fUeijfip9IdzbGnTkCNdQ="; }; nativeBuildInputs = [ gettext wrapGAppsHook ]; - propagatedBuildInputs = [ gtk3 gdk-pixbuf gobject-introspection ] - ++ (with python3Packages; [ pygobject3 ]); - + propagatedBuildInputs = [ + gdk-pixbuf + gobject-introspection + gtk3 + python3Packages.pygobject3 + ]; postInstall = '' ln -s $out/bin/nicotine $out/bin/nicotine-plus - test -e $out/share/applications/org.nicotine_plus.Nicotine.desktop && exit 1 - install -D data/org.nicotine_plus.Nicotine.desktop -t $out/share/applications ''; preFixup = '' @@ -34,12 +41,16 @@ python3Packages.buildPythonApplication rec { doCheck = false; - meta = { + meta = with lib; { broken = stdenv.isDarwin; description = "A graphical client for the SoulSeek peer-to-peer system"; + longDescription = '' + Nicotine+ aims to be a pleasant, free and open source (FOSS) alternative + to the official Soulseek client, providing additional functionality while + keeping current with the Soulseek protocol. + ''; homepage = "https://www.nicotine-plus.org"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ehmry klntsky ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 731f6e263638..a6536865d884 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -8,13 +8,13 @@ else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-batteries"; - version = "3.4.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "ocaml-batteries-team"; repo = "batteries-included"; rev = "v${version}"; - sha256 = "sha256:1cd7475n1mxhq482aidmhh27mq5p2vmb8d9fkb1mlza9pz5z66yq"; + sha256 = "sha256-lLlpsg1v7mYFJ61rTdLV2v8/McK1R4HDTTuyka48aBw="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index 401d08ddf6ab..bd5629816528 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -5,12 +5,12 @@ then throw "fmt is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "0.9.0"; + version = "0.8.9"; pname = "ocaml${ocaml.version}-fmt"; src = fetchurl { url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz"; - sha256 = "sha256-8fsggFoi3XWhN9cnBKNw53ic9r32OUjmgX0cImwUEmE="; + sha256 = "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk"; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index c6a3f2b346b1..fe0520979548 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "3.0.6"; + version = "3.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/wiVyIiyNl7pqujjROgWdrQH253Li6QZzFZisUm5jlM="; + hash = "sha256-yjcO5fRYR4v5334eh9Sen2VKk59zVT1WB/1iXKDd0rA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index c97c2c5e7e9a..6a232cfbe55c 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { repo = "uap-python"; rev = version; fetchSubmodules = true; - hash = "sha256-CwwVaToy5se5dZ4m1EHn8qgvprK82/Sgpos4lHedIUc="; + hash = "sha256-TtOj1ZL8+4T95AgF9ErvI+0W35WQ23snFhCyCbuRjxM="; }; patches = [ diff --git a/pkgs/development/python-modules/unittest2/collections-compat.patch b/pkgs/development/python-modules/unittest2/collections-compat.patch new file mode 100644 index 000000000000..350c9d716783 --- /dev/null +++ b/pkgs/development/python-modules/unittest2/collections-compat.patch @@ -0,0 +1,19 @@ +diff --git a/unittest2/compatibility.py b/unittest2/compatibility.py +index 9e5f1a5..473957c 100644 +--- a/unittest2/compatibility.py ++++ b/unittest2/compatibility.py +@@ -1,4 +1,5 @@ + import collections ++import collections.abc + import os + import sys + +@@ -140,7 +141,7 @@ except ImportError: + ### ChainMap (helper for configparser and string.Template) + ######################################################################## + +-class ChainMap(collections.MutableMapping): ++class ChainMap(collections.abc.MutableMapping): + ''' A ChainMap groups multiple dicts (or other mappings) together + to create a single, updateable view. + diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix index e044176242d5..786b8996f83b 100644 --- a/pkgs/development/python-modules/unittest2/default.nix +++ b/pkgs/development/python-modules/unittest2/default.nix @@ -15,6 +15,10 @@ buildPythonPackage rec { sha256 = "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212"; }; + patches = lib.optionals (pythonAtLeast "3.7") [ + ./collections-compat.patch + ]; + propagatedBuildInputs = [ six traceback2 ]; # 1.0.0 and up create a circle dependency with traceback2/pbr @@ -34,7 +38,5 @@ buildPythonPackage rec { description = "A backport of the new features added to the unittest testing framework"; homepage = "https://pypi.org/project/unittest2/"; license = licenses.bsd0; - # AttributeError: module 'collections' has no attribute 'MutableMapping' - broken = pythonAtLeast "3.10"; }; } diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix index c46c58e7b404..0b337f613366 100644 --- a/pkgs/tools/compression/zfp/default.nix +++ b/pkgs/tools/compression/zfp/default.nix @@ -1,4 +1,4 @@ -{ cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, pythonPackages, stdenv, targetPlatform +{ cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv, targetPlatform , enableCfp ? true , enableCuda ? false , enableExamples ? true @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional enableCuda cudatoolkit ++ lib.optional enableFortran gfortran ++ lib.optional enableOpenMP llvmPackages.openmp - ++ lib.optionals enablePython [ pythonPackages.cython pythonPackages.numpy pythonPackages.python ]; + ++ lib.optionals enablePython (with python3Packages; [ cython numpy python ]); cmakeFlags = [ # More tests not enabled by default diff --git a/pkgs/tools/misc/vimv-rs/default.nix b/pkgs/tools/misc/vimv-rs/default.nix new file mode 100644 index 000000000000..6f20ad277753 --- /dev/null +++ b/pkgs/tools/misc/vimv-rs/default.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchCrate, stdenv, Foundation }: + +rustPlatform.buildRustPackage rec { + pname = "vimv-rs"; + version = "1.7.5"; + + src = fetchCrate { + inherit version; + crateName = "vimv"; + sha256 = "sha256-VOHQLdwJ6c8KB/IjMDZe9/pNHmLuouNggIK8uJPu+NQ="; + }; + + cargoHash = "sha256-qXT44h4f4Zw1bi/gblczxehA6hqLLjQBpSwVpYd0PE4="; + + buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; + + meta = with lib; { + description = "Command line utility for batch-renaming files"; + homepage = "https://www.dmulholl.com/dev/vimv.html"; + license = licenses.bsd0; + mainProgram = "vimv"; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 4b278c12a3f8..c99face8d7d8 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchpatch , texlive , zlib, libiconv, libpng, libX11 , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext @@ -25,6 +25,15 @@ let ]; sha256 = "0jsq1p66l46k2qq0gbqmx25flj2nprsz4wrd1ybn286p11kdkvvs"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains. + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/TeX-Live/texlive-source/commit/7748582aeda70ffa02105f6e3e2fc2476e76aac6.patch"; + sha256 = "1y59cwa41kbg0i071g488jhi9qg0h8l7hqd69brhx2yj95za8c40"; + excludes = [ "texk/xdvik/ChangeLog" ]; + }) + ]; prePatch = '' for i in texk/kpathsea/mktex*; do @@ -406,7 +415,7 @@ xdvi = stdenv.mkDerivation { pname = "texlive-xdvi.bin"; inherit version; - inherit (common) src; + inherit (common) src patches; nativeBuildInputs = [ pkg-config ]; buildInputs = [ core/*kpathsea*/ freetype ghostscript ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1e7a6b4294c..1566ee8139a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30704,6 +30704,10 @@ with pkgs; vimv = callPackage ../tools/misc/vimv { }; + vimv-rs = callPackage ../tools/misc/vimv-rs { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { };