From 680b1632a609d5e7f128c445a382486ca106800a Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 6 Apr 2022 16:46:22 -0400 Subject: [PATCH 01/63] python3Packages.sfepy: 2021.4 -> 2022.1 --- pkgs/development/python-modules/sfepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 3d895f4a3f3..9e725175f9e 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "sfepy"; - version = "2021.4"; + version = "2022.1"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sfepy"; repo = "sfepy"; rev = "release_${version}"; - sha256 = "sha256-+wvFcME02la5JwzD5bvPgBBlkQKF5LWz5MC3+0s5jSs="; + sha256 = "sha256-OayULh/dGI5sEynYMc+JLwUd67zEGdIGEKo6CTOdZS8="; }; propagatedBuildInputs = [ From d6b756dec558672fca372b1e261ed0e813c1091d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Thu, 5 May 2022 17:37:56 +0200 Subject: [PATCH 02/63] jabcode: unstable-2020-05-13 -> unstable-2021-02-16 --- pkgs/development/libraries/jabcode/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix index 489b44a4e5c..bc4df3f99ba 100644 --- a/pkgs/development/libraries/jabcode/default.nix +++ b/pkgs/development/libraries/jabcode/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "jabcode-${subproject}"; - version = "unstable-2020-05-13"; + version = "unstable-2021-02-16"; src = fetchFromGitHub { repo = "jabcode"; owner = "jabcode"; - rev = "a7c25d4f248078f257b014e31c791bfcfcd083e1"; - sha256 = "1c4cv9b0d7r4bxzkwzdv9h651ziq822iya6fbyizm57n1nzdkk4s"; + rev = "e342b647525fa294127930d836b54a6b21957cdc"; + sha256 = "04ngw5aa43q7kxfn1v8drmir2i2qakvq0ni0lgf0zw8150mww52x"; }; nativeBuildInputs = From bff64d8e02fa1685b6cfbbd9e2b980f36ffd60f6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 May 2022 16:46:01 +0200 Subject: [PATCH 03/63] libmt32emu: 2.5.3 -> 2.6.3 --- pkgs/applications/audio/munt/libmt32emu.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix index f79a2667542..58fb9cddc90 100644 --- a/pkgs/applications/audio/munt/libmt32emu.nix +++ b/pkgs/applications/audio/munt/libmt32emu.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libmt32emu"; - version = "2.5.3"; + version = "2.6.3"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; rev = "${pname}_${lib.replaceChars [ "." ] [ "_" ] version}"; - hash = "sha256-n5VV5Swh1tOVQGT3urEKl64A/w7cY95/0y5wC5ZuLm4="; + sha256 = "0ncy55fj9l2s750clxjpv102hrgcndz4qba9w2sf8lwzgy6d1xmp"; }; outputs = [ "out" "dev" ]; From f7db111ff081c69c77e64b1750a1bfcc63cb4b99 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 May 2022 17:52:17 +0200 Subject: [PATCH 04/63] gkraken: 1.1.6 -> 1.2.0 --- pkgs/tools/system/gkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gkraken/default.nix b/pkgs/tools/system/gkraken/default.nix index 9cd30e83c32..cd5e02d9a04 100644 --- a/pkgs/tools/system/gkraken/default.nix +++ b/pkgs/tools/system/gkraken/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "gkraken"; - version = "1.1.6"; + version = "1.2.0"; src = fetchFromGitLab { owner = "leinardi"; repo = "gkraken"; rev = version; - sha256 = "085zz6m7c3xzsrvkw50gbbz8l9fmswxj2hjya2f52dvgs8daijdy"; + sha256 = "0hxlh0319rl28iba02917z3n6d5cq2qcgpj2ng31bkjjhlvvfm2g"; }; format = "other"; From 883cb64ae9d9c266bae6e19d740428505a997a66 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 May 2022 16:53:35 +0200 Subject: [PATCH 05/63] mt32emu-qt: 1.9.0 -> 1.10.2 --- pkgs/applications/audio/munt/mt32emu-qt.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/applications/audio/munt/mt32emu-qt.nix index 0c541885689..c2b84fd6ed7 100644 --- a/pkgs/applications/audio/munt/mt32emu-qt.nix +++ b/pkgs/applications/audio/munt/mt32emu-qt.nix @@ -13,15 +13,18 @@ , withJack ? stdenv.hostPlatform.isUnix, libjack2 }: +let + char2underscore = char: str: lib.replaceChars [ char ] [ "_" ] str; +in mkDerivation rec { pname = "mt32emu-qt"; - version = "1.9.0"; + version = "1.10.2"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; - rev = "mt32emu_qt_${lib.replaceChars [ "." ] [ "_" ] version}"; - hash = "sha256-9vapBKpl1NC3mIDetuCb452IHV6c7c7NCzSyiBry5oo="; + rev = "${char2underscore "-" pname}_${char2underscore "." version}"; + sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9"; }; postPatch = '' @@ -55,8 +58,8 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications - mv $out/bin/${meta.mainProgram}.app $out/Applications/ - ln -s $out/{Applications/${meta.mainProgram}.app/Contents/MacOS,bin}/${meta.mainProgram} + mv $out/bin/${pname}.app $out/Applications/ + ln -s $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname} ''; meta = with lib; { @@ -70,6 +73,5 @@ mkDerivation rec { license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; - mainProgram = "mt32emu-qt"; }; } From f88302aa1c0bc6f41cf2391605112c2c31a84290 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 May 2022 16:57:32 +0200 Subject: [PATCH 06/63] mt32emu-smf2wav: 1.7.0 -> 1.8.2 --- pkgs/applications/audio/munt/mt32emu-smf2wav.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix index 378b5dd8fb8..eee9f01ebb5 100644 --- a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix +++ b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix @@ -7,15 +7,18 @@ , pkg-config }: +let + char2underscore = char: str: lib.replaceChars [ char ] [ "_" ] str; +in stdenv.mkDerivation rec { pname = "mt32emu-smf2wav"; - version = "1.7.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; - rev = "mt32emu_smf2wav_${lib.replaceChars [ "." ] [ "_" ] version}"; - hash = "sha256-FnKlKJxe7P4Yqpv0oVGgV4253dMgSmgtb7EAa2FI+aI="; + rev = "${char2underscore "-" pname}_${char2underscore "." version}"; + sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9"; }; postPatch = '' @@ -45,6 +48,5 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; - mainProgram = "mt32emu-smf2wav"; }; } From 179dd402cbb2772cb8b80de3c58b21efb23ba030 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 13 May 2022 18:22:30 -0400 Subject: [PATCH 07/63] yoda: 1.9.4 -> 1.9.5 --- pkgs/development/libraries/physics/yoda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index a2bb09b58a2..db7c18a3344 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - hash = "sha256-KifrhuZH11szennCDC2sJeHxO9JZJbnJWuKK3JN5NwU="; + hash = "sha256-WRkaDpr6jbU/+qIHn4Uy5bE94b5iJwPW9wYNNhBSi2s="; }; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; From d2144c1e0cce513807d15979eb9844386cd16ccc Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 13 May 2022 18:24:59 -0400 Subject: [PATCH 08/63] rivet: 3.1.5 -> 3.1.6 --- .../development/libraries/physics/rivet/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 9739530f8ba..1b97997c5c1 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,22 +2,13 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - hash = "sha256-YhcXW3gab7z3EJd3qGePeplVEapV4a5WKIc151hQXZo="; + hash = "sha256-HPbrtqedGBxEHR0MfG1iPEI4F8YQk/NvIa2q4j5nkJA="; }; - patches = [ - # Fixes build - (fetchpatch { - name = "rivet-3.1.5-namespace-fix.patch"; - url = "https://gitlab.com/hepcedar/rivet/-/commit/17a99b38b52e65a4a3fd6289124bd9dd874c30bf.diff"; - sha256 = "sha256-OknqghpMMB5nRHeeRc2ddxybhnkVGRB1x8jfOjrkyms="; - }) - ]; - latex = texlive.combine { inherit (texlive) scheme-basic collection-pstricks From fc3790f9952d21da3f3696ec2e3f03081704842a Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 23 May 2022 14:52:39 -0700 Subject: [PATCH 09/63] =?UTF-8?q?mozillavpn:=202.8.0=20=E2=86=92=202.8.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/tools/networking/mozillavpn/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index 8fe6e6169fd..3a652cca24f 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -47,19 +47,19 @@ let }; pname = "mozillavpn"; - version = "2.8.0"; + version = "2.8.3"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-UmLYs/J6syfMrjA66K33h8ubYqzvmcGf5spIilVVdVk="; + hash = "sha256-eKgoRE/JDEQEFp7xYY60ARDgw/n5VoZpD/Gb/CWzHuo="; }; patches = [ # Rust bridge: Add Cargo.lock file (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/3341/commits/718c7f52756b5a88511da91dafad7af312bb2473.patch"; + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/05c9a366cf9dc4e378485c8e9d494f77c35dbb8c.patch"; hash = "sha256-fG+SATbJpGqpCFXSWEiBo4dYx6RLtJYR0yTdBqN6Fww="; }) ]; @@ -103,7 +103,7 @@ stdenv.mkDerivation { inherit src patches; name = "${pname}-${version}"; preBuild = "cd ${cargoRoot}"; - hash = "sha256-dnbF1hfm3qoZaPrIimhY2bUzlrYaNVUZ+nyp6NbgP3Y="; + hash = "sha256-C0wPmGVXbhUs0IzeIMZD6724P0XTOzeK1bzrnUMPlWo="; }; postPatch = '' From 81e1166bffbe792d303dac9a84fe751dc53b8d64 Mon Sep 17 00:00:00 2001 From: Popa Ioan Alexandru Date: Tue, 24 May 2022 02:22:44 +0300 Subject: [PATCH 10/63] themechanger: 0.10.2 -> 0.11.0 --- pkgs/applications/misc/themechanger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/themechanger/default.nix b/pkgs/applications/misc/themechanger/default.nix index d2b92fa250b..17e5d458b89 100644 --- a/pkgs/applications/misc/themechanger/default.nix +++ b/pkgs/applications/misc/themechanger/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "themechanger"; - version = "0.10.2"; + version = "0.11.0"; format = "other"; src = fetchFromGitHub { owner = "ALEX11BR"; repo = "ThemeChanger"; rev = "v${version}"; - sha256 = "00z1npm3lpvf0wc9z2v58pc4nxxh8x9m158kxf1k0qlz536jrzqr"; + sha256 = "sha256-umRkGPeNDZOmx6pjWLU9rRdHX6QFuHY/dsuQ8oI2YLI="; }; nativeBuildInputs = [ From d2aa5ff6e7c17887fabb08aebca40f45d60b7cea Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 6 May 2022 00:22:46 -0700 Subject: [PATCH 11/63] infnoise: unstable-2019-08-12 -> 0.3.2 --- pkgs/misc/drivers/infnoise/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/drivers/infnoise/default.nix b/pkgs/misc/drivers/infnoise/default.nix index b64cb56c407..d8e4dd65975 100644 --- a/pkgs/misc/drivers/infnoise/default.nix +++ b/pkgs/misc/drivers/infnoise/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, libftdi }: +{ lib, stdenv, fetchFromGitHub, libftdi +, infnoise, testers }: stdenv.mkDerivation rec { pname = "infnoise"; - version = "unstable-2019-08-12"; + version = "0.3.2"; src = fetchFromGitHub { - owner = "13-37-org"; + owner = "leetronics"; repo = "infnoise"; - rev = "132683d4b5ce0902468b666cba63baea36e97f0c"; - sha256 = "1dzfzinyvhyy9zj32kqkl19fyhih6sy8r5sa3qahbbr4c30k7flp"; + rev = "e80ddd78085abf3d06df2e0d8c08fd33dade78eb"; + sha256 = "sha256-9MKG1InkV+yrQPBTgi2gZJ3y9Fokb6WbxuAnM7n7FyA="; }; # Patch makefile so we can set defines from the command line instead of it depending on .git @@ -26,8 +27,12 @@ stdenv.mkDerivation rec { substituteInPlace init_scripts/infnoise.service --replace "/usr/local" "$out" ''; + passthru = { + tests.version = testers.testVersion { package = infnoise; }; + }; + meta = with lib; { - homepage = "https://github.com/13-37-org/infnoise"; + homepage = "https://github.com/leetronics/infnoise"; description = "Driver for the Infinite Noise TRNG"; longDescription = '' The Infinite Noise TRNG is a USB key hardware true random number generator. @@ -37,7 +42,7 @@ stdenv.mkDerivation rec { services.udev.packages = [ pkgs.infnoise ]; ''; license = licenses.cc0; - maintainers = with maintainers; [ StijnDW ]; + maintainers = with maintainers; [ StijnDW zhaofengli ]; platforms = platforms.linux; }; } From 6c4bfe583c0bb74ff62e29bce3818654242667ad Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 6 May 2022 00:22:46 -0700 Subject: [PATCH 12/63] nixos/infnoise: init --- .../from_md/release-notes/rl-2211.section.xml | 9 ++- .../manual/release-notes/rl-2211.section.md | 3 + nixos/modules/module-list.nix | 1 + nixos/modules/services/security/infnoise.nix | 60 +++++++++++++++++++ pkgs/misc/drivers/infnoise/default.nix | 3 - 5 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 nixos/modules/services/security/infnoise.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 8bbb8665219..b2d9b26fa37 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -40,7 +40,7 @@
New Services - + appvm, @@ -48,6 +48,13 @@ virtualisation.appvm. + + + infnoise, + a hardware True Random Number Generator dongle. Available as + services.infnoise. + +
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 5dc8e958c89..8dcde84f237 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -25,6 +25,9 @@ In addition to numerous new and upgraded packages, this release has the followin - [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable). +- [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. + Available as [services.infnoise](options.html#opt-services.infnoise.enable). + ## Backward Incompatibilities {#sec-release-22.11-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f7357036d69..0767343368d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -981,6 +981,7 @@ ./services/security/hologram-server.nix ./services/security/hologram-agent.nix ./services/security/kanidm.nix + ./services/security/infnoise.nix ./services/security/munge.nix ./services/security/nginx-sso.nix ./services/security/oauth2_proxy.nix diff --git a/nixos/modules/services/security/infnoise.nix b/nixos/modules/services/security/infnoise.nix new file mode 100644 index 00000000000..4fb8adaf33f --- /dev/null +++ b/nixos/modules/services/security/infnoise.nix @@ -0,0 +1,60 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.infnoise; +in { + options = { + services.infnoise = { + enable = mkEnableOption "the Infinite Noise TRNG driver"; + + fillDevRandom = mkOption { + description = '' + Whether to run the infnoise driver as a daemon to refill /dev/random. + + If disabled, you can use the `infnoise` command-line tool to + manually obtain randomness. + ''; + type = types.bool; + default = true; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.infnoise ]; + + services.udev.extraRules = '' + SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015", SYMLINK+="infnoise", TAG+="systemd", GROUP="dialout", MODE="0664", ENV{SYSTEMD_WANTS}="infnoise.service" + ''; + + systemd.services.infnoise = mkIf cfg.fillDevRandom { + description = "Infinite Noise TRNG driver"; + + bindsTo = [ "dev-infnoise.device" ]; + after = [ "dev-infnoise.device" ]; + + serviceConfig = { + ExecStart = "${pkgs.infnoise}/bin/infnoise --dev-random --debug"; + Restart = "always"; + User = "infnoise"; + DynamicUser = true; + SupplementaryGroups = [ "dialout" ]; + DeviceAllow = [ "/dev/infnoise" ]; + DevicePolicy = "closed"; + PrivateNetwork = true; + ProtectSystem = "strict"; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; # only reads entropy pool size and watermark + RestrictNamespaces = true; + RestrictRealtime = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + }; + }; + }; +} diff --git a/pkgs/misc/drivers/infnoise/default.nix b/pkgs/misc/drivers/infnoise/default.nix index d8e4dd65975..5bc32ba1ca0 100644 --- a/pkgs/misc/drivers/infnoise/default.nix +++ b/pkgs/misc/drivers/infnoise/default.nix @@ -37,9 +37,6 @@ stdenv.mkDerivation rec { longDescription = '' The Infinite Noise TRNG is a USB key hardware true random number generator. It can either provide rng for userland applications, or provide rng for the OS entropy. - Add the following to your system configuration for plug and play support, adding to the OS entropy: - systemd.packages = [ pkgs.infnoise ]; - services.udev.packages = [ pkgs.infnoise ]; ''; license = licenses.cc0; maintainers = with maintainers; [ StijnDW zhaofengli ]; From 31cb3f9908a31e6c3ba88b38c675f533fc0d5aae Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 6 May 2022 00:22:46 -0700 Subject: [PATCH 13/63] infnoise: Add patch to fix build on aarch64-linux --- pkgs/misc/drivers/infnoise/default.nix | 17 +++++++++++++---- pkgs/misc/drivers/infnoise/makefile.patch | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/drivers/infnoise/default.nix b/pkgs/misc/drivers/infnoise/default.nix index 5bc32ba1ca0..6353b279176 100644 --- a/pkgs/misc/drivers/infnoise/default.nix +++ b/pkgs/misc/drivers/infnoise/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libftdi +{ lib, stdenv, fetchFromGitHub, fetchpatch, libftdi , infnoise, testers }: stdenv.mkDerivation rec { @@ -12,18 +12,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-9MKG1InkV+yrQPBTgi2gZJ3y9Fokb6WbxuAnM7n7FyA="; }; - # Patch makefile so we can set defines from the command line instead of it depending on .git - patches = [ ./makefile.patch ]; + patches = [ + # Patch makefile so we can set defines from the command line instead of it depending on .git + ./makefile.patch + + # Fix getc return type + (fetchpatch { + url = "https://github.com/leetronics/infnoise/commit/7ed7014e14253311c07e530c8f89f1c8f4705c2b.patch"; + sha256 = "sha256-seB/fJaxQ/rXJp5iPtnobXXOccQ2KUAk6HFx31dhOhs="; + }) + ]; + GIT_COMMIT = src.rev; GIT_VERSION = version; GIT_DATE = "2019-08-12"; buildInputs = [ libftdi ]; - sourceRoot = "source/software"; makefile = "Makefile.linux"; makeFlags = [ "PREFIX=$(out)" ]; postPatch = '' + cd software substituteInPlace init_scripts/infnoise.service --replace "/usr/local" "$out" ''; diff --git a/pkgs/misc/drivers/infnoise/makefile.patch b/pkgs/misc/drivers/infnoise/makefile.patch index b38519036d2..871a6c508ce 100644 --- a/pkgs/misc/drivers/infnoise/makefile.patch +++ b/pkgs/misc/drivers/infnoise/makefile.patch @@ -1,7 +1,7 @@ diff --git a/software/Makefile.linux b/software/Makefile.linux index db48aa5..df8b3d2 100644 ---- a/Makefile.linux -+++ b/Makefile.linux +--- a/software/Makefile.linux ++++ b/software/Makefile.linux @@ -1,6 +1,6 @@ -GIT_VERSION := $(shell git --no-pager describe --tags --always) -GIT_COMMIT := $(shell git rev-parse --verify HEAD) From d7432b815d0e08634d0a5e4f56f42fc18cbd38e9 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 6 May 2022 00:22:46 -0700 Subject: [PATCH 14/63] infnoise: Also build and install tools --- pkgs/misc/drivers/infnoise/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/misc/drivers/infnoise/default.nix b/pkgs/misc/drivers/infnoise/default.nix index 6353b279176..47ff0045992 100644 --- a/pkgs/misc/drivers/infnoise/default.nix +++ b/pkgs/misc/drivers/infnoise/default.nix @@ -36,6 +36,12 @@ stdenv.mkDerivation rec { substituteInPlace init_scripts/infnoise.service --replace "/usr/local" "$out" ''; + postInstall = '' + make -C tools + find ./tools/ -executable -type f -exec \ + sh -c "install -Dm755 {} $out/bin/infnoise-\$(basename {})" \; + ''; + passthru = { tests.version = testers.testVersion { package = infnoise; }; }; From f242b1079a281e656188ea6264520b006097861b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 29 May 2022 02:17:32 +0000 Subject: [PATCH 15/63] python310Packages.smart-meter-texas: 0.5.0 -> 0.5.1 https://github.com/grahamwetzler/smart-meter-texas/releases/tag/v0.5.1 --- pkgs/development/python-modules/smart-meter-texas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix index dbe24923bbf..d7d56860235 100644 --- a/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.5.0"; + version = "0.5.1"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "grahamwetzler"; repo = "smart-meter-texas"; rev = "v${version}"; - sha256 = "1f5blmz3w549qjqn5xmdk1fx2pqd76hnlc9p439r7yc473nhw69w"; + hash = "sha256-rjMRV5MekwRkipes2nWos/1zi3sD+Ls8LyD3+t5FOZc="; }; postPatch = '' From 8187ce441044170ba8f6970e71e369a695095d0b Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Sun, 29 May 2022 11:06:28 +0100 Subject: [PATCH 16/63] wails: 2.0.0-beta.36 -> 2.0.0-beta.37 --- pkgs/development/tools/wails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 73198af687c..51de7ae3870 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "wails"; - version = "2.0.0-beta.36"; + version = "2.0.0-beta.37"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uAbVc1UDgSNJwk8R6zXXqZImo6J9TRs3zPNlWelXS/I="; + sha256 = "sha256-KelPMb0ANEh0eW0vBGMydrwWm93wiwcIBoOetQ6EJgM="; } + "/v2"; vendorSha256 = "sha256-rrwlFZQT7sHhUqtU4UzwEqZbjWd/1fudfj/xdTGFUmQ="; From 9644cda0a03a49777815ed4b6de41fe4eeb73a3b Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Thu, 2 Jun 2022 17:27:22 +0300 Subject: [PATCH 17/63] pyasn: add missing databases --- pkgs/development/python-modules/pyasn/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyasn/default.nix b/pkgs/development/python-modules/pyasn/default.nix index b180226ec46..3054af1b4e0 100644 --- a/pkgs/development/python-modules/pyasn/default.nix +++ b/pkgs/development/python-modules/pyasn/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, }: +{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub, python, }: buildPythonPackage rec { pname = "pyasn"; @@ -9,6 +9,18 @@ buildPythonPackage rec { sha256 = "sha256-6UK1SRY2Pse4tw6urs0OtOQe8bz0ojl7KabXFfzN+SU="; }; + datasrc = fetchFromGitHub { + owner = "hadiasghari"; + repo = "pyasn"; + rev = "${version}"; + sha256 = "sha256-R7Vi1Mn44Mg3HQLDk9O43MkXXwbLRr/jjVKSHJvgYj0"; + }; + + postInstall = '' + install -dm755 $out/${python.sitePackages}/pyasn/data + cp $datasrc/data/* $out/${python.sitePackages}/pyasn/data + ''; + doCheck = false; # Tests require internet connection which wont work pythonImportsCheck = [ "pyasn" ]; From c49b3af8b4989c9839015961fc4d8f4a0acc5075 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Thu, 2 Jun 2022 17:27:39 +0300 Subject: [PATCH 18/63] opensnitch-ui: fix events table and notifications --- pkgs/tools/networking/opensnitch/ui.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/opensnitch/ui.nix b/pkgs/tools/networking/opensnitch/ui.nix index 6d3d7fd3058..3650792e181 100644 --- a/pkgs/tools/networking/opensnitch/ui.nix +++ b/pkgs/tools/networking/opensnitch/ui.nix @@ -15,6 +15,11 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-8IfupmQb1romGEvv/xqFkYhp0gGoY4ZEllX6rZYIkqw="; }; + postPatch = '' + substituteInPlace ui/opensnitch/utils.py \ + --replace /usr/lib/python3/dist-packages/data ${python3Packages.pyasn}/${python3Packages.python.sitePackages}/pyasn/data + ''; + nativeBuildInputs = [ python3Packages.pyqt5 wrapQtAppsHook @@ -32,7 +37,9 @@ python3Packages.buildPythonApplication rec { preBuild = '' make -C ../proto ../ui/opensnitch/ui_pb2.py + # sourced from ui/Makefile pyrcc5 -o opensnitch/resources_rc.py opensnitch/res/resources.qrc + sed -i 's/^import ui_pb2/from . import ui_pb2/' opensnitch/ui_pb2* ''; preConfigure = '' @@ -44,7 +51,7 @@ python3Packages.buildPythonApplication rec { ''; postInstall = '' - mv $out/lib/python3.9/site-packages/usr/* $out/ + mv $out/${python3Packages.python.sitePackages}/usr/* $out/ ''; dontWrapQtApps = true; From fa2f9199e4551fca3a1e29e55fba1ad2de5a2ff7 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 5 Jun 2022 09:16:19 +1000 Subject: [PATCH 19/63] docker-compose: remove ipaddress --- pkgs/applications/virtualization/docker-compose/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index fd67aa554f0..1299d6f69ec 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -2,7 +2,7 @@ , installShellFiles , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt -, dockerpty, docker, ipaddress, jsonschema, requests +, dockerpty, docker, jsonschema, requests , six, texttable, websocket-client, cached-property , enum34, functools32, paramiko, distro, python-dotenv }: @@ -22,7 +22,7 @@ buildPythonApplication rec { checkInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml colorama dockerpty docker - ipaddress jsonschema requests six texttable websocket-client + jsonschema requests six texttable websocket-client docopt cached-property paramiko distro python-dotenv ] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname ++ lib.optional (pythonOlder "3.4") enum34 From 74ed89f2439f1ccc12da0517fe7a573a4143c9ed Mon Sep 17 00:00:00 2001 From: Denbeigh Stevens Date: Sat, 4 Jun 2022 19:35:37 -0700 Subject: [PATCH 20/63] noisetorch: 0.11.5 -> 0.12.0 --- pkgs/applications/audio/noisetorch/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index 067263032b0..1015829709e 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -2,20 +2,21 @@ buildGoModule rec { pname = "NoiseTorch"; - version = "0.11.5"; + version = "0.12.0"; src = fetchFromGitHub { - owner = "lawl"; + owner = "noisetorch"; repo = "NoiseTorch"; - rev = version; - sha256 = "sha256-j/6XB3vA5LvTuCxmeB0HONqEDzYg210AWW/h3nCGOD8="; + rev = "v${version}"; + sha256 = "sha256-A6cX1ck47/ZIn9cnV/Ow4CxVFfOX5J0K0Q+B70jCFdQ="; + fetchSubmodules = true; }; vendorSha256 = null; doCheck = false; - ldflags = [ "-X main.version=${version}" "-X main.distribution=nix" ]; + ldflags = [ "-X main.version=${version}" "-X main.distribution=nix" ]; subPackages = [ "." ]; @@ -34,9 +35,10 @@ buildGoModule rec { meta = with lib; { insecure = true; - knownVulnerabilities = [ "https://github.com/lawl/NoiseTorch/releases/tag/0.11.6" ]; + knownVulnerabilities = + lib.optional (lib.versionOlder version "0.12") "https://github.com/noisetorch/NoiseTorch/releases/tag/v0.12.0"; description = "Virtual microphone device with noise supression for PulseAudio"; - homepage = "https://github.com/lawl/NoiseTorch"; + homepage = "https://github.com/noisetorch/NoiseTorch"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ panaeon lom ]; From d7848386e5791ecbea187b013e16cbd114281c67 Mon Sep 17 00:00:00 2001 From: misuzu Date: Sun, 5 Jun 2022 09:16:29 +0300 Subject: [PATCH 21/63] llvmPackages/libllvm: disable failing tests on armv7l --- pkgs/development/compilers/llvm/14/llvm/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index ea147337831..c3f3c94f434 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -89,6 +89,9 @@ in stdenv.mkDerivation (rec { rm test/DebugInfo/X86/convert-inlined.ll rm test/DebugInfo/X86/convert-linked.ll rm test/tools/dsymutil/X86/op-convert.test + rm test/tools/gold/X86/split-dwarf.ll + rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s + rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' # Seems to require certain floating point hardware (NEON?) rm test/ExecutionEngine/frem.ll From 053e10dfbc6f1b396e955cd90ba06a643f8dcf9c Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 5 Jun 2022 09:35:48 +0200 Subject: [PATCH 22/63] nixos/nitter: fix wait_for_open_port --- nixos/tests/nitter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/nitter.nix b/nixos/tests/nitter.nix index 0e1a6d150f3..8bc55ba8c69 100644 --- a/nixos/tests/nitter.nix +++ b/nixos/tests/nitter.nix @@ -12,7 +12,7 @@ import ./make-test-python.nix ({ pkgs, ... }: testScript = '' machine.wait_for_unit("nitter.service") - machine.wait_for_open_port("80") + machine.wait_for_open_port(80) machine.succeed("curl --fail http://localhost:80/") ''; }) From 125e150cd230087a782b9eabf731b7d7a6bffc20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jun 2022 10:43:15 +0200 Subject: [PATCH 23/63] python310Packages.pymc: unstable-2022-05-23 -> 4.0.0 - rename to pymc - use pythonRelaxDepsHook --- .../{pymc3 => pymc}/default.nix | 23 ++++++++++++------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) rename pkgs/development/python-modules/{pymc3 => pymc}/default.nix (76%) diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc/default.nix similarity index 76% rename from pkgs/development/python-modules/pymc3/default.nix rename to pkgs/development/python-modules/pymc/default.nix index 1d31188c9c8..4fce3800ef1 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -9,24 +9,29 @@ , fetchFromGitHub , numpy , pythonOlder +, pythonRelaxDepsHook , scipy , typing-extensions }: buildPythonPackage rec { - pname = "pymc3"; - version = "unstable-2022-05-23"; + pname = "pymc"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pymc-devs"; - repo = "pymc3"; - rev = "b5a5b569779673914c9420c1cc0135b118505ff5"; - hash = "sha256-vkIFwdjX2Rex8oqscVMP4xh0K4bjmN/RL7aQmOI//Dw="; + repo = "pymc"; + rev = "v${version}"; + hash = "sha256-ZMuDQJ+bmrQlrem/OqU/hIie3ZQkAqayU3N8ZtaW7xo="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ aeppl aesara @@ -42,11 +47,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace ', "pytest-cov"' "" - substituteInPlace requirements.txt \ - --replace "aesara==2.6.2" "aesara" \ - --replace "aeppl==0.0.28" "aeppl" ''; + pythonRelaxDeps = [ + "aesara" + "aeppl" + ]; + # The test suite is computationally intensive and test failures are not # indicative for package usability hence tests are disabled by default. doCheck = false; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 2a17eb067b8..0e58d7b976c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -112,6 +112,7 @@ mapAliases ({ pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 + pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pyreadability = readability-lxml; # added 2022-05-24 pysmart-smartx = pysmart; # added 2021-10-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2dfd23222d..8da9937cbc0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7570,7 +7570,7 @@ in { pymbolic = callPackage ../development/python-modules/pymbolic { }; - pymc3 = callPackage ../development/python-modules/pymc3 { }; + pymc = callPackage ../development/python-modules/pymc { }; pymdstat = callPackage ../development/python-modules/pymdstat { }; From 803065a3a23c9a71f2e36b117ca8b9d3d8bfd2c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jun 2022 11:04:52 +0200 Subject: [PATCH 24/63] python310Packages.aesara: 2.6.6 -> 2.7.1 --- pkgs/development/python-modules/aesara/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index d7d51c2582d..56d298f6ed1 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.6.6"; + version = "2.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = "aesara"; rev = "refs/tags/rel-${version}"; - hash = "sha256-ChLMQCXw9EBR0hnNYGdkUbiLF+4oCqOxzsKsnsf22Jk="; + hash = "sha256-qjAaW7YYmzGBNpc8T5RyOdP5evkKOdzUGzQ9JXKioxw="; }; nativeBuildInputs = [ From a4873048b4ab5c45f4902f841643882e9e3a7bdb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jun 2022 11:45:21 +0200 Subject: [PATCH 25/63] python310Packages.aiolookin: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/aiolookin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index 2de513e6fbc..f0b5e145d8b 100644 --- a/pkgs/development/python-modules/aiolookin/default.nix +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiolookin"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ANMalko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-l3A1fOydAUQ4arR7Zl/PDYksp53C/56fVVcz35q1hjY="; + sha256 = "sha256-xFxkhKM/lX/kSg709wID7HlkfNKDlOcL3STUZOrHZJ8="; }; propagatedBuildInputs = [ From b82f6f7cf060fd3fc8e08065dc9928ba76f697c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jun 2022 11:58:33 +0200 Subject: [PATCH 26/63] python310Packages.simplisafe-python: 2022.05.2 -> 2022.06.0 --- pkgs/development/python-modules/simplisafe-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 2f488d3cd80..68cfa0035c6 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.05.2"; + version = "2022.06.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-DWhXNn5KNs06oKJbWTCI/vuX2oruERAgb/1f4Au8na0="; + sha256 = "sha256-rYWtq56Gjbw5zs2ZqZkNqIP7wEzVziN3VQQfoyF5fJk="; }; nativeBuildInputs = [ From efe278181e536b65b92aaccfc43bb848ae2d61ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jun 2022 12:14:04 +0200 Subject: [PATCH 27/63] python310Packages.venstarcolortouch: 0.15 -> 0.16 --- pkgs/development/python-modules/venstarcolortouch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix index f2ac0266ce1..082db8b90ab 100644 --- a/pkgs/development/python-modules/venstarcolortouch/default.nix +++ b/pkgs/development/python-modules/venstarcolortouch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "venstarcolortouch"; - version = "0.15"; + version = "0.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7JUqXHk/yL+/EvfQoGLaKmPPy4DkljT9olqK0a/Nmkk="; + sha256 = "sha256-kV/fPxvJPMZVmRyyKJnmHgDMsD5tvxcolPSdO13GV90="; }; propagatedBuildInputs = [ From 4902f456f4b4d13ab6b0c31b7ccaf9754dbe29e6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jun 2022 12:16:17 +0200 Subject: [PATCH 28/63] python310Packages.pysensibo: 1.0.15 -> 1.0.16 --- pkgs/development/python-modules/pysensibo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index 5a215352af8..a2cddaa7507 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.15"; + version = "1.0.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "andrey-git"; repo = pname; rev = version; - hash = "sha256-TZjlMry9Ek/13gRKg54aCif/xbx9IEg+rsYnuOzwxRo="; + hash = "sha256-8SGYJ99xbCRKuWJkDN5u6wnh5Rdd+aZR5QaqOXVVQMM="; }; propagatedBuildInputs = [ From de295b31a899f25922867a3cec5ad34b2287812b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jun 2022 12:23:05 +0200 Subject: [PATCH 29/63] python310Packages.regenmaschine: 2022.05.1 -> 2022.06.0 --- pkgs/development/python-modules/regenmaschine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index a18e8cb2e8b..2ce16013ce4 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.05.1"; + version = "2022.06.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-E66qs8EC5o2WNMlv8ITK98De639wwhscbSFjljDzrks="; + sha256 = "sha256-fmoq0mOhD8Y3P9IgghxiTuS9b3gMUUyCCXmYnqN9ue0="; }; nativeBuildInputs = [ From 16a4320fdf4e163aae3bce5a25a8acc616f4a4be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jun 2022 12:34:09 +0200 Subject: [PATCH 30/63] python310Packages.aeppl: disable failing test --- pkgs/development/python-modules/aeppl/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix index bf7f4b8d02a..5457da46677 100644 --- a/pkgs/development/python-modules/aeppl/default.nix +++ b/pkgs/development/python-modules/aeppl/default.nix @@ -42,6 +42,11 @@ buildPythonPackage rec { "aeppl" ]; + disabledTests = [ + # Compute issue + "test_initial_values" + ]; + meta = with lib; { description = "Library for an Aesara-based PPL"; homepage = "https://github.com/aesara-devs/aeppl"; From a69d42dcfbe57ed2684a6d68cae12ae11cc69d9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jun 2022 12:47:52 +0200 Subject: [PATCH 31/63] python310Packages.json-schema-for-humans: 0.40.2 -> 0.41.1 --- .../python-modules/json-schema-for-humans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index 6be5da3fda5..49f05cd545e 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.40.2"; + version = "0.41.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = pname; rev = "v${version}"; - hash = "sha256-9bHylNG+YT+tZmqE8DJMbhpPPaany29+0sIt1jKmFLg="; + hash = "sha256-JQqoQiug4n1o4PbGT/Ry/Qib11KmaTmkhPtZjhwmpc4="; }; postPatch = '' From 686fc5d91db1cbaeaa6fc75e8185642c9ac993c6 Mon Sep 17 00:00:00 2001 From: Sarah Date: Sun, 5 Jun 2022 12:48:00 +0200 Subject: [PATCH 32/63] vapoursynth: 58 -> 59 --- pkgs/development/libraries/vapoursynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 1f2d2d2546c..b0f8f5edd30 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "58"; + version = "59"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - sha256 = "sha256-LIjNfyfpyvE+Ec6f4aGzRA4ZGoWPFhjtUw4yrenDsUQ="; + sha256 = "sha256-6w7GSC5ZNIhLpulni4sKq0OvuxHlTJRilBFGH5PQW8U="; }; patches = [ From fc6a90abc24f7f28a3fcdce8bd13fd4be9300c61 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jun 2022 12:51:13 +0200 Subject: [PATCH 33/63] python310Packages.jsonrpc-base: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/jsonrpc-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index bdcdda0f41e..f10fc3f1237 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "jsonrpc-base"; - version = "2.1.0"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emlove"; repo = pname; rev = version; - hash = "sha256-fliyJmVmG1DgoePE92LKm/wknlgXgYq2mOzZMFAdqLE="; + hash = "sha256-C03m/zeLIFqsmEMSzt84LMOWAHUcpdEHhaa5hx2NsoQ="; }; checkInputs = [ From f6ffa11348108b05ecb4ade86cbefbe3099199b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jun 2022 12:52:49 +0200 Subject: [PATCH 34/63] python310Packages.jsonrpc-async: 2.1.0 -> 2.1.1 --- .../python-modules/jsonrpc-async/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 622c84988a4..2c66779e019 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -2,7 +2,6 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, fetchpatch , jsonrpc-base , pytest-aiohttp , pytestCheckHook @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "jsonrpc-async"; - version = "2.1.0"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +19,7 @@ buildPythonPackage rec { owner = "emlove"; repo = pname; rev = version; - hash = "sha256-Lr8gvQR0Q46b/e1K/XyvqtJo18nBpHjlDdNq4vjCMyU="; + hash = "sha256-HhesXzxVjhWJkubiBi6sMoXi/zicqn99dqT5bilycS8="; }; propagatedBuildInputs = [ @@ -33,15 +32,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Fix tests with later pytest-aiohttp, https://github.com/emlove/jsonrpc-async/pull/9 - (fetchpatch { - name = "support-later-pytest-aiohttp.patch"; - url = "https://github.com/emlove/jsonrpc-async/commit/8b790f23af0d898df90460029d5ba3bcfb0423ed.patch"; - sha256 = "sha256-rthHRF90hywMIbvIHo3Do/uzXKe+STPOoZIa80H4b/g="; - }) - ]; - pytestFlagsArray = [ "tests.py" ]; From ad53954502ba38c0c9e714629e419ce5029f6981 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jun 2022 12:53:33 +0200 Subject: [PATCH 35/63] python310Packages.jsonrpc-websocket: 3.1.1 -> 3.1.4 --- pkgs/development/python-modules/jsonrpc-websocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index ba723702296..c3d68f77d85 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "3.1.1"; + version = "3.1.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "emlove"; repo = "jsonrpc-websocket"; rev = version; - sha256 = "aAXY1OUsF83rGQ1sg1lDrbWmxWqJJ+ZnuvHR1Y+ZDs4="; + sha256 = "sha256-xSOITOVtsNMEDrq610l8LNipLdyMWzKOQDedQEGaNOQ="; }; propagatedBuildInputs = [ From 25bcc609425328c36ee1750de90432f527238dcb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Jun 2022 11:01:48 +0000 Subject: [PATCH 36/63] python310Packages.asyncssh: 2.10.1 -> 2.11.0 --- pkgs/development/python-modules/asyncssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 51faed7373f..1bb50960846 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.10.1"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SZuDbPWKnxknrStaQMPL0N042+CNLfj6is1TjCj8j6k="; + sha256 = "sha256-WcNs53up3ajdV62HV3bnEF3bH6hRvAObs66t6sT2e1Y="; }; propagatedBuildInputs = [ From f8ffee74ce49707a5fb3eeb612cf12c105392027 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 5 Jun 2022 14:24:24 +0300 Subject: [PATCH 37/63] Revert "gst_all_1.gst-plugins-good: add missing deps for qt5Support (#176246)" This reverts commit cf3cb3c272d32eab56bcf7a7bca416c9cbbe578f. --- pkgs/development/libraries/gstreamer/good/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 25de793ceac..18361f15ae8 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -76,9 +76,6 @@ stdenv.mkDerivation rec { qtbase ]) ++ lib.optionals stdenv.isLinux [ wayland-protocols - ] ++ lib.optionals qt5Support [ - qt5.qttools.dev - qt5.qtbase.dev # For moc-qt5 ]; buildInputs = [ From 1b00adbad171384b99ad842684d4f5e58e6657a2 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 5 Jun 2022 13:33:35 +0200 Subject: [PATCH 38/63] pkgs/make-derivation.nix: Refactor, introduce let binding --- pkgs/stdenv/generic/make-derivation.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 395c1586a26..075012d6e0f 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -70,9 +70,7 @@ let makeDerivationExtensible mkDerivationSimple (self: attrs // f self attrs)) attrs; -in - -makeOverlayable (overrideAttrs: + mkDerivationSimple = overrideAttrs: # `mkDerivation` wraps the builtin `derivation` function to @@ -485,6 +483,7 @@ lib.extendDerivation # should be made available to Nix expressions using the # derivation (e.g., in assertions). passthru) - (derivation derivationArg) + (derivation derivationArg); -) +in + makeOverlayable mkDerivationSimple From 7e3c80f5b7db00252f3334d97a28d2c4800c8f41 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 5 Jun 2022 13:35:04 +0200 Subject: [PATCH 39/63] pkgs/make-derivation.nix: Refactor, inline makeOverlayable --- pkgs/stdenv/generic/make-derivation.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 075012d6e0f..23e7d992bc2 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -10,12 +10,6 @@ let inherit (stdenv) hostPlatform; }; - makeOverlayable = mkDerivationSimple: - fnOrAttrs: - if builtins.isFunction fnOrAttrs - then makeDerivationExtensible mkDerivationSimple fnOrAttrs - else makeDerivationExtensibleConst mkDerivationSimple fnOrAttrs; - # Based off lib.makeExtensible, with modifications: makeDerivationExtensible = mkDerivationSimple: rattrs: let @@ -486,4 +480,7 @@ lib.extendDerivation (derivation derivationArg); in - makeOverlayable mkDerivationSimple + fnOrAttrs: + if builtins.isFunction fnOrAttrs + then makeDerivationExtensible mkDerivationSimple fnOrAttrs + else makeDerivationExtensibleConst mkDerivationSimple fnOrAttrs From cd88f8613f3d8cd5a985c624cd3cf14459ddbed9 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 5 Jun 2022 13:36:56 +0200 Subject: [PATCH 40/63] pkgs/make-derivation.nix: Refactor, hardcode mkDerivationSimple --- pkgs/stdenv/generic/make-derivation.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 23e7d992bc2..5f1a22cee06 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -11,7 +11,7 @@ let }; # Based off lib.makeExtensible, with modifications: - makeDerivationExtensible = mkDerivationSimple: rattrs: + makeDerivationExtensible = rattrs: let # NOTE: The following is a hint that will be printed by the Nix cli when # encountering an infinite recursion. It must not be formatted into @@ -42,14 +42,14 @@ let f0 self super else x; in - makeDerivationExtensible mkDerivationSimple + makeDerivationExtensible (self: let super = rattrs self; in super // f self super)) args; in finalPackage; # makeDerivationExtensibleConst == makeDerivationExtensible (_: attrs), # but pre-evaluated for a slight improvement in performance. - makeDerivationExtensibleConst = mkDerivationSimple: attrs: + makeDerivationExtensibleConst = attrs: mkDerivationSimple (f0: let @@ -61,7 +61,7 @@ let f0 self super else x; in - makeDerivationExtensible mkDerivationSimple (self: attrs // f self attrs)) + makeDerivationExtensible (self: attrs // f self attrs)) attrs; mkDerivationSimple = overrideAttrs: @@ -482,5 +482,5 @@ lib.extendDerivation in fnOrAttrs: if builtins.isFunction fnOrAttrs - then makeDerivationExtensible mkDerivationSimple fnOrAttrs - else makeDerivationExtensibleConst mkDerivationSimple fnOrAttrs + then makeDerivationExtensible fnOrAttrs + else makeDerivationExtensibleConst fnOrAttrs From dd770cc211b9de60c5c6bb116f0b01d608661889 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 5 Jun 2022 13:51:57 +0200 Subject: [PATCH 41/63] stdenv/adapters.nix: Fix for overlay style arguments --- pkgs/stdenv/adapters.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 93184c4fc07..3e11f7c6c41 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -21,7 +21,7 @@ let # Wrap the original `mkDerivation` providing extra args to it. extendMkDerivationArgs = old: f: withOldMkDerivation old (_: mkDerivationSuper: args: - mkDerivationSuper (args // f args)); + (mkDerivationSuper args).overrideAttrs f); # Wrap the original `mkDerivation` transforming the result. overrideMkDerivationResult = old: f: withOldMkDerivation old (_: mkDerivationSuper: args: @@ -60,10 +60,10 @@ rec { mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args: if stdenv.hostPlatform.isDarwin then throw "Cannot build fully static binaries on Darwin/macOS" - else mkDerivationSuper (args // { - NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static"; - } // lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { - configureFlags = (args.configureFlags or []) ++ [ + else (mkDerivationSuper args).overrideAttrs(finalAttrs: { + NIX_CFLAGS_LINK = toString (finalAttrs.NIX_CFLAGS_LINK or "") + " -static"; + } // lib.optionalAttrs (!(finalAttrs.dontAddStaticConfigureFlags or false)) { + configureFlags = (finalAttrs.configureFlags or []) ++ [ "--disable-shared" # brrr... ]; })); From a354d5b16bea0fe4b6790d2e078551e25f9b0d92 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 5 Jun 2022 14:11:40 +0200 Subject: [PATCH 42/63] mu: 1.6.10 -> 1.6.11 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 47d0dffda00..fd140bfe55e 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.10"; + version = "1.6.11"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "1uJB8QdR0JgWlogb1cdUicz+LLtYQpAvYJjwcRjXt+E="; + sha256 = "E/6+vEwYXk65/ZoAtUeTjvg56g6gz+Qtcaz0qwEru6c="; }; postPatch = lib.optionalString (batchSize != null) '' From 4195c9225b68c4b1d8fd883c4c18298f4c83318a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 4 Jun 2022 15:45:21 -0300 Subject: [PATCH 43/63] nitter: 2022-05-13 -> 2022-06-04 --- pkgs/servers/nitter/default.nix | 43 ++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix index 3931f5b3281..8005b78df53 100644 --- a/pkgs/servers/nitter/default.nix +++ b/pkgs/servers/nitter/default.nix @@ -1,32 +1,37 @@ -{ lib, nimPackages, nixosTests, fetchFromGitHub, libsass }: +{ lib +, fetchFromGitHub +, nimPackages +, nixosTests +}: nimPackages.buildNimPackage rec { pname = "nitter"; - version = "unstable-2022-05-13"; - nimBinOnly = true; + version = "unstable-2022-06-04"; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "683c052036b268028f0ecae020a1519bc586516d"; - sha256 = "179z66jlwbdarrgvpdh8aqy2ihkiakd22wqydrfgpsgr59ma8fgl"; + rev = "138826fb4fbdec73fc6fee2e025fda88f7f2fb49"; + hash = "sha256-fdzVfzmEFIej6Kb/K9MQyvbN8aN3hO7RetHL53cD59k="; }; buildInputs = with nimPackages; [ - jester - karax - sass - nimcrypto - markdown - packedjson - supersnappy - redpool - redis - zippy flatty + jester jsony + karax + markdown + nimcrypto + packedjson + redis + redpool + sass + supersnappy + zippy ]; + nimBinOnly = true; + postBuild = '' nim c --hint[Processing]:off -r tools/gencss nim c --hint[Processing]:off -r tools/rendermd @@ -37,13 +42,13 @@ nimPackages.buildNimPackage rec { cp -r public $out/share/nitter/public ''; - passthru.tests = { inherit (nixosTests) nitter; }; - meta = with lib; { - description = "Alternative Twitter front-end"; homepage = "https://github.com/zedeus/nitter"; - maintainers = with maintainers; [ erdnaxe ]; + description = "Alternative Twitter front-end"; license = licenses.agpl3Only; + maintainers = with maintainers; [ erdnaxe ]; mainProgram = "nitter"; }; + + passthru.tests = { inherit (nixosTests) nitter; }; } From f6f5188f751cdb9821802eef4e5e680e758eca53 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 29 May 2022 15:05:10 +0200 Subject: [PATCH 44/63] =?UTF-8?q?oacmlPackages.odate:=20make=20compatible?= =?UTF-8?q?=20with=20menhir=20=E2=89=A5=2020211215?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/odate/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix index 8967a381547..24d2c04c6ca 100644 --- a/pkgs/development/ocaml-modules/odate/default.nix +++ b/pkgs/development/ocaml-modules/odate/default.nix @@ -6,9 +6,7 @@ buildDunePackage rec { pname = "odate"; version = "0.6"; - useDune2 = true; - - minimumOCamlVersion = "4.07"; + minimalOCamlVersion = "4.07"; src = fetchFromGitHub { owner = "hhugo"; @@ -21,6 +19,11 @@ buildDunePackage rec { nativeBuildInputs = [ menhir ]; + # Ensure compatibility of v0.6 with menhir ≥ 20220210 + preBuild = '' + substituteInPlace dune-project --replace "(using menhir 1.0)" "(using menhir 2.0)" + ''; + meta = { description = "Date and duration in OCaml"; inherit (src.meta) homepage; From 0a91054a94cf4abab1048134cc8066d2a7db4ede Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 29 May 2022 15:05:22 +0200 Subject: [PATCH 45/63] =?UTF-8?q?oacmlPackages.toml:=20make=20compatible?= =?UTF-8?q?=20with=20menhir=20=E2=89=A5=2020211215?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/toml/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/toml/default.nix b/pkgs/development/ocaml-modules/toml/default.nix index b79d80016d9..41c52985cf9 100644 --- a/pkgs/development/ocaml-modules/toml/default.nix +++ b/pkgs/development/ocaml-modules/toml/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage +{ lib, fetchFromGitHub, fetchpatch, buildDunePackage , iso8601, menhir }: @@ -13,6 +13,12 @@ buildDunePackage rec { sha256 = "sha256-VEZQTFPwAGShCBGbKUiNOIY1zA/JdTpXU0ZIGNWopnQ="; }; + # Ensure compatibility with menhir ≥ 20211215 + patches = fetchpatch { + url = "https://github.com/ocaml-toml/To.ml/commit/41172b739dff43424a12f7c1f0f64939e3660648.patch"; + sha256 = "sha256:1333xkmm9qp5m3pp4y5w17k6rvmb30v62qyra6rfk1km2v28hqqq"; + }; + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ iso8601 ]; From 1b95daa381fa4a0963217a5d386433c20008208a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 29 May 2022 15:05:27 +0200 Subject: [PATCH 46/63] =?UTF-8?q?alt-ergo:=20ensure=20compatibility=20with?= =?UTF-8?q?=20Menhir=20=E2=89=A5=2020211215?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../science/logic/alt-ergo/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 0767c58bdea..553f133c7f7 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, which, ocamlPackages }: +{ fetchFromGitHub, fetchpatch, lib, which, ocamlPackages }: let pname = "alt-ergo"; @@ -10,13 +10,11 @@ let rev = version; sha256 = "0hglj1p0753w2isds01h90knraxa42d2jghr35dpwf9g8a1sm9d3"; }; - - useDune2 = true; in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src useDune2; + inherit version src; configureFlags = [ pname ]; nativeBuildInputs = [ which ]; buildInputs = with ocamlPackages; [ dune-configurator ]; @@ -25,7 +23,7 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src useDune2; + inherit version src; configureFlags = [ pname ]; nativeBuildInputs = [ which ocamlPackages.menhir ]; propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); @@ -33,7 +31,13 @@ let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage { - inherit pname version src useDune2; + inherit pname version src; + + # Ensure compatibility with Menhir ≥ 20211215 + patches = fetchpatch { + url = "https://github.com/OCamlPro/alt-ergo/commit/0f9c45af352657c3aec32fca63d11d44f5126df8.patch"; + sha256 = "sha256:0zaj3xbk2s8k8jl0id3nrhdfq9mv0n378cbawwx3sziiizq7djbg"; + }; configureFlags = [ pname ]; From c25fcedaf0997809df52d9861c27d5d0d73ca932 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 29 May 2022 15:05:30 +0200 Subject: [PATCH 47/63] liquidsoap: pin menhir dependency --- pkgs/tools/audio/liquidsoap/full.nix | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 94cc353dd1c..a9319696a3a 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -1,4 +1,5 @@ { lib, stdenv, makeWrapper, fetchurl, which, pkg-config +, fetchFromGitLab , ocamlPackages , libao, portaudio, alsa-lib, libpulseaudio, libjack2 , libsamplerate, libmad, taglib, lame, libogg @@ -20,6 +21,28 @@ let "voaacenc" "soundtouch" "gavl" "lo" ]; in + +# Liquidsoap 1.4.2 is not compatible with menhir ≥ 20220210 +# Locally override menhir to an earlier version +let menhirLib = ocamlPackages.menhirLib.overrideAttrs (o: rec { + version = "20211128"; + src = fetchFromGitLab { + domain = "gitlab.inria.fr"; + owner = "fpottier"; + repo = "menhir"; + rev = version; + sha256 = "sha256-L/zfjPZfn9L7qqqqJGk3Ge52rvujOVPiL8jxfH5R60g="; + }; + }); + + menhirSdk = ocamlPackages.menhirSdk.override { inherit menhirLib; }; + + menhir = ocamlPackages.menhir.override { + inherit menhirLib menhirSdk; + }; + +in + stdenv.mkDerivation { name = "${pname}-full-${version}"; @@ -59,7 +82,7 @@ stdenv.mkDerivation { ocamlPackages.xmlm ocamlPackages.ocaml_pcre ocamlPackages.camomile ocamlPackages.fdkaac - ocamlPackages.srt ocamlPackages.sedlex ocamlPackages.menhir ocamlPackages.menhirLib + ocamlPackages.srt ocamlPackages.sedlex menhir menhirLib ]; hardeningDisable = [ "format" "fortify" ]; From 81008f02c420a34097f2c612edf08cf298c695c5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 29 May 2022 15:05:35 +0200 Subject: [PATCH 48/63] =?UTF-8?q?ocamlPackages.menhir:=2020211128=20?= =?UTF-8?q?=E2=86=92=2020220210?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/menhir/default.nix | 2 +- pkgs/development/ocaml-modules/menhir/lib.nix | 6 ++---- pkgs/development/ocaml-modules/menhir/sdk.nix | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 1938206361e..e4eba6e4f5c 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -7,7 +7,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.03"; - inherit (menhirLib) version src useDune2; + inherit (menhirLib) version src; buildInputs = [ menhirLib menhirSdk ]; diff --git a/pkgs/development/ocaml-modules/menhir/lib.nix b/pkgs/development/ocaml-modules/menhir/lib.nix index 4d27fe32738..e351ee7e631 100644 --- a/pkgs/development/ocaml-modules/menhir/lib.nix +++ b/pkgs/development/ocaml-modules/menhir/lib.nix @@ -2,18 +2,16 @@ buildDunePackage rec { pname = "menhirLib"; - version = "20211128"; + version = "20220210"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "fpottier"; repo = "menhir"; rev = version; - sha256 = "sha256-L/zfjPZfn9L7qqqqJGk3Ge52rvujOVPiL8jxfH5R60g="; + sha256 = "sha256:0f31isr3cyiishflz6qr4xc3gp9xwf32r3vxdvm5wnr2my1fnn1n"; }; - useDune2 = true; - meta = with lib; { homepage = "http://pauillac.inria.fr/~fpottier/menhir/"; description = "Runtime support library for parsers generated by Menhir"; diff --git a/pkgs/development/ocaml-modules/menhir/sdk.nix b/pkgs/development/ocaml-modules/menhir/sdk.nix index 0e60849494c..cc699175af3 100644 --- a/pkgs/development/ocaml-modules/menhir/sdk.nix +++ b/pkgs/development/ocaml-modules/menhir/sdk.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "menhirSdk"; - inherit (menhirLib) version src useDune2; + inherit (menhirLib) version src; meta = menhirLib.meta // { description = "Compile-time library for auxiliary tools related to Menhir"; From 4b88d42f5125b6b97d4991d0f7efac95f18d90c1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 29 May 2022 07:28:42 +0100 Subject: [PATCH 49/63] firefox: disable 'MOZILLA_OFFICIAL=1' on i686 Without the change firefox build on i686 fails at configure time: $ NIXPKGS_ALLOW_BROKEN=1 nix build -f. --argstr system "i686-linux" firefox ... mozbuild.configure.options.InvalidOptionError: '--enable-release' implied by 'MOZILLA_OFFICIAL' conflicts with '--disable-release' from the command-line The change uses the same 32-bit guard for both. It still does not allow i686 build to succeed for other toolchain misconfiguration, but it's a step forward. --- pkgs/applications/networking/browsers/firefox/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 06bfddd1d8d..e82a87c59ec 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -328,7 +328,7 @@ buildStdenv.mkDerivation ({ # please get your own set of keys at https://location.services.mozilla.com/api. echo "dfd7836c-d458-4917-98bb-421c82d3c8a0" > $TMPDIR/mls-api-key configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key") - '' + lib.optionalString enableOfficialBranding '' + '' + lib.optionalString (enableOfficialBranding && !stdenv.is32bit) '' export MOZILLA_OFFICIAL=1 ''; From fb52e287c79457f253d3e2c5647d1b8697d1b14b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 05:29:46 +0000 Subject: [PATCH 50/63] castor: 0.8.18 -> 0.9.0 --- pkgs/applications/networking/browsers/castor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index 71b4593c40d..5a0a7f0d215 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "castor"; - version = "0.8.18"; + version = "0.9.0"; src = fetchFromSourcehut { owner = "~julienxx"; repo = pname; rev = version; - sha256 = "sha256-sv6hiSTVFe3jxNuaM6Jyn7UeqFqUNmRvYtWfkJTJ4tA="; + sha256 = "sha256-yYLDbxmUR86fdpbHQQTiHVUbicnOD75cl3Vhofw5qr0="; }; - cargoSha256 = "sha256-/IHxvTW9VYZmgjmDh0zJFDQqfw/H5CXVwEuLKq6Hnys="; + cargoSha256 = "sha256-AHhKfy2AAcDBcknzNb8DAzm51RQqFQDuWN+Hp5731Yk="; nativeBuildInputs = [ pkg-config From 95f001206fd289959940fa1f6cc10993841818cb Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 5 Jun 2022 10:13:08 -0400 Subject: [PATCH 51/63] sway: Disable strictDeps for wrapper strictDeps breaks `withGtkWrapper` as, it seems, the setup hook does not run and `GSETTINGS_SCHEMA_PATH` does not get set so `XDG_DATA_DIRS` is not updated. Probably other things are broken by it as well. See also probably related https://github.com/NixOS/nixpkgs/issues/56943 (mentioned from `doc/languages-frameworks/gnome.section.md`). This partially reverts commit da4707d6366e0784116102743c58c89d98b7ac68. --- pkgs/applications/window-managers/sway/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 1eb9693379e..42384fa06ae 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -37,7 +37,7 @@ in symlinkJoin { paths = (optional withBaseWrapper baseWrapper) ++ [ sway ]; - strictDeps = true; + strictDeps = false; nativeBuildInputs = [ makeWrapper ] ++ (optional withGtkWrapper wrapGAppsHook); From e3b9cba7cb47ec3e09d2e2801873cc834158520e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 5 Jun 2022 15:18:59 +0100 Subject: [PATCH 52/63] xboard: pull patch pending upstream inclusion for -fno-common toolchain support Without the change build fails on upstream gcc-10 as: ld: evalgraph.o:(.bss+0x20): multiple definition of `ics_type'; backend.o:(.bss+0x1df910): first defined here ld: nevalgraph.o:(.bss+0x8): multiple definition of `currPvInfo'; backend.o:(.bss+0x1df908): first defined here --- pkgs/games/xboard/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 663207bd23c..eefbb90114f 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , libX11 , xorgproto , libXt @@ -28,6 +29,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ky5T6EKK2bbo3IpVs6UYM4GRGk2uLABy+pYpa7sZcNY="; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common toolchain support: + # https://savannah.gnu.org/patch/index.php?10211 + (fetchpatch { + name = "fno-common.patch"; + url = "https://savannah.gnu.org/patch/download.php?file_id=53275"; + sha256 = "sha256-ZOo9jAy1plFjhC5HXJQvXL+Zf7FL14asV3G4AwfgqTY="; + }) + ]; + buildInputs = [ libX11 xorgproto From 1a82aefed87666388380fce418f7ae0117de3fe6 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 5 Jun 2022 23:05:52 +0800 Subject: [PATCH 53/63] gx: 0.14.1 -> 0.14.3 (#176176) --- pkgs/tools/package-management/gx/default.nix | 17 +- pkgs/tools/package-management/gx/deps.nix | 246 ------------------ .../package-management/gx/go/default.nix | 11 +- 3 files changed, 9 insertions(+), 265 deletions(-) delete mode 100644 pkgs/tools/package-management/gx/deps.nix diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 60fbdd4941f..0384cbce772 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -1,20 +1,19 @@ -# This file was generated by go2nix. -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gx"; - version = "0.14.1"; - - goPackagePath = "github.com/whyrusleeping/gx"; + version = "0.14.3"; src = fetchFromGitHub { owner = "whyrusleeping"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "0pfx2p59xdbmqzfbgaf8xvlnzh8m05hkg596glq5kvl8ib65i4ha"; + rev = "v${version}"; + sha256 = "sha256-jGtUsb2gm8dN45wniD+PYoUlk8m1ssrfj1a7PPYEYuo="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-6tdVpMztaBjoQRVG2vaUWuvnPq05zjbNAX9HBiC50t0="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A packaging tool built around IPFS"; diff --git a/pkgs/tools/package-management/gx/deps.nix b/pkgs/tools/package-management/gx/deps.nix deleted file mode 100644 index 766e58775b4..00000000000 --- a/pkgs/tools/package-management/gx/deps.nix +++ /dev/null @@ -1,246 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/blang/semver"; - fetch = { - type = "git"; - url = "https://github.com/blang/semver"; - rev = "3c1074078d32d767e08ab2c8564867292da86926"; - sha256 = "1vqkjrag8nn5hvjz34cf9zsrgwd13ss63y6sp7y5jq39j7bcprdx"; - }; - } - { - goPackagePath = "github.com/btcsuite/btcd"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btcd"; - rev = "67e573d211ace594f1366b4ce9d39726c4b19bd0"; - sha256 = "04s92gsy71w1jirlr5lkk9y6r5cparbas7nmf6ywbp7kq7fn8ajn"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "07eab6a8298cf32fac45cceaac59424f98421bbc"; - sha256 = "1l2v9yq74qsiq3q7kii091rzx67jx6isz5szs27hyhsdwvy0y2p7"; - }; - } - { - goPackagePath = "github.com/gxed/hashland"; - fetch = { - type = "git"; - url = "https://github.com/gxed/hashland"; - rev = "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8"; - sha256 = "1q23y4lacsz46k9gmgfw4iwwydw36j2601rbidmmswl94grpc386"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-api"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-api"; - rev = "b4fd7838d9771414868cb78fa8c4f97e47cad013"; - sha256 = "1kb0ja6bji9q1ly66hx3490mjmk3w56zpwl9c0pkfy6da9x4dkyr"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-files"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-files"; - rev = "90d206a6f3947f904673ebffd376a2dcbbd84942"; - sha256 = "0bq6lciqba362lqmszjf1x33qwdpfrfik6r680iqr5c4sybywzqv"; - }; - } - { - goPackagePath = "github.com/libp2p/go-flow-metrics"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-flow-metrics"; - rev = "7e5a55af485341567f98d6847a373eb5ddcdcd43"; - sha256 = "1p87iyk6q6f3g3xkncssx400qlld8f2z93qiz8m1f97grfyhjif1"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-crypto"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-crypto"; - rev = "3120e9f9526fe05f2d3905961a5e0701b85579d9"; - sha256 = "05i8jcfmk51zln634x782jvjmmn5l11104ylzqfnjxgjibz9pyd7"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-metrics"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-metrics"; - rev = "2d5733beaa2a9fdd05ef696d7a734aa61549fb2a"; - sha256 = "1g59z1mn483npmzgdyxn5w7w1k94phi5lgqkw3lq8i1b2jdy5mci"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-peer"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-peer"; - rev = "d3df4bca884d7a9c2d350c8120240db3c2b0f2ee"; - sha256 = "0hn75dnr80f846jj38bpcjw5z73iw292ygcqsfbghvdrwl2pf5xm"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-protocol"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-protocol"; - rev = "b29f3d97e3a2fb8b29c5d04290e6cb5c5018004b"; - sha256 = "1xgjfnx9zcqglg9li29wdqywsp8hz22wx6phns9zscni2jsfidld"; - }; - } - { - goPackagePath = "github.com/minio/blake2b-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/blake2b-simd"; - rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4"; - sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd"; - }; - } - { - goPackagePath = "github.com/minio/sha256-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/sha256-simd"; - rev = "51976451ce1942acbb55707a983ed232fa027110"; - sha256 = "0kaxvpidf6ygkkb06vi95pirll31jnmywhyalfjvf7djhim2wr8f"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - { - goPackagePath = "github.com/mr-tron/base58"; - fetch = { - type = "git"; - url = "https://github.com/mr-tron/base58"; - rev = "c8897612421d88a51012eaa53bf7267686173ae5"; - sha256 = "10lr50ia7xccfdvg772f7nb2azn81djcpnckhblhwq6l6a1fpm48"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multiaddr"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multiaddr"; - rev = "ec8630b6b7436b5d7f6c1c2366d3d7214d1b29e2"; - sha256 = "1npx4d3scj087a54m6my2xnd0wga8bkklswnbhzghwhhpsgmy800"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multiaddr-net"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multiaddr-net"; - rev = "f0af4033635f1241179700537dacdc04f2803df8"; - sha256 = "0s90ix09mm6dc8319l48g3zhnjl1mkih168wsdh6fdf73801lhg5"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multihash"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multihash"; - rev = "a91e75d03bf4dba801af7b159c8b2aa7b5f47ea8"; - sha256 = "1xvj944qg17vmdgzhyn5qryqrksyxi1q188f91my52wfkz23qmmm"; - }; - } - { - goPackagePath = "github.com/sabhiram/go-gitignore"; - fetch = { - type = "git"; - url = "https://github.com/sabhiram/go-gitignore"; - rev = "d3107576ba9425fc1c85f4b3569c4631b805a02e"; - sha256 = "1rdwyxgcsiwgmlqnc3k6h300mzlvjc3j21np4yh1h476wc8dvl0l"; - }; - } - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc725b9e6d41a297405f65e7e8804acc"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b"; - sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/json-filter"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/json-filter"; - rev = "ff25329a9528f01c5175414f16cc0a6a162a5b8b"; - sha256 = "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/progmeter"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/progmeter"; - rev = "f3e57218a75b913eff88d49a52c1debf9684ea04"; - sha256 = "0xs8rz6yhpvj9512c5v3b8dwr2kivywnyyfxzdfbr6fy1xc8zskb"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/stump"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/stump"; - rev = "206f8f13aae1697a6fc1f4a55799faf955971fc5"; - sha256 = "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/tar-utils"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/tar-utils"; - rev = "8c6c8ba81d5c71fd69c0f48dbde4b2fb422b6dfc"; - sha256 = "14jjdw3yics0k467xsyk388684wdpi0bbx8nqj0y4pqxa0s0in6s"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "3d3f9f413869b949e48070b5bc593aa22cc2b8f2"; - sha256 = "0rbkcq48lkiw043sm8hciprqy2d77s4agpj6rwy2qgbqm8gvv3a6"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "ec83556a53fe16b65c452a104ea9d1e86a671852"; - sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f"; - }; - } -] diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index ad4435c9e2d..bc5b90993a6 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -1,7 +1,5 @@ # This file was generated by go2nix. -{ lib, buildGoPackage, fetchFromGitHub -, gx -}: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gx-go"; @@ -18,13 +16,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - extraSrcs = [ - { - goPackagePath = gx.goPackagePath; - src = gx.src; - } - ]; - meta = with lib; { description = "A tool for importing go packages into gx"; homepage = "https://github.com/whyrusleeping/gx-go"; From 1acba8b3e5d35eb971519785e9dce857b95cbdbc Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 4 Jun 2022 11:14:33 +0200 Subject: [PATCH 54/63] psst: 2022-01-25 -> 2022-05-19 and fix build --- pkgs/applications/audio/psst/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix index d2d4927c113..5d41661b6d5 100644 --- a/pkgs/applications/audio/psst/default.nix +++ b/pkgs/applications/audio/psst/default.nix @@ -2,22 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "psst"; - version = "unstable-2022-01-25"; + version = "unstable-2022-05-19"; src = fetchFromGitHub { owner = "jpochyla"; repo = pname; - rev = "1627cd4a301dd51e9ee3034294cd7b0d94d02ddc"; - sha256 = "sha256-kepvYhmieXx6Hj79aqaA7tYUnueaBsNx0U4lV7K6LuU="; + rev = "e403609e0916fe664fb1f28c7a259d01fa69b0e9"; + sha256 = "sha256-hpAP/m9aJsfh9FtwLqaKFZllnCQn9OSYLWuNZakZJnk="; }; - cargoSha256 = "sha256-DcdlQudGyWUUAacV7pAOLDvhd1fgAkEesdxDkHSYm4M="; + cargoSha256 = "sha256-gQ0iI2wTS5n5pItmQCmFXDs5L8nA2w5ZrZyZtpMlUro="; # specify the subdirectory of the binary crate to build from the workspace buildAndTestSubdir = "psst-gui"; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib @@ -30,10 +28,14 @@ rustPlatform.buildRustPackage rec { pango ]; + postInstall = '' + install -Dm444 psst-gui/assets/logo_512.png $out/share/icons/${pname}.png + ''; + meta = with lib; { description = "Fast and multi-platform Spotify client with native GUI"; homepage = "https://github.com/jpochyla/psst"; license = licenses.mit; - maintainers = [ maintainers.vbrandl ]; + maintainers = with maintainers; [ vbrandl peterhoeg ]; }; } From e366bbf9b631b3e54bc829780c4fefd3b21534ff Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 5 Jun 2022 12:35:04 +0200 Subject: [PATCH 55/63] janet: 1.21.2 -> 1.22.0 Fixes CVE-2022-30763 https://github.com/janet-lang/janet/releases/tag/v1.22.0 --- pkgs/development/interpreters/janet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 098a7fe7d3a..2d9a02e1752 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.21.2"; + version = "1.22.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6E726+DLs1hCUbr2/rqIdSn8u94LLFdKBBHkbB4rgm0="; + sha256 = "sha256-FOs8ZfO61A1amovLy4EDSZiZ6XlwVNXf1TiPvNo6BnQ="; }; # This release fails the test suite on darwin, remove when debugged. From 1b467b894b7dd9c9fc6ceff3f6c7a5ce4c24555e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 May 2022 18:03:28 +0800 Subject: [PATCH 56/63] platformio: needs xdg-user-dirs --- pkgs/development/embedded/platformio/chrootenv.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/embedded/platformio/chrootenv.nix b/pkgs/development/embedded/platformio/chrootenv.nix index 138e7186624..fbabfe982de 100644 --- a/pkgs/development/embedded/platformio/chrootenv.nix +++ b/pkgs/development/embedded/platformio/chrootenv.nix @@ -8,9 +8,11 @@ let platformio = self.callPackage ./core.nix { inherit version src; }; }; }; - in (with pkgs; [ + in + (with pkgs; [ zlib git + xdg-user-dirs ]) ++ (with python.pkgs; [ python setuptools @@ -19,7 +21,8 @@ let platformio ]); -in buildFHSUserEnv { +in +buildFHSUserEnv { name = "platformio"; targetPkgs = pio-pkgs; From e5b2c5f447ff3cadbbaff89ef2d547eee07c250d Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 8 Oct 2021 01:31:47 +0200 Subject: [PATCH 57/63] ocamlPackages.alsa: init at 3.0.0 --- .../ocaml-modules/alsa/default.nix | 25 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/alsa/default.nix diff --git a/pkgs/development/ocaml-modules/alsa/default.nix b/pkgs/development/ocaml-modules/alsa/default.nix new file mode 100644 index 00000000000..988ca8280dc --- /dev/null +++ b/pkgs/development/ocaml-modules/alsa/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, alsa-lib }: + +buildDunePackage rec { + pname = "alsa"; + version = "0.3.0"; + + minimalOCamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-alsa"; + rev = version; + sha256 = "1qy22g73qc311rmv41w005rdlj5mfnn4yj1dx1jhqzr31zixl8hj"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ alsa-lib ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-alsa"; + description = "OCaml interface for libasound2"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3119d138dfd..ba4529909e5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -24,6 +24,8 @@ let alcotest-mirage = callPackage ../development/ocaml-modules/alcotest/mirage.nix {}; + alsa = callPackage ../development/ocaml-modules/alsa { }; + angstrom = callPackage ../development/ocaml-modules/angstrom { }; angstrom-async = callPackage ../development/ocaml-modules/angstrom-async { }; From e5031b839b07a5432f12fd2505339c7cbdaabfd4 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 10 Oct 2021 14:43:23 +0200 Subject: [PATCH 58/63] ocamlPackages.gstreamer: init at 0.3.1 --- .../ocaml-modules/gstreamer/default.nix | 31 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/ocaml-modules/gstreamer/default.nix diff --git a/pkgs/development/ocaml-modules/gstreamer/default.nix b/pkgs/development/ocaml-modules/gstreamer/default.nix new file mode 100644 index 00000000000..4ef3e98cb75 --- /dev/null +++ b/pkgs/development/ocaml-modules/gstreamer/default.nix @@ -0,0 +1,31 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, glib, gst_all_1 }: + +buildDunePackage rec { + pname = "gstreamer"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-gstreamer"; + rev = "v${version}"; + sha256 = "0y8xi1q0ld4hrk96bn6jfh9slyjrxmnlhm662ynacp3yzalp8jji"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ glib.dev gst_all_1.gstreamer.dev gst_all_1.gst-plugins-base ]; + + CFLAGS_COMPILE = [ + "-I${glib.dev}/include/glib-2.0" + "-I${glib.out}/lib/glib-2.0/include" + "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" + "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" + ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-gstreamer"; + description = "Bindings for the GStreamer library which provides functions for playning and manipulating multimedia streams"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ba4529909e5..03dfc2afbe8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -482,6 +482,8 @@ let inherit (pkgs) gsl; }; + gstreamer = callPackage ../development/ocaml-modules/gstreamer { }; + h2 = callPackage ../development/ocaml-modules/h2 { }; hack_parallel = callPackage ../development/ocaml-modules/hack_parallel { }; From 754433d82a58d18a3c492cc84b4eae794766d648 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 30 Oct 2021 17:08:37 +0200 Subject: [PATCH 59/63] ocamlPackages.portaudio: init at 0.2.3 --- .../ocaml-modules/portaudio/default.nix | 23 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/portaudio/default.nix diff --git a/pkgs/development/ocaml-modules/portaudio/default.nix b/pkgs/development/ocaml-modules/portaudio/default.nix new file mode 100644 index 00000000000..9a6b450b5c4 --- /dev/null +++ b/pkgs/development/ocaml-modules/portaudio/default.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, portaudio }: + +buildDunePackage rec { + pname = "portaudio"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-portaudio"; + rev = "v${version}"; + sha256 = "sha256-rMSE+ta7ughjjCnz4oho1D3VGaAsUlLtxizvxZT0/cQ="; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ portaudio ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-portaudio"; + description = "Bindings for the portaudio library which provides high-level functions for using soundcards"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 03dfc2afbe8..e0138ffb291 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1209,6 +1209,10 @@ let pipebang = callPackage ../development/ocaml-modules/pipebang { }; + portaudio = callPackage ../development/ocaml-modules/portaudio { + inherit (pkgs) portaudio; + }; + pprint = callPackage ../development/ocaml-modules/pprint { }; ppx_blob = callPackage ../development/ocaml-modules/ppx_blob { }; From 7ed016627f9b7c3a0ab068cb526ad37ec2f8bcc7 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 30 Oct 2021 20:17:51 +0200 Subject: [PATCH 60/63] ocamlPackages.pulseaudio: init at 0.1.5 --- .../ocaml-modules/pulseaudio/default.nix | 24 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/pulseaudio/default.nix diff --git a/pkgs/development/ocaml-modules/pulseaudio/default.nix b/pkgs/development/ocaml-modules/pulseaudio/default.nix new file mode 100644 index 00000000000..75f5e0f414f --- /dev/null +++ b/pkgs/development/ocaml-modules/pulseaudio/default.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, pulseaudio }: + +buildDunePackage rec { + pname = "pulseaudio"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-pulseaudio"; + rev = "v${version}"; + sha256 = "sha256-eG2HS5g3ycDftRDyXGBwPJE7VRnLXNUgcEgNfVm//ds="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ pulseaudio ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-pulseaudio"; + description = "Bindings to Pulseaudio client library"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e0138ffb291..1a03b0c2bcd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1135,6 +1135,10 @@ let ptime = callPackage ../development/ocaml-modules/ptime { }; + pulseaudio = callPackage ../development/ocaml-modules/pulseaudio { + inherit (pkgs) pulseaudio; + }; + pure-splitmix = callPackage ../development/ocaml-modules/pure-splitmix { }; resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { }; From 5a8e7406ca7d56b1b1d8590d44ca1966887eb9ed Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 5 Jun 2022 18:05:40 +0100 Subject: [PATCH 61/63] mcomix: init at 2.0.2 This was removed in https://github.com/NixOS/nixpkgs/pull/74295 because it was compatible with Python 2 only. mcomix3 was a fork originally introduced to port it to Python 3, however upstream eventually released version 2.x, porting it to Python 3. --- pkgs/applications/graphics/mcomix/default.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/applications/graphics/mcomix/default.nix diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix new file mode 100644 index 00000000000..530ae0013b5 --- /dev/null +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -0,0 +1,64 @@ +{ lib +, fetchurl +, gdk-pixbuf +, gobject-introspection +, gtk3 +, mcomix +, python3 +, testVersion +, wrapGAppsHook + +# Recommended Dependencies: +, lhasa +, mupdf +, p7zip +, unrar +, unrarSupport ? false # unfree software +}: + +python3.pkgs.buildPythonApplication rec { + pname = "mcomix"; + version = "2.0.2"; + + src = fetchurl { + url = "mirror://sourceforge/mcomix/${pname}-${version}.tar.gz"; + sha256 = "sha256-7zjQcT5WoHxy+YzCDJ6s2ngOOfO4L9exuqBqacecClg="; + }; + + buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ]; + nativeBuildInputs = [ wrapGAppsHook ]; + propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]); + + # Tests are broken + doCheck = false; + + # Correct wrapper behavior, see https://github.com/NixOS/nixpkgs/issues/56943 + # until https://github.com/NixOS/nixpkgs/pull/102613 + strictDeps = false; + + # prevent double wrapping + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + "--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip lhasa mupdf ] ++ lib.optional (unrarSupport) unrar)}" + ) + ''; + + passthru.tests.version = testVersion { + package = mcomix; + }; + + meta = with lib; { + description = "Comic book reader and image viewer"; + longDescription = '' + User-friendly, customizable image viewer, specifically designed to handle + comic books and manga supporting a variety of container formats + (including CBR, CBZ, CB7, CBT, LHA and PDF) + ''; + homepage = "https://sourceforge.net/projects/mcomix/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ thiagokokada ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98f94a75669..f563e1dc4fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28037,6 +28037,8 @@ with pkgs; mbrola = callPackage ../applications/audio/mbrola { }; + mcomix = callPackage ../applications/graphics/mcomix { }; + mcomix3 = callPackage ../applications/graphics/mcomix3 {}; mcpp = callPackage ../development/compilers/mcpp { }; From 09e3c1209172a224d3ca6be2de4466f2612f4a4c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 5 Jun 2022 18:11:43 +0100 Subject: [PATCH 62/63] mcomix3: remove and alias it to mcomix The mcomix3 fork now recommends usage of mcomix. --- .../applications/graphics/mcomix3/default.nix | 105 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 pkgs/applications/graphics/mcomix3/default.nix diff --git a/pkgs/applications/graphics/mcomix3/default.nix b/pkgs/applications/graphics/mcomix3/default.nix deleted file mode 100644 index 30a05673897..00000000000 --- a/pkgs/applications/graphics/mcomix3/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ lib -, fetchFromGitHub -, wrapGAppsHook -, installShellFiles -, python3 -, gobject-introspection -, gtk3 -, gdk-pixbuf - -# Recommended Dependencies: -, unrarSupport ? false # unfree software -, unrar -, p7zip -, lhasa -, mupdf -}: - -python3.pkgs.buildPythonApplication rec { - pname = "mcomix3"; - version = "unstable-2021-04-23"; - - # no official release on pypi/github and no build system - src = fetchFromGitHub { - repo = "${pname}"; - owner = "multiSnow"; - rev = "139344e23898c28484328fc29fd0c6659affb12d"; - sha256 = "0q9xgl60ryf7qmy5vgzgfry4rvw5j9rb4d1ilxmpjmvm7dd3fm2k"; - }; - - buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ]; - nativeBuildInputs = [ wrapGAppsHook installShellFiles ]; - propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]); - - format = "other"; - - # Correct wrapper behavior, see https://github.com/NixOS/nixpkgs/issues/56943 - # until https://github.com/NixOS/nixpkgs/pull/102613 - strictDeps = false; - - preInstall = '' - libdir=$out/lib/${python3.libPrefix}/site-packages - mkdir -p $out/share/{icons/hicolor,man/man1,applications,metainfo,thumbnailers} - mkdir -p $out/bin $libdir - ''; - - installPhase = '' - runHook preInstall - - substituteInPlace mime/*.desktop \ - --replace "Exec=mcomix" "Exec=mcomix3" \ - --replace "Icon=mcomix" "Icon=${pname}" - ${python3.executable} installer.py --srcdir=mcomix --target=$libdir - mv $libdir/mcomix/mcomixstarter.py $out/bin/${pname} - mv $libdir/mcomix/comicthumb.py $out/bin/comicthumb - mv $libdir/mcomix/mcomix/* $libdir/mcomix - - runHook postInstall - ''; - - postInstall = '' - rmdir $libdir/mcomix/mcomix - mv man/mcomix.1 man/${pname}.1 - installManPage man/* - cp -r mime/icons/* $out/share/icons/hicolor/ - cp mime/*.desktop $out/share/applications/ - cp mime/*.appdata.xml $out/share/metainfo/ - cp mime/*.thumbnailer $out/share/thumbnailers/ - for folder in $out/share/icons/hicolor/*; do - mkdir $folder/{apps,mimetypes} - mv $folder/*.png $folder/mimetypes - cp $libdir/mcomix/images/$(basename $folder)/mcomix.png $folder/apps/${pname}.png - cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbr.png - cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbz.png - done - ''; - - # prevent double wrapping - dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - "--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip lhasa mupdf ] ++ lib.optional (unrarSupport) unrar)}" - ) - ''; - - # real pytests broken upstream - checkPhase = '' - $out/bin/comicthumb --help > /dev/null - $out/bin/${pname} --help > /dev/null - ''; - - meta = with lib; { - description = "Comic book reader and image viewer; python3 fork of mcomix"; - longDescription = '' - User-friendly, customizable image viewer, specifically designed to handle - comic books and manga supporting a variety of container formats - (including CBR, CBZ, CB7, CBT, LHA and PDF) - ''; - homepage = "https://github.com/multiSnow/mcomix3"; - changelog = "https://github.com/multiSnow/mcomix3/blob/gtk3/ChangeLog"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ confus ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7ef48d6193d..a1620d99d22 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -833,6 +833,7 @@ mapAliases ({ matrique = spectral; # Added 2020-01-27 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # Added 2020-05-23 + mcomix3 = mcomix; # Added 2022-06-05 mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04 meme = meme-image-generator; # Added 2021-04-21 memtest86 = throw "'memtest86' has been renamed to/replaced by 'memtest86plus'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f563e1dc4fb..a2c3b14d281 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28039,8 +28039,6 @@ with pkgs; mcomix = callPackage ../applications/graphics/mcomix { }; - mcomix3 = callPackage ../applications/graphics/mcomix3 {}; - mcpp = callPackage ../development/compilers/mcpp { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; From 74fbade62f6c9cf492c478a840e2746a5f9b9005 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 5 Jun 2022 12:15:25 -0400 Subject: [PATCH 63/63] qmk: 1.0.0 -> 1.1.0 --- pkgs/tools/misc/qmk/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index 21eb7bdab29..510e1e45774 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -10,11 +10,11 @@ python3.pkgs.buildPythonApplication rec { pname = "qmk"; - version = "1.0.0"; + version = "1.1.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-2mLuxzxFSMw3sLm+OTcgLcOjAdwvJmNhDsynUaYQ+co="; + sha256 = "sha256-dxV3yeaOt/4IlpurNq60IHE6UlBi3OUqBu2kDajNpeE="; }; nativeBuildInputs = with python3.pkgs; [ @@ -36,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { milc pygments pyusb + pillow ] ++ [ # Binaries need to be in the path so this is in propagatedBuildInputs avrdude dfu-programmer