Merge staging-next into staging

main
github-actions[bot] 2 years ago committed by GitHub
commit c5aa4ef300
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 17
      maintainers/maintainer-list.nix
  2. 22
      nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
  3. 11
      nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
  4. 11
      nixos/doc/manual/release-notes/rl-2205.section.md
  5. 1
      nixos/doc/manual/release-notes/rl-2211.section.md
  6. 16
      nixos/modules/services/web-apps/peertube.nix
  7. 8
      nixos/modules/services/x11/desktop-managers/phosh.nix
  8. 1
      nixos/tests/matrix/mjolnir.nix
  9. 7
      nixos/tests/web-apps/peertube.nix
  10. 66
      pkgs/applications/audio/famistudio/default.nix
  11. 87
      pkgs/applications/audio/mmlgui/default.nix
  12. 43
      pkgs/applications/audio/vgmplay-libvgm/default.nix
  13. 4
      pkgs/applications/blockchains/groestlcoin/default.nix
  14. 4
      pkgs/applications/emulators/dolphin-emu/master.nix
  15. 8
      pkgs/applications/emulators/dolphin-emu/primehack.nix
  16. 4
      pkgs/applications/misc/ArchiSteamFarm/default.nix
  17. 8
      pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix
  18. 8
      pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix
  19. 4
      pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
  20. 621
      pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix
  21. 2
      pkgs/applications/misc/hugo/default.nix
  22. 4
      pkgs/applications/misc/organicmaps/default.nix
  23. 22
      pkgs/applications/misc/swaynag-battery/default.nix
  24. 9
      pkgs/applications/networking/mailreaders/notmuch/default.nix
  25. 2
      pkgs/applications/networking/remote/citrix-workspace/generic.nix
  26. 68
      pkgs/applications/networking/remote/citrix-workspace/sources.nix
  27. 31
      pkgs/applications/version-management/git-lfs/1.nix
  28. 5
      pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix
  29. 4
      pkgs/development/compilers/mono/4.nix
  30. 4
      pkgs/development/compilers/mono/generic.nix
  31. 11
      pkgs/development/libraries/libdigidocpp/default.nix
  32. 5
      pkgs/development/libraries/libspnav/default.nix
  33. 122
      pkgs/development/libraries/libvgm/default.nix
  34. 4
      pkgs/development/python-modules/flask-jwt-extended/default.nix
  35. 4
      pkgs/development/python-modules/google-cloud-firestore/default.nix
  36. 4
      pkgs/development/python-modules/proto-plus/default.nix
  37. 40
      pkgs/development/python-modules/ua-parser/default.nix
  38. 17
      pkgs/development/python-modules/ua-parser/dont-fetch-submodule.patch
  39. 6
      pkgs/development/python-modules/zigpy/default.nix
  40. 6
      pkgs/development/tools/gojq/default.nix
  41. 4
      pkgs/development/tools/misc/ccache/default.nix
  42. 13
      pkgs/development/tools/misc/texlab/default.nix
  43. 4
      pkgs/servers/matrix-synapse/default.nix
  44. 4
      pkgs/servers/mjolnir/default.nix
  45. 2
      pkgs/servers/mjolnir/node-composition.nix
  46. 468
      pkgs/servers/mjolnir/node-deps.nix
  47. 32
      pkgs/servers/mjolnir/node-env.nix
  48. 23
      pkgs/test/make-binary-wrapper/cross.nix
  49. 58
      pkgs/test/make-binary-wrapper/default.nix
  50. 72
      pkgs/tools/audio/fmtoy/default.nix
  51. 44
      pkgs/tools/audio/vgmtools/default.nix
  52. 3
      pkgs/tools/filesystems/wiimms-iso-tools/default.nix
  53. 51
      pkgs/tools/misc/pridefetch/default.nix
  54. 166
      pkgs/tools/networking/airgeddon/default.nix
  55. 6
      pkgs/tools/networking/ooniprobe-cli/default.nix
  56. 13
      pkgs/tools/security/qdigidoc/default.nix
  57. 39
      pkgs/top-level/all-packages.nix

@ -8489,6 +8489,17 @@
fingerprint = "3196 83D3 9A1B 4DE1 3DC2 51FD FEA8 88C9 F5D6 4F62";
}];
};
minion3665 = {
name = "Skyler Grey";
email = "skyler3665@gmail.com";
matrix = "@minion3665:matrix.org";
github = "Minion3665";
githubId = 34243578;
keys = [{
longkeyid = "rsa4096/0x1AFD10256B3C714D";
fingerprint = "D520 AC8D 7C96 9212 5B2B BD3A 1AFD 1025 6B3C 714D";
}];
};
mir06 = {
email = "armin.leuprecht@uni-graz.at";
github = "mir06";
@ -9885,6 +9896,12 @@
githubId = 8641;
name = "Pierre Carrier";
};
pedrohlc = {
email = "root@pedrohlc.com";
github = "PedroHLC";
githubId = 1368952;
name = "Pedro Lara Campos";
};
penguwin = {
email = "penguwin@penguwin.eu";
github = "penguwin";

@ -2098,6 +2098,28 @@
<programlisting language="bash">
redis-cli save
cp /var/lib/redis/dump.rdb &quot;/var/lib/redis-mastodon/dump.rdb&quot;
</programlisting>
</listitem>
<listitem>
<para>
Peertube now uses services.redis.servers to start a new redis
server, instead of using a global redis server. This improves
compatibility with other services that use redis.
</para>
<para>
Redis database is used for storage only cache and job queue.
More information can be found here -
<link xlink:href="https://docs.joinpeertube.org/contribute-architecture">Peertube
architecture</link>.
</para>
<para>
If you do want to save the redis database, you can use the
following commands before upgrade OS:
</para>
<programlisting language="bash">
redis-cli save
sudo mkdir /var/lib/redis-peertube
sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb
</programlisting>
</listitem>
<listitem>

@ -98,6 +98,17 @@
<literal>hardware.saleae-logic.package</literal>.
</para>
</listitem>
<listitem>
<para>
Matrix Synapse now requires entries in the
<literal>state_group_edges</literal> table to be unique, in
order to prevent accidentally introducing duplicate
information (for example, because a database backup was
restored multiple times). If your Synapse database already has
duplicate rows in this table, this could fail with an error
and require manual remediation.
</para>
</listitem>
</itemizedlist>
</section>
</section>

@ -765,6 +765,17 @@ In addition to numerous new and upgraded packages, this release has the followin
redis-cli save
cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb"
```
- Peertube now uses services.redis.servers to start a new redis server, instead of using a global redis server.
This improves compatibility with other services that use redis.
Redis database is used for storage only cache and job queue. More information can be found here - [Peertube architecture](https://docs.joinpeertube.org/contribute-architecture).
If you do want to save the redis database, you can use the following commands before upgrade OS:
```bash
redis-cli save
sudo mkdir /var/lib/redis-peertube
sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb
```
- If you are using Wayland you can choose to use the Ozone Wayland support
in Chrome and several Electron apps by setting the environment variable

@ -45,5 +45,6 @@ In addition to numerous new and upgraded packages, this release has the followin
## Other Notable Changes {#sec-release-22.11-notable-changes}
* A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`.
* Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

@ -209,7 +209,7 @@ in {
port = lib.mkOption {
type = lib.types.nullOr lib.types.port;
default = if cfg.redis.createLocally && cfg.redis.enableUnixSocket then null else 6379;
default = if cfg.redis.createLocally && cfg.redis.enableUnixSocket then null else 31638;
defaultText = lib.literalExpression ''
if config.${opt.redis.createLocally} && config.${opt.redis.enableUnixSocket}
then null
@ -344,7 +344,7 @@ in {
};
};
}
(lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis/redis.sock"; }; })
(lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis-peertube/redis.sock"; }; })
];
systemd.tmpfiles.rules = [
@ -441,13 +441,17 @@ in {
enable = true;
};
services.redis = lib.mkMerge [
services.redis.servers.peertube = lib.mkMerge [
(lib.mkIf cfg.redis.createLocally {
enable = true;
})
(lib.mkIf (cfg.redis.createLocally && !cfg.redis.enableUnixSocket) {
bind = "127.0.0.1";
port = cfg.redis.port;
})
(lib.mkIf (cfg.redis.createLocally && cfg.redis.enableUnixSocket) {
unixSocket = "/run/redis/redis.sock";
unixSocketPerm = 770;
unixSocket = "/run/redis-peertube/redis.sock";
unixSocketPerm = 660;
})
];
@ -465,7 +469,7 @@ in {
};
})
(lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs-16_x pkgs.yarn ])
(lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis" ];})
(lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];})
];
users.groups = lib.optionalAttrs (cfg.group == "peertube") {

@ -78,7 +78,13 @@ let
description = ''
Display scaling factor.
'';
type = types.nullOr types.ints.unsigned;
type = types.nullOr (
types.addCheck
(types.either types.int types.float)
(x : x > 0)
) // {
description = "null or positive integer or float";
};
default = null;
example = 2;
};

@ -45,6 +45,7 @@ import ../make-test-python.nix (
enable_registration = true;
enable_registration_without_verification = true;
registration_shared_secret = "supersecret-registration";
enable_registration_without_verification = true;
listeners = [ {
# The default but tls=false

@ -11,7 +11,7 @@ import ../make-test-python.nix ({pkgs, ...}:
{ address = "192.168.2.10"; prefixLength = 24; }
];
};
firewall.allowedTCPPorts = [ 5432 6379 ];
firewall.allowedTCPPorts = [ 5432 31638 ];
};
services.postgresql = {
@ -34,7 +34,7 @@ import ../make-test-python.nix ({pkgs, ...}:
enable = true;
bind = "0.0.0.0";
requirePass = "turrQfaQwnanGbcsdhxy";
port = 6379;
port = 31638;
};
};
@ -76,6 +76,7 @@ import ../make-test-python.nix ({pkgs, ...}:
redis = {
host = "192.168.2.10";
port = 31638;
passwordFile = "/etc/peertube/password-redis-db";
};
@ -113,7 +114,7 @@ import ../make-test-python.nix ({pkgs, ...}:
database.wait_for_unit("redis-peertube.service")
database.wait_for_open_port(5432)
database.wait_for_open_port(6379)
database.wait_for_open_port(31638)
server.wait_for_unit("peertube.service")
server.wait_for_open_port(9000)

@ -0,0 +1,66 @@
{ lib
, stdenv
, fetchzip
, autoPatchelfHook
, makeWrapper
, alsa-lib
, gtk-sharp-2_0
, glib
, gtk2
, mono
, openal
}:
stdenv.mkDerivation rec {
pname = "famistudio";
version = "3.3.0";
src = fetchzip {
url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip";
stripRoot = false;
sha256 = "1r7y7z3s3b0zm7lvdgr9z70iall1swzlr3npx7g5azz6vza00vva";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
buildInputs = [ alsa-lib gtk-sharp-2_0 glib gtk2 mono openal ];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,lib/famistudio}
mv * $out/lib/famistudio
makeWrapper ${mono}/bin/mono $out/bin/famistudio \
--add-flags $out/lib/famistudio/FamiStudio.exe \
--prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 gtk-sharp-2_0 ]}
# Fails to find openal32.dll on its own, needs abit of help
rm $out/lib/famistudio/libopenal32.so
cat <<EOF >$out/lib/famistudio/OpenTK.dll.config
<configuration>
<dllmap dll="openal32.dll" target="${openal}/lib/libopenal.so"/>
</configuration>
EOF
runHook postInstall
'';
meta = with lib; {
homepage = "https://famistudio.org/";
description = "NES Music Editor";
longDescription = ''
FamiStudio is very simple music editor for the Nintendo Entertainment System
or Famicom. It is targeted at both chiptune artists and NES homebrewers.
'';
license = licenses.mit;
# Maybe possible to build from source but I'm not too familiar with C# packaging
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ OPNA2608 ];
platforms = [ "x86_64-linux" ];
};
}

@ -0,0 +1,87 @@
{ stdenv
, lib
, fetchFromGitHub
, unstableGitUpdater
, pkg-config
, glfw
, libvgm
, libX11
, libXau
, libXdmcp
, Carbon
, Cocoa
, cppunit
}:
stdenv.mkDerivation rec {
pname = "mmlgui";
version = "unstable-2022-05-24";
src = fetchFromGitHub {
owner = "superctr";
repo = "mmlgui";
rev = "fe2b298c1eddae4cc38096f6c1ba1ccaed562cf1";
fetchSubmodules = true;
sha256 = "Q34zzZthdThMbduXcc/qMome89mAMrn1Vinr073u4zo=";
};
postPatch = ''
# Actually wants pkgconf but that seems abit broken:
# https://github.com/NixOS/nixpkgs/pull/147503#issuecomment-1055943897
# Removing a pkgconf-specific option makes it work with pkg-config
substituteInPlace libvgm.mak \
--replace '--with-path=/usr/local/lib/pkgconfig' ""
substituteInPlace Makefile \
--replace 'all: $(MMLGUI_BIN) test' 'all: $(MMLGUI_BIN)'
'';
nativeBuildInputs = [
pkg-config
];
buildInputs = [
glfw
libvgm
] ++ lib.optionals stdenv.hostPlatform.isLinux [
libX11
libXau
libXdmcp
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Carbon
Cocoa
];
checkInputs = [
cppunit
];
makeFlags = [
"RELEASE=1"
];
enableParallelBuilding = true;
doCheck = true;
installPhase = ''
runHook preInstall
install -Dm755 {,$out/}bin/mmlgui
mkdir -p $out/share/ctrmml
mv ctrmml/sample $out/share/ctrmml/
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater {
url = "https://github.com/superctr/mmlgui.git";
};
meta = with lib; {
homepage = "https://github.com/superctr/mmlgui";
description = "MML (Music Macro Language) editor and compiler GUI, powered by the ctrmml framework";
license = licenses.gpl2Only;
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.all;
};
}

@ -0,0 +1,43 @@
{ stdenv
, lib
, fetchFromGitHub
, unstableGitUpdater
, cmake
, pkg-config
, zlib
, libvgm
, inih
}:
stdenv.mkDerivation rec {
pname = "vgmplay-libvgm";
version = "unstable-2022-03-17";
src = fetchFromGitHub {
owner = "ValleyBell";
repo = "vgmplay-libvgm";
rev = "a2c21cb134b58043a013ac2efc060144cdecf13d";
sha256 = "0g251laqjvvzblyflkg8xac424dbxm1v35ckfazsfchmcqiaqfw4";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ zlib libvgm inih ];
postInstall = ''
install -Dm644 ../VGMPlay.ini $out/share/vgmplay/VGMPlay.ini
'';
passthru.updateScript = unstableGitUpdater {
url = "https://github.com/ValleyBell/vgmplay-libvgm.git";
};
meta = with lib; {
mainProgram = "vgmplay";
homepage = "https://github.com/ValleyBell/vgmplay-libvgm";
description = "New VGMPlay, based on libvgm";
license = licenses.unfree; # no licensing text anywhere yet
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.all;
};
}

@ -24,7 +24,7 @@
}:
let
version = "22.0";
version = "23.0";
desktop = fetchurl {
url = "https://raw.githubusercontent.com/Groestlcoin/packaging/${version}/debian/groestlcoin-qt.desktop";
sha256 = "0mxwq4jvcip44a796iwz7n1ljkhl3a4p47z7qlsxcfxw3zmm0k0k";
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "Groestlcoin";
repo = "groestlcoin";
rev = "v${version}";
sha256 = "104zzcigpk976iqyinjn6mw3l36zb1if7249iz44ds1zaxv3g1v1";
sha256 = "1ag7wpaw4zssx1g482kziqr95yl2vk9r332689s3093xv9i9pz4s";
};
nativeBuildInputs = [ autoreconfHook pkg-config ]

@ -81,9 +81,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ MP2E ashkitten xfix ];
branch = "master";
# x86_32 is an unsupported platform.
# Enable generic build if you really want a JIT-less binary.
broken = stdenv.isDarwin;
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
platforms = platforms.unix;
};
}

@ -48,13 +48,13 @@
stdenv.mkDerivation rec {
pname = "dolphin-emu-primehack";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "shiiion";
repo = "dolphin";
rev = version;
sha256 = "011qghswgh9l7k993lfn1hrwhgyrv9m33smgspsjq50jww6r27fl";
sha256 = "sha256-ywCh6wiBjXY5baWfu7cBgwc8w8yJaLM3QQ0FATsrweQ=";
fetchSubmodules = true;
};
@ -143,9 +143,7 @@ stdenv.mkDerivation rec {
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ MP2E ashkitten Madouura ];
# x86_32 is an unsupported platform.
# Enable generic build if you really want a JIT-less binary.
broken = stdenv.isDarwin;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = platforms.unix;
};
}

@ -12,13 +12,13 @@
buildDotnetModule rec {
pname = "archisteamfarm";
# nixpkgs-update: no auto update
version = "5.2.5.7";
version = "5.2.6.3";
src = fetchFromGitHub {
owner = "justarchinet";
repo = pname;
rev = version;
sha256 = "sha256-NXRHLE9Y7j10l8mAUY68+556wcxRXLfdKeCI+b4Xs7I=";
sha256 = "sha256-ZsBOF3ZFZ0aicaAJ5j+6DQPwDyloxSafae8FTKSdwAI=";
};
dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;

@ -1,7 +1,7 @@
{ fetchNuGet }: [
(fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; })
(fetchNuGet { pname = "AngleSharp.XPath"; version = "1.1.7"; sha256 = "0lrk002nizq973zdmcm0wmcq17j5gizwp03xdv84hiqqd8cyy538"; })
(fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0"; sha256 = "0sklcgan0w0afvmd4akq7wvdbx5j353ifbhg8z7bxs80yi6f9q17"; })
(fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; })
(fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; })
(fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; })
(fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; })
@ -110,9 +110,9 @@
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
(fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
(fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
(fetchNuGet { pname = "NLog"; version = "4.7.11"; sha256 = "0vvgypqh6cxzkrfymjaghads5dg88l2xvbz6dxwwrnjg5hhpcjaw"; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "1.7.4"; sha256 = "1lilk9sv3j9jg23hl0vhxd8w63bh6xvns42rkz5n582wpf5k2r24"; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "4.14.0"; sha256 = "1q2v44inp4xjynncxpv432k2qjkfara1bpipmv3p3in0yv14l3wg"; })
(fetchNuGet { pname = "NLog"; version = "5.0.0"; sha256 = "10da1qfvqkfs7msb0f9yba3ias6dh9m0xjr2hbp95symbz8nrfwz"; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.0"; sha256 = "0r06b64f7j1pi7qlsaqvbvnp0irpng3vkngszis7mj0g6415rz8c"; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.0.0"; sha256 = "1fj4m1kdszcxva918pz2abpn31vp69vj0349gfzixz87gml8vbg4"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
(fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })

@ -1,7 +1,7 @@
{ fetchNuGet }: [
(fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; })
(fetchNuGet { pname = "AngleSharp.XPath"; version = "1.1.7"; sha256 = "0lrk002nizq973zdmcm0wmcq17j5gizwp03xdv84hiqqd8cyy538"; })
(fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0"; sha256 = "0sklcgan0w0afvmd4akq7wvdbx5j353ifbhg8z7bxs80yi6f9q17"; })
(fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; })
(fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; })
(fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; })
(fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; })
@ -110,9 +110,9 @@
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
(fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
(fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
(fetchNuGet { pname = "NLog"; version = "4.7.11"; sha256 = "0vvgypqh6cxzkrfymjaghads5dg88l2xvbz6dxwwrnjg5hhpcjaw"; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "1.7.4"; sha256 = "1lilk9sv3j9jg23hl0vhxd8w63bh6xvns42rkz5n582wpf5k2r24"; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "4.14.0"; sha256 = "1q2v44inp4xjynncxpv432k2qjkfara1bpipmv3p3in0yv14l3wg"; })
(fetchNuGet { pname = "NLog"; version = "5.0.0"; sha256 = "10da1qfvqkfs7msb0f9yba3ias6dh9m0xjr2hbp95symbz8nrfwz"; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.0"; sha256 = "0r06b64f7j1pi7qlsaqvbvnp0irpng3vkngszis7mj0g6415rz8c"; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.0.0"; sha256 = "1fj4m1kdszcxva918pz2abpn31vp69vj0349gfzixz87gml8vbg4"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
(fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })

@ -11,8 +11,8 @@ let
repo = "ASF-ui";
# updated by the update script
# this is always the commit that should be used with asf-ui from the latest asf version
rev = "bb59242af6f17a54449e6f87e9df397da1a19525";
sha256 = "0d9x0fcjxghmjqnfxj22x2hnx3k6jfsayb2ws7ayn3azcczfsccp";
rev = "5c7d99928e2d390bc1cd5fa74b2f422aa760d78e";
sha256 = "04wcmqav2q7dchvjyy0k6g8cv5ff1sw2a238sz38670cnwx569r2";
};
in

File diff suppressed because it is too large Load Diff

@ -33,7 +33,7 @@ buildGoModule rec {
'';
meta = with lib; {
broken = stdenv.isDarwin;
broken = stdenv.isDarwin && stdenv.isx86_64;
description = "A fast and modern static website engine";
homepage = "https://gohugo.io";
license = licenses.asl20;

@ -20,13 +20,13 @@
mkDerivation rec {
pname = "organicmaps";
version = "2022.04.27-2";
version = "2022.05.31-10";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = "${version}-android";
sha256 = "sha256-HsskddXne5xClBZoT3aXP+51VRQQJhlUPda/M20SrH0=";
sha256 = "sha256-2GeWa4CQoY7hi24q0/cZBbq1Ofl2Jane9BiZ0N+IsSc=";
fetchSubmodules = true;
};

@ -0,0 +1,22 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "swaynag-battery";
version = "0.2.0";
src = fetchFromGitHub {
owner = "m00qek";
repo = "swaynag-battery";
rev = "v${version}";
hash = "sha256-7f9+4Fzw5B5ATuud4MJC3iyuNRTx6kwJ7/KsusGtQM8=";
};
vendorSha256 = "h9Zj3zmQ0Xpili5Pl6CXh1L0bb2uL1//B79I4/ron08=";
meta = with lib; {
homepage = "https://github.com/m00qek/swaynag-battery";
description = "Shows a message when your battery is discharging ";
maintainers = with maintainers; [ asbachb ];
license = licenses.mit;
};
}

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "notmuch";
version = "0.35";
version = "0.36";
src = fetchurl {
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
sha256 = "0fdc81m24xrbhfrhw00g12ak4b8hap4961sq7ap6q2pjqhac8cd8";
sha256 = "0h6f6mh9m9vrijm638x5sbsl321b74a25cdasbxhx67x62w320hk";
};
nativeBuildInputs = [
@ -79,11 +79,6 @@ stdenv.mkDerivation rec {
in ''
mkdir -p test/test-databases
ln -s ${test-database} test/test-databases/database-v1.tar.xz
''
# TODO: restore after resolved upstream
# https://www.mail-archive.com/notmuch@notmuchmail.org/msg52808.html
+ ''
rm test/T355-smime.sh
'';
doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3");

@ -207,7 +207,7 @@ stdenv.mkDerivation rec {
license = licenses.unfree;
description = "Citrix Workspace";
platforms = platforms.linux;
maintainers = with maintainers; [ pmenke ];
maintainers = with maintainers; [ pmenke michaeladler ];
inherit homepage;
};
}

@ -13,61 +13,6 @@ let
#
# The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/
supportedVersions = lib.mapAttrs mkVersionInfo {
"20.04.0" = {
major = "20";
minor = "04";
patch = "0";
x64hash = "E923592216F9541173846F932784E6C062CB09C9E8858219C7489607BF82A0FB";
x86hash = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F";
x64suffix = "21";
x86suffix = "21";
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2004.html";
};
"20.06.0" = {
major = "20";
minor = "06";
patch = "0";
x64hash = "1kpfcfg95mpprlca6cccnjlsqbj3xvv77cn3fc5msd304nsi9x1v";
x86hash = "1di29hrimbw3myjnf2nn26a14klidhdwvjqla6yxhwd3s6lil194";
x64suffix = "15";
x86suffix = "15";
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2006.html";
};
"20.09.0" = {
major = "20";
minor = "9";
patch = "0";
x64hash = "15gjq1vk1y76c39p72xnam9h9rnr0632i4n11l6xbjnfnad8d4pr";
x86hash = "1b4gdmnnpa61ydiv2fnmap8cnfhskrq6swcs6i1nqrp5zvvkqrv4";
x64suffix = "15";
x86suffix = "15";
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2009.html";
};
"20.10.0" = {
major = "20";
minor = "10";
patch = "0";
x64hash = "13g7r92mhwqwqkm6a4k4yn232ighkmxifs7j8wdi1yva0dvklqdf";
x86hash = "04cr2da25v8x098ccyjwa47d4krk3jpldqkyf4kk2j3hwzbqh9yx";
x64suffix = "6";
x86suffix = "6";
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2010.html";
};
"20.12.0" = {
major = "20";
minor = "12";
patch = "0";
x64hash = "1268nriqjp27nxqqi4dvkv8r01yj3bhglxv21xd185761da2mzry";
x86hash = "0f982d5y9k4hscqfmqpfs277cqw1pvp191ybvg5p8rxk12fh67vf";
x64suffix = "12";
x86suffix = "12";
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2012.html";
};
"21.01.0" = {
major = "21";
minor = "1";
@ -120,7 +65,7 @@ let
x86hash = "c646c52889e88aa0bb051070076763d5407f21fb6ad6dfcb0fe635ac01180c51";
x64suffix = "25";
x86suffix = "25";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2109.html";
};
"21.12.0" = {
@ -131,6 +76,17 @@ let
x86hash = "3746cdbe26727f7f6fb85fbe5f3e6df0322d79bb66e3a70158b22cb4f6b6b292";
x64suffix = "18";
x86suffix = "18";
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2112.html";
};
"22.05.0" = {
major = "22";
minor = "5";
patch = "0";
x64hash = "49786fd3b5361b1f42b7bb0e36572a209e95acb1335737da5216345b6420f053";
x86hash = "f2dc1fd64e5314b62ba87f384958c2bbd48b06b55bed10345cddb05fdc8cffa1";
x64suffix = "16";
x86suffix = "16";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
};
};

@ -1,31 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "git-lfs";
version = "1.5.6";
rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0";
goPackagePath = "github.com/git-lfs/git-lfs";
src = fetchFromGitHub {
inherit rev;
owner = "git-lfs";
repo = "git-lfs";
sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d";
};
subPackages = [ "." ];
preBuild = ''
pushd go/src/github.com/git-lfs/git-lfs
go generate ./commands
popd
'';
meta = with lib; {
description = "Git extension for versioning large files";
homepage = "https://git-lfs.github.com/";
license = [ licenses.mit ];
maintainers = [ maintainers.twey ];
};
}

@ -1,10 +1,11 @@
{ stdenv
, targetPackages
, lib
, makeSetupHook
, dieHook
, writeShellScript
, tests
, cc ? stdenv.cc
, cc ? targetPackages.stdenv.cc
, sanitizers ? []
}:
@ -14,7 +15,7 @@ makeSetupHook {
++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) cc;
substitutions = {
cc = "${cc}/bin/cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}";
cc = "${cc}/bin/${cc.targetPrefix}cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}";
# Extract the function call used to create a binary wrapper from its embedded docstring
passthru.extractCmd = writeShellScript "extract-binary-wrapper-cmd" ''

@ -1,9 +1,9 @@
{ callPackage, Foundation, libobjc }:
{ callPackage, Foundation, libobjc, stdenv, lib }:
callPackage ./generic.nix ({
inherit Foundation libobjc;
version = "4.8.1.0";
sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645
extraPatches = [ ./mono4-glibc.patch ];
extraPatches = lib.optionals stdenv.isLinux [ ./mono4-glibc.patch ];
})

@ -76,7 +76,9 @@ stdenv.mkDerivation rec {
inherit enableParallelBuilding;
meta = with lib; {
broken = stdenv.isDarwin;
# Per nixpkgs#151720 the build failures for aarch64-darwin are fixed upstream, but a
# stable release with the fix is not available yet.
broken = stdenv.isDarwin && stdenv.isAarch64 && lib.versionOlder version "6.12.0.129";
homepage = "https://mono-project.com/";
description = "Cross platform, open source .NET development framework";
platforms = with platforms; darwin ++ linux;

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, minizip, pcsclite, opensc, openssl
{ lib, stdenv, fetchurl, cmake, makeWrapper, minizip, pcsclite, opensc, openssl
, xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }:
stdenv.mkDerivation rec {
@ -10,13 +10,20 @@ stdenv.mkDerivation rec {
sha256 = "sha256-U5i5IAyJF4359q6M6mQemEuG7+inPYIXqLy8GHv4dkg=";
};
nativeBuildInputs = [ cmake pkg-config xxd ];
nativeBuildInputs = [ cmake makeWrapper pkg-config xxd ];
buildInputs = [
minizip pcsclite opensc openssl xercesc
xml-security-c xsd zlib xalanc
];
# replace this hack with a proper cmake variable or environment variable
# once https://github.com/open-eid/cmake/pull/34 (or #35) gets merged.
postInstall = ''
wrapProgram $out/bin/digidoc-tool \
--prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/
'';
meta = with lib; {
description = "Library for creating DigiDoc signature files";
homepage = "http://www.id.ee/";

@ -21,7 +21,10 @@ stdenv.mkDerivation rec {
];
configureFlags = [ "--disable-debug"];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"AR=${stdenv.cc.targetPrefix}ar"
];
preInstall = ''
mkdir -p $out/{lib,include}

@ -0,0 +1,122 @@
{ stdenv
, lib
, fetchFromGitHub
, unstableGitUpdater
, cmake
, libiconv
, zlib
, enableShared ? true
, enableAudio ? true
, withWaveWrite ? true
, withWinMM ? stdenv.hostPlatform.isWindows
, withDirectSound ? stdenv.hostPlatform.isWindows
, withXAudio2 ? stdenv.hostPlatform.isWindows
, withWASAPI ? stdenv.hostPlatform.isWindows
, withOSS ? stdenv.hostPlatform.isFreeBSD
, withSADA ? stdenv.hostPlatform.isSunOS
, withALSA ? stdenv.hostPlatform.isLinux
, alsa-lib
, withPulseAudio ? stdenv.hostPlatform.isLinux
, libpulseaudio
, withCoreAudio ? stdenv.hostPlatform.isDarwin
, CoreAudio
, AudioToolbox
, withLibao ? true
, libao
, enableEmulation ? true
, withAllEmulators ? true
, emulators ? [ ]
, enableLibplayer ? true
, enableTools ? false
}:
assert enableTools -> enableAudio && enableEmulation && enableLibplayer;
let
inherit (lib) optional optionals;
onOff = val: if val then "ON" else "OFF";
in
stdenv.mkDerivation rec {
pname = "libvgm";
version = "unstable-2022-05-27";
src = fetchFromGitHub {
owner = "ValleyBell";
repo = "libvgm";
rev = "ec6ddae3e3488b6dc9e993cb0f76d3015d2f6fff";
sha256 = "AwIx4LuVSuCf7xgtximcB6N+rzC7g1ajeBdaBz6RSyk=";
};
outputs = [
"out"
"dev"
] ++ optional enableTools "bin";
nativeBuildInputs = [
cmake
];
propagatedBuildInputs = [
libiconv
zlib
] ++ optionals withALSA [
alsa-lib
] ++ optionals withPulseAudio [
libpulseaudio
] ++ optionals withCoreAudio [
CoreAudio
AudioToolbox
] ++ optionals withLibao [
libao
];
cmakeFlags = [
"-DBUILD_LIBAUDIO=${onOff enableAudio}"
"-DBUILD_LIBEMU=${onOff enableEmulation}"
"-DBUILD_LIBPLAYER=${onOff enableLibplayer}"
"-DBUILD_TESTS=${onOff enableTools}"
"-DBUILD_PLAYER=${onOff enableTools}"
"-DBUILD_VGM2WAV=${onOff enableTools}"
"-DLIBRARY_TYPE=${if enableShared then "SHARED" else "STATIC"}"
"-DUSE_SANITIZERS=ON"
] ++ optionals enableAudio [
"-DAUDIODRV_WAVEWRITE=${onOff withWaveWrite}"
"-DAUDIODRV_WINMM=${onOff withWinMM}"
"-DAUDIODRV_DSOUND=${onOff withDirectSound}"
"-DAUDIODRV_XAUDIO2=${onOff withXAudio2}"
"-DAUDIODRV_WASAPI=${onOff withWASAPI}"
"-DAUDIODRV_OSS=${onOff withOSS}"
"-DAUDIODRV_SADA=${onOff withSADA}"
"-DAUDIODRV_ALSA=${onOff withALSA}"
"-DAUDIODRV_PULSE=${onOff withPulseAudio}"
"-DAUDIODRV_APPLE=${onOff withCoreAudio}"
"-DAUDIODRV_LIBAO=${onOff withLibao}"
] ++ optionals enableEmulation ([
"-DSNDEMU__ALL=${onOff withAllEmulators}"
] ++ optionals (!withAllEmulators)
(lib.lists.forEach emulators (x: "-DSNDEMU_${x}=ON"))
) ++ optionals enableTools [
"-DUTIL_CHARCNV_ICONV=ON"
"-DUTIL_CHARCNV_WINAPI=${onOff stdenv.hostPlatform.isWindows}"
];
passthru.updateScript = unstableGitUpdater {
url = "https://github.com/ValleyBell/libvgm.git";
};
meta = with lib; {
homepage = "https://github.com/ValleyBell/libvgm";
description = "More modular rewrite of most components from VGMPlay";
license =
if (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators))) then
licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43
else
licenses.gpl2Only;
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.all;
};
}

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "flask-jwt-extended";
version = "4.4.0";
version = "4.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Flask-JWT-Extended";
inherit version;
hash = "sha256-P+gVBL3JGtjxy5db0tlexgElHzG94YQRXjn8fm7SPqY=";
hash = "sha256-CYh/o3K91Omrtg2KcVWpZr8Rt0mZVUQQsgl1gCrsJ34=";
};
propagatedBuildInputs = [

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-firestore";
version = "2.5.0";
version = "2.5.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-g/IgGlVWHjkqJKDFvkmp/TVNA0TgN+Xf65M10+x3f+o=";
sha256 = "sha256-ltFXT+cU/YGPqu28WcStV6bJarbiIGbjsHLI+9UZU80=";
};
propagatedBuildInputs = [

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "proto-plus";
version = "1.20.3";
version = "1.20.5";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-8osiW8nmwU4gb7f46Zakb7LM2QJkjlEtSWq7anFqSuU=";
sha256 = "sha256-gXlOsb4zPGeYYzOUjfcOu4zfU44Dn4z6kv0qnXF21AU=";
};
propagatedBuildInputs = [ protobuf ];

@ -1,20 +1,44 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, pyyaml
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "ua-parser";
version = "0.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "0csh307zfz666kkk5idrw3crj1x8q8vsqgwqil0r1n1hs4p7ica7";
format = "setuptools";
src = fetchFromGitHub {
owner = "ua-parser";
repo = "uap-python";
rev = version;
fetchSubmodules = true;
hash = "sha256-kaTAfUtHj2vH7i7eIU61efuB4/XVHoc/z6o3ny+sgrQ=";
};
postPatch = ''
substituteInPlace setup.py \
--replace '"pyyaml"' ""
patches = [
./dont-fetch-submodule.patch
];
nativeBuildInputs = [
pyyaml
];
preBuild = ''
mkdir -p build/lib/ua_parser
'';
doCheck = false; # requires files from uap-core
checkInputs = [
pytestCheckHook
];
preCheck = ''
# import from $out
rm ua_parser/__init__.py
'';
pythonImportsCheck = [ "ua_parser" ];

@ -0,0 +1,17 @@
diff --git a/setup.py b/setup.py
index a976eee..6919795 100644
--- a/setup.py
+++ b/setup.py
@@ -64,12 +64,6 @@ class build_regexes(Command):
def run(self):
work_path = self.work_path
- if not os.path.exists(os.path.join(work_path, ".git")):
- return
-
- log.info("initializing git submodules")
- check_output(["git", "submodule", "init"], cwd=work_path)
- check_output(["git", "submodule", "update"], cwd=work_path)
yaml_src = os.path.join(work_path, "uap-core", "regexes.yaml")
if not os.path.exists(yaml_src):

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "zigpy";
version = "0.45.1";
version = "0.46.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "zigpy";
repo = "zigpy";
rev = version;
sha256 = "sha256-85Bi8qjbUKLXFW7VGOxzelMa1gY9giGeQRmOeoZ1idE=";
rev = "refs/tags/${version}";
sha256 = "sha256-YCkNjygNSvGNuhP7N1apCWYevl18GASgUFSSTLHj2YU=";
};
propagatedBuildInputs = [

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gojq";
version = "0.12.7";
version = "0.12.8";
src = fetchFromGitHub {
owner = "itchyny";
repo = pname;
rev = "v${version}";
sha256 = "sha256-aQZLuwMFnggtwHZaE6KGBKJSbtmAz+Cs1RqLgvIsO24=";
sha256 = "sha256-WcPvsThYgXwYXwXyylOqopTZOfsXmDU4wbhEdS3neA8=";
};
vendorSha256 = "sha256-b7TQywIOxzFnUNwgxGFR3W++QGHYUROBG7P/lTRmhGc=";
vendorSha256 = "sha256-fFW+gWdGMxDApcyR6dy0491WvQcVMAJ5dgMQqgNmOkw=";
ldflags = [ "-s" "-w" ];

@ -15,13 +15,13 @@
let ccache = stdenv.mkDerivation rec {
pname = "ccache";
version = "4.6";
version = "4.6.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "011i1aczv4nixq4gvjixcd73df2xplcrldfv0w12yaz5iy4vaw6b";
sha256 = "sha256-XcelGBb5bRLZKSbtC2J40d6CsSF/ZF3eJW0UXe1Y40A=";
};
outputs = [ "out" "man" ];

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "texlab";
version = "3.3.2";
version = "4.0.0";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-SpfX/3uM1y8skN5BqudUtswkCpinrmHWT7ixbgg8QNI=";
sha256 = "sha256-hRY1cJFakbq6pU2TKql+eVWvKtNDzVIQkE5BbRW5n5A=";
};
cargoSha256 = "sha256-0YipSDKss8qaINkUw9dW8n0fVKp4FmagI9+9jFyXaLA=";
cargoSha256 = "sha256-VwB02FfoAKL0fEvpvpxfkAR6PcWZFK/d5aVOtUq7f10=";
outputs = [ "out" "man" ];
@ -30,13 +30,6 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
installManPage texlab.1
# Remove generated dylib of html2md dependency. TexLab statically
# links to the generated rlib and doesn't reference the dylib. I
# couldn't find any way to prevent building this by passing cargo flags.
# See https://gitlab.com/Kanedias/html2md/-/blob/0.2.10/Cargo.toml#L20
rm "$out/lib/libhtml2md${stdenv.hostPlatform.extensions.sharedLibrary}"
rmdir "$out/lib"
'';
passthru.updateScript = nix-update-script {

@ -11,11 +11,11 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.59.1";
version = "1.60.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-EASd+tlPIYQpQP2OOHJSPDzgJZyVoigVfcC2b2c2A2o=";
sha256 = "sha256-sR+DZhpAkPpurPs6jSBVphYp12z8qulcQSl3ngcCrcs=";
};
buildInputs = [ openssl ];

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "mjolnir";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "mjolnir";
rev = "v${version}";
sha256 = "zVb0lD5tYhX2a2MzNVQ8u7rMuQ8yGC/JlodbY4nsqNU=";
sha256 = "887azmXT5PGpcOqtWtKwdoyEtsXGm5DzpNRgEMlgSfM=";
};
nativeBuildInputs = [

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.9.0. Do not edit!
# This file has been generated by node2nix 1.11.1. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;

File diff suppressed because it is too large Load Diff

@ -98,7 +98,7 @@ let
''
+ (lib.concatMapStrings (dependency:
''
if [ ! -e "${dependency.name}" ]; then
if [ ! -e "${dependency.packageName}" ]; then
${composePackage dependency}
fi
''
@ -257,8 +257,8 @@ let
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
if(![1, 2].includes(packageLock.lockfileVersion)) {
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
process.exit(1);
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
process.exit(1);
}
if(packageLock.dependencies !== undefined) {
@ -390,7 +390,7 @@ let
buildNodePackage =
{ name
, packageName
, version
, version ? null
, dependencies ? []
, buildInputs ? []
, production ? true
@ -409,7 +409,7 @@ let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
in
stdenv.mkDerivation ({
name = "${name}-${version}";
name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool
@ -441,6 +441,14 @@ let
if [ -d "$out/lib/node_modules/.bin" ]
then
ln -s $out/lib/node_modules/.bin $out/bin
# Patch the shebang lines of all the executables
ls $out/bin/* | while read i
do
file="$(readlink -f "$i")"
chmod u+rwx "$file"
patchShebangs "$file"
done
fi
# Create symlinks to the deployed manual page folders, if applicable
@ -471,7 +479,7 @@ let
buildNodeDependencies =
{ name
, packageName
, version
, version ? null
, src
, dependencies ? []
, buildInputs ? []
@ -489,7 +497,7 @@ let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
in
stdenv.mkDerivation ({
name = "node-dependencies-${name}-${version}";
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
@ -519,6 +527,7 @@ let
if [ -f ${src}/package-lock.json ]
then
cp ${src}/package-lock.json .
chmod 644 package-lock.json
fi
''}
@ -541,7 +550,7 @@ let
buildNodeShell =
{ name
, packageName
, version
, version ? null
, src
, dependencies ? []
, buildInputs ? []
@ -557,9 +566,10 @@ let
let
nodeDependencies = buildNodeDependencies args;
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
in
stdenv.mkDerivation {
name = "node-shell-${name}-${version}";
stdenv.mkDerivation ({
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildCommand = ''
@ -578,7 +588,7 @@ let
export NODE_PATH=${nodeDependencies}/lib/node_modules
export PATH="${nodeDependencies}/bin:$PATH"
'';
};
} // extraArgs);
in
{
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;

@ -0,0 +1,23 @@
{ stdenv
, runCommand
, makeBinaryWrapper
, binutils
, expectedArch ? stdenv.hostPlatform.parsed.cpu.name
}:
runCommand "make-binary-wrapper-test-cross" {
nativeBuildInputs = [
makeBinaryWrapper
binutils
];
inherit expectedArch;
} ''
touch prog
chmod +x prog
makeWrapper prog $out
read -r _ arch < <($READELF --file-header $out | grep Machine:)
if [[ ''${arch,,} != *"''${expectedArch,,}"* ]]; then
echo "expected $expectedArch, got $arch"
exit 1
fi
''

@ -1,12 +1,19 @@
{ lib, coreutils, python3, gcc, writeText, writeScript, runCommand, makeBinaryWrapper }:
{ lib
, stdenv
, pkgsCross
, makeBinaryWrapper
, writeText
, runCommand
, runCommandCC
}:
let
env = { buildInputs = [ makeBinaryWrapper ]; };
envCheck = runCommand "envcheck" env ''
${gcc}/bin/cc -Wall -Werror -Wpedantic -o $out ${./envcheck.c}
env = { nativeBuildInputs = [ makeBinaryWrapper ]; };
envCheck = runCommandCC "envcheck" env ''
cc -Wall -Werror -Wpedantic -o $out ${./envcheck.c}
'';
makeGoldenTest = testname: runCommand "test-wrapper_${testname}" env ''
mkdir -p ./tmp/foo
makeGoldenTest = testname: runCommand "make-binary-wrapper-test-${testname}" env ''
mkdir -p tmp/foo # for the chdir test
params=$(<"${./.}/${testname}.cmdline")
eval "makeCWrapper /send/me/flags $params" > wrapper.c
@ -32,24 +39,23 @@ let
cp wrapper.c $out
'';
tests = let
names = [
"add-flags"
"argv0"
"basic"
"chdir"
"combination"
"env"
"inherit-argv0"
"invalid-env"
"prefix"
"suffix"
"overlength-strings"
];
f = name: lib.nameValuePair name (makeGoldenTest name);
in builtins.listToAttrs (builtins.map f names);
in writeText "make-binary-wrapper-test" ''
${lib.concatStringsSep "\n" (lib.mapAttrsToList (_: test: ''
"${test.name}" "${test}"
'') tests)}
tests = lib.genAttrs [
"add-flags"
"argv0"
"basic"
"chdir"
"combination"
"env"
"inherit-argv0"
"invalid-env"
"overlength-strings"
"prefix"
"suffix"
] makeGoldenTest // lib.optionalAttrs (! stdenv.isDarwin) {
cross = pkgsCross.aarch64-multiplatform.callPackage ./cross.nix { };
};
in
writeText "make-binary-wrapper-tests" ''
${lib.concatStringsSep "\n" (builtins.attrValues tests)}
'' // tests

@ -0,0 +1,72 @@
{ stdenv
, lib
, fetchFromGitHub
, unstableGitUpdater
, dos2unix
, pkg-config
, zlib
, alsa-lib
, libjack2
}:
stdenv.mkDerivation rec {
pname = "fmtoy";
version = "unstable-2021-12-24";
src = fetchFromGitHub {
owner = "vampirefrog";
repo = "fmtoy";
rev = "0de6703b3373eb5bf19fd3deaae889286f330c21";
sha256 = "0sr6klkmjd2hd2kyb9y0x986d6lsy8bziizfc6cmhkqcq92fh45c";
};
postPatch = ''
dos2unix Makefile
# Don't hardcode compilers
sed -i -e '/CC=/d' -e '/CXX=/d' Makefile
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
# Remove Linux-only program & its dependencies
sed -i -e '/PROGS/ s/fmtoy_jack//' Makefile
substituteInPlace Makefile \
--replace '$(shell pkg-config alsa jack --cflags)' ""
'';
nativeBuildInputs = [
dos2unix
] ++ lib.optionals stdenv.hostPlatform.isLinux [
pkg-config
];
buildInputs = [
zlib
] ++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
libjack2
];
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
for prog in $(grep 'PROGS=' Makefile | cut -d= -f2-); do
install -Dm755 $prog $out/bin/$prog
done
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater {
url = "https://github.com/vampirefrog/fmtoy.git";
};
meta = with lib; {
homepage = "https://github.com/vampirefrog/fmtoy";
description = "Tools for FM voices for Yamaha YM chips (OPL, OPM and OPN series)";
# Unknown license situation
# https://github.com/vampirefrog/fmtoy/issues/1
license = licenses.unfree;
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.all;
};
}

@ -0,0 +1,44 @@
{ stdenv
, lib
, fetchFromGitHub
, unstableGitUpdater
, cmake
, zlib
}:
stdenv.mkDerivation rec {
pname = "vgmtools";
version = "unstable-2022-05-23";
src = fetchFromGitHub {
owner = "vgmrips";
repo = "vgmtools";
rev = "e0df1511ddf7b1207b448487616ff18a9049c278";
sha256 = "2nM3E/XeZ1OeOj3fPqvuJgQcPOtBerduGpVfpGLVhHQ=";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
zlib
];
# Some targets are not enabled by default
makeFlags = [
"all" "opt_oki" "optdac" "optvgm32"
];
passthru.updateScript = unstableGitUpdater {
url = "https://github.com/vgmrips/vgmtools.git";
};
meta = with lib; {
homepage = "https://github.com/vgmrips/vgmtools";
description = "A collection of tools for the VGM file format";
license = licenses.gpl2; # Not clarified whether Only or Plus
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.all;
};
}

@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
patchShebangs gen-text-file.sh
'';
NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
# Workaround build failure on -fno-common toolchains like upstream gcc-10.
NIX_CFLAGS_COMPILE = "-Wno-error=format-security -fcommon";
INSTALL_PATH = "$out";
installPhase = ''

@ -0,0 +1,51 @@
{ lib, stdenv, fetchFromGitHub, python3, zip }: let
version = "1.0.0";
sha256 = "sha256-/o4er8bO/3HUFXzP+sC+5DYv9EwmxW05o1RT5fEulEg=";
pname = "pridefetch";
src = fetchFromGitHub {
owner = "SpyHoodle";
repo = pname;
rev = "v" + version;
inherit sha256;
};
in stdenv.mkDerivation {
inherit pname version src;
nativeBuildInputs = [
zip
];
buildInputs = [
(python3.withPackages (pythonPackages: with pythonPackages; [
distro
]))
];
buildPhase = ''
runHook preBuild
pushd src
zip -r ../pridefetch.zip ./*
popd
echo '#!/usr/bin/env python' | cat - pridefetch.zip > pridefetch
rm pridefetch.zip
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv pridefetch $out/bin/pridefetch
chmod +x $out/bin/pridefetch
runHook postInstall
'';
meta = with lib; {
description = "Print out system statistics with pride flags";
longDescription = ''
Pridefetch prints your system statistics (similarly to neofetch, screenfetch or pfetch) along with a pride flag.
The flag which is printed is configurable, as well as the width of the output.
'';
homepage = "https://github.com/SpyHoodle/pridefetch";
license = licenses.mit;
maintainers = [
maintainers.minion3665
];
platforms = platforms.all;
};
}

@ -0,0 +1,166 @@
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
# Required
, aircrack-ng
, bash
, coreutils-full
, gawk
, gnugrep
, gnused
, iproute2
, iw
, pciutils
, procps
, tmux
# X11 Front
, xterm
, xorg
# what the author calls "Internals"
, usbutils
, wget
, ethtool
, util-linux
, ccze
# Optionals
# Missing in nixpkgs: beef, hostapd-wpe, asleap
, bettercap
, bully
, crunch
, dhcp
, dnsmasq
, ettercap
, hashcat
, hcxdumptool
, hcxtools
, hostapd
, john
, lighttpd
, mdk4
, nftables
, openssl
, pixiewps
, reaverwps-t6x # Could be the upstream version too
, wireshark-cli
# Undocumented requirements (there is also ping)
, apparmor-bin-utils
, curl
, glibc
, ncurses
, networkmanager
, systemd
# Support groups
, supportWpaWps ? true # Most common use-case
, supportHashCracking ? false
, supportEvilTwin ? false
, supportX11 ? false # Allow using xterm instead of tmux, hard to test
}:
let
deps = [
aircrack-ng
bash
coreutils-full
curl
gawk
glibc
gnugrep
gnused
iproute2
iw
networkmanager
ncurses
pciutils
procps
tmux
usbutils
wget
ethtool
util-linux
ccze
systemd
] ++ lib.optionals supportWpaWps [
bully
pixiewps
reaverwps-t6x
] ++ lib.optionals supportHashCracking [
crunch
hashcat
hcxdumptool
hcxtools
john
wireshark-cli
] ++ lib.optionals supportEvilTwin [
bettercap
dhcp
dnsmasq
ettercap
hostapd
lighttpd
openssl
mdk4
nftables
apparmor-bin-utils
] ++ lib.optionals supportX11 [
xterm
xorg.xset
xorg.xdpyinfo
];
in
stdenv.mkDerivation rec {
pname = "airgeddon";
version = "11.01";
src = fetchFromGitHub {
owner = "v1s1t0r1sh3r3";
repo = "airgeddon";
rev = "v${version}";
sha256 = "3TjaLEcerRk69Ys4kj7vOMCRUd0ifFJzL4MB5ifoK68=";
};
strictDeps = true;
nativeBuildInputs = [ makeWrapper ];
# What these replacings do?
# - Disable the auto-updates (we'll run from a read-only directory);
# - Silence the checks (NixOS will enforce the PATH, it will only see the tools as we listed);
# - Use "tmux", we're not patching XTerm commands;
# - Remove PWD and $0 references, forcing it to use the paths from store;
# - Force our PATH to all tmux sessions.
postPatch = ''
patchShebangs airgeddon.sh
sed -i '
s|AIRGEDDON_AUTO_UPDATE=true|AIRGEDDON_AUTO_UPDATE=false|
s|AIRGEDDON_SILENT_CHECKS=false|AIRGEDDON_SILENT_CHECKS=true|
s|AIRGEDDON_WINDOWS_HANDLING=xterm|AIRGEDDON_WINDOWS_HANDLING=tmux|
' .airgeddonrc
sed -Ei '
s|\$\(pwd\)|${placeholder "out"}/share/airgeddon;scriptfolder=${placeholder "out"}/share/airgeddon/|
s|\$\{0\}|${placeholder "out"}/bin/airgeddon|
s|tmux send-keys -t "([^"]+)" "|tmux send-keys -t "\1" "export PATH=\\"$PATH\\"; |
' airgeddon.sh
'';
# ATTENTION: No need to chdir around, we're removing the occurrences of "$(pwd)"
postInstall = ''
wrapProgram $out/bin/airgeddon --prefix PATH : ${lib.makeBinPath deps}
'';
# Install only the interesting files
installPhase = ''
runHook preInstall
install -Dm 755 airgeddon.sh "$out/bin/airgeddon"
install -dm 755 "$out/share/airgeddon"
cp -dr .airgeddonrc known_pins.db language_strings.sh plugins/ "$out/share/airgeddon/"
runHook postInstall
'';
meta = with lib; {
description = "Multi-use TUI to audit wireless networks. ";
homepage = "https://github.com/v1s1t0r1sh3r3/airgeddon";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ pedrohlc ];
platforms = platforms.linux;
};
}

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "ooniprobe-cli";
version = "3.14.2";
version = "3.15.0";
src = fetchFromGitHub {
owner = "ooni";
repo = "probe-cli";
rev = "v${version}";
hash = "sha256-9n/Ozyy1QzjFum/R/X2DChzTHl70e+JQuo09nToAIcE=";
hash = "sha256-lIRU6TM76/uX2LA4hdWbF4fbbcfGMUzmGz4e1PTyH3c=";
};
vendorSha256 = "/fN9nRYOy00EeI8zZQFkCgTMGLZ0pFbYmRdTr2NLIsc=";
vendorSha256 = "h06WoKykuVzNgco74YbpSP+1nu/bOEf2mT4rUEX8MxU=";
subPackages = [ "cmd/ooniprobe" ];

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchurl, cmake, darkhttpd, gettext, makeWrapper
{ lib, mkDerivation, fetchurl, cmake, gettext
, pkg-config, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase
, qttranslations, qtsvg }:
@ -17,7 +17,7 @@ mkDerivation rec {
sha256 = "1cikz36w9phgczcqnwk4k3mx3kk919wy2327jksmfa4cjfjq4a8d";
};
nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ];
nativeBuildInputs = [ cmake gettext pkg-config ];
postPatch = ''
substituteInPlace client/CMakeLists.txt \
@ -35,10 +35,11 @@ mkDerivation rec {
qttranslations
];
postInstall = ''
wrapProgram $out/bin/qdigidoc4 \
--prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/
'';
# replace this hack with a proper cmake variable or environment variable
# once https://github.com/open-eid/cmake/pull/34 (or #35) gets merged.
qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/"
];
meta = with lib; {
description = "Qt-based UI for signing and verifying DigiDoc documents";

@ -411,6 +411,8 @@ with pkgs;
pridecat = callPackage ../tools/misc/pridecat { };
pridefetch = callPackage ../tools/misc/pridefetch { };
proto-contrib = callPackage ../development/tools/proto-contrib { };
protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { };
@ -1069,6 +1071,8 @@ with pkgs;
airfield = callPackage ../tools/networking/airfield { };
airgeddon = callPackage ../tools/networking/airgeddon { };
apache-airflow = with python3.pkgs; toPythonApplication apache-airflow;
airsonic = callPackage ../servers/misc/airsonic { };
@ -4635,20 +4639,16 @@ with pkgs;
circus = callPackage ../tools/networking/circus { };
citrix_workspace = citrix_workspace_21_12_0;
citrix_workspace = citrix_workspace_22_05_0;
inherit (callPackage ../applications/networking/remote/citrix-workspace { })
citrix_workspace_20_04_0
citrix_workspace_20_06_0
citrix_workspace_20_09_0
citrix_workspace_20_10_0
citrix_workspace_20_12_0
citrix_workspace_21_01_0
citrix_workspace_21_03_0
citrix_workspace_21_06_0
citrix_workspace_21_08_0
citrix_workspace_21_09_0
citrix_workspace_21_12_0
citrix_workspace_22_05_0
;
cmigemo = callPackage ../tools/text/cmigemo { };
@ -6300,8 +6300,6 @@ with pkgs;
git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { });
git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { };
git-ftp = callPackage ../development/tools/git-ftp { };
git-machete = python3Packages.callPackage ../applications/version-management/git-and-tools/git-machete { };
@ -19346,6 +19344,10 @@ with pkgs;
libversion = callPackage ../development/libraries/libversion { };
libvgm = callPackage ../development/libraries/libvgm {
inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox;
};
libvirt = callPackage ../development/libraries/libvirt {
inherit (darwin.apple_sdk.frameworks) Carbon AppKit;
};
@ -26161,6 +26163,8 @@ with pkgs;
faircamp = callPackage ../applications/misc/faircamp { };
famistudio = callPackage ../applications/audio/famistudio { };
fasttext = callPackage ../applications/science/machine-learning/fasttext { };
fbmenugen = callPackage ../applications/misc/fbmenugen { };
@ -26561,6 +26565,8 @@ with pkgs;
firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { };
fmtoy = callPackage ../tools/audio/fmtoy { };
flac = callPackage ../applications/audio/flac { };
redoflacs = callPackage ../applications/audio/redoflacs { };
@ -27194,6 +27200,8 @@ with pkgs;
swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { };
swaynag-battery = callPackage ../applications/misc/swaynag-battery {};
tiramisu = callPackage ../applications/misc/tiramisu { };
rootbar = callPackage ../applications/misc/rootbar {};
@ -28147,6 +28155,17 @@ with pkgs;
};
};
mmlgui = callPackage ../applications/audio/mmlgui {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
libvgm = libvgm.override {
withAllEmulators = false;
emulators = [
"_PRESET_SMD"
];
enableLibplayer = false;
};
};
mmsd = callPackage ../tools/networking/mmsd { };
mmtc = callPackage ../applications/audio/mmtc { };
@ -28819,6 +28838,10 @@ with pkgs;
owamp = callPackage ../applications/networking/owamp { };
vgmplay-libvgm = callPackage ../applications/audio/vgmplay-libvgm { };
vgmtools = callPackage ../tools/audio/vgmtools { };
vieb = callPackage ../applications/networking/browsers/vieb { };
vivaldi = callPackage ../applications/networking/browsers/vivaldi {};

Loading…
Cancel
Save