From ad7bf0e1fa0ba5d21c4528567c18aab901522a45 Mon Sep 17 00:00:00 2001 From: Christoph Charles <23055925+christophcharles@users.noreply.github.com> Date: Sun, 16 Oct 2022 11:34:26 +0200 Subject: [PATCH 01/48] maintainers: add christophcharles --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3e5cefc356cd..448f7c096743 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2459,6 +2459,12 @@ fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4"; }]; }; + christophcharles = { + email = "23055925+christophcharles@users.noreply.github.com"; + github = "christophcharles"; + githubId = 23055925; + name = "Christoph Charles"; + }; christopherpoole = { email = "mail@christopherpoole.net"; github = "christopherpoole"; From 10b4690b659ec29cb135ff444f552b75cf002f2c Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 17 Oct 2022 03:25:29 +0000 Subject: [PATCH 02/48] lnch: unstable-2021-02-10 -> unstable-2021-08-15 --- pkgs/tools/misc/lnch/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/tools/misc/lnch/default.nix index a9c736525390..5a68c7697cc4 100644 --- a/pkgs/tools/misc/lnch/default.nix +++ b/pkgs/tools/misc/lnch/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "lnch"; - version = "unstable-2021-02-10"; - - goPackagePath = "github.com/oem/${pname}"; + version = "unstable-2021-08-15"; src = fetchFromGitHub { owner = "oem"; repo = pname; - rev = "6ed336dd893afa071178b8ac6f6297d23fc55514"; - sha256 = "K2TV+mx6C3/REJyDpC6a/Zn/ZZFxkDMC3EnkveH6YNQ="; + rev = "56b5e256b46c002821bef3b9c1b6f68b9dbb4207"; + sha256 = "sha256-Iro/FjPFMqulcK90MbludnOXkMEHW0QSCoQRL01/LDE"; }; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo"; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://github.com/oem/lnch"; description = "Launches a process and moves it out of the process group"; license = licenses.mit; - platforms = with platforms; all; }; } From adc5c77dc99920fe7bc240c6f3adb2b246567047 Mon Sep 17 00:00:00 2001 From: Christoph Charles <23055925+christophcharles@users.noreply.github.com> Date: Sun, 16 Oct 2022 11:38:33 +0200 Subject: [PATCH 03/48] nqc: init at 3.1.r6 --- pkgs/development/compilers/nqc/default.nix | 33 +++++++++++++++++++ .../compilers/nqc/nqc-unistd.patch | 11 +++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 46 insertions(+) create mode 100644 pkgs/development/compilers/nqc/default.nix create mode 100644 pkgs/development/compilers/nqc/nqc-unistd.patch diff --git a/pkgs/development/compilers/nqc/default.nix b/pkgs/development/compilers/nqc/default.nix new file mode 100644 index 000000000000..a532b7df8580 --- /dev/null +++ b/pkgs/development/compilers/nqc/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "nqc"; + version = "3.1.r6"; + + src = fetchurl { + url = "https://bricxcc.sourceforge.net/nqc/release/nqc-${version}.tgz"; + sha256 = "sha256-v9XmVPY5r3pYjP3vTSK9Xvz/9UexClbOvr3ljvK/52Y="; + }; + + sourceRoot = "."; + + patches = [ + ./nqc-unistd.patch + (fetchpatch { + url = "https://sourceforge.net/p/bricxcc/patches/_discuss/thread/00b427dc/b84b/attachment/nqc-01-Linux_usb_and_tcp.diff"; + sha256 = "sha256-UZmmhhhfLAUus36TOBhiDQ8KUeEdYhGHVFwqKqDIqII="; + }) + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + dontConfigure = true; + + meta = with lib; { + homepage = "https://bricxcc.sourceforge.net/nqc/"; + description = "A programming language for several LEGO MINDSTORMS products including the RCX, CyberMaster, and Scout"; + platforms = platforms.linux; + license = licenses.mpl10; + maintainers = with maintainers; [ christophcharles ]; + }; +} diff --git a/pkgs/development/compilers/nqc/nqc-unistd.patch b/pkgs/development/compilers/nqc/nqc-unistd.patch new file mode 100644 index 000000000000..7abf37f93ca7 --- /dev/null +++ b/pkgs/development/compilers/nqc/nqc-unistd.patch @@ -0,0 +1,11 @@ +diff -ruN nqc-3.1.r6-old/compiler/lexer.cpp nqc-3.1.r6-new/compiler/lexer.cpp +--- nqc-3.1.r6-old/compiler/lexer.cpp 2007-06-06 20:19:10.000000000 +0200 ++++ nqc-3.1.r6-new/compiler/lexer.cpp 2022-10-13 07:57:08.247213954 +0200 +@@ -11,6 +11,7 @@ + #define YY_FLEX_MINOR_VERSION 5 + + #include ++#include + + #if defined(__MWERKS__) && !__MACH__ && !YY_NEVER_INTERACTIVE + #include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74176742d1db..f75bb70d9f55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14612,6 +14612,8 @@ with pkgs; nasmfmt = callPackage ../development/tools/nasmfmt { }; + nqc = callPackage ../development/compilers/nqc { }; + nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; obliv-c = callPackage ../development/compilers/obliv-c From 35ebc8d19390c686bf1858c9c280b70edaf2c49e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 26 Oct 2022 19:54:15 +0200 Subject: [PATCH 04/48] libvgm: unstable-2022-06-18 -> unstable-2022-08-02 --- pkgs/development/libraries/libvgm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index 43b145be62bf..f7c85b292a66 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "libvgm"; - version = "unstable-2022-06-18"; + version = "unstable-2022-08-02"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "001ca758538ca3f82403dff654d82342730b215d"; - sha256 = "O3jvEEW1M0cwZoG6j2ndmuQW4jP0dvt6gGp2BS4VD5s="; + rev = "0e349256338144205303a1495ddc788a854be1eb"; + sha256 = "FNNPiIfBUxkwgEbiFebPGn6ZIxv3ypDefcOzC6r94hE="; }; outputs = [ From c765c2d079a1c305df167ecda4d9e67255d87bc1 Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 27 Oct 2022 22:18:53 +0800 Subject: [PATCH 05/48] jami: 20220726.1515.da8d1da -> 20220825.0828.c10f01f --- .../instant-messengers/jami/client-qt.nix | 4 +-- .../instant-messengers/jami/default.nix | 25 ++++++++----------- .../instant-messengers/jami/update.sh | 4 +-- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/client-qt.nix b/pkgs/applications/networking/instant-messengers/jami/client-qt.nix index 840606bf19a9..7733b05168b6 100644 --- a/pkgs/applications/networking/instant-messengers/jami/client-qt.nix +++ b/pkgs/applications/networking/instant-messengers/jami/client-qt.nix @@ -21,7 +21,7 @@ , qtsvg , qtwebengine , qtwebchannel -, withWebengine ? false +, withWebengine ? true }: stdenv.mkDerivation { @@ -32,7 +32,7 @@ stdenv.mkDerivation { preConfigure = '' python gen-resources.py - echo 'const char VERSION_STRING[] = "${version}";' > src/version.h + echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h ''; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 5982b9b0dded..a2d53141f413 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -3,7 +3,7 @@ , callPackage , fetchFromGitHub , fetchzip -, ffmpeg_4 +, ffmpeg , pjsip , opendht , jack @@ -12,11 +12,11 @@ }: let - version = "20220726.1515.da8d1da"; + version = "20220825.0828.c10f01f"; src = fetchzip { url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - hash = "sha256-yK+xo+YpNYmmWyNAE31hiL6HLvDdEFkm8FO6LQmPCL0="; + hash = "sha256-axQYU7+kOFE9SnI8fR4F6NFvD9ITZ85UJhg5OVniSlg="; stripRoot = false; postFetch = '' @@ -40,7 +40,12 @@ let readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); in rec { - ffmpeg-jami = ffmpeg_4.overrideAttrs (old: + ffmpeg-jami = (ffmpeg.override rec { + version = "5.0.1"; + branch = version; + sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY="; + doCheck = false; + }).overrideAttrs (old: let patch-src = src + "/daemon/contrib/src/ffmpeg/"; in @@ -51,10 +56,6 @@ rec { ++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux) ++ lib.optionals (stdenv.isx86_32 || stdenv.isx86_64) (readLinesToList ./config/ffmpeg_args_x86); outputs = [ "out" "doc" ]; - meta = old.meta // { - # undefined reference to `ff_nlmeans_init_aarch64' - broken = stdenv.isAarch64; - }; }); pjsip-jami = pjsip.overrideAttrs (old: @@ -62,23 +63,19 @@ rec { patch-src = src + "/daemon/contrib/src/pjproject/"; in rec { - version = "4af5d666d18837abaac94c8ec6bfc84984dcf1e2"; + version = "513a3f14c44b2c2652f9219ec20dea64b236b713"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "pjproject"; rev = version; - sha256 = "sha256-ENRfQh/HCXqInTV0tu8tGQO7+vTbST6XXpptERXMACE="; + sha256 = "sha256-93AlJGMnlzJMrJquelpHQQKjhEgfpTFXTMqkBnm87u8="; }; patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); configureFlags = (readLinesToList ./config/pjsip_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); - - meta = { - knownVulnerabilities = [ "CVE-2022-39269" "CVE-2022-39244" ]; - } // old.meta; }); opendht-jami = opendht.override { diff --git a/pkgs/applications/networking/instant-messengers/jami/update.sh b/pkgs/applications/networking/instant-messengers/jami/update.sh index abc7728e0703..27472d568c28 100755 --- a/pkgs/applications/networking/instant-messengers/jami/update.sh +++ b/pkgs/applications/networking/instant-messengers/jami/update.sh @@ -13,7 +13,7 @@ echo "Latest version: ${version}" update-source-version jami-daemon "$version" --file=$jami_dir/default.nix -src=$(nix-build --no-out-link -A jami-libclient.src) +src=$(nix-build --no-out-link -A jami-daemon.src) config_dir="$jami_dir/config" mkdir -p $config_dir @@ -47,7 +47,7 @@ echo "${pjsip_patches}" > "$config_dir/pjsip_patches" # Update pjsip version pjsip_version=$(sed -n -E 's/.*PJPROJECT_VERSION := ([0-9a-f]+).*/\1/p' ${src}/daemon/contrib/src/pjproject/rules.mak) -update-source-version jami-daemon.pjsip "$pjsip_version" --file=pkgs/applications/networking/instant-messengers/jami/daemon.nix +update-source-version jami.pjsip-jami "$pjsip_version" --file=$jami_dir/default.nix pjsip_rules="${src}/daemon/contrib/src/pjproject/rules.mak" From 42b5fa9e3b6537c290c755440bb370afe8ed526a Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 29 Oct 2022 17:53:58 +0200 Subject: [PATCH 06/48] mysql57: remove derivation files `mysql57` was dropped in a5c9290979cc03b30284f02e7002a35f2c609cd1 but the derivation files were kept. They can now be removed. --- pkgs/servers/sql/mysql/5.7.x.nix | 94 ------------------- .../mysql-5.7-add-protobuf-3.8+-support.patch | 66 ------------- 2 files changed, 160 deletions(-) delete mode 100644 pkgs/servers/sql/mysql/5.7.x.nix delete mode 100644 pkgs/servers/sql/mysql/mysql-5.7-add-protobuf-3.8+-support.patch diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix deleted file mode 100644 index ea8842c5695f..000000000000 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, bison, pkg-config, nukeReferences -, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl -, cctools, CoreServices, developer_cmds -, libtirpc, rpcsvc-proto, nixosTests -}: - -# Note: zlib is not required; MySQL can use an internal zlib. - -let -self = stdenv.mkDerivation rec { - pname = "mysql"; - version = "5.7.39"; - - src = fetchurl { - url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz"; - sha256 = "sha256-ERw6ypGJfkUwOds5GkdSZeAg/ZIcuXMHwACEqI5NYQQ="; - }; - - patches = [ - ./mysql-5.7-add-protobuf-3.8+-support.patch - ]; - - preConfigure = lib.optionalString stdenv.isDarwin '' - ln -s /bin/ps $TMPDIR/ps - export PATH=$PATH:$TMPDIR - ''; - - nativeBuildInputs = [ bison cmake pkg-config nukeReferences ] - ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; - - buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ] - ++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ] - ++ lib.optionals stdenv.isLinux [ libtirpc ]; - - outputs = [ "out" "static" ]; - - cmakeFlags = [ - "-DWITH_SSL=yes" - "-DWITH_EMBEDDED_SERVER=yes" - "-DWITH_UNIT_TESTS=no" - "-DWITH_EDITLINE=system" - "-DWITH_LIBEVENT=system" - "-DWITH_LZ4=system" - "-DWITH_PROTOBUF=system" - "-DWITH_ZLIB=system" - "-DWITH_ARCHIVE_STORAGE_ENGINE=yes" - "-DWITH_BLACKHOLE_STORAGE_ENGINE=yes" - "-DWITH_FEDERATED_STORAGE_ENGINE=yes" - "-DHAVE_IPV6=yes" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" - "-DMYSQL_DATADIR=/var/lib/mysql" - "-DINSTALL_INFODIR=share/mysql/docs" - "-DINSTALL_MANDIR=share/man" - "-DINSTALL_PLUGINDIR=lib/mysql/plugin" - "-DINSTALL_SCRIPTDIR=bin" - "-DINSTALL_INCLUDEDIR=include/mysql" - "-DINSTALL_DOCREADMEDIR=share/mysql" - "-DINSTALL_SUPPORTFILESDIR=share/mysql" - "-DINSTALL_MYSQLSHAREDIR=share/mysql" - "-DINSTALL_MYSQLTESTDIR=" - "-DINSTALL_DOCDIR=share/mysql/docs" - "-DINSTALL_SHAREDIR=share/mysql" - ]; - - CXXFLAGS = "-fpermissive -std=c++11"; - NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; - - prePatch = '' - sed -i -e "s|/usr/bin/libtool|libtool|" cmake/merge_archives.cmake.in - ''; - postInstall = '' - nuke-refs "$out/share/mysql/docs/INFO_BIN" - moveToOutput "lib/*.a" $static - ln -s libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libmysqlclient_r${stdenv.hostPlatform.extensions.sharedLibrary} - ''; - - passthru = { - client = self; - connector-c = self; - server = self; - mysqlVersion = "5.7"; - tests = nixosTests.mysql.mysql57; - }; - - meta = with lib; { - homepage = "https://www.mysql.com/"; - description = "The world's most popular open source database"; - platforms = platforms.unix; - license = with licenses; [ - artistic1 bsd0 bsd2 bsd3 bsdOriginal - gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib - ]; - }; -}; in self diff --git a/pkgs/servers/sql/mysql/mysql-5.7-add-protobuf-3.8+-support.patch b/pkgs/servers/sql/mysql/mysql-5.7-add-protobuf-3.8+-support.patch deleted file mode 100644 index 99c90ebd33bc..000000000000 --- a/pkgs/servers/sql/mysql/mysql-5.7-add-protobuf-3.8+-support.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake -index a935227e523..b4ebd61c5c1 100644 ---- a/cmake/build_configurations/compiler_options.cmake -+++ b/cmake/build_configurations/compiler_options.cmake -@@ -43,7 +43,7 @@ IF(UNIX) - - # Default GCC flags - IF(CMAKE_COMPILER_IS_GNUCC) -- SET(COMMON_C_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -+ SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing") - # Disable inline optimizations for valgrind testing to avoid false positives - IF(WITH_VALGRIND) - STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ") -@@ -68,7 +68,7 @@ IF(UNIX) - ENDIF() - ENDIF() - IF(CMAKE_COMPILER_IS_GNUCXX) -- SET(COMMON_CXX_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -+ SET(COMMON_CXX_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing") - # GCC 6 has C++14 as default, set it explicitly to the old default. - EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion - OUTPUT_VARIABLE GXX_VERSION) -diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc b/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc -index 5dc91ba269c..3a45284859f 100644 ---- a/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc -+++ b/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc -@@ -629,12 +629,12 @@ class ErrorDumper : public ::google::protobuf::io::ErrorCollector - std::stringstream m_out; - - public: -- virtual void AddError(int line, int column, const string & message) -+ virtual void AddError(int line, int column, const std::string & message) - { - m_out << "ERROR in message: line " << line+1 << ": column " << column << ": " << message<<"\n"; - } - -- virtual void AddWarning(int line, int column, const string & message) -+ virtual void AddWarning(int line, int column, const std::string & message) - { - m_out << "WARNING in message: line " << line+1 << ": column " << column << ": " << message<<"\n"; - } -diff --git a/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h b/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h -index 90f7cc77a39..cf6c607a818 100644 ---- a/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h -+++ b/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h -@@ -36,7 +36,6 @@ - #include - #include - #include --#include - #include - - #include "mysqlx_connection.pb.h" -diff --git a/rapid/plugin/x/ngs/src/protocol_decoder.cc b/rapid/plugin/x/ngs/src/protocol_decoder.cc -index 298b6a6884c..fae21d18f78 100644 ---- a/rapid/plugin/x/ngs/src/protocol_decoder.cc -+++ b/rapid/plugin/x/ngs/src/protocol_decoder.cc -@@ -123,7 +123,7 @@ Error_code Message_decoder::parse(Request &request) - google::protobuf::io::CodedInputStream stream(reinterpret_cast(request.buffer()), - static_cast(request.buffer_size())); - // variable 'mysqlx_max_allowed_packet' has been checked when buffer was filling by data -- stream.SetTotalBytesLimit(static_cast(request.buffer_size()), -1 /*no warnings*/); -+ stream.SetTotalBytesLimit(static_cast(request.buffer_size())); - // Protobuf limits the number of nested objects when decoding messages - // lets set the value in explicit way (to ensure that is set accordingly with - // out stack size) \ No newline at end of file From c3704d95926c030be80fe8de124bd6ada22077f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 08:18:01 +0000 Subject: [PATCH 07/48] victoriametrics: 1.82.1 -> 1.83.0 --- pkgs/servers/nosql/victoriametrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 871e3307f096..9cad03c58af9 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.82.1"; + version = "1.83.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Lor4rpL19xc/eA2quJ1D0WrJiviEcKnArBKUQhb9Z0k="; + sha256 = "sha256-bc13aIo2gCHZfBRbi5CoPLcCGoNJgTuWJbCwqX/QgtU="; }; vendorSha256 = null; From 8d3fe232e31a7b945c4613923e9395ed6152375f Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Sun, 30 Oct 2022 16:47:12 +0100 Subject: [PATCH 08/48] linux: Set CONFIG_NO_HZ_FULL=y. CONFIG_NO_HZ_FULL=y should be set to enable the `nohz_full=` and `rcu_nocbs=` options. These carry no additional performance penalty compared to CONFIG_NO_HZ_IDLE and behaves like it by default, but allows disabling the tick interrupts on cores for power or performance reasons. [Debian][1] also applied the change to all their kernels. Like the Kernel says: "If you're a distro say Y." [1]: https://salsa.debian.org/kernel-team/linux/-/commit/f6aad27f05c007d6f30b34ff77bc7ea47844f117 --- pkgs/os-specific/linux/kernel/common-config.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 57fe7420f481..3c1bbb73fda5 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -114,6 +114,12 @@ let IOSCHED_BFQ = whenAtLeast "4.12" module; }; + + timer = { + # Enable Full Dynticks System. + NO_HZ_FULL = yes; + }; + # Enable NUMA. numa = { NUMA = option yes; From 5c6415411e74c1ddc648e78eb1c8d53baddb4885 Mon Sep 17 00:00:00 2001 From: Andrei Boar Date: Mon, 31 Oct 2022 10:20:12 +0200 Subject: [PATCH 09/48] bob: 0.6.2 -> 0.6.3 --- pkgs/development/tools/build-managers/bob/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/development/tools/build-managers/bob/default.nix index 21429b1c7522..d5b86139cb16 100644 --- a/pkgs/development/tools/build-managers/bob/default.nix +++ b/pkgs/development/tools/build-managers/bob/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "bob"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "benchkram"; repo = pname; rev = version; - hash = "sha256-Bq/BL45EN4h7eV1glCkuVqUhZCrDS5b5mVg6JJxlTD4="; + hash = "sha256-jZDyZVjo4Purt2tabJew5N4MZmLXli6gqBTejv5FGJM="; }; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; - vendorHash = "sha256-jakmXkDHjcA1BOIorrP2ZukcJhosbkJoC+Y/+wAPBCc="; + vendorHash = "sha256-dmMoFyl9IX0QS6sNC6qzC4DQQQfvxmxuUeUfx0DBd/I="; excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ]; From e33fbda0979ac9c3c20a975fdfb0b8ebde06cd4f Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Mon, 31 Oct 2022 08:24:57 +0000 Subject: [PATCH 10/48] =?UTF-8?q?webex:=2042.7.0.22904=20=E2=86=92=2042.10?= =?UTF-8?q?.0.24000?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/instant-messengers/webex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/applications/networking/instant-messengers/webex/default.nix index bd75eb06f6f0..f28cc3c25f6e 100644 --- a/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "42.7.0.22904"; + version = "42.10.0.24000"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20220907184519/Webex_ubuntu.7z"; - sha256 = "731ec24d95243171649213b19a1709bef98846fd631f54a27d11fe16ebcc7d33"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20221019145240/Webex_ubuntu.7z"; + sha256 = "03b77a3fcce76f04cf684bcdecb3bcce97c5a8b6cc36b40967cc14fa9a46c102"; }; buildInputs = [ From ed7511ad0229e8e84662693642e0831e2509dd73 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 30 Oct 2022 06:53:28 +0000 Subject: [PATCH 11/48] mmseqs2: init at 14-7e284 --- .../science/biology/mmseqs2/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/science/biology/mmseqs2/default.nix diff --git a/pkgs/applications/science/biology/mmseqs2/default.nix b/pkgs/applications/science/biology/mmseqs2/default.nix new file mode 100644 index 000000000000..253f4a43a81c --- /dev/null +++ b/pkgs/applications/science/biology/mmseqs2/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, xxd +, perl +, installShellFiles +, enableAvx2 ? stdenv.hostPlatform.avx2Support +, enableSse4_1 ? stdenv.hostPlatform.sse4_1Support +, enableMpi ? false +, mpi +, openmp +, zlib +, bzip2 +}: + +stdenv.mkDerivation rec { + pname = "mmseqs2"; + version = "14-7e284"; + + src = fetchFromGitHub { + owner = "soedinglab"; + repo = pname; + rev = version; + sha256 = "sha256-pVryZGblgMEqJl5M20CHxav269yGY6Y4ci+Gxt6SHOU="; + }; + + nativeBuildInputs = [ cmake xxd perl installShellFiles ]; + cmakeFlags = + lib.optional enableAvx2 "-DHAVE_AVX2=1" + ++ lib.optional enableSse4_1 "-DHAVE_SSE4_1=1" + ++ lib.optional enableMpi "-DHAVE_MPI=1"; + + buildInputs = + lib.optionals stdenv.cc.isClang [ openmp zlib bzip2 ] + ++ lib.optional enableMpi mpi; + + postInstall = '' + installShellCompletion --bash --cmd mmseqs $out/util/bash-completion.sh + rm -r $out/util/ + ''; + + meta = with lib; { + description = "Ultra fast and sensitive sequence search and clustering suite"; + homepage = "https://mmseqs.com/"; + license = licenses.gpl3; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69fff1388b2e..cc02ac4238ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35165,6 +35165,10 @@ with pkgs; minimap2 = callPackage ../applications/science/biology/minimap2 { }; + mmseqs2 = callPackage ../applications/science/biology/mmseqs2 { + inherit (llvmPackages) openmp; + }; + mosdepth = callPackage ../applications/science/biology/mosdepth { }; niftyreg = callPackage ../applications/science/biology/niftyreg { }; From 204fa120175de74d7d673571054f98d71526187b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 31 Oct 2022 18:10:51 +0100 Subject: [PATCH 12/48] =?UTF-8?q?php.packages.psalm:=204.25.0=20=E2=86=92?= =?UTF-8?q?=204.29.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/vimeo/psalm/releases/tag/4.26.0 https://github.com/vimeo/psalm/releases/tag/4.27.0 https://github.com/vimeo/psalm/releases/tag/4.28.0 https://github.com/vimeo/psalm/releases/tag/4.29.0 --- pkgs/development/php-packages/psalm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index e3f291452628..f092d1a8b199 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "psalm"; - version = "4.25.0"; + version = "4.29.0"; in mkDerivation { inherit pname version; src = fetchurl { - url = "https://github.com/vimeo/psalm/releases/download/v${version}/psalm.phar"; - sha256 = "sha256-bEv9YzBycN+fs3DeAU/QpuOvsmUFLgrltGEe2KuUM0c="; + url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; + sha256 = "q+OjEPNAPwSjtnbfBynbbJy3WDITr01ci8O74BMO0Og="; }; dontUnpack = true; From 0a242b15735b7375e9842d54545f3b8dd93c3ddf Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 31 Oct 2022 17:21:58 +0000 Subject: [PATCH 13/48] linux_xanmod_tt: remove --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 14 -------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/linux-kernels.nix | 4 ++-- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 8ec761a701a3..34bf83b9dc46 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -20,13 +20,6 @@ let variant = "next"; }; - ttVariant = { - version = "5.15.54"; - suffix = "xanmod1-tt"; - hash = "sha256-4ck9PAFuIt/TxA/U+moGlVfCudJnzSuAw7ooFG3OJis="; - variant = "tt"; - }; - xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec { inherit version; modDirVersion = "${version}-${suffix}"; @@ -56,12 +49,6 @@ let # WineSync driver for fast kernel-backed Wine WINESYNC = module; - } // lib.optionalAttrs (variant == "tt") { - # removed options - CFS_BANDWIDTH = lib.mkForce (option no); - RT_GROUP_SCHED = lib.mkForce (option no); - SCHED_AUTOGROUP = lib.mkForce (option no); - SCHED_CORE = lib.mkForce (option no); }; extraMeta = { @@ -76,5 +63,4 @@ in lts = xanmodKernelFor ltsVariant; current = xanmodKernelFor currentVariant; next = xanmodKernelFor nextVariant; - tt = xanmodKernelFor ttVariant; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ac16901e15bd..81337dfb5784 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -836,6 +836,8 @@ mapAliases ({ linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 + linuxPackages_xanmod_tt = throw "linuxPackages_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 # Added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ef2108e841f..e1c581e0ca10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25148,8 +25148,6 @@ with pkgs; linux_xanmod_stable = linuxKernel.kernels.linux_xanmod_stable; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; - linuxPackages_xanmod_tt = linuxKernel.packages.linux_xanmod_tt; - linux_xanmod_tt = linuxKernel.kernels.linux_xanmod_tt; linux-doc = callPackage ../os-specific/linux/kernel/htmldocs.nix { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 766edb74b5e8..5faf6d0172a2 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -234,7 +234,7 @@ in { linux_xanmod = xanmodKernels.lts; linux_xanmod_stable = xanmodKernels.current; linux_xanmod_latest = xanmodKernels.next; - linux_xanmod_tt = xanmodKernels.tt; + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; linux_libre = deblobKernel packageAliases.linux_default.kernel; @@ -583,7 +583,7 @@ in { linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable); linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); - linux_xanmod_tt = recurseIntoAttrs (packagesFor kernels.linux_xanmod_tt); + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; hardkernel_4_14 = recurseIntoAttrs (packagesFor kernels.linux_hardkernel_4_14); From 94a1409703818f8fc7af81a1ff3bcfa97af1fe36 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 31 Oct 2022 17:28:40 +0000 Subject: [PATCH 14/48] linux_xanmod_stable: remove --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 7 ------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/linux-kernels.nix | 4 ++-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 34bf83b9dc46..8e1726693b66 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -8,12 +8,6 @@ let variant = "lts"; }; - currentVariant = { - version = "5.19.13"; - hash = "sha256-BzQH4c24CtE3R5HNe2sOc3McVkRmf/RKOOjuf1W4YfE="; - variant = "current"; - }; - nextVariant = { version = "6.0.0"; hash = "sha256-E7T8eHwMKYShv4KWdCbHQmpn+54edJoKdimZY3GFbPU="; @@ -61,6 +55,5 @@ let in { lts = xanmodKernelFor ltsVariant; - current = xanmodKernelFor currentVariant; next = xanmodKernelFor nextVariant; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 81337dfb5784..5e27e59594bd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -836,6 +836,8 @@ mapAliases ({ linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; + linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; + linuxPackages_xanmod_stable = throw "linuxPackages_xanmod_stable was removed because it has reached its end of life upstream"; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 linuxPackages_xanmod_tt = throw "linuxPackages_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1c581e0ca10..b04e0245fd24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25144,8 +25144,6 @@ with pkgs; # XanMod kernel linuxPackages_xanmod = linuxKernel.packages.linux_xanmod; linux_xanmod = linuxKernel.kernels.linux_xanmod; - linuxPackages_xanmod_stable = linuxKernel.packages.linux_xanmod_stable; - linux_xanmod_stable = linuxKernel.kernels.linux_xanmod_stable; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5faf6d0172a2..1cf7b5b02b99 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -232,7 +232,7 @@ in { }; linux_xanmod = xanmodKernels.lts; - linux_xanmod_stable = xanmodKernels.current; + linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; linux_xanmod_latest = xanmodKernels.next; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; @@ -581,7 +581,7 @@ in { linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); - linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable); + linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; From ebc901cc8eee5252d9a55dd8dcb2c4ad29d09bd9 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 31 Oct 2022 17:46:51 +0000 Subject: [PATCH 15/48] linux_xanmod: 5.15.70 -> 5.15.75 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 8e1726693b66..b3ed0b165778 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,8 +3,8 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "5.15.70"; - hash = "sha256-gMtGoj/HzMqd6Y3PSc6QTsu/PI7vfb+1pg4mt878cxs="; + version = "5.15.75"; + hash = "sha256-tgm5nmguEfRFq3OhmZgRgFLIW7E798Rv1basxnfdqLI="; variant = "lts"; }; From ec9b92c9f12f164af6edbd6cdadb1fa6822da637 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 31 Oct 2022 17:57:16 +0000 Subject: [PATCH 16/48] linux_xanmod_latest: 6.0.0 -> 6.0.6 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 10 +++++----- pkgs/top-level/linux-kernels.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index b3ed0b165778..d4c31e555f42 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -8,10 +8,10 @@ let variant = "lts"; }; - nextVariant = { - version = "6.0.0"; - hash = "sha256-E7T8eHwMKYShv4KWdCbHQmpn+54edJoKdimZY3GFbPU="; - variant = "next"; + mainVariant = { + version = "6.0.6"; + hash = "sha256-JMfAtiPDgoVF+ypeFXev06PL39ZM2H7m07IxpasjAoM="; + variant = "main"; }; xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec { @@ -55,5 +55,5 @@ let in { lts = xanmodKernelFor ltsVariant; - next = xanmodKernelFor nextVariant; + main = xanmodKernelFor mainVariant; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 1cf7b5b02b99..2a075155e43f 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -233,7 +233,7 @@ in { linux_xanmod = xanmodKernels.lts; linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; - linux_xanmod_latest = xanmodKernels.next; + linux_xanmod_latest = xanmodKernels.main; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; linux_libre = deblobKernel packageAliases.linux_default.kernel; From d68e6bd1cf36ed3b33a71b0385fa238ab3721f04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 18:18:48 +0000 Subject: [PATCH 17/48] grcov: 0.8.12 -> 0.8.13 --- pkgs/development/tools/misc/grcov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/grcov/default.nix b/pkgs/development/tools/misc/grcov/default.nix index bffa7e551123..e4a0f1632a38 100644 --- a/pkgs/development/tools/misc/grcov/default.nix +++ b/pkgs/development/tools/misc/grcov/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "grcov"; - version = "0.8.12"; + version = "0.8.13"; src = fetchFromGitHub { owner = "mozilla"; repo = pname; rev = "v${version}"; - sha256 = "sha256-any14rCn4hE4j2AM4H4jSHIB9qTgPYb6dCZqoRerxXE="; + sha256 = "sha256-fyITsOlkBY1f9AjQqUII7G1Onm0i0FIqNspPi8J+eOM="; }; - cargoSha256 = "sha256-uY/PCYqtoqffod6Ts7LsRY7YWN2O8d5J73rO6Tr12eM="; + cargoSha256 = "sha256-qbxJJGwJ7hRNIujud10AYnM2NaNwjBB5zhOxXp/5z/k="; # tests do not find grcov path correctly checkFlags = let From f7431885c063059822f1cc6e8759c23c8c21a8fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 18:59:22 +0000 Subject: [PATCH 18/48] irssi: 1.4.2 -> 1.4.3 --- pkgs/applications/networking/irc/irssi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index b04cd2e07aab..f9563313f2fb 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "irssi"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "irssi"; repo = "irssi"; rev = version; - hash = "sha256-dQZ/CeBfcfWGjKPF3fR62JDqyEXGv5hd9VT4OEbgJhQ="; + hash = "sha256-wRJp4KfI+2IAJ70XW7+0LR83cRvS/SGq7CpDVuc636Q="; }; nativeBuildInputs = [ From 3e23abf416d65b14a6cd5219c6455a3edcf07085 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 19:09:53 +0000 Subject: [PATCH 19/48] python310Packages.ansible-compat: 2.2.1 -> 2.2.3 --- pkgs/development/python-modules/ansible-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index fdbec256dd21..bd2e59d9b45a 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "2.2.1"; + version = "2.2.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-egEnU6CgLasvIrDldOPnsAOZ9mBgYVRHT/4lYh+oDTs="; + sha256 = "sha256-H06GH6OwhDaIrdMsWHOyCEjr75bvcV0dgI0mWDViBCg="; }; nativeBuildInputs = [ From 75bb9aeda42b39a417031d80b47500d8a3b4c640 Mon Sep 17 00:00:00 2001 From: Shyim Date: Mon, 31 Oct 2022 19:50:17 +0000 Subject: [PATCH 20/48] phpPackages.box: 3.16.0 -> 4.1.0 --- pkgs/development/php-packages/box/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index 97b9bbc0f11e..0ba58139710b 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "box"; - version = "3.16.0"; + version = "4.1.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/box-project/box/releases/download/${version}/box.phar"; - sha256 = "sha256-9QjijzCdfpWjGb3NXxPc+7GOuRy3psrJtpvHeZ14vfk="; + sha256 = "sha256-DtrTsCocCpLngiEPrKBrFeU+OnND8AoI83g+Y7+zHzs="; }; dontUnpack = true; From d9ca370401d7673f71ae9a74e33e0840a72e5156 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 31 Oct 2022 22:46:45 +0100 Subject: [PATCH 21/48] python310Packages.python-bsblan: 0.5.6 -> 0.5.7 --- pkgs/development/python-modules/python-bsblan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 73f41f63b121..ada950cd8aab 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.6"; + version = "0.5.7"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "liudger"; repo = pname; rev = "v${version}"; - hash = "sha256-eTKexiuomlTryy2bD2w9Pzhb4R9C3OIbLNX+7h/5l+c="; + hash = "sha256-eavARej+R8SPNuwX6LOGr43SJi1AuZszThJVG00vKhQ="; }; nativeBuildInputs = [ From d7266ab6d67899085c19888cf16a8b89ea2f334f Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 28 Oct 2022 22:18:37 +0200 Subject: [PATCH 22/48] commitizen: 2.35.0 -> 2.37.0 --- pkgs/applications/version-management/commitizen/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index bd5e22dc3c6f..959a2e1cb35b 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -21,13 +21,13 @@ buildPythonApplication rec { pname = "commitizen"; - version = "2.35.0"; + version = "2.37.0"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - hash = "sha256-9ek6m5k01sGVHwqWXjWYDsPmIeAgK+H23D9sF5hjrf0="; + hash = "sha256-wo1I6QDWLxByHISmkPdass+BcKh0oxR5hD31UN/5+WQ="; deepClone = true; }; @@ -83,6 +83,7 @@ buildPythonApplication rec { meta = with lib; { description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs"; homepage = "https://github.com/commitizen-tools/commitizen"; + changelog = "https://github.com/commitizen-tools/commitizen/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault anthonyroussel ]; }; From f51e59f2341faf2420a96d20cd445027eae37518 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 28 Oct 2022 22:20:06 +0200 Subject: [PATCH 23/48] commitizen: add passthru.updateScript --- pkgs/applications/version-management/commitizen/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index 959a2e1cb35b..274eb3a0070f 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -17,6 +17,7 @@ , tomlkit , typing-extensions , argcomplete +, nix-update-script }: buildPythonApplication rec { @@ -80,6 +81,10 @@ buildPythonApplication rec { "test_get_commits_with_signature" ]; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs"; homepage = "https://github.com/commitizen-tools/commitizen"; From 01d8e02175668df2e7a8b2f8729cef51d8c589f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 23:52:24 +0000 Subject: [PATCH 24/48] nix-eval-jobs: 2.9.0 -> 2.11.0 --- pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 7e3f489b084a..3028903cb948 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.9.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-fN9D1rqJ4UFmCykTK8cU0oPWqN3wR8m9/zQ6fwVdBcY="; + hash = "sha256-xgXYe/IJfGhLc1D9q+QdPHsjUlq10oKBbEn9AR37pn8="; }; buildInputs = [ boost From 6b0998378502ff54029c729db6f96d16a7e8dc05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Nov 2022 01:04:57 +0100 Subject: [PATCH 25/48] python310Packages.tank-utility: bypass detection of urllib3[secure] --- pkgs/development/python-modules/tank-utility/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tank-utility/default.nix b/pkgs/development/python-modules/tank-utility/default.nix index ebcec39f862d..658920abbed1 100644 --- a/pkgs/development/python-modules/tank-utility/default.nix +++ b/pkgs/development/python-modules/tank-utility/default.nix @@ -24,6 +24,12 @@ buildPythonPackage rec { hash = "sha256-2cxAaSyreIzQzCUtiolEV7JbGFKL8Mob3337J0jlMsU="; }; + postPatch = '' + # urllib3[secure] is not picked-up + substituteInPlace setup.py \ + --replace "urllib3[secure]" "urllib3" + ''; + propagatedBuildInputs = [ requests urllib3 @@ -31,12 +37,11 @@ buildPythonPackage rec { ] ++ urllib3.optional-dependencies.secure; checkInputs = [ - responses mock pytestCheckHook + responses ]; - pythonImportsCheck = [ "tank_utility" ]; From 4fe2fe1a51238c8c1d6721f7ce49ba44b770d92d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 1 Nov 2022 01:53:12 +0100 Subject: [PATCH 26/48] lpcnetfreedv: unstable-2021-06-29 -> unstable-2022-08-22 --- pkgs/development/libraries/lpcnetfreedv/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/lpcnetfreedv/default.nix b/pkgs/development/libraries/lpcnetfreedv/default.nix index 33b295b9a1ec..b3b1d7059d81 100644 --- a/pkgs/development/libraries/lpcnetfreedv/default.nix +++ b/pkgs/development/libraries/lpcnetfreedv/default.nix @@ -4,21 +4,21 @@ let dataVersion = "191005_v1.0"; data = fetchurl { url = "http://rowetel.com/downloads/deep/lpcnet_${dataVersion}.tgz"; - sha256 = "1j1695hm2pg6ri611f9kr3spm4yxvpikws55z9zxizai8y94152h"; + sha256 = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg="; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "lpcnetfreedv"; - version = "unstable-2021-06-29"; + version = "unstable-2022-08-22"; src = fetchFromGitHub { owner = "drowe67"; repo = "LPCNet"; - rev = "0dc5935bbf49ff3ba3c9654cc2f802838ebbaead"; - sha256 = "0r6488z40fkar11ync8achpg5l6qz7y7cbh7cs3b3w4fsxn58q9i"; + rev = "67a6eb74d0c07faddcdce199856862cc45779d25"; + sha256 = "sha256-eHYZoDgoZBuuLvQn9X7H/zmK5onOAniOgY1/8RVn8gk="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ codec2 ]; postPatch = '' mkdir build From 3f25fcd6602920c290aff915c78538bc32e3caa5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 1 Nov 2022 01:53:25 +0100 Subject: [PATCH 27/48] codec2: add freedv support --- pkgs/development/libraries/codec2/default.nix | 15 ++++++++++++++- pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 303965b34b63..018ef10aebd5 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, freedvSupport ? false +, lpcnetfreedv +, codec2 +}: stdenv.mkDerivation rec { pname = "codec2"; @@ -13,6 +20,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals freedvSupport [ + lpcnetfreedv + ]; + # Install a binary that is used by openwebrx postInstall = '' install -Dm0755 src/freedv_rx -t $out/bin/ @@ -26,6 +37,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ # RPATH of binary /nix/store/.../bin/freedv_rx contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" + ] ++ lib.optionals freedvSupport [ + "-DLPCNET=ON" ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f923ae0d2456..cd2eaffd33a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28614,6 +28614,9 @@ with pkgs; freedv = callPackage ../applications/radio/freedv { inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia; + codec2 = codec2.override { + freedvSupport = true; + }; }; freemind = callPackage ../applications/misc/freemind { From 30507f88ad9c7ee5d91c53b954226eb0b11cc6cd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 1 Nov 2022 01:53:31 +0100 Subject: [PATCH 28/48] freedv: 1.8.3.1 -> 1.8.4 --- pkgs/applications/radio/freedv/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index ba8646885482..b648c04577e0 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.8.3.1"; + version = "1.8.4"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-LPCY5gPinxJkfPfumKggI/JQorcW+Qw/ZAP6XQmPkeA="; + hash = "sha256-X/jL6q2yLNtRq7Xg9JeXu1zXD0KCs59D1poA9hM3Ndo="; }; postPatch = lib.optionalString stdenv.isDarwin '' @@ -58,12 +58,15 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_INTERNAL_CODEC2:BOOL=FALSE" "-DUSE_STATIC_DEPS:BOOL=FALSE" + "-DUNITTEST=ON" ] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ]; NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-DAPPLE_OLD_XCODE" ]; + doCheck = true; + meta = with lib; { homepage = "https://freedv.org/"; description = "Digital voice for HF radio"; From 8960d62f97da1bd6ed90cde867753cec0f6d0817 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 02:58:50 +0000 Subject: [PATCH 29/48] python310Packages.emoji: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/emoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index ba94db33016d..a25458d6fc72 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "emoji"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "carpedm20"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mcbrlPD2BHjm4WJQZrymv+2wK2NUjv+qvpD/G7iCjwA="; + hash = "sha256-3mCzbFuBIMdF6tbKLxqNKAO50vaRWeOxpydJ4ZeE+Vc="; }; checkInputs = [ From 940a3b6ea685ddd1642f4dff1c7553ae8ea7d3e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 03:36:57 +0000 Subject: [PATCH 30/48] python310Packages.findpython: 0.2.1 -> 0.2.2 --- pkgs/development/python-modules/findpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index e1d0850c9a6f..0e5892f58663 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.2.1"; + version = "0.2.2"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-Q5Shy828+NEOo0OeLYCGsuwHRQcJe25tvuGAKMblKwg="; + hash = "sha256-gFV5YcBM8cjEukyjrHz3bsJ/qSeIpq9Cy3AeNFDElDA="; }; nativeBuildInputs = [ From 0b7786987ae955362ec83a3dc017f4eda9afa7b6 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Tue, 1 Nov 2022 05:49:18 +0000 Subject: [PATCH 31/48] linux_xanmod: add additional kconfig options --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index d4c31e555f42..2ac516175f02 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -33,6 +33,10 @@ let TCP_CONG_BBR2 = yes; DEFAULT_BBR2 = yes; + # Google's Multigenerational LRU framework + LRU_GEN = yes; + LRU_GEN_ENABLED = yes; + # FQ-PIE Packet Scheduling NET_SCH_DEFAULT = yes; DEFAULT_FQ_PIE = yes; @@ -43,6 +47,11 @@ let # WineSync driver for fast kernel-backed Wine WINESYNC = module; + + # Preemptive Full Tickless Kernel at 500Hz + HZ = freeform "500"; + HZ_500 = yes; + HZ_1000 = no; }; extraMeta = { From 59dbe99544ef34f3daf08c3380f9cc408e30d84d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 06:06:55 +0000 Subject: [PATCH 32/48] python310Packages.jupyterlab_server: 2.16.1 -> 2.16.2 --- pkgs/development/python-modules/jupyterlab_server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 1b16814eabc2..0d9d1cb59716 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.16.1"; + version = "2.16.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/g3lWP87tEejLiQJmqfhdET9vIwI9tvAFxyxoK44LT8="; + hash = "sha256-BwB6Ogowv8ZCSyi3bfjWc4bMLV+fQohnc7GzxHPLmj8="; }; nativeBuildInputs = [ From 46f39aef702f189f37c071733209e3cd889134cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 06:23:31 +0000 Subject: [PATCH 33/48] python310Packages.libpyfoscam: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/libpyfoscam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libpyfoscam/default.nix b/pkgs/development/python-modules/libpyfoscam/default.nix index 519d57eb8c58..472c53f72ca9 100644 --- a/pkgs/development/python-modules/libpyfoscam/default.nix +++ b/pkgs/development/python-modules/libpyfoscam/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "libpyfoscam"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2E6zQT86UEOKoFnAfXfeWt352HIdOQZBGy5vR0WQO6Y="; + hash = "sha256-FLPerVzx2+3f5biiqt0JHJjBuMIalUBkY+bGb2ShVao="; }; # tests need access to a camera From cef047162364ab07efa308f9de0b26812f0f19a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 07:19:12 +0000 Subject: [PATCH 34/48] sundials: 6.4.0 -> 6.4.1 --- pkgs/development/libraries/sundials/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 6e7b13daaba2..367b7d999eee 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "6.4.0"; + version = "6.4.1"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-Cv+AOhLG0pjQW1aDkZfdCYWGMYZAF+JV7Ynii0m2UvE="; + hash = "sha256-e/EKjSkgWRrz+6LbklSOka1g63JBqyM1CpsbxR4F6NA="; }; nativeBuildInputs = [ From 8f00715ad0d0099c16c3735815e2daf5519abde0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 07:31:45 +0000 Subject: [PATCH 35/48] tar2ext4: 0.9.4 -> 0.9.5 --- pkgs/tools/filesystems/tar2ext4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index 3dfdb86a9a13..daa237437658 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-P2ri+9MDV6ObyAiqUguifjqkPg+8zE+Ha6jgFS5aCsQ="; + sha256 = "sha256-p64BQlxwXU9+6MbT2Aw9EcW82t2i3E6mKfOWoEEFf9g="; }; sourceRoot = "source/cmd/tar2ext4"; From 5eee2c72a015efd49ee1d7a6521abd0588ad983d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 07:57:39 +0000 Subject: [PATCH 36/48] python310Packages.miniaudio: 1.52 -> 1.53 --- pkgs/development/python-modules/miniaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index d3d370d40cfc..a494c1011e40 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "miniaudio"; - version = "1.52"; + version = "1.53"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "irmen"; repo = "pyminiaudio"; rev = "refs/tags/v${version}"; - sha256 = "sha256-qy2FKzg02M1MwUwuPKmK8uGhCrR19Hyzg2YRmlHl67s="; + sha256 = "sha256-TB4V41GN48Q2ocsDM1uIyRziY+y8njRNoPxZpTqk+Tk="; }; buildInputs = lib.optionals stdenv.isDarwin [ From c9a4c000218be53195d8587e586a0dbd96920406 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 08:07:04 +0000 Subject: [PATCH 37/48] python310Packages.moku: 2.4 -> 2.5.1 --- pkgs/development/python-modules/moku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moku/default.nix b/pkgs/development/python-modules/moku/default.nix index de17bca79916..e93f1a054fac 100644 --- a/pkgs/development/python-modules/moku/default.nix +++ b/pkgs/development/python-modules/moku/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "moku"; - version = "2.4"; + version = "2.5.1"; /* @@ -22,7 +22,7 @@ buildPythonPackage rec { */ src = fetchPypi { inherit pname version; - hash = "sha256-yFA2NkiRt6wjXJk6i7oxrjD597acAligWId3MDYwTd0="; + hash = "sha256-oFRwJ6i4wfjA3E2QMqE4ybutT7OZiFZ3LYXoplY3D/I="; }; /* From 37c2766e1ef2c3744a78955e3c6d8aabff653e96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 00:37:57 +0000 Subject: [PATCH 38/48] konf: 0.4.0 -> 0.5.1 --- pkgs/development/tools/konf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index a00e66474bd0..5a1a4c7bc547 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "konf"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "SimonTheLeg"; repo = "konf-go"; rev = "v${version}"; - hash = "sha256-8TXr/jYMl3NLERtLkm7qG97IL/idz4xxP0g0LEy4/j8="; + hash = "sha256-uzB3quuex00Gp7YRkgo7gF92oPcBoQtLwG6hqMzK6oo="; }; vendorHash = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8="; From ef2f213d9659a274985778bff4ca322f3ef3ac68 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 07:39:11 +0000 Subject: [PATCH 39/48] tbls: 1.56.5 -> 1.56.6 --- pkgs/tools/misc/tbls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 7dbe9d0088c6..f7c03c884c0b 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.56.5"; + version = "1.56.6"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-gS3LOE6TiRMWXKjOO6D9YGMYsg/dGgoSNwZgwHLulrE="; + hash = "sha256-GscA0nLGnz8Ae6V6vBgn7TCGj9AgzrIJREqkLKsZEH0="; }; vendorHash = "sha256-pmnSeQHZEtsshldfq6D/r5pMYA5ivMWkzjOq2/WseYU="; From 8b054c62e738373ba823d3869cc9364095422bad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 09:05:48 +0000 Subject: [PATCH 40/48] trivy: 0.33.0 -> 0.34.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 ecaf323faa19..245da2e199a9 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Df81rXRPJ0wDQLVwEtk9mR9dHXqhLvkxhIfMdr5FTCE="; + sha256 = "sha256-6xALedNX37+xUhvsVz7lWgqDppK0b3avUJ3zA6W2n6M="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorSha256 = "sha256-I2myL1A3SrI4oBpIPWC0UItCvfslhIktD1ixVPDd3pA="; + vendorSha256 = "sha256-CBsu2p66XgpeInKw/F6f6ULyoLc6cTtlXzNv3fI41YU="; excludedPackages = "misc"; From ab8f86d73f9978d939d884b62f7a876d04d9b8e5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 1 Nov 2022 17:24:40 +0800 Subject: [PATCH 41/48] various: add bobby285271 as maintainer (#198911) Basically Linux Mint related packages. Cinnamon 5.6 is likely to happen soon, I want to make sure no duplicate work is done. --- pkgs/applications/backup/timeshift/unwrapped.nix | 2 +- .../display-managers/lightdm-slick-greeter/default.nix | 2 +- pkgs/applications/editors/xed-editor/default.nix | 2 +- pkgs/applications/misc/sticky/default.nix | 2 +- pkgs/applications/video/hypnotix/default.nix | 2 +- pkgs/applications/video/xplayer/default.nix | 2 +- pkgs/applications/video/xplayer/plparser.nix | 2 +- pkgs/development/python-modules/xapp/default.nix | 2 +- pkgs/tools/bluetooth/blueberry/default.nix | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 61964370b3e2..81a0cd8b02e1 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linuxmint/timeshift"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ShamrockLee ]; + maintainers = with maintainers; [ ShamrockLee bobby285271 ]; }; } diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix index fe8132fb1b46..fe912d2cc30a 100644 --- a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { description = "A slick-looking LightDM greeter"; homepage = "https://github.com/linuxmint/slick-greeter"; license = licenses.gpl3Only; - maintainers = with maintainers; [ water-sucks ]; + maintainers = with maintainers; [ water-sucks bobby285271 ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 0cbca2ea2bde..16331ba79e07 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linuxmint/xed"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ tu-maurice ]; + maintainers = with maintainers; [ tu-maurice bobby285271 ]; }; } diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 75dac02f56ec..cab49db654e2 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -85,6 +85,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/linuxmint/sticky"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ linsui ]; + maintainers = with maintainers; [ linsui bobby285271 ]; }; } diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index a2da839347f3..3d5f8d4957ab 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linuxmint/hypnotix"; changelog = "https://github.com/linuxmint/hypnotix/blob/${src.rev}/debian/changelog"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ dotlambda bobby285271 ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix index c75635b44b31..56ba7957a5a2 100644 --- a/pkgs/applications/video/xplayer/default.nix +++ b/pkgs/applications/video/xplayer/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { description = "A generic media player from Linux Mint"; license = with licenses; [ gpl2Plus lgpl21Plus ]; homepage = "https://github.com/linuxmint/xplayer"; - maintainers = with maintainers; [ tu-maurice ]; + maintainers = with maintainers; [ tu-maurice bobby285271 ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/xplayer/plparser.nix b/pkgs/applications/video/xplayer/plparser.nix index c26bd06802f4..67e394968da5 100644 --- a/pkgs/applications/video/xplayer/plparser.nix +++ b/pkgs/applications/video/xplayer/plparser.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Playlist parsing library for xplayer"; homepage = "https://github.com/linuxmint/xplayer-plparser"; - maintainers = with maintainers; [ tu-maurice ]; + maintainers = with maintainers; [ tu-maurice bobby285271 ]; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index ba48de4de7e1..333f544c151e 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Cross-desktop libraries and common resources for python"; license = licenses.lgpl2; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 9208e286c9b4..a9c45f27abcd 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linuxmint/blueberry"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [ bobby285271 romildo ]; }; } From a089f79823558cc33eb08d31ba47623ebf842019 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Tue, 1 Nov 2022 10:33:19 +0100 Subject: [PATCH 42/48] mariadb_107: drop ahead of 22.11 release Supported until 2023-02, not long enough for 22.11. --- pkgs/servers/sql/mariadb/default.nix | 9 +-------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 2796906fe03e..19a81db9a364 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -257,13 +257,6 @@ in inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; - mariadb_107 = self.callPackage generic { - # Supported until 2023-02. TODO: remove ahead of 22.11 release. - version = "10.7.6"; - hash = "sha256-erX7pDmQV33BdPG5a9NAszN8G9Rv48NmIgsJ0siNLqA="; - inherit (self.darwin) cctools; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; - }; mariadb_108 = self.callPackage generic { # Supported until 2023-05 version = "10.8.5"; @@ -272,7 +265,7 @@ in inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_109 = self.callPackage generic { - # Supported until 2023-08(?) + # Supported until 2023-08 version = "10.9.3"; hash = "sha256-mh4imXL8zMgnDmM/aNP7gk2hUdz09T2h342UesqHa+4="; inherit (self.darwin) cctools; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d08b09c37e3d..032fb2dc92b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23983,7 +23983,6 @@ with pkgs; mariadb_104 mariadb_105 mariadb_106 - mariadb_107 mariadb_108 mariadb_109 ; From f627f3a2b51c77fb227c0ae2b440cfac4a169469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 29 Oct 2022 23:39:29 +0200 Subject: [PATCH 43/48] skypeforlinux: remove nix store path references in desktop files Because desktop files can be copied to $HOME/.config/autostart, and eventually the Nix store paths they reference will be garbage collected and break. --- .../networking/instant-messengers/skypeforlinux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index ec33f99809ef..d9fcbc26380e 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -110,11 +110,11 @@ in stdenv.mkDerivation { # Fix the desktop link substituteInPlace $out/share/applications/skypeforlinux.desktop \ - --replace /usr/bin/ $out/bin/ + --replace /usr/bin/ "" substituteInPlace $out/share/applications/skypeforlinux-share.desktop \ - --replace /usr/bin/ $out/bin/ + --replace /usr/bin/ "" substituteInPlace $out/share/kservices5/ServiceMenus/skypeforlinux.desktop \ - --replace /usr/bin/ $out/bin/ + --replace /usr/bin/ "" ''; meta = with lib; { From 83d02e230fb0bc2a9695a2beae63bd8d486d888e Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Tue, 1 Nov 2022 10:10:28 +0000 Subject: [PATCH 44/48] linux_xanmod_stable: point to latest --- pkgs/top-level/aliases.nix | 2 -- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5e27e59594bd..81337dfb5784 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -836,8 +836,6 @@ mapAliases ({ linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; - linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; - linuxPackages_xanmod_stable = throw "linuxPackages_xanmod_stable was removed because it has reached its end of life upstream"; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 linuxPackages_xanmod_tt = throw "linuxPackages_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b04e0245fd24..e1c581e0ca10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25144,6 +25144,8 @@ with pkgs; # XanMod kernel linuxPackages_xanmod = linuxKernel.packages.linux_xanmod; linux_xanmod = linuxKernel.kernels.linux_xanmod; + linuxPackages_xanmod_stable = linuxKernel.packages.linux_xanmod_stable; + linux_xanmod_stable = linuxKernel.kernels.linux_xanmod_stable; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 2a075155e43f..9309e38c4173 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -232,7 +232,7 @@ in { }; linux_xanmod = xanmodKernels.lts; - linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; + linux_xanmod_stable = xanmodKernels.main; linux_xanmod_latest = xanmodKernels.main; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; @@ -581,7 +581,7 @@ in { linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); - linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; + linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable); linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; From ba15914be7a100614a4bce2211080ce80cb8ed05 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sun, 30 Oct 2022 19:29:55 +0100 Subject: [PATCH 45/48] v4l2loopback: unstable-2021-07-13 -> unstable-2022-08-05 --- pkgs/os-specific/linux/v4l2loopback/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 095d873e66cb..3bb1650e8c85 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v4l2loopback"; - version = "unstable-2021-07-13-${kernel.version}"; + version = "unstable-2022-08-05-${kernel.version}"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; - rev = "baf9de279afc7a7c7513e9c40a0c9ff88f456af4"; - sha256 = "sha256-uglYTeqz81fgkKYYU9Cw8x9+S088jGxDEGkb3rmkhrw=="; + rev = "76434ab6f71d5ecbff8a218ff6bed91ea2bf73b8"; + sha256 = "sha256-TdZacRkFAO2HAEbljzXeJ241VcDqSwBECq3bnn7yvBY="; }; hardeningDisable = [ "format" "pic" ]; From ddcd07f4a8ab984fe44016facb4b634c7cb3ba4b Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Tue, 1 Nov 2022 10:40:25 +0000 Subject: [PATCH 46/48] pianobooster: 0.7.2b -> 1.0.0 (#197900) Co-authored-by: Sandro Co-authored-by: linsui --- .../audio/pianobooster/default.nix | 56 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index 2c58ecc5dcbb..7d62aa61d6b0 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,29 +1,69 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools -, alsa-lib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, qttools +, alsa-lib +, ftgl +, libGLU +, qtbase +, rtmidi +, libjack2 +, fluidsynth +, soundfont-fluid +, unzip +, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "pianobooster"; - version = "0.7.2b"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "captnfab"; + owner = "pianobooster"; repo = "PianoBooster"; rev = "v${version}"; - sha256 = "03xcdnlpsij22ca3i6xj19yqzn3q2ch0d32r73v0c96nm04gvhjj"; + hash = "sha256-1WOlAm/HXSL6QK0Kd1mnFEZxxpMseTG+6WzgMNWt+RA="; }; - nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; + postPatch = '' + substituteInPlace src/Settings.cpp src/GuiMidiSetupDialog.cpp \ + --replace "/usr/share/soundfonts" "${soundfont-fluid}/share/soundfonts" \ + --replace "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2" + ''; - buildInputs = [ alsa-lib ftgl libGLU libjack2 qtbase rtmidi ]; + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + alsa-lib + ftgl + libGLU + qtbase + rtmidi + libjack2 + fluidsynth + ]; cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=GLVND" + "-DUSE_JACK=ON" ]; + postInstall = '' + qtWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ unzip ]}" + ) + ''; + meta = with lib; { description = "A MIDI file player that teaches you how to play the piano"; - homepage = "https://github.com/captnfab/PianoBooster"; + homepage = "https://github.com/pianobooster/PianoBooster"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu orivej ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2d16233d804..762fb599df35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31076,7 +31076,7 @@ with pkgs; pianobar = callPackage ../applications/audio/pianobar { }; - pianobooster = qt5.callPackage ../applications/audio/pianobooster { stdenv = gcc10StdenvCompat; }; + pianobooster = qt5.callPackage ../applications/audio/pianobooster { }; pianoteq = callPackage ../applications/audio/pianoteq { }; From 3357d39dc0c3ee6d4741a69c0921ae8957ea4ea1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Oct 2022 03:13:15 +0000 Subject: [PATCH 47/48] plantuml: 1.2022.10 -> 1.2022.12 --- pkgs/tools/misc/plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 39ebe69d5e93..692792c64ccf 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2022.10"; + version = "1.2022.12"; pname = "plantuml"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; - sha256 = "sha256-/I4wRcnF3Gad0Wr9aMe3CCAmAUODHSnDDAexVwiHE2E="; + sha256 = "sha256-smxdHluEVJxga03aAu4WmTtbPsAKTckHsHn+aUNrtcg="; }; nativeBuildInputs = [ makeWrapper ]; From e0cec52d57ddb0b3ba2f2ad980facd0b65677856 Mon Sep 17 00:00:00 2001 From: Christoph Bauer Date: Tue, 1 Nov 2022 08:02:04 +0100 Subject: [PATCH 48/48] haskell.packages.ghcjs.stm: 2.5.0.2 -> stm 2.5.1.0 The stm_2_5_0_2 attribute was removed due to a package update upstream, leading to an evaluation failure in the ghcjs package set. Co-authored-by: sternenseemann --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 94a173c049bc..a7b90341a620 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -26,7 +26,7 @@ self: super: # GHCJS does not ship with the same core packages as GHC. # https://github.com/ghcjs/ghcjs/issues/676 - stm = doJailbreak self.stm_2_5_0_2; + stm = doJailbreak self.stm_2_5_1_0; exceptions = dontCheck self.exceptions_0_10_5; ## OTHER PACKAGES