Merge staging-next into staging

main
github-actions[bot] 2 years ago committed by GitHub
commit a1bbd60cb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
  2. 3
      nixos/doc/manual/release-notes/rl-2211.section.md
  3. 1
      nixos/modules/module-list.nix
  4. 60
      nixos/modules/services/security/infnoise.nix
  5. 2
      nixos/tests/nitter.nix
  6. 4
      pkgs/applications/audio/munt/libmt32emu.nix
  7. 14
      pkgs/applications/audio/munt/mt32emu-qt.nix
  8. 10
      pkgs/applications/audio/munt/mt32emu-smf2wav.nix
  9. 16
      pkgs/applications/audio/noisetorch/default.nix
  10. 18
      pkgs/applications/audio/psst/default.nix
  11. 64
      pkgs/applications/graphics/mcomix/default.nix
  12. 105
      pkgs/applications/graphics/mcomix3/default.nix
  13. 4
      pkgs/applications/misc/themechanger/default.nix
  14. 6
      pkgs/applications/networking/browsers/castor/default.nix
  15. 2
      pkgs/applications/networking/browsers/firefox/common.nix
  16. 16
      pkgs/applications/science/logic/alt-ergo/default.nix
  17. 4
      pkgs/applications/virtualization/docker-compose/default.nix
  18. 2
      pkgs/applications/window-managers/sway/wrapper.nix
  19. 3
      pkgs/development/compilers/llvm/14/llvm/default.nix
  20. 7
      pkgs/development/embedded/platformio/chrootenv.nix
  21. 4
      pkgs/development/interpreters/janet/default.nix
  22. 3
      pkgs/development/libraries/gstreamer/good/default.nix
  23. 6
      pkgs/development/libraries/jabcode/default.nix
  24. 13
      pkgs/development/libraries/physics/rivet/default.nix
  25. 4
      pkgs/development/libraries/physics/yoda/default.nix
  26. 4
      pkgs/development/libraries/vapoursynth/default.nix
  27. 25
      pkgs/development/ocaml-modules/alsa/default.nix
  28. 31
      pkgs/development/ocaml-modules/gstreamer/default.nix
  29. 2
      pkgs/development/ocaml-modules/menhir/default.nix
  30. 6
      pkgs/development/ocaml-modules/menhir/lib.nix
  31. 2
      pkgs/development/ocaml-modules/menhir/sdk.nix
  32. 9
      pkgs/development/ocaml-modules/odate/default.nix
  33. 23
      pkgs/development/ocaml-modules/portaudio/default.nix
  34. 24
      pkgs/development/ocaml-modules/pulseaudio/default.nix
  35. 8
      pkgs/development/ocaml-modules/toml/default.nix
  36. 5
      pkgs/development/python-modules/aeppl/default.nix
  37. 4
      pkgs/development/python-modules/aesara/default.nix
  38. 4
      pkgs/development/python-modules/aiolookin/default.nix
  39. 4
      pkgs/development/python-modules/asyncssh/default.nix
  40. 4
      pkgs/development/python-modules/json-schema-for-humans/default.nix
  41. 14
      pkgs/development/python-modules/jsonrpc-async/default.nix
  42. 4
      pkgs/development/python-modules/jsonrpc-base/default.nix
  43. 4
      pkgs/development/python-modules/jsonrpc-websocket/default.nix
  44. 14
      pkgs/development/python-modules/pyasn/default.nix
  45. 23
      pkgs/development/python-modules/pymc/default.nix
  46. 4
      pkgs/development/python-modules/pysensibo/default.nix
  47. 4
      pkgs/development/python-modules/regenmaschine/default.nix
  48. 4
      pkgs/development/python-modules/sfepy/default.nix
  49. 4
      pkgs/development/python-modules/simplisafe-python/default.nix
  50. 4
      pkgs/development/python-modules/smart-meter-texas/default.nix
  51. 4
      pkgs/development/python-modules/venstarcolortouch/default.nix
  52. 4
      pkgs/development/tools/wails/default.nix
  53. 11
      pkgs/games/xboard/default.nix
  54. 43
      pkgs/misc/drivers/infnoise/default.nix
  55. 4
      pkgs/misc/drivers/infnoise/makefile.patch
  56. 35
      pkgs/servers/nitter/default.nix
  57. 10
      pkgs/stdenv/adapters.nix
  58. 26
      pkgs/stdenv/generic/make-derivation.nix
  59. 25
      pkgs/tools/audio/liquidsoap/full.nix
  60. 5
      pkgs/tools/misc/qmk/default.nix
  61. 8
      pkgs/tools/networking/mozillavpn/default.nix
  62. 4
      pkgs/tools/networking/mu/default.nix
  63. 9
      pkgs/tools/networking/opensnitch/ui.nix
  64. 17
      pkgs/tools/package-management/gx/default.nix
  65. 246
      pkgs/tools/package-management/gx/deps.nix
  66. 11
      pkgs/tools/package-management/gx/go/default.nix
  67. 4
      pkgs/tools/system/gkraken/default.nix
  68. 1
      pkgs/top-level/aliases.nix
  69. 2
      pkgs/top-level/all-packages.nix
  70. 12
      pkgs/top-level/ocaml-packages.nix
  71. 1
      pkgs/top-level/python-aliases.nix
  72. 2
      pkgs/top-level/python-packages.nix

@ -40,7 +40,7 @@
</section>
<section xml:id="sec-release-22.11-new-services">
<title>New Services</title>
<itemizedlist spacing="compact">
<itemizedlist>
<listitem>
<para>
<link xlink:href="https://github.com/jollheef/appvm">appvm</link>,
@ -48,6 +48,13 @@
<link xlink:href="options.html#opt-virtualisation.appvm.enable">virtualisation.appvm</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/leetronics/infnoise">infnoise</link>,
a hardware True Random Number Generator dongle. Available as
<link xlink:href="options.html#opt-services.infnoise.enable">services.infnoise</link>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.11-incompatibilities">

@ -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).
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Backward Incompatibilities {#sec-release-22.11-incompatibilities}

@ -983,6 +983,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

@ -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;
};
};
};
}

@ -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/")
'';
})

@ -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" ];

@ -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";
};
}

@ -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";
};
}

@ -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 ];

@ -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 ];
};
}

@ -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 ];
};
}

@ -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;
};
}

@ -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 = [

@ -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

@ -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
'';

@ -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 ];

@ -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

@ -37,7 +37,7 @@ in symlinkJoin {
paths = (optional withBaseWrapper baseWrapper)
++ [ sway ];
strictDeps = true;
strictDeps = false;
nativeBuildInputs = [ makeWrapper ]
++ (optional withGtkWrapper wrapGAppsHook);

@ -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

@ -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;

@ -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.

@ -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 = [

@ -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 =

@ -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

@ -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 ];

@ -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 = [

@ -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 ];
};
}

@ -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 ];
};
}

@ -7,7 +7,7 @@ buildDunePackage rec {
minimalOCamlVersion = "4.03";
inherit (menhirLib) version src useDune2;
inherit (menhirLib) version src;
buildInputs = [ menhirLib menhirSdk ];

@ -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";

@ -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";

@ -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;

@ -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 ];
};
}

@ -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 ];
};
}

@ -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 ];

@ -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";

@ -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 = [

@ -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 = [

@ -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 = [

@ -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 = ''

@ -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"
];

@ -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 = [

@ -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 = [

@ -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" ];

@ -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;

@ -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 = [

@ -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 = [

@ -19,14 +19,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 = [

@ -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 = [

@ -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 = ''

@ -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 = [

@ -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=";

@ -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

@ -1,43 +1,60 @@
{ lib, stdenv, fetchFromGitHub, libftdi }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, 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
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"
'';
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; };
};
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.
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 ];
maintainers = with maintainers; [ StijnDW zhaofengli ];
platforms = platforms.linux;
};
}

@ -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)

@ -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; [
flatty
jester
jsony
karax
sass
nimcrypto
markdown
nimcrypto
packedjson
supersnappy
redpool
redis
redpool
sass
supersnappy
zippy
flatty
jsony
];
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; };
}

@ -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...
];
}));

@ -10,14 +10,8 @@ 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:
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
@ -48,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
@ -67,12 +61,10 @@ let
f0 self super
else x;
in
makeDerivationExtensible mkDerivationSimple (self: attrs // f self attrs))
makeDerivationExtensible (self: attrs // f self attrs))
attrs;
in
makeOverlayable (overrideAttrs:
mkDerivationSimple = overrideAttrs:
# `mkDerivation` wraps the builtin `derivation` function to
@ -485,6 +477,10 @@ lib.extendDerivation
# should be made available to Nix expressions using the
# derivation (e.g., in assertions).
passthru)
(derivation derivationArg)
(derivation derivationArg);
)
in
fnOrAttrs:
if builtins.isFunction fnOrAttrs
then makeDerivationExtensible fnOrAttrs
else makeDerivationExtensibleConst fnOrAttrs

@ -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" ];

@ -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

@ -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 = ''

@ -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) ''

@ -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;

@ -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";

@ -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";
};
}
]

@ -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";

@ -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";

@ -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

@ -28037,7 +28037,7 @@ with pkgs;
mbrola = callPackage ../applications/audio/mbrola { };
mcomix3 = callPackage ../applications/graphics/mcomix3 {};
mcomix = callPackage ../applications/graphics/mcomix { };
mcpp = callPackage ../development/compilers/mcpp { };

@ -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 { };
@ -480,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 { };
@ -1131,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 { };
@ -1205,6 +1213,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 { };

@ -114,6 +114,7 @@ mapAliases ({
pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28
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

@ -7607,7 +7607,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 { };

Loading…
Cancel
Save