diff --git a/nixos/modules/programs/qt5ct.nix b/nixos/modules/programs/qt5ct.nix index 3f2bcf622836..88e861bf4031 100644 --- a/nixos/modules/programs/qt5ct.nix +++ b/nixos/modules/programs/qt5ct.nix @@ -26,6 +26,6 @@ with lib; ###### implementation config = mkIf config.programs.qt5ct.enable { environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct"; - environment.systemPackages = with pkgs; [ qt5ct ]; + environment.systemPackages = with pkgs; [ libsForQt5.qt5ct ]; }; } diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 7dd5594a9a93..ba3d921751b5 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "kid3"; - version = "3.8.7"; + version = "3.9.0"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Dr+NLh5ajG42jRKt1Swq6mccPfuAXRvhhoTNuO8lnI0="; + sha256 = "sha256-d0Y+swzzGk1FzQ3EK8sN8i1Nf6CRIPMAYgTUYN71FXU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index f635c70ae4d3..f805a2d345d9 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-VDLfOcIXM3+04tEvPzKDEKMperMhB5hDo1MlttS04yM="; + sha256 = "sha256-r3FoAV0wah9fwnqyMyu8927c4Uj0zZoQNvLoXP5AP/E="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 3a4fc329de64..f4665aa3e18e 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -91,6 +91,10 @@ let patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv chmod +x $out/goland*/plugins/go/lib/dlv/linux/dlv + + # fortify source breaks build since delve compiles with -O0 + wrapProgram $out/goland*/plugins/go/lib/dlv/linux/dlv \ + --prefix disableHardening " " fortify ''; }); diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 653ac79267e5..3f62ffe7dfb4 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.3.1"; # When updating also update fetchedMavenDeps.sha256 + version = "21.3.2"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "ePy3uS+LpyDzweLocSk3O/G2zFPISKbMbci9fdELrpE="; + sha256 = "SifnnzuETFKtnEwLjJtB7CV2QZaToex3MjKGuiShlwo="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "7Sm1hAoi5xc4MLONOD8ySLLkpao0qmlMRRva/8zR210="; + outputHash = "grSFtkohTlLtK8qE4A4wVppC6UHcyaXRQlGnrOmQDC4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/timew-sync-server/default.nix b/pkgs/applications/misc/timew-sync-server/default.nix index 86a428df38f6..8fb6bb3a1043 100644 --- a/pkgs/applications/misc/timew-sync-server/default.nix +++ b/pkgs/applications/misc/timew-sync-server/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "timew-sync-server"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "timewarrior-synchronize"; repo = pname; rev = "v${version}"; - sha256 = "041j618c2bcryhgi2j2w5zlfcxcklgbir2xj3px4w7jxbbg6p68n"; + sha256 = "GaDcnPJBcDJ3AQaHzifDgdl0QT4GSbAOIqp4RrAcO3M="; }; - vendorSha256 = "0wbd4cpswgbr839sk8qwly8gjq4lqmq448m624akll192mzm9wj7"; + vendorSha256 = "iROqiRWkHG6N6kivUmgmu6sg14JDdG4f98BdR7CL1gs="; meta = with lib; { homepage = "https://github.com/timewarrior-synchronize/timew-sync-server"; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 65835aa10cf3..8c9587254d7a 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.25"; + version = "2.26"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - sha256 = "sha256-TAnGDxTKYl4niouS6nYdJDaIngAPsPHr9Bw9L3cR2Xk="; + hash = "sha256-VFeKj8X7gEyxsdsOK6UYJ6xB24gsuzb1Wm4GK5AJCHc="; }; - cargoSha256 = "sha256-MxoyYBLbrCuLVa0p8JrYKSKu2oFPnXMwab42lhhAu48="; + cargoHash = "sha256-pr/Vzm321/uX4fIGt3kuWrtcgsnDRbeK3AvNO19NDwQ="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 1a6f19721331..7f36fd232e97 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre, zip }: stdenv.mkDerivation rec { version = "13.8.0"; @@ -8,13 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0zfkwz5psv7m0881ykgqrxwjhadg39c55aj2wpy7m1jdara86c5q"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper zip ]; installPhase = '' runHook preInstall mkdir -p $out/{bin,lib} + # log4j mitigation, see https://logging.apache.org/log4j/2.x/security.html + zip -d MediathekView.jar org/apache/logging/log4j/core/lookup/JndiLookup.class + install -m644 MediathekView.jar $out/lib makeWrapper ${jre}/bin/java $out/bin/mediathek \ diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index cb76f0c465cc..f75d7ec5d1bd 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "sawfish"; - version = "1.12.90"; + version = "1.13.0"; src = fetchurl { url = "https://download.tuxfamily.org/sawfish/${pname}_${version}.tar.xz"; - sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31"; + sha256 = "sha256-gWs8W/pMtQjbH8FEifzNAj3siZzxPd6xm8PmXXhyr10="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index 0ed8ea0486b6..09b2d9f73a2b 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -21,6 +21,7 @@ , graalvmXmx ? "-J-Xmx6g" # The GraalVM to use , graalvm ? graalvmCEPackages.graalvm11-ce +, meta ? { } , ... } @ args: @@ -47,6 +48,10 @@ stdenv.mkDerivation (args // { runHook postInstall ''; - meta.platforms = lib.attrByPath [ "meta" "platforms" ] graalvm.meta.platforms args; - meta.mainProgram = lib.attrByPath [ "meta" "mainProgram" ] executable args; + meta = { + # default to graalvm's platforms + platforms = graalvm.meta.platforms; + # default to executable name + mainProgram = executable; + } // meta; }) diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index a226c7edba45..afa592ebaf45 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, crystal, openssl }: crystal.buildCrystalPackage rec { - version = "0.14.0"; + version = "0.15.1"; pname = "mint"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "1mf9d0jpdb21hkzaqvwyx2171dv3hr50zhl07p85wpf0d3n5wml8"; + sha256 = "sha256-naiZ51B5TBc88wH4Y7WcrkdFnZosEVCS5MlLAGVe8/E="; }; postPatch = '' diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix index 7028572174ff..a1d3c183b8e2 100644 --- a/pkgs/development/libraries/CGAL/4.nix +++ b/pkgs/development/libraries/CGAL/4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { version = "4.14.2"; @@ -11,6 +11,28 @@ stdenv.mkDerivation rec { sha256 = "1p1xyws2s9h2c8hlkz1af4ix48qma160av24by6lcm8al1g44pca"; }; + patches = [ + + # Pull upstream fix for c++17 (gcc-12): + # https://github.com/CGAL/cgal/pull/6109 + (fetchpatch { + name = "gcc-12-prereq.patch"; + url = "https://github.com/CGAL/cgal/commit/4581f1b7a8e97d1a136830e64b77cdae3546c4bf.patch"; + sha256 = "1gzrvbrwxylv80v0m3j2s1znlysmr69lp3ggagnh38lp6423i6pq"; + # Upstream slightly reordered directory structure since. + stripLen = 1; + # Fill patch does not apply: touches too many parts of the source. + includes = [ "include/CGAL/CORE/BigFloatRep.h" ]; + }) + (fetchpatch { + name = "gcc-12.patch"; + url = "https://github.com/CGAL/cgal/commit/6680a6e6f994b2c5b9f068eb3014d12ee1134d53.patch"; + sha256 = "1c0h1lh8zng60yx78qc8wx714b517mil8mac87v6xr21q0b11wk7"; + # Upstream slightly reordered directory structure since. + stripLen = 1; + }) + ]; + # note: optional component libCGAL_ImageIO would need zlib and opengl; # there are also libCGAL_Qt{3,4} omitted ATM buildInputs = [ boost gmp mpfr ]; diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index 56259814d8a5..2cd1be1fff2b 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgit2-glib"; - version = "0.99.0.1"; + version = "1.0.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pmrcnsa7qdda73c3dxf47733mwprmj5ljpw3acxbj6r8k27anp0"; + sha256 = "RgpdaTaVDKCNLYUYv8kMErsYfPbmdN5xX3BV/FgQK1c="; }; postPatch = '' diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix index 31b85b01d6a5..bc2661548888 100644 --- a/pkgs/development/libraries/lyra/default.nix +++ b/pkgs/development/libraries/lyra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lyra"; - version = "1.5.1"; + version = "1.6"; src = fetchFromGitHub { owner = "bfgroup"; repo = "lyra"; rev = version; - sha256 = "0xil6b055csnrvxxmby5x9njf166bri472jxwzshc49cz7svhhpk"; + sha256 = "sha256-5k4b1JVrGDmT65tSWo6AkqvNpN+6n8wZgqEuXLL7stI="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index c1040c942ce4..089fd70f19d5 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.7.10"; + version = "1.7.12"; src = fetchFromGitHub { owner = "tdlib"; repo = "td"; # https://github.com/tdlib/td/issues/1790 - rev = "a53cb30e99f937cfd64e0266fa558785a184a553"; - sha256 = "FX+66JRsigauLq2JLx0InWiedGeQJ9+ox+D/Bqik9ik="; + rev = "a69030239c53951db8a1b0af6408f24d63f5dcb7"; + sha256 = "tqytmjij79YzvBP1abbA/Oavx28mvEGESn39b3HYAMg="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index ea745dba369c..5f9eb41bf821 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.13.0"; + version = "1.14.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-Q9B85c+WhazDeXsMR2S0aId32xLY8BAuYRj4QD21x1k="; + sha256 = "900da60f9e569e02405b85db35541a79e1cac776ace5d054498b107982ea443c"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 74e4c77c0fa2..c49d76705f79 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.11.1"; + version = "0.11.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "b7a0aeb79b85ee81a3c72c49019b4bfeb57fa920abaa6c17ba8be3be9c5290f1"; + sha256 = "f393adf659709a5f111d6ca190871c61808a6f3611bd0a132e27e93b24dd3448"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index bd5b9e374f16..d2c8be795f1d 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "11.0.1"; + version = "11.0.2"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "04s4hganb6x0dlfyyg9gjah5z0vxd7bxzqwgvd28hqnf0iwc2byb"; + hash = "sha256-3HrkhlwV8OLqbzC6QgddLB1fQxWbwCQ6STCgUXlr5So="; }; checkInputs = [ diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 70bf668765ba..b46ad5efc881 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,23 +1,13 @@ { fetchFromGitHub, lib, python3Packages }: -let - python3Packages2 = python3Packages.override { - overrides = self: super: { - arrow = self.callPackage ../../python-modules/arrow/2.nix { }; - }; - }; -in -let - python3Packages = python3Packages2; # two separate let … in to avoid infinite recursion -in python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "3.0.3"; + version = "3.2.0"; src = python3Packages.fetchPypi { inherit version; pname = "b2"; - sha256 = "sha256-asrhinANGlTsSBbtGToOxTRGGSCf+1c4VWnoE3ezoIA="; + sha256 = "sha256-dE4eLTNU6O0DscwN8+m1UaG46dbI0DiWzeJK49GUvKA="; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index c0c32a76a71d..9c64b4a078c9 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.3.1"; + version = "2.3.3"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aQsc2dBS1IWm1lpBPrrHx1CfrHXJYkDIObNHMqqVYn4="; + sha256 = "sha256-3ZN/SCTQ5k0X4cqnrpp8Yt1QDnYkT2RbMLKpDfdWaxk="; }; vendorSha256 = "sha256-XBsYSA0i0q/mp8sQh9h//pjs+TbEDc7UIdNU24/Qemo="; diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix index cf719f2c0ca1..06d38588dbda 100644 --- a/pkgs/development/tools/build-managers/mage/default.nix +++ b/pkgs/development/tools/build-managers/mage/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mage"; - version = "1.11.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "magefile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ghOk44VcQUAAYm9NCLsgYdky1KEpwOeChBNrgUKjnC8="; + sha256 = "sha256-hfLclI9bzsvITwdo8LTqNcr25yZN82B0pqwlk559tRU="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 8e667cc23bea..5371bea7760e 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.5.8"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "sha256-WnT3UrfcIAs7HRxRUyfwHCH++DPpVzjeQsJC+3hA1Ik="; + sha256 = "sha256-Y52xcPZRDQ+IX/QAVGRODshbuDb5oJA45r9OT2Jxusw="; }; postPatch = '' diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index bd6848c8be74..8a71939f2c11 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -18,7 +18,7 @@ buildGraalvmNativeImage rec { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/clj-kondo/clj-kondo"; license = licenses.epl10; - changelog = "https://github.com/clj-kondo/clj-kondo/blob/v${versiont}/CHANGELOG.md"; + changelog = "https://github.com/clj-kondo/clj-kondo/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ jlesquembre bandresen thiagokokada ]; }; } diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 7da576555ee1..2eb11b2ffc28 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "datree"; - version = "0.14.62"; + version = "0.14.87"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - sha256 = "sha256-yNq3GRovFm0OlYNJJGjTe5AqKG9J4I+igJ/WVNLWdKI="; + sha256 = "sha256-zoFWiqrKdTh6XDrKx2mQe3NqK03so6MqIX0sSQHQa5U="; }; vendorSha256 = "sha256-SlU1lJcKCDkoihU19c8iky3Bj5ZZD9E9W0QQX9fBT1c="; diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix index 1ae81793b56d..31085e748c2c 100644 --- a/pkgs/development/tools/oq/default.nix +++ b/pkgs/development/tools/oq/default.nix @@ -8,13 +8,13 @@ crystal.buildCrystalPackage rec { pname = "oq"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Blacksmoke16"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oLy8Ts+wnI0LxtAH6vVqhS7nqNkaLs0/vK9GxfG4vU8="; + sha256 = "sha256-La2oi+r9sCmnacgjQe+LcTQ7EXKorSoTTD4LhNtQsYk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 0b4f2f405480..3b3e5be296fe 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "3.2.1"; + version = "3.3.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "v1IODq88Wpjm7IxSKmD9Nub3r4XNP+jNT0A6ApX3Cas="; + outputHash = "PlLQVNn2HomcR9grqGFgaXYWxg9EU7ihd28wXruZiBs="; }; in stdenv.mkDerivation { diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 2b46c7ff2cfb..8c379959ad8b 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -22,7 +22,6 @@ let lsb-release # Errors in output without those pciutils - python2 # Games' dependencies xorg.xrandr which diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 5d26fd1200ff..dcd74748b865 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2021-11-24T23-19-33Z"; + version = "2021-12-10T23-03-39Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-cYoeCjkCLnlp5BVp3BOj7okA1yX+rDp0Rbwcn+ji+Ak="; + sha256 = "sha256-vu3p6LnmC2o7pX7T/x8SJ+Nr0G2GPIZqqOdPZ836puc="; }; - vendorSha256 = "sha256-DdsLQ87tvh8gbiLh6uLCXiGmnkcE+LcLwvdgDJxXbc8="; + vendorSha256 = "sha256-QxQPjjfCx0SVYquYVX5DOe8uzM16I2AYve0O2bj4y1k="; doCheck = false; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 5cb326dab534..931e5f7ffeae 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,7 +2,7 @@ , lib , go , pkgs -, nodejs +, nodejs-14_x , nodePackages , buildGoModule , fetchFromGitHub @@ -24,11 +24,13 @@ let goPackagePath = "github.com/prometheus/prometheus"; codemirrorNode = import ./webui/codemirror-promql { - inherit pkgs nodejs; + inherit pkgs; + nodejs = nodejs-14_x; inherit (stdenv.hostPlatform) system; }; webuiNode = import ./webui/webui { - inherit pkgs nodejs; + inherit pkgs; + nodejs = nodejs-14_x; inherit (stdenv.hostPlatform) system; }; @@ -36,7 +38,7 @@ let name = "prometheus-webui-codemirror-promql"; src = "${src}/web/ui/module/codemirror-promql"; - buildInputs = [ nodejs nodePackages.typescript codemirrorNode.nodeDependencies ]; + buildInputs = [ nodejs-14_x nodePackages.typescript codemirrorNode.nodeDependencies ]; configurePhase = '' ln -s ${codemirrorNode.nodeDependencies}/lib/node_modules node_modules @@ -56,7 +58,7 @@ let name = "prometheus-webui"; src = "${src}/web/ui/react-app"; - buildInputs = [ nodejs webuiNode.nodeDependencies ]; + buildInputs = [ nodejs-14_x webuiNode.nodeDependencies ]; # create `node_modules/.cache` dir (we need writeable .cache) # and then copy the rest over. @@ -77,7 +79,7 @@ buildGoModule rec { excludedPackages = [ "documentation/prometheus-mixin" ]; - nativeBuildInputs = [ nodejs ]; + nativeBuildInputs = [ nodejs-14_x ]; postPatch = '' # we don't want this anyways, as we diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 06ae9e176b7d..440a21a6b6ac 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.32.0"; + version = "1.33.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-/WrkWhtLNqoLJP0FwPlWr4WmEYweEkyBZlv9NVmaozc="; + sha256 = "sha256-3b0hlRjPXrMjFhXi8j4VvKJyRGicIk9FZUBRsBUp+Xo="; }; vendorSha256 = "sha256-MVDb4JN2QqZNxANDLUZywgoBc2NpcaPB8TkR1xrq+Yk="; diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index 8e5f8cfc4903..7002749a0df5 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "1awqada8vwyz3aj1ip9jgmf84hb60jai16in6yhn4b42x9qj8m08"; + sha256 = "sha256-8hYsyHq0iyWzY/HHE4JWBtlaRcSTyM6BdAPcByThme8="; rev = "v${version}"; }; - vendorSha256 = "1k6ak175z1qikicmqb6c8sc3dnwghpy9rv7ayl8mpq50y3ighwqi"; + vendorSha256 = "sha256-bmF38dj+ovVlSbTtv2TSXGLe/W1R4NUbeDrpgGlfPf4="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X main.VERSION=${version}" ]; diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 5fae5c92c231..d4d00cc4a813 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-aUmeZ/numcAkejfMm4kuXem5u9bwkn5jRz5PzTNq1tQ="; - arm64-linux_hash = "sha256-8EwB52bNTxmoPcCC8Q5y77gM8M9pDqMXypwz7ukLDuE="; - x64-osx_hash = "sha256-NnunLw9sZCBDMqrDMX+u/xt0owJT/NdsUv2rF6knnx4="; + x64-linux_hash = "sha256-KPGE9Az98UOBEJ/mUH/RI0zrf1tf90yckAfURvC+lWM="; + arm64-linux_hash = "sha256-seJJ2le7Y4x6G5s0ASbN3KzldD9kOmFamwaxnJV3T7c="; + x64-osx_hash = "sha256-FA81l/IZWGoAlBUS3irPCdcf3ey9Df3XzDen+4UlZzc="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "0.1.6.1184"; + version = "0.1.8.1231"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix index c0af38e10f3b..26916cc5598c 100644 --- a/pkgs/tools/admin/turbovnc/default.nix +++ b/pkgs/tools/admin/turbovnc/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "turbovnc"; - version = "2.2.6"; + version = "2.2.7"; src = fetchFromGitHub { owner = "TurboVNC"; repo = "turbovnc"; rev = version; - sha256 = "sha256-HSppHPBBkTf+88ZBaYG6JK4A/5lOBCxPFv6898TD7PE="; + sha256 = "sha256-mEdatfTBx4nNmMTgv1Z+xefPFEiE2rCrsxyB7Dd03rg="; }; # TODO: diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index aa836e3ca43c..9a221dcfc2f6 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.33.1"; + version = "2.33.3"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-60jGW3aMBf1Ue+AbV/kHb8WoKBqCRMa0fgt6Id1Xt9w="; + sha256 = "sha256-hZA7AkFEuSHp84Zn+m9+VVr4UewbbzeQL1n2bkUOX0Y="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 2b2d6ca0a868..d64b690b7636 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { pname = "moreutils"; - version = "0.66"; + version = "0.67"; src = fetchgit { url = "git://git.joeyh.name/moreutils"; rev = "refs/tags/${version}"; - sha256 = "sha256-y+imKvLbaegpI4GTVPuHFT43OGFGnzOnWP2J3LSX1BQ="; + sha256 = "sha256-8Mu7L3KqOsW9OmidMkWB+q9TofHd1P1sbsNrtE4MUoA="; }; preBuild = '' diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 94a921bc1360..40599ff9c4e4 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20211122"; + version = "20211222"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-SLJWMixWpMsaeBj+CJT93lddqw4PklxqIolRe2vYli4="; + sha256 = "sha256-BYSRz0xSpIVZd73oA8Y2iLLKnFmRvhDnuLDArt5G0Zw="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index f7e761ac0fd0..eb2b109dbecd 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "axel"; - version = "2.17.10"; + version = "2.17.11"; src = fetchFromGitHub { owner = "axel-download-accelerator"; repo = pname; rev = "v${version}"; - sha256 = "01mpfkz98r2fx4n0gyi3b4zvlyfd5bxydp2wh431lnj0ahrsiikp"; + sha256 = "sha256-yC4TL8IXWGEwRXAyeon6QnQa+rT1xL/McLsghjZ4ky4="; }; nativeBuildInputs = [ autoreconfHook pkg-config autoconf-archive txt2man ]; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 3edc085b931d..12ac37af7105 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -10,15 +10,15 @@ let in buildGoModule rec { pname = "datadog-agent"; - version = "7.32.1"; + version = "7.32.4"; src = fetchFromGitHub { inherit owner repo; rev = version; - sha256 = "sha256-21xrnPP5uoGzVCBplNxzKUxFTjopDTjdVQqyvIEzIuo="; + sha256 = "sha256-/vHNxcJQb0QHwFq6lxsSh9zc+Bkhb2SUymI5jEzkjm4="; }; - vendorSha256 = "sha256-j3A8Gqw3Erf6suK/TH9Ml2zb7tYDGNFqil5wSZRs79o="; + vendorSha256 = "sha256-LyXveLSa+p9GEzcKifTXweY8nJwPISwhboi8zBeBrMo="; subPackages = [ "cmd/agent" diff --git a/pkgs/tools/networking/oonf-olsrd2/default.nix b/pkgs/tools/networking/oonf-olsrd2/default.nix new file mode 100644 index 000000000000..c2ab89834afa --- /dev/null +++ b/pkgs/tools/networking/oonf-olsrd2/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "oonf-olsrd2"; + version = "0.15.1"; + + src = fetchFromGitHub { + owner = "OLSR"; + repo = "OONF"; + rev = "v${version}"; + hash = "sha256-7EH2K7gaBGD95WFlG6RRhKEWJm91Xv2GOHYQjZWuzl0="; + }; + + cmakeFlags = [ + "-DOONF_NO_WERROR=yes" + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "An adhoc wireless mesh routing daemon"; + license = licenses.bsd3; + homepage = "http://olsr.org/"; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix index 13c254cbee29..39a5517ba27b 100644 --- a/pkgs/tools/package-management/nix-template/default.nix +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "nix-template"; - version = "0.1.4"; + version = "0.2.0"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "jonringer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kNFhSfHUYBUOCXoD6m7thMho4tOIpRHfHGcsW8FTgkc="; + sha256 = "sha256-5CIGxm9LJ5GGUM2D2tZxzMsNlWIlfTWCVzyM/VNh15I="; }; - cargoSha256 = "sha256-7PthFLCEt+E/Gx5//aulHYYBKZqapNEWKtKfRlDr3Pw="; + cargoSha256 = "sha256-enclL7lGwIiJFrMwH/d4vTK+lKbP5ytySKha5mkHsvc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index 18b098620548..58d1fe2a7a68 100644 --- a/pkgs/tools/text/csview/default.nix +++ b/pkgs/tools/text/csview/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FrdW3f/ydjClgySEa2AIlAC9NOAr9cE4W67zXmlrUrQ="; + sha256 = "sha256-ezN/hU8SdC/ox+l1KJQixzFwGvfmg3zfUjf/bAtnYRU="; }; - cargoSha256 = "sha256-cew6czpBGNF3kulgdmfoWl/4f1AyKvHTIk/3eGEwkhE="; + cargoSha256 = "sha256-gEiZIwISlazkBwQPFaIWM6dViumc55no8RQ8E30JfUo="; meta = with lib; { description = "A high performance csv viewer with cjk/emoji support"; diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index f1b2928c7941..1174c2f382e3 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -3,7 +3,7 @@ buildPythonApplication rec { pname = "transifex-client"; - version = "0.14.3"; + version = "0.14.4"; propagatedBuildInputs = [ urllib3 requests python-slugify six setuptools GitPython @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-sKol67lRaYPFa7Bg9KNa1rDrNoT9DtUd48NY8jqK1iw="; + sha256 = "11dc95cefe90ebf0cef3749c8c7d85b9d389c05bd0e3389bf117685df562bd5c"; }; # https://github.com/transifex/transifex-client/issues/323 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dab34668b217..4ff990489380 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -770,6 +770,7 @@ mapAliases ({ qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # added 2021-04-02 qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 + qt5ct = libsForQt5.qt5ct; # added 2021-12-27 quake3game = ioquake3; # added 2016-01-14 quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-03 qvim = throw "qvim has been removed."; # added 2020-08-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2df6a19cf90d..c56e5e883a58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -883,7 +883,9 @@ with pkgs; type = "OPN"; }; - arc_unpacker = callPackage ../tools/archivers/arc_unpacker { }; + arc_unpacker = callPackage ../tools/archivers/arc_unpacker { + boost = boost16x; # checkPhase fails with Boost 1.77 + }; adminer = callPackage ../servers/adminer { }; @@ -8472,6 +8474,8 @@ with pkgs; olsrd = callPackage ../tools/networking/olsrd { }; + oonf-olsrd2 = callPackage ../tools/networking/oonf-olsrd2 { }; + opl3bankeditor = libsForQt5.callPackage ../tools/audio/opl3bankeditor { }; opn2bankeditor = libsForQt5.callPackage ../tools/audio/opl3bankeditor/opn2bankeditor.nix { }; @@ -19490,8 +19494,6 @@ with pkgs; # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop plasma5Packages = libsForQt515; - qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; - qtEnv = qt5.env; qt5Full = qt5.full; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index c80462d9d1ed..a2bd8dc6a547 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -194,6 +194,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea withQt5 = true; }; + qt5ct = callPackage ../tools/misc/qt5ct { }; + qtfeedback = callPackage ../development/libraries/qtfeedback { }; qtutilities = callPackage ../development/libraries/qtutilities { };