Merge master into haskell-updates

main
github-actions[bot] 2 years ago committed by GitHub
commit d3db7d02b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      maintainers/maintainer-list.nix
  2. 1
      nixos/modules/module-list.nix
  3. 1
      nixos/modules/services/hardware/illum.nix
  4. 2
      nixos/modules/services/x11/desktop-managers/default.nix
  5. 73
      nixos/modules/services/x11/desktop-managers/phosh.nix
  6. 13
      nixos/tests/systemd-nspawn.nix
  7. 25
      pkgs/applications/audio/airwindows-lv2/default.nix
  8. 82
      pkgs/applications/audio/rhythmbox/default.nix
  9. 1
      pkgs/applications/editors/standardnotes/default.nix
  10. 8
      pkgs/applications/emulators/citra/default.nix
  11. 5
      pkgs/applications/emulators/duckstation/default.nix
  12. 5
      pkgs/applications/emulators/simh/default.nix
  13. 4
      pkgs/applications/misc/1password-gui/beta.nix
  14. 4
      pkgs/applications/misc/1password-gui/default.nix
  15. 4
      pkgs/applications/misc/calibre/default.nix
  16. 18
      pkgs/applications/misc/catclock/default.nix
  17. 16
      pkgs/applications/misc/hstr/default.nix
  18. 6
      pkgs/applications/misc/lutris/default.nix
  19. 6
      pkgs/applications/misc/polybar/default.nix
  20. 6
      pkgs/applications/misc/sigi/default.nix
  21. 18
      pkgs/applications/networking/browsers/chromium/upstream-info.json
  22. 2
      pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
  23. 2
      pkgs/applications/networking/mailreaders/alot/default.nix
  24. 2
      pkgs/applications/office/paperless-ngx/default.nix
  25. 4
      pkgs/applications/science/misc/snakemake/default.nix
  26. 4
      pkgs/applications/video/ffmpeg-normalize/default.nix
  27. 4
      pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix
  28. 8
      pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix
  29. 6
      pkgs/desktops/arcan/default.nix
  30. 6
      pkgs/desktops/arcan/durden/default.nix
  31. 6
      pkgs/desktops/arcan/pipeworld/default.nix
  32. 4
      pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
  33. 4
      pkgs/desktops/gnome/core/gnome-shell/default.nix
  34. 4
      pkgs/desktops/gnome/core/mutter/default.nix
  35. 4
      pkgs/development/beam-modules/erlang-ls/default.nix
  36. 6
      pkgs/development/compilers/ats2/default.nix
  37. 757
      pkgs/development/compilers/elm/packages/node-packages.nix
  38. 13
      pkgs/development/coq-modules/QuickChick/default.nix
  39. 2
      pkgs/development/coq-modules/category-theory/default.nix
  40. 2
      pkgs/development/coq-modules/goedel/default.nix
  41. 2
      pkgs/development/coq-modules/graph-theory/default.nix
  42. 4
      pkgs/development/coq-modules/itauto/default.nix
  43. 2
      pkgs/development/coq-modules/mathcomp-tarjan/default.nix
  44. 2
      pkgs/development/coq-modules/semantics/default.nix
  45. 4
      pkgs/development/coq-modules/smpl/default.nix
  46. 4
      pkgs/development/coq-modules/smtcoq/default.nix
  47. 4
      pkgs/development/interpreters/clojure/babashka.nix
  48. 4
      pkgs/development/libraries/libpg_query/default.nix
  49. 4
      pkgs/development/python-modules/androguard/default.nix
  50. 13
      pkgs/development/python-modules/async-lru/default.nix
  51. 6
      pkgs/development/python-modules/aws-adfs/default.nix
  52. 16
      pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
  53. 4
      pkgs/development/python-modules/beancount/default.nix
  54. 2
      pkgs/development/python-modules/contexttimer/default.nix
  55. 41
      pkgs/development/python-modules/django-tastypie/default.nix
  56. 4
      pkgs/development/python-modules/django-versatileimagefield/default.nix
  57. 6
      pkgs/development/python-modules/dunamai/default.nix
  58. 4
      pkgs/development/python-modules/hahomematic/default.nix
  59. 48
      pkgs/development/python-modules/hatch-vcs/default.nix
  60. 32
      pkgs/development/python-modules/holoviews/default.nix
  61. 4
      pkgs/development/python-modules/imap-tools/default.nix
  62. 17
      pkgs/development/python-modules/karton-autoit-ripper/default.nix
  63. 4
      pkgs/development/python-modules/karton-classifier/default.nix
  64. 12
      pkgs/development/python-modules/malduck/default.nix
  65. 4
      pkgs/development/python-modules/mastodon-py/default.nix
  66. 4
      pkgs/development/python-modules/mocket/default.nix
  67. 4
      pkgs/development/python-modules/mypy-boto3-s3/default.nix
  68. 40
      pkgs/development/python-modules/nutils/default.nix
  69. 4
      pkgs/development/python-modules/phonenumbers/default.nix
  70. 4
      pkgs/development/python-modules/pushbullet/default.nix
  71. 32
      pkgs/development/python-modules/py-nextbusnext/default.nix
  72. 4
      pkgs/development/python-modules/pydeps/default.nix
  73. 13
      pkgs/development/python-modules/pylint-django/default.nix
  74. 39
      pkgs/development/python-modules/pylint-plugin-utils/default.nix
  75. 4
      pkgs/development/python-modules/pysnow/default.nix
  76. 2
      pkgs/development/python-modules/python-magic/default.nix
  77. 4
      pkgs/development/python-modules/relatorio/default.nix
  78. 31
      pkgs/development/python-modules/sdds/default.nix
  79. 16
      pkgs/development/python-modules/snapcast/default.nix
  80. 20
      pkgs/development/python-modules/spglib/default.nix
  81. 4
      pkgs/development/python-modules/trimesh/default.nix
  82. 4
      pkgs/development/python-modules/types-toml/default.nix
  83. 2
      pkgs/development/python-modules/xmltodict/default.nix
  84. 6
      pkgs/development/python-modules/yte/default.nix
  85. 7
      pkgs/development/tools/amazon-qldb-shell/default.nix
  86. 8
      pkgs/development/tools/analysis/tflint/default.nix
  87. 6
      pkgs/development/tools/analysis/tfsec/default.nix
  88. 4
      pkgs/development/tools/database/sqlfluff/default.nix
  89. 4
      pkgs/development/tools/misc/uncrustify/default.nix
  90. 14
      pkgs/development/tools/prospector/default.nix
  91. 6
      pkgs/development/tools/rust/cargo-expand/default.nix
  92. 2
      pkgs/development/tools/rust/rust-analyzer/default.nix
  93. 2
      pkgs/development/tools/rust/rust-analyzer/update.sh
  94. 12
      pkgs/development/tools/taplo-cli/default.nix
  95. 6
      pkgs/development/web/deno/default.nix
  96. 2
      pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix
  97. 4
      pkgs/servers/home-assistant/component-packages.nix
  98. 2
      pkgs/servers/mautrix-facebook/default.nix
  99. 2
      pkgs/servers/mautrix-signal/default.nix
  100. 2
      pkgs/servers/mautrix-telegram/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

@ -513,6 +513,17 @@
github = "alexnortung"; github = "alexnortung";
githubId = 1552267; githubId = 1552267;
}; };
alexshpilkin = {
email = "ashpilkin@gmail.com";
github = "alexshpilkin";
githubId = 1010468;
keys = [{
longkeyid = "rsa4096/0x73E9AA114B3A894B";
fingerprint = "B595 D74D 6615 C010 469F 5A13 73E9 AA11 4B3A 894B";
}];
matrix = "@alexshpilkin:matrix.org";
name = "Alexander Shpilkin";
};
alexvorobiev = { alexvorobiev = {
email = "alexander.vorobiev@gmail.com"; email = "alexander.vorobiev@gmail.com";
github = "alexvorobiev"; github = "alexvorobiev";

@ -196,7 +196,6 @@
./programs/partition-manager.nix ./programs/partition-manager.nix
./programs/plotinus.nix ./programs/plotinus.nix
./programs/proxychains.nix ./programs/proxychains.nix
./programs/phosh.nix
./programs/qt5ct.nix ./programs/qt5ct.nix
./programs/screen.nix ./programs/screen.nix
./programs/sedutil.nix ./programs/sedutil.nix

@ -28,6 +28,7 @@ in {
description = "Backlight Adjustment Service"; description = "Backlight Adjustment Service";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig.ExecStart = "${pkgs.illum}/bin/illum-d"; serviceConfig.ExecStart = "${pkgs.illum}/bin/illum-d";
serviceConfig.Restart = "on-failure";
}; };
}; };

@ -18,7 +18,7 @@ in
# determines the default: later modules (if enabled) are preferred. # determines the default: later modules (if enabled) are preferred.
# E.g., if Plasma 5 is enabled, it supersedes xterm. # E.g., if Plasma 5 is enabled, it supersedes xterm.
imports = [ imports = [
./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix ./none.nix ./xterm.nix ./phosh.nix ./xfce.nix ./plasma5.nix ./lumina.nix
./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix ./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix
./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix
./cinnamon.nix ./cinnamon.nix

@ -3,7 +3,7 @@
with lib; with lib;
let let
cfg = config.programs.phosh; cfg = config.services.xserver.desktopManager.phosh;
# Based on https://source.puri.sm/Librem5/librem5-base/-/blob/4596c1056dd75ac7f043aede07887990fd46f572/default/sm.puri.OSK0.desktop # Based on https://source.puri.sm/Librem5/librem5-base/-/blob/4596c1056dd75ac7f043aede07887990fd46f572/default/sm.puri.OSK0.desktop
oskItem = pkgs.makeDesktopItem { oskItem = pkgs.makeDesktopItem {
@ -118,12 +118,39 @@ let
[cursor] [cursor]
theme = ${phoc.cursorTheme} theme = ${phoc.cursorTheme}
''; '';
in { in
{
options = { options = {
programs.phosh = { services.xserver.desktopManager.phosh = {
enable = mkEnableOption '' enable = mkOption {
Whether to enable, Phosh, related packages and default configurations. type = types.bool;
''; default = false;
description = "Enable the Phone Shell.";
};
package = mkOption {
type = types.package;
default = pkgs.phosh;
defaultText = literalExpression "pkgs.phosh";
example = literalExpression "pkgs.phosh";
description = ''
Package that should be used for Phosh.
'';
};
user = mkOption {
description = "The user to run the Phosh service.";
type = types.str;
example = "alice";
};
group = mkOption {
description = "The group to run the Phosh service.";
type = types.str;
example = "users";
};
phocConfig = mkOption { phocConfig = mkOption {
description = '' description = ''
Configurations for the Phoc compositor. Configurations for the Phoc compositor.
@ -135,14 +162,42 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.defaultUnit = "graphical.target";
# Inspired by https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/phosh.service
systemd.services.phosh = {
wantedBy = [ "graphical.target" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/phosh";
User = cfg.user;
Group = cfg.group;
PAMName = "login";
WorkingDirectory = "~";
Restart = "always";
TTYPath = "/dev/tty7";
TTYReset = "yes";
TTYVHangup = "yes";
TTYVTDisallocate = "yes";
# Fail to start if not controlling the tty.
StandardInput = "tty-fail";
StandardOutput = "journal";
StandardError = "journal";
# Log this user with utmp, letting it show up with commands 'w' and 'who'.
UtmpIdentifier = "tty7";
UtmpMode = "user";
};
};
environment.systemPackages = [ environment.systemPackages = [
pkgs.phoc pkgs.phoc
pkgs.phosh cfg.package
pkgs.squeekboard pkgs.squeekboard
oskItem oskItem
]; ];
systemd.packages = [ pkgs.phosh ]; systemd.packages = [ cfg.package ];
programs.feedbackd.enable = true; programs.feedbackd.enable = true;
@ -152,7 +207,7 @@ in {
services.gnome.core-shell.enable = true; services.gnome.core-shell.enable = true;
services.gnome.core-os-services.enable = true; services.gnome.core-os-services.enable = true;
services.xserver.displayManager.sessionPackages = [ pkgs.phosh ]; services.xserver.displayManager.sessionPackages = [ cfg.package ];
environment.etc."phosh/phoc.ini".source = environment.etc."phosh/phoc.ini".source =
if builtins.isPath cfg.phocConfig then cfg.phocConfig if builtins.isPath cfg.phocConfig then cfg.phocConfig

@ -25,8 +25,15 @@ let
nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } '' nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } ''
mkdir -p $out mkdir -p $out
cd $out cd $out
# produce a testimage.raw
dd if=/dev/urandom of=$out/testimage.raw bs=$((1024*1024+7)) count=5 dd if=/dev/urandom of=$out/testimage.raw bs=$((1024*1024+7)) count=5
sha256sum testimage.raw > SHA256SUMS
# produce a testimage2.tar.xz, containing the hello store path
tar cvJpf testimage2.tar.xz ${pkgs.hello}
# produce signature(s)
sha256sum testimage* > SHA256SUMS
export GNUPGHOME="$(mktemp -d)" export GNUPGHOME="$(mktemp -d)"
cp -R ${gpgKeyring}/* $GNUPGHOME cp -R ${gpgKeyring}/* $GNUPGHOME
gpg --batch --sign --detach-sign --output SHA256SUMS.gpg SHA256SUMS gpg --batch --sign --detach-sign --output SHA256SUMS.gpg SHA256SUMS
@ -56,5 +63,9 @@ in {
client.succeed( client.succeed(
"cmp /var/lib/machines/testimage.raw ${nspawnImages}/testimage.raw" "cmp /var/lib/machines/testimage.raw ${nspawnImages}/testimage.raw"
) )
client.succeed("machinectl pull-tar --verify=signature http://server/testimage2.tar.xz")
client.succeed(
"cmp /var/lib/machines/testimage2/${pkgs.hello}/bin/hello ${pkgs.hello}/bin/hello"
)
''; '';
}) })

@ -0,0 +1,25 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, lv2 }:
stdenv.mkDerivation rec {
pname = "airwindows-lv2";
version = "1.0";
src = fetchFromGitHub {
owner = "hannesbraun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xokV4Af0evdo73D9JObzAmY1wD0aUyXiI0Z7BUN0m+M=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ lv2 ];
cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/lv2" ];
meta = with lib; {
description = "Airwindows plugins (ported to LV2)";
homepage = "https://github.com/hannesbraun/airwindows-lv2";
license = licenses.mit;
maintainers = [ maintainers.magnetophon ];
platforms = platforms.unix;
};
}

@ -1,17 +1,30 @@
{ lib, stdenv, fetchurl, pkg-config, fetchFromGitLab { stdenv
, lib
, fetchurl
, fetchpatch
, pkg-config
, meson
, ninja
, fetchFromGitLab
, python3 , python3
, perl , vala
, perlPackages , glib
, gtk3 , gtk3
, intltool
, libpeas , libpeas
, libsoup , libsoup
, libxml2
, libsecret , libsecret
, libnotify , libnotify
, libdmapsharing , libdmapsharing
, gnome , gnome
, gobject-introspection , gobject-introspection
, totem-pl-parser , totem-pl-parser
, libgudev
, libgpod
, libmtp
, lirc
, brasero
, grilo
, tdb , tdb
, json-glib , json-glib
, itstool , itstool
@ -19,38 +32,32 @@
, gst_all_1 , gst_all_1
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
}: }:
let
# The API version of libdmapsharing required by rhythmbox 3.4.4 is 3.0. stdenv.mkDerivation rec {
# This PR would solve the issue:
# https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/12
# Unfortunately applying this patch produces a rhythmbox which
# cannot fetch data from DAAP shares.
libdmapsharing_3 = libdmapsharing.overrideAttrs (old: rec {
version = "2.9.41";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = old.pname;
rev = "${lib.toUpper old.pname}_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "05kvrzf0cp3mskdy6iv7zqq24qdczl800q2dn1h4bk3d9wchgm4p";
};
});
in stdenv.mkDerivation rec {
pname = "rhythmbox"; pname = "rhythmbox";
version = "3.4.4"; version = "3.4.5";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf"; sha256 = "l+u8YPN4sibaRbtEbYmQL26hgx4j8Q76ujZVk7HnTyo=";
}; };
patches = [
# Fix stuff linking against rhythmdb not finding libxml headers
# included by rhythmdb.h header.
# https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/147
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/rhythmbox/-/commit/7e8c7b803a45b7badf350132f8e78e3d75b99a21.patch";
sha256 = "5CE/NVlmx7FItNJCVQxx+x0DCYhUkAi/UuksfAiyWBg=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
intltool perl perlPackages.XMLParser meson
ninja
vala
glib
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -58,13 +65,20 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
python3 python3
libsoup libsoup
libxml2
tdb tdb
json-glib json-glib
glib
gtk3 gtk3
libpeas libpeas
totem-pl-parser totem-pl-parser
gnome.adwaita-icon-theme libgudev
libgpod
libmtp
lirc
brasero
grilo
gobject-introspection gobject-introspection
python3.pkgs.pygobject3 python3.pkgs.pygobject3
@ -76,16 +90,14 @@ in stdenv.mkDerivation rec {
gst_all_1.gst-plugins-ugly gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav gst_all_1.gst-libav
libdmapsharing_3 # necessary for daap support libdmapsharing # for daap support
libsecret libsecret
libnotify libnotify
] ++ gst_plugins; ] ++ gst_plugins;
configureFlags = [ postInstall = ''
"--enable-daap" glib-compile-schemas "$out/share/glib-2.0/schemas"
"--enable-libnotify" '';
"--with-libsecret"
];
preFixup = '' preFixup = ''
gappsWrapperArgs+=( gappsWrapperArgs+=(
@ -93,8 +105,6 @@ in stdenv.mkDerivation rec {
) )
''; '';
enableParallelBuilding = true;
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = pname;

@ -49,6 +49,7 @@ in appimageTools.wrapType2 rec {
# fixup and install desktop file # fixup and install desktop file
${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \ ${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \
--set-key Exec --set-value ${pname} standard-notes.desktop --set-key Exec --set-value ${pname} standard-notes.desktop
mv usr/share/icons share
rm usr/lib/* AppRun standard-notes.desktop .so* rm usr/lib/* AppRun standard-notes.desktop .so*
''; '';

@ -77,9 +77,11 @@ stdenv.mkDerivation {
chmod -R a+w externals/zstd chmod -R a+w externals/zstd
''; '';
# Todo: cubeb audio backend (the default one) doesn't work on the SDL interface. # Fixes https://github.com/NixOS/nixpkgs/issues/171173
# This seems to be a problem with libpulseaudio, other applications have similar problems (e.g Duckstation). postInstall = lib.optionalString (enableCubeb && enableSdl2) ''
# Note that the two interfaces have two separate configuration files. wrapProgram "$out/bin/citra" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio ]}
'';
meta = with lib; { meta = with lib; {
homepage = "https://citra-emu.org"; homepage = "https://citra-emu.org";

@ -90,8 +90,9 @@ mkDerivation rec {
runHook postCheck runHook postCheck
''; '';
# Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173
qtWrapperArgs = [ qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}"
]; ];
meta = with lib; { meta = with lib; {
@ -102,5 +103,3 @@ mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }
# TODO: default sound backend (cubeb) does not work, but SDL does. Strangely,
# switching to cubeb while a game is running makes it work.

@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
dontConfigure = true; dontConfigure = true;
# Workaround to build against upstream gcc-10 and clang-11.
# Can be removed when next release contains
# https://github.com/simh/simh/issues/794
NIX_CFLAGS_COMPILE = [ "-fcommon" ];
makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ];
preInstall = '' preInstall = ''

@ -42,11 +42,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "1password"; pname = "1password";
version = "8.7.0-49.BETA"; version = "8.8.0-11.BETA";
src = fetchurl { src = fetchurl {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
sha256 = "sha256-cYT9Pi2WEjZQ5P7Dr84l65AHyD8tZrYC+m4hFxSsNd4="; sha256 = "sha256-HU+nIz3aKXXdBWEBMSRlbi8yZ+JEsE33o6nfbWRgpBo=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

@ -42,11 +42,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "1password"; pname = "1password";
version = "8.6.1"; version = "8.7.0";
src = fetchurl { src = fetchurl {
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
sha256 = "sha256-CbSx1UJAvNrA1gTQyi6r8NgjwQ7H+tqWU9t3TUNrDMg="; sha256 = "sha256-Ubn1KEjK8H8d8+4QNEpEOuclWyD8ujUbO5CpzWr+kSg=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

@ -28,11 +28,11 @@
mkDerivation rec { mkDerivation rec {
pname = "calibre"; pname = "calibre";
version = "5.37.0"; version = "5.42.0";
src = fetchurl { src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
hash = "sha256-x2u4v0k05WMATSsuo76NnqChIz8BcTuZfPkZa0uLnMY="; hash = "sha256-pob9GZl3Wiky5aMGGvcNQdDrKh19bo+n5ihdS45X+Vg=";
}; };
# https://sources.debian.org/patches/calibre/${version}+dfsg-1 # https://sources.debian.org/patches/calibre/${version}+dfsg-1

@ -1,14 +1,15 @@
{ lib, stdenv, fetchFromGitHub, xlibsWrapper, motif }: { stdenv, lib, fetchFromGitHub, xlibsWrapper, motif
, withAudioTracking ? false, libpulseaudio, aubio }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "catclock"; pname = "catclock";
version = "unstable-2015-10-04"; version = "unstable-2021-11-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BarkyTheDog"; owner = "BarkyTheDog";
repo = "catclock"; repo = "catclock";
rev = "d20b8825b38477a144e8a2a4bbd4779adb3620ac"; rev = "b2f277974b5a80667647303cabf8a89d6d6a4290";
sha256 = "0fiv9rj8p8mifv24cxljdrrmh357q70zmzdci9bpbxnhs1gdpr63"; sha256 = "0ls02j9waqg155rj6whisqm7ppsdabgkrln92n4rmkgnwv25hdbi";
}; };
preInstall = '' preInstall = ''
@ -17,14 +18,15 @@ stdenv.mkDerivation {
cp xclock.man $out/share/man/man1/xclock.1 cp xclock.man $out/share/man/man1/xclock.1
''; '';
makeFlags = [ makeFlags = [ "DESTINATION=$(out)/bin/" ]
"DESTINATION=$(out)/bin/" ++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1";
];
buildInputs = [ xlibsWrapper motif ]; buildInputs = [ xlibsWrapper motif ]
++ lib.optionals withAudioTracking [ libpulseaudio aubio ];
meta = with lib; { meta = with lib; {
homepage = "http://codefromabove.com/2014/05/catclock/"; homepage = "http://codefromabove.com/2014/05/catclock/";
description = "Analog / Digital / Cat clock for X";
license = with licenses; mit; license = with licenses; mit;
maintainers = with maintainers; [ ramkromberg ]; maintainers = with maintainers; [ ramkromberg ];
mainProgram = "xclock"; mainProgram = "xclock";

@ -1,27 +1,17 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, readline, ncurses { lib, stdenv, fetchFromGitHub, readline, ncurses
, autoreconfHook, pkg-config, gettext }: , autoreconfHook, pkg-config, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hstr"; pname = "hstr";
version = "2.3"; version = "2.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dvorka"; owner = "dvorka";
repo = "hstr"; repo = "hstr";
rev = version; rev = version;
sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y"; sha256 = "sha256-qIMnU+gRR3HPAOrrrduN68R5E8ZJKROfZ0sEHL0E4XU=";
}; };
patches = [
# pull pending upstream inclusion fix for ncurses-6.3:
# https://github.com/dvorka/hstr/pull/435
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/dvorka/hstr/commit/7fbd852c464ae3cfcd2f4fed9c62a21fb84c5439.patch";
sha256 = "15f0ja4bsh4jnchcg0ray8ijpdraag7k07ss87a6ymfs1rg6i0jr";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ readline ncurses gettext ]; buildInputs = [ readline ncurses gettext ];

@ -31,7 +31,7 @@
, pyyaml , pyyaml
, requests , requests
, keyring , keyring
, python_magic , python-magic
# commands that lutris needs # commands that lutris needs
, xrandr , xrandr
@ -104,7 +104,7 @@ buildPythonApplication rec {
libnotify libnotify
pango pango
webkitgtk webkitgtk
python_magic python-magic
] ++ gstDeps; ] ++ gstDeps;
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -117,7 +117,7 @@ buildPythonApplication rec {
pillow pillow
dbus-python dbus-python
keyring keyring
python_magic python-magic
]; ];
postPatch = '' postPatch = ''

@ -44,13 +44,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "polybar"; pname = "polybar";
version = "3.6.2"; version = "3.6.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-mLAcA8afGLNhRRU/x/TngCMcSRXdEM5wKWoYZhezJqU="; hash = "sha256-FKkPSAEMzptnjJq3xTk+fpD8XjASQ3smX5imstDyLNE=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -120,7 +120,7 @@ stdenv.mkDerivation rec {
having a black belt in shell scripting. having a black belt in shell scripting.
''; '';
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ]; maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ckie ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "sigi"; pname = "sigi";
version = "3.2.1"; version = "3.3.0";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-1eZ6i0CvjNyYlWb7c0OPlGtvVSFpi8hiOl/7qeeE9wA="; sha256 = "sha256-dcfzCac4dT2X1hgTSh30G7h2XtvVj1jMUmrUzqZ11y8=";
}; };
cargoSha256 = "sha256-Tyrcu/BYt9k4igiEIiZ2I7VIGiBZ3D2i6XfT/XGlU+U="; cargoSha256 = "sha256-CQofC9Y0y8XASLpjk9B6mMlSQqiXnoGZ8kJh16txiPA=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
# In case anything goes wrong. # In case anything goes wrong.

@ -19,9 +19,9 @@
} }
}, },
"beta": { "beta": {
"version": "102.0.5005.27", "version": "102.0.5005.40",
"sha256": "0fznry72w50dpijg55yxkaz1hv1zkvvxini3yxadwpfa5y0mpn3m", "sha256": "1max5ndvl59j2hlv9k88dmadr4q05q1clzlc6zba0gcbvqx5q9jb",
"sha256bin64": "0k543zz3njsn5kh1wf90hqywll9s6g4xrnh2zqph066l91gj17rx", "sha256bin64": "1byqx9w0hqwk3vizdas3dylbm69108bnq4xlm0mp1p1gh37h1642",
"deps": { "deps": {
"gn": { "gn": {
"version": "2022-04-14", "version": "2022-04-14",
@ -32,15 +32,15 @@
} }
}, },
"dev": { "dev": {
"version": "103.0.5028.0", "version": "103.0.5042.0",
"sha256": "06i6kgsdril5gfbjl1sh0z5hqvq64bchhb2z8w0h8cw9977bvqk6", "sha256": "0wm8m1mff8gb0x7whif16gvmhibgc8ndygnawkwq3g4fvninb65h",
"sha256bin64": "09hxvcv5n1kd4qnwh6pxzmrlnc8xijm7rwb1c8c57v0jjb32x9ry", "sha256bin64": "0vzmpi36a86kgxhdxvbqbn7i1wf2annar1mi15gra1cjpz3lf9kh",
"deps": { "deps": {
"gn": { "gn": {
"version": "2022-04-26", "version": "2022-05-02",
"url": "https://gn.googlesource.com/gn", "url": "https://gn.googlesource.com/gn",
"rev": "ced9fbfe6943854e65ada4ac1849d1fa4cb19348", "rev": "53ef169800760fdc09f0773bf380fe99eaeab339",
"sha256": "14fgjsfqihmma1cr8n30n37vxkf20paa6swq2yxn1agjvfr9cdvl" "sha256": "08i7qc4qvf8gb3vryajvww75wk653fybf1bb2k40r8i07znhy78r"
} }
} }
}, },

@ -18,7 +18,7 @@ let
scriptPython = python.withPackages (ps: with ps; [ scriptPython = python.withPackages (ps: with ps; [
aiohttp aiohttp
requests requests
python_magic python-magic
]); ]);
version = "0.3.0"; version = "0.3.0";

@ -40,7 +40,7 @@ with python3.pkgs; buildPythonApplication rec {
file file
gpgme gpgme
notmuch2 notmuch2
python_magic python-magic
service-identity service-identity
twisted twisted
urwid urwid

@ -106,7 +106,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
python-dotenv python-dotenv
python-gnupg python-gnupg
python-Levenshtein python-Levenshtein
python_magic python-magic
pytz pytz
pyyaml pyyaml
redis redis

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "snakemake"; pname = "snakemake";
version = "7.6.1"; version = "7.6.2";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "snakemake"; owner = "snakemake";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-McknAQDzpTE1WdIBr8HsFpGzXuJT2kDNvLzK2gn75GM="; hash = "sha256-mIl5c+HR2kqgJzbLVTQjJlf4Ca/+Icqg9G49yIUyipc=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

@ -7,11 +7,11 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "ffmpeg-normalize"; pname = "ffmpeg-normalize";
version = "1.22.10"; version = "1.23.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-F058lCuIxH0lqJlPrWIznu2Ks2w+KXrTnJD7CmYSZFU="; sha256 = "sha256-DSBh3m7gGm5fWH47YWALlyhi4x6A2RcVrpuDDpXolSI=";
}; };
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];

@ -2,11 +2,11 @@
buildKodiAddon rec { buildKodiAddon rec {
pname = "inputstreamhelper"; pname = "inputstreamhelper";
namespace = "script.module.inputstreamhelper"; namespace = "script.module.inputstreamhelper";
version = "0.5.8+matrix.1"; version = "0.5.10+matrix.1";
src = fetchzip { src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "xdsUzmz8ji9JcYLEUFWwvXq0Oig5i08VPQD93K8R9hk="; sha256 = "FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4=";
}; };
passthru = { passthru = {

@ -10,21 +10,21 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "obs-gstreamer"; pname = "obs-gstreamer";
version = "0.2.1"; version = "0.3.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fzwoch"; owner = "fzwoch";
repo = "obs-gstreamer"; repo = "obs-gstreamer";
rev = "v${version}"; rev = "v${version}";
sha256 = "1fdpwr8br8x9cnrhr3j4f0l81df26n3bj2ibi3cg96rl86054nid"; hash = "sha256-KhSBZcV2yILTf5+aNoYWDfNwPiJoyYPeIOQMDFvOusg=";
}; };
nativeBuildInputs = [ pkg-config meson ninja ]; nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = [ gst_all_1.gstreamermm obs-studio ]; buildInputs = with gst_all_1; [ gstreamer gst-plugins-base obs-studio ];
meta = with lib; { meta = with lib; {
description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio"; description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio";
homepage = "https://github.com/fswoch/obs-gstreamer"; homepage = "https://github.com/fzwoch/obs-gstreamer";
maintainers = with maintainers; [ ahuzik ]; maintainers = with maintainers; [ ahuzik ];
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [ "x86_64-linux" "i686-linux" ];

@ -1,6 +1,6 @@
{ callPackage, lib, pkgs }: { config, lib, pkgs }:
rec { lib.makeScope pkgs.newScope (self: with self; {
# Dependencies # Dependencies
espeak = pkgs.espeak-ng; espeak = pkgs.espeak-ng;
@ -40,4 +40,4 @@ rec {
name = "all-wrapped"; name = "all-wrapped";
appls = [ durden pipeworld ]; appls = [ durden pipeworld ];
}; };
} })

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "durden"; pname = "durden";
version = "0.6.1+date=2022-03-11"; version = "0.6.1+date=2022-04-16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "letoram"; owner = "letoram";
repo = pname; repo = pname;
rev = "fec2a1051500df28becce188d932645743091efa"; rev = "b07ba6535addf0d36a64385745cd9595f7d214b1";
hash = "sha256-uZ7oTnkWG3P/4ETgn6MQ9v47mRAJnvyzglQS7jlabPA="; hash = "sha256-nDSuJrJvJOVpRax+AwuNAZ3Ioqfoo10EGCab1EiPbIY=";
}; };
dontConfigure = true; dontConfigure = true;

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pipeworld"; pname = "pipeworld";
version = "0.pre+date=2021-12-03"; version = "0.pre+date=2022-04-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "letoram"; owner = "letoram";
repo = pname; repo = pname;
rev = "c653414670cafb0c73a57492aa3d9510460b16a9"; rev = "f60d0b93fcd5462f47b1c928c109f5b4cbd74eef";
hash = "sha256-XuAsuTC+P6yoNlDnsT2fiWoqKW+1JKc9NF+Vn/ta0pk="; hash = "sha256-PNziP5LaUODZwtAHvg8uYt/EyoD3mB5aWIfp7n5a82E=";
}; };
dontConfigure = true; dontConfigure = true;

@ -13,11 +13,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extensions"; pname = "gnome-shell-extensions";
version = "42.0"; version = "42.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "PuZbdbGv2LzKCioD2psohHh+1A4leogdmqbvfIcnYC8="; sha256 = "LYjv61d+2viqrkMcd5um5uuWHuvd8FzKLsyhqgTbekA=";
}; };
patches = [ patches = [

@ -67,13 +67,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell"; pname = "gnome-shell";
version = "42.0"; version = "42.1";
outputs = [ "out" "devdoc" ]; outputs = [ "out" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "M9QE+zyTud5CmE8BEKKWnWpKckfCf+f14kxn7P7HUJQ="; sha256 = "9e6KYVj6EiYnQScmy4gATn4tBGrcMiFQViROWbdAY+o=";
}; };
patches = [ patches = [

@ -47,13 +47,13 @@
let self = stdenv.mkDerivation rec { let self = stdenv.mkDerivation rec {
pname = "mutter"; pname = "mutter";
version = "42.0"; version = "42.1";
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "0eJARGt/jNij/52q4zbByQFhk7p+B2nHml5sA4SQIuU="; sha256 = "cZQhi/7EW5o+/avOb4RQ7Uw5dyIaHqQBTC5Fii/poVQ=";
}; };
patches = [ patches = [

@ -1,7 +1,7 @@
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
, stdenv, writeScript, lib }: , stdenv, writeScript, lib }:
let let
version = "0.31.0"; version = "0.32.0";
owner = "erlang-ls"; owner = "erlang-ls";
repo = "erlang_ls"; repo = "erlang_ls";
deps = import ./rebar-deps.nix { deps = import ./rebar-deps.nix {
@ -19,7 +19,7 @@ rebar3Relx {
inherit version; inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
inherit owner repo; inherit owner repo;
sha256 = "sha256-tpJUCHrSFNEzNrln7nKwav0GSBW+4fwjSB3WI1MKW9A="; sha256 = "sha256-aYMfsaqdsxlWatvXBWIxKJ7baruH1kqp2nrXL+/IrUQ=";
rev = version; rev = version;
}; };
releaseType = "escript"; releaseType = "escript";

@ -3,11 +3,11 @@
, withContrib ? true }: , withContrib ? true }:
let let
versionPkg = "0.4.1" ; versionPkg = "0.4.2";
contrib = fetchurl { contrib = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz"; url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz";
sha256 = "184m4hz2xszhcfc6w9fw9qibhmcvgjmikwfwkb345xypr59jm93d"; hash = "sha256-m0hfBLsaNiLaIktcioK+ZtWUsWht3IDSJ6CzgJmS06c=";
}; };
postInstallContrib = lib.optionalString withContrib postInstallContrib = lib.optionalString withContrib
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-gmp-${version}.tgz"; url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-gmp-${version}.tgz";
sha256 = "0c4nqp6yzmpj0mcpg7ibmwyqi8hjw3sza8myvy4nzq3fa6wldy5l"; hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM=";
}; };
buildInputs = [ gmp ]; buildInputs = [ gmp ];

File diff suppressed because it is too large Load Diff

@ -1,11 +1,12 @@
{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }: { lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }:
let recent = lib.versions.isGe "8.7" coq.coq-version; in let recent = lib.versions.isGe "8.7" coq.coq-version; in
mkCoqDerivation { (mkCoqDerivation {
pname = "QuickChick"; pname = "QuickChick";
owner = "QuickChick"; owner = "QuickChick";
inherit version; inherit version;
defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [ defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [
{ cases = [ (isGe "8.13") pred.true ]; out = "1.6.2"; }
{ cases = [ "8.13" pred.true ]; out = "1.5.0"; } { cases = [ "8.13" pred.true ]; out = "1.5.0"; }
{ cases = [ "8.12" pred.true ]; out = "1.4.0"; } { cases = [ "8.12" pred.true ]; out = "1.4.0"; }
{ cases = [ "8.11" pred.true ]; out = "1.3.2"; } { cases = [ "8.11" pred.true ]; out = "1.3.2"; }
@ -16,6 +17,7 @@ mkCoqDerivation {
{ cases = [ "8.6" pred.true ]; out = "20171102"; } { cases = [ "8.6" pred.true ]; out = "20171102"; }
{ cases = [ "8.5" pred.true ]; out = "20170512"; } { cases = [ "8.5" pred.true ]; out = "20170512"; }
] null; ] null;
release."1.6.2".sha256 = "0g5q9zw3xd4zndihq96nxkq4w3dh05418wzlwdk1nnn3b6vbx6z0";
release."1.5.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dcw7hyfkw"; release."1.5.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dcw7hyfkw";
release."1.4.0".sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc"; release."1.4.0".sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc";
release."1.3.2".sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs"; release."1.3.2".sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs";
@ -46,4 +48,11 @@ mkCoqDerivation {
description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck"; description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
maintainers = with maintainers; [ jwiegley ]; maintainers = with maintainers; [ jwiegley ];
}; };
} }).overrideAttrs (o:
let after_1_6 = lib.versions.isGe "1.6" o.version || o.version == "dev";
in {
nativeBuildInputs = o.nativeBuildInputs
++ lib.optional after_1_6 coq.ocamlPackages.cppo;
propagatedBuildInputs = o.propagatedBuildInputs
++ lib.optionals after_1_6 (with coq.ocamlPackages; [ findlib zarith ]);
})

@ -16,7 +16,7 @@ with lib; mkCoqDerivation {
inherit version; inherit version;
defaultVersion = with versions; switch coq.coq-version [ defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.14"; out = "20211213"; } { case = range "8.10" "8.15"; out = "20211213"; }
{ case = range "8.8" "8.9"; out = "20190414"; } { case = range "8.8" "8.9"; out = "20190414"; }
{ case = range "8.6" "8.7"; out = "20180709"; } { case = range "8.6" "8.7"; out = "20180709"; }
] null; ] null;

@ -12,7 +12,7 @@ mkCoqDerivation {
inherit version; inherit version;
defaultVersion = with versions; switch coq.coq-version [ defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.11" "8.14"; out = "8.13.0"; } { case = range "8.11" "8.15"; out = "8.13.0"; }
] null; ] null;
propagatedBuildInputs = [ hydra-battles pocklington ]; propagatedBuildInputs = [ hydra-battles pocklington ];

@ -12,7 +12,7 @@ mkCoqDerivation {
inherit version; inherit version;
defaultVersion = with versions; switch coq.coq-version [ defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.13" "8.14"; out = "0.9"; } { case = range "8.13" "8.15"; out = "0.9"; }
] null; ] null;
propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ]; propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ];

@ -6,9 +6,13 @@ mkCoqDerivation rec {
owner = "fbesson"; owner = "fbesson";
domain = "gitlab.inria.fr"; domain = "gitlab.inria.fr";
release."8.15.0".sha256 = "sha256:10qpv4nx1p0wm9sas47yzsg9z22dhvizszfa21yff08a8fr0igya";
release."8.14.0".sha256 = "sha256:1k6pqhv4dwpkwg81f2rlfg40wh070ks1gy9r0ravm2zhsbxqcfc9";
release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A=";
inherit version; inherit version;
defaultVersion = with versions; switch coq.coq-version [ defaultVersion = with versions; switch coq.coq-version [
{ case = isEq "8.15"; out = "8.15.0"; }
{ case = isEq "8.14"; out = "8.14.0"; }
{ case = isEq "8.13"; out = "8.13+no"; } { case = isEq "8.13"; out = "8.13+no"; }
] null; ] null;

@ -9,7 +9,7 @@ with lib; mkCoqDerivation {
inherit version; inherit version;
defaultVersion = with versions; defaultVersion = with versions;
switch [ coq.version mathcomp-ssreflect.version ] [{ switch [ coq.version mathcomp-ssreflect.version ] [{
cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.0.0"; cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.0.0";
}] null; }] null;
release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1"; release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1";

@ -16,7 +16,7 @@ mkCoqDerivation rec {
inherit version; inherit version;
defaultVersion = with versions; switch coq.coq-version [ defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.14"; out = "8.14.0"; } { case = range "8.10" "8.15"; out = "8.14.0"; }
{ case = "8.9"; out = "8.9.0"; } { case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; } { case = "8.8"; out = "8.8.0"; }
{ case = "8.7"; out = "8.7.0"; } { case = "8.7"; out = "8.7.0"; }

@ -8,10 +8,14 @@ mkCoqDerivation {
release."8.10.2".sha256 = "sha256-TUfTZKBgrSOT6piXRViHSGPE9NSj3bGx2XBIw6YCcEs="; release."8.10.2".sha256 = "sha256-TUfTZKBgrSOT6piXRViHSGPE9NSj3bGx2XBIw6YCcEs=";
release."8.12".sha256 = "sha256-UQbDHLVBKYk++o+Y2B6ARYRYGglytsnXhguwMatjOHg="; release."8.12".sha256 = "sha256-UQbDHLVBKYk++o+Y2B6ARYRYGglytsnXhguwMatjOHg=";
release."8.13".sha256 = "sha256-HxQBaIE2CjyfG4GoIXprfehqjsr/Z74YdodxMmrbzSg="; release."8.13".sha256 = "sha256-HxQBaIE2CjyfG4GoIXprfehqjsr/Z74YdodxMmrbzSg=";
release."8.14".sha256 = "sha256:0wmrc741j67ch4rkygjkrz5i9afi01diyyj69i24cmasvx4wad38";
release."8.15".sha256 = "sha256:0m9xlkdhilvqb0v4q9c4hzfwffbccd6029ks39xg7qbiq6zklpvp";
releaseRev = v: "v${v}"; releaseRev = v: "v${v}";
inherit version; inherit version;
defaultVersion = with versions; switch coq.version [ defaultVersion = with versions; switch coq.version [
{ case = isEq "8.15"; out = "8.15"; }
{ case = isEq "8.14"; out = "8.14"; }
{ case = "8.13.2"; out = "8.13"; } { case = "8.13.2"; out = "8.13"; }
{ case = "8.12.2"; out = "8.12"; } { case = "8.12.2"; out = "8.12"; }
{ case = "8.10.2"; out = "8.10.2"; } { case = "8.10.2"; out = "8.10.2"; }

@ -9,8 +9,8 @@ mkCoqDerivation {
release."itp22".sha256 = "sha256-CdPfgDfeJy8Q6ZlQeVCSR/x8ZlJ2kSEF6F5UnAespnQ="; release."itp22".sha256 = "sha256-CdPfgDfeJy8Q6ZlQeVCSR/x8ZlJ2kSEF6F5UnAespnQ=";
inherit version; inherit version;
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ defaultVersion = with versions; switch coq.version [
{ cases = [ (isGe "8.13") ]; out = "itp22"; } { case = isEq "8.13"; out = "itp22"; }
] null; ] null;
propagatedBuildInputs = [ trakt cvc4 ] ++ lib.optionals (!stdenv.isDarwin) [ veriT ]; propagatedBuildInputs = [ trakt cvc4 ] ++ lib.optionals (!stdenv.isDarwin) [ veriT ];

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec { buildGraalvmNativeImage rec {
pname = "babashka"; pname = "babashka";
version = "0.8.1"; version = "0.8.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-9mh3ki6Q0vwlF+j4+UVznIhZ6Xleh7ChklJ5ojjGhYM="; sha256 = "sha256-rdA/pV2EGYPs1UuuTq4dIuce3i8haJOyyyTDAWpOeR8=";
}; };
executable = "bb"; executable = "bb";

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libpg_query"; pname = "libpg_query";
version = "13-2.1.0"; version = "13-2.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pganalyze"; owner = "pganalyze";
repo = "libpg_query"; repo = "libpg_query";
rev = version; rev = version;
sha256 = "sha256-DpvPmBvpx5pWDlx6T3Kp82ALi6FjOO549Exd8tWXDIk="; sha256 = "sha256-195WNTTdXHHPbQg2Ipwa3v/qPEeAtehvZa2OC1egoFo=";
}; };
nativeBuildInputs = [ which ]; nativeBuildInputs = [ which ];

@ -17,7 +17,7 @@
, nose , nose
, nose-timer , nose-timer
, mock , mock
, python_magic , python-magic
, codecov , codecov
, coverage , coverage
, qt5 , qt5
@ -70,7 +70,7 @@ buildPythonPackage rec {
nose-timer nose-timer
pyperclip pyperclip
pyqt5 pyqt5
python_magic python-magic
]; ];
inherit doCheck; inherit doCheck;

@ -8,15 +8,15 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "async-lru"; pname = "async-lru";
version = "unstable-2022-02-03"; version = "1.0.3";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aio-libs"; owner = "aio-libs";
repo = "async-lru"; repo = "async-lru";
rev = "3574af7691371015c47faf77e0abf8c7b06a3cdc"; rev = "v${version}";
hash = "sha256-EsadpQlRNnebp0UUybzQwzyK4zwFlortutv3VTUsprU="; hash = "sha256-98ZPFSOFRnymTCfCG9OuajfxXAWyCrByyJEHhpPVPbM=";
}; };
postPatch = '' postPatch = ''
@ -32,13 +32,6 @@ buildPythonPackage rec {
"--asyncio-mode=strict" "--asyncio-mode=strict"
]; ];
disabledTests = [
# https://github.com/aio-libs/async-lru/issues/341
"test_alru_cache_deco"
"test_alru_cache_fn_called"
"test_close"
];
pythonImportsCheck = [ "async_lru" ]; pythonImportsCheck = [ "async_lru" ];
meta = with lib; { meta = with lib; {

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aws-adfs"; pname = "aws-adfs";
version = "2.0.2"; version = "2.0.3";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -26,8 +26,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "venth"; owner = "venth";
repo = pname; repo = pname;
rev = version; rev = "refs/tags/${version}";
hash = "sha256-T3AmPCOSeu7gvl57aHjnviy5iQAKlWy85fUOVecFRFc="; hash = "sha256-/cOJ8k8YuwTGEXrNuPFAYvDyDKERMJf3o3nRkDLkrJE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

@ -5,17 +5,20 @@
, msrestazure , msrestazure
, azure-common , azure-common
, azure-mgmt-core , azure-mgmt-core
, azure-mgmt-nspkg , pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-recoveryservicesbackup"; pname = "azure-mgmt-recoveryservicesbackup";
version = "4.1.1"; version = "4.2.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "sha256-9xF2TIAzydmviOwfveA0ZGP7Qj0HWLL6rXp4V4IDS6A="; hash = "sha256-At0BP9mWJneG65FDZuQXTnikaNcEWe+GtTr9ZPri89M=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -23,13 +26,14 @@ buildPythonPackage rec {
msrestazure msrestazure
azure-common azure-common
azure-mgmt-core azure-mgmt-core
azure-mgmt-nspkg
]; ];
# has no tests # Module has no tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "azure.mgmt.recoveryservicesbackup" ]; pythonImportsCheck = [
"azure.mgmt.recoveryservicesbackup"
];
meta = with lib; { meta = with lib; {
description = "This is the Microsoft Azure Recovery Services Backup Management Client Library"; description = "This is the Microsoft Azure Recovery Services Backup Management Client Library";

@ -12,7 +12,7 @@
, oauth2client , oauth2client
, ply , ply
, pytest , pytest
, python_magic , python-magic
, requests , requests
}: }:
@ -40,7 +40,7 @@ buildPythonPackage rec {
lxml lxml
oauth2client oauth2client
ply ply
python_magic python-magic
requests requests
# pytest really is a runtime dependency # pytest really is a runtime dependency
# https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82 # https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82

@ -25,7 +25,7 @@ buildPythonPackage rec {
}) })
]; ];
pythonImportCheck = [ "contexttimer" ]; pythonImportsCheck = [ "contexttimer" ];
checkInputs = [ mock ]; checkInputs = [ mock ];

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, python-dateutil
, python-mimeparse
, pythonOlder
}:
buildPythonPackage rec {
pname = "django-tastypie";
version = "0.14.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "django-tastypie";
repo = pname;
rev = "v${version}";
hash = "sha256-O/aVi8BshOZmg9WQxrFlBEOXfgyqJKVK/QlEFG3Edqs=";
};
propagatedBuildInputs = [
python-dateutil
python-mimeparse
];
# Tests requires a Django instance
doCheck = false;
pythonImportsCheck = [
"tastypie"
];
meta = with lib; {
description = "Utilities and helpers for writing Pylint plugins";
homepage = "https://github.com/django-tastypie/django-tastypie";
license = licenses.gpl2Only;
maintainers = with maintainers; [ fab ];
};
}

@ -3,7 +3,7 @@
, fetchPypi , fetchPypi
, django , django
, pillow , pillow
, python_magic , python-magic
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -14,7 +14,7 @@ buildPythonPackage rec {
inherit pname version; inherit pname version;
sha256 = "6569d5c3e13c69ab8912ba5100084aa5abcdcffb8d1f5abc085b226e7bbd65b3"; sha256 = "6569d5c3e13c69ab8912ba5100084aa5abcdcffb8d1f5abc085b226e7bbd65b3";
}; };
propagatedBuildInputs = [ pillow python_magic ]; propagatedBuildInputs = [ pillow python-magic ];
checkInputs = [ django ]; checkInputs = [ django ];

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dunamai"; pname = "dunamai";
version = "1.11.1"; version = "1.12.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mtkennerly"; owner = "mtkennerly";
repo = "dunamai"; repo = "dunamai";
rev = "v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-nkE9QBziCQA/aN+Z0OuqJlf5FJ4fidE7u5Gt25zjX0c="; sha256 = "sha256-SyHml8TIcqU7KQE4IuTZbp+Jktao7ReJHQyHV8wKeWg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hahomematic"; pname = "hahomematic";
version = "1.2.2"; version = "1.3.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84"; owner = "danielperna84";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-eXJXKWlvNJIqEJY5WE5Wbk9BdGu9N9xhintJbdSkJrQ="; sha256 = "sha256-033iPQfFF26Ly8OVdjExDZDoQ35DXuVF7dXqokA7k/s=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -0,0 +1,48 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
, git
, hatchling
, setuptools-scm
}:
buildPythonPackage rec {
pname = "hatch-vcs";
version = "0.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "hatch_vcs";
inherit version;
sha256 = "sha256-mRPXM7NO7JuwNF0GJsoyFlpK0t4V0c5kPDbQnKkIq/8=";
};
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
hatchling
setuptools-scm
];
checkInputs = [
git
pytestCheckHook
];
pythonImportsCheck = [
"hatch_vcs"
];
meta = with lib; {
description = "A plugin for Hatch that uses your preferred version control system (like Git) to determine project versions";
homepage = "https://github.com/ofek/hatch-vcs";
license = licenses.mit;
maintainers = with maintainers; [ cpcloud ];
};
}

@ -1,26 +1,30 @@
{ buildPythonPackage { lib
, bokeh
, buildPythonPackage
, colorcet
, fetchPypi , fetchPypi
, lib
, param
, numpy
, pyviz-comms
, ipython , ipython
, matplotlib
, notebook , notebook
, numpy
, pandas , pandas
, matplotlib
, bokeh
, scipy
, panel , panel
, colorcet , param
, pythonOlder
, pyviz-comms
, scipy
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "holoviews"; pname = "holoviews";
version = "1.14.8"; version = "1.14.9";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-bDZVmaLLFnk7tifJtcVDCYK7WRyd6IhQAv+RtTm2ETM="; hash = "sha256-mRI5CqJ58/vb5N81UYsS6Hy+zNeRXnIZEd7lVW22MGo=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -35,12 +39,14 @@ buildPythonPackage rec {
# tests not fully included with pypi release # tests not fully included with pypi release
doCheck = false; doCheck = false;
pythonImportsCheck = [ "holoviews" ]; pythonImportsCheck = [
"holoviews"
];
meta = with lib; { meta = with lib; {
description = "Python data analysis and visualization seamless and simple"; description = "Python data analysis and visualization seamless and simple";
homepage = "http://www.holoviews.org/"; homepage = "http://www.holoviews.org/";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.costrouc ]; maintainers = with maintainers; [ costrouc ];
}; };
} }

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "imap-tools"; pname = "imap-tools";
version = "0.54.0"; version = "0.55.0";
disabled = isPy27; disabled = isPy27;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "ikvk"; owner = "ikvk";
repo = "imap_tools"; repo = "imap_tools";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-RiKGxyCPYlAJ5YbxvEKxCYgUg1D9s29YSCT4tY3FIEE="; hash = "sha256-Jtuw0pYkgR1wrqPlEBOpia1rFU/+MLadOFEm2xLIFMw=";
}; };
checkInputs = [ checkInputs = [

@ -4,12 +4,16 @@
, fetchFromGitHub , fetchFromGitHub
, karton-core , karton-core
, malduck , malduck
, pythonOlder
, regex , regex
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "karton-autoit-ripper"; pname = "karton-autoit-ripper";
version = "1.1.0"; version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CERT-Polska"; owner = "CERT-Polska";
@ -27,14 +31,17 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace requirements.txt \ substituteInPlace requirements.txt \
--replace "autoit-ripper==1.0.0" "autoit-ripper" \ --replace "autoit-ripper==" "autoit-ripper>=" \
--replace "malduck==3.1.0" "malduck>=3.1.0" \ --replace "malduck==" "malduck>=" \
--replace "regex==2020.2.20" "regex>=2020.2.20" --replace "regex==" "regex>="
''; '';
# Project has no tests # Module has no tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "karton.autoit_ripper" ];
pythonImportsCheck = [
"karton.autoit_ripper"
];
meta = with lib; { meta = with lib; {
description = "AutoIt script ripper for Karton framework"; description = "AutoIt script ripper for Karton framework";

@ -4,7 +4,7 @@
, fetchFromGitHub , fetchFromGitHub
, karton-core , karton-core
, pytestCheckHook , pytestCheckHook
, python_magic , python-magic
, pythonOlder , pythonOlder
}: }:
@ -24,7 +24,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
chardet chardet
karton-core karton-core
python_magic python-magic
]; ];
postPatch = '' postPatch = ''

@ -14,14 +14,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "malduck"; pname = "malduck";
version = "4.1.0"; version = "4.2.0";
format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CERT-Polska"; owner = "CERT-Polska";
repo = pname; repo = pname;
rev = "v${version}"; rev = "refs/tags/v${version}";
sha256 = "04d8bhzax9ynbl83hif9i8gcs29zrvcay2r6n7mcxiixlxcqciak"; hash = "sha256-UgpblcZ/Jxl3U4256YIHzly7igNXwhTdFN4HOqZBVbM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -43,7 +45,9 @@ buildPythonPackage rec {
# Project has no tests. They will come with the next release # Project has no tests. They will come with the next release
doCheck = false; doCheck = false;
pythonImportsCheck = [ "malduck" ]; pythonImportsCheck = [
"malduck"
];
meta = with lib; { meta = with lib; {
description = "Helper for malware analysis"; description = "Helper for malware analysis";

@ -6,7 +6,7 @@
, decorator , decorator
, http-ece , http-ece
, python-dateutil , python-dateutil
, python_magic , python-magic
, pytz , pytz
, requests , requests
, six , six
@ -37,7 +37,7 @@ buildPythonPackage rec {
decorator decorator
http-ece http-ece
python-dateutil python-dateutil
python_magic python-magic
pytz pytz
requests requests
six six

@ -5,7 +5,7 @@
, isPy3k , isPy3k
, decorator , decorator
, http-parser , http-parser
, python_magic , python-magic
, urllib3 , urllib3
, pytestCheckHook , pytestCheckHook
, pytest-mock , pytest-mock
@ -30,7 +30,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
decorator decorator
http-parser http-parser
python_magic python-magic
urllib3 urllib3
]; ];

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mypy-boto3-s3"; pname = "mypy-boto3-s3";
version = "1.22.6"; version = "1.22.8";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-b+Rf7mYifN5KXAECg7goCDlD/S1W7sTh06In1mp4NR4="; hash = "sha256-Br7HlymKuQUbI+iw90HWi1lSnEFwQbziBLokAHTzGEk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -1,15 +1,26 @@
{ lib, python, buildPythonPackage, fetchPypi, numpy, treelog, stringly, coverage }: { lib
, buildPythonPackage
, fetchFromGitHub
, numpy
, treelog
, stringly
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "nutils"; pname = "nutils";
version = "7.0"; version = "7.0";
format = "setuptools";
src = fetchPypi { disabled = pythonOlder "3.7";
inherit pname version;
sha256 = "1sw310l2yb8wbcv2qhik8s928zjh2syzz2qxisglbzski9qdw2x6";
};
pythonImportChecks = [ "nutils" ]; src = fetchFromGitHub {
owner = "evalf";
repo = "nutils";
rev = "refs/tags/v${version}";
hash = "sha256-V7lSMhwzc9+36uXMCy5uF241XwJ62Pdf59RUulOt4i8=";
};
propagatedBuildInputs = [ propagatedBuildInputs = [
numpy numpy
@ -17,16 +28,23 @@ buildPythonPackage rec {
stringly stringly
]; ];
checkInputs = [ coverage ]; checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"nutils"
];
checkPhase = '' disabledTestPaths = [
${python.interpreter} -m unittest # AttributeError: type object 'setup' has no attribute '__code__'
''; "tests/test_cli.py"
];
meta = with lib; { meta = with lib; {
description = "Numerical Utilities for Finite Element Analysis"; description = "Numerical Utilities for Finite Element Analysis";
homepage = "https://www.nutils.org/"; homepage = "https://www.nutils.org/";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.Scriptkiddi ]; maintainers = with maintainers; [ Scriptkiddi ];
}; };
} }

@ -6,12 +6,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "phonenumbers"; pname = "phonenumbers";
version = "8.12.47"; version = "8.12.48";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-Vv1gXS9UYOHfIRcIW2U7s4MiKV7GWOasqvycl2hn1SI="; sha256 = "sha256-rwaB+/6foHITdq2bcp53Ll0gvyz1DZ3Yyi8L3Xjp8M4=";
}; };
checkInputs = [ checkInputs = [

@ -3,7 +3,7 @@
, fetchPypi , fetchPypi
, requests , requests
, websocket-client , websocket-client
, python_magic , python-magic
, cryptography , cryptography
, pytestCheckHook , pytestCheckHook
}: }:
@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64"; sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
}; };
propagatedBuildInputs = [ cryptography requests websocket-client python_magic ]; propagatedBuildInputs = [ cryptography requests websocket-client python-magic ];
preCheck = '' preCheck = ''
export PUSHBULLET_API_KEY="" export PUSHBULLET_API_KEY=""

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "py-nextbusnext";
version = "0.1.5";
format = "setuptools";
src = fetchFromGitHub {
owner = "ViViDboarder";
repo = "py_nextbus";
rev = "v${version}";
hash = "sha256-uUHA8v5iTISmPaTgk0RvcLLRM34f3JXUjZClKGXdMoI=";
};
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "py_nextbus" ];
meta = {
description = "Minimalistic Python client for the NextBus public API";
homepage = "https://github.com/ViViDboarder/py_nextbus";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pydeps"; pname = "pydeps";
version = "1.10.17"; version = "1.10.18";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "thebjorn"; owner = "thebjorn";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-V0LgHFvGvJqDHmyXJNb0sJjRuqGGDZpV467XDmdFg5k="; hash = "sha256-AKpaGXUaKCVk1C8GqtWayZEU2xbz3eqbUenjZCtsAUY=";
}; };
buildInputs = [ buildInputs = [

@ -1,24 +1,25 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, coverage
, django , django
, factory_boy , factory_boy
, fetchFromGitHub , fetchFromGitHub
, isPy3k
, pylint-plugin-utils , pylint-plugin-utils
, pytestCheckHook , pytestCheckHook
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pylint-django"; pname = "pylint-django";
version = "2.5.2"; version = "2.5.3";
disabled = !isPy3k; format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PyCQA"; owner = "PyCQA";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-VgGdV1T154LauclGo6jpLPUrYn5vTOWwvO4IXQ9se7c="; hash = "sha256-5xEXjNMkOetRM9NDz0S4DsC6v39YQi34s2s+Fs56hYU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -27,7 +28,6 @@ buildPythonPackage rec {
]; ];
checkInputs = [ checkInputs = [
coverage
factory_boy factory_boy
pytestCheckHook pytestCheckHook
]; ];
@ -38,6 +38,7 @@ buildPythonPackage rec {
"external_factory_boy_noerror" "external_factory_boy_noerror"
"func_noerror_foreign_key_attributes" "func_noerror_foreign_key_attributes"
"func_noerror_foreign_key_key_cls_unbound" "func_noerror_foreign_key_key_cls_unbound"
"test_everything"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [

@ -1,39 +1,46 @@
{ buildPythonPackage { lib
, buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, isPy3k
, lib
# pythonPackages
, pylint , pylint
, pytestCheckHook
, pythonOlder
, toml , toml
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pylint-plugin-utils"; pname = "pylint-plugin-utils";
version = "0.6"; version = "0.7";
disabled = !isPy3k; format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PyCQA"; owner = "PyCQA";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1zapmbczxs1phrwbd0yvpfxhljd2pyv4pi9rwggaq38lcnc325s7"; hash = "sha256-uDsSSUWdlzuQz6umoYLbIotOYNEnLQu041ZZVMRd2ww=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
pylint toml pylint
toml
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"pylint_plugin_utils"
]; ];
checkPhase = '' # https://github.com/PyCQA/pylint-plugin-utils/issues/26
python tests.py doCheck = false;
'';
meta = with lib; { meta = with lib; {
description = "Utilities and helpers for writing Pylint plugins"; description = "Utilities and helpers for writing Pylint plugins";
homepage = "https://github.com/PyCQA/pylint-plugin-utils"; homepage = "https://github.com/PyCQA/pylint-plugin-utils";
license = licenses.gpl2; license = licenses.gpl2Only;
maintainers = with maintainers; [ maintainers = with maintainers; [ kamadorueda ];
kamadorueda
];
}; };
} }

@ -6,7 +6,7 @@
, httpretty , httpretty
, ijson , ijson
, poetry-core , poetry-core
, python_magic , python-magic
, pytz , pytz
, pytestCheckHook , pytestCheckHook
, requests-oauthlib , requests-oauthlib
@ -32,7 +32,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
brotli brotli
ijson ijson
python_magic python-magic
pytz pytz
requests-oauthlib requests-oauthlib
]; ];

@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "A python interface to the libmagic file type identification library"; description = "A python interface to the libmagic file type identification library";
homepage = "https://github.com/ahupp/python-magic"; homepage = "https://github.com/ahupp/python-magic";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ SuperSandro2000 ];
}; };
} }

@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python_magic }: { lib, fetchPypi, buildPythonPackage, genshi, lxml, python-magic }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "relatorio"; pname = "relatorio";
@ -12,7 +12,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
genshi genshi
lxml lxml
python_magic python-magic
]; ];
meta = { meta = {

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, numpy
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "sdds";
version = "0.2.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "pylhc";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JcxcF0tDigZz3upzE7rPDynCH45dnLk/zpS0a2dOwRU=";
};
propagatedBuildInputs = [ numpy ];
pythonImportsCheck = [ "sdds" ];
checkInputs = [ pytestCheckHook ];
meta = with lib; {
description = "Python 3 package to handle SDDS files";
homepage = "https://pylhc.github.io/sdds/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ veprbl ];
};
}

@ -2,20 +2,22 @@
, buildPythonPackage , buildPythonPackage
, construct , construct
, fetchFromGitHub , fetchFromGitHub
, isPy3k
, pytestCheckHook , pytestCheckHook
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "snapcast"; pname = "snapcast";
version = "2.1.3"; version = "2.2.0";
disabled = !isPy3k; format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "happyleavesaoc"; owner = "happyleavesaoc";
repo = "python-snapcast"; repo = "python-snapcast";
rev = version; rev = "refs/tags/${version}";
sha256 = "1jigdccdd7bffszim942mxcwxyznfjx7y3r5yklz3psl7zgbzd6c"; hash = "sha256-H41X5bfRRu+uE7eUsmUkONm6hugNs43+O7MvVPH0e+8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -26,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
pythonImportsCheck = [ "snapcast" ]; pythonImportsCheck = [
"snapcast"
];
meta = with lib; { meta = with lib; {
description = "Control Snapcast, a multi-room synchronous audio solution"; description = "Control Snapcast, a multi-room synchronous audio solution";

@ -1,23 +1,31 @@
{ lib, buildPythonPackage, fetchPypi, numpy, nose, pyyaml }: { lib, buildPythonPackage, fetchPypi, numpy, pytest, pyyaml }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "spglib"; pname = "spglib";
version = "1.16.3"; version = "1.16.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "ff1420967d64c2d4f0d747886116a6836d9b473454cdd73d560dbfe973a8a038"; sha256 = "sha256-Lqzv1TzGRLqakMRoH9bJNLa92BjBE9fzGZBOB41dq5M=";
}; };
propagatedBuildInputs = [ numpy ]; propagatedBuildInputs = [ numpy ];
checkInputs = [ nose pyyaml ]; checkInputs = [ pytest pyyaml ];
# pytestCheckHook doesn't work
# ImportError: cannot import name '_spglib' from partially initialized module 'spglib'
checkPhase = ''
pytest
'';
pythonImportsCheck = [ "spglib" ];
meta = with lib; { meta = with lib; {
description = "Python bindings for C library for finding and handling crystal symmetries"; description = "Python bindings for C library for finding and handling crystal symmetries";
homepage = "https://atztogo.github.io/spglib"; homepage = "https://spglib.github.io/spglib/";
changelog = "https://github.com/spglib/spglib/raw/v${version}/ChangeLog";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ psyanticy ]; maintainers = with maintainers; [ psyanticy ];
}; };
} }

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "trimesh"; pname = "trimesh";
version = "3.11.2"; version = "3.12.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-7booFScN2qNqldPdBmxH1pTUz2+u7JMmPmX0tJojaeI="; sha256 = "sha256-RcRFF5vIMOQsPXbd2g8DSnOrWnpLLNe3Sa8PqAdwFvU=";
}; };
propagatedBuildInputs = [ numpy ]; propagatedBuildInputs = [ numpy ];

@ -5,12 +5,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-toml"; pname = "types-toml";
version = "0.10.6"; version = "0.10.7";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-aus+17+oaTgVUcd07WqRQuPu2YqD76UQipYy6v1W3NM="; sha256 = "sha256-pWf+JhSxd9U3rZmmYa3Jv8jFWkb5XmY3Ck7S3RcTNfk=";
}; };
# Module doesn't have tests # Module doesn't have tests

@ -22,6 +22,6 @@ buildPythonPackage rec {
description = "Makes working with XML feel like you are working with JSON"; description = "Makes working with XML feel like you are working with JSON";
homepage = "https://github.com/martinblech/xmltodict"; homepage = "https://github.com/martinblech/xmltodict";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ SuperSandro2000 ];
}; };
} }

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "yte"; pname = "yte";
version = "1.2.2"; version = "1.2.3";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "koesterlab"; owner = "koesterlab";
repo = pname; repo = pname;
rev = "v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-x0CmPiV/6zTnawPW9lgrZ9NsUhmK8fhafwqOP9o3Mdc="; sha256 = "sha256-xu88zupT0/kIzTd56IbKYKBM5+EDI1d+QIEq8zOBWWo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

@ -1,10 +1,12 @@
{ lib { stdenv
, lib
, clang , clang
, cmake , cmake
, fetchFromGitHub , fetchFromGitHub
, llvmPackages , llvmPackages
, rustPlatform , rustPlatform
, testers , testers
, Security
}: }:
let let
@ -21,7 +23,8 @@ let
}; };
nativeBuildInputs = [ clang cmake ]; nativeBuildInputs = [ clang cmake ];
buildInputs = [ llvmPackages.libclang ]; buildInputs = [ llvmPackages.libclang ]
++ lib.optional stdenv.isDarwin Security;
cargoSha256 = "sha256-y3dNEa2U9mwsENPda44zweszlk4UJXGtfeH+er8mi0U="; cargoSha256 = "sha256-y3dNEa2U9mwsENPda44zweszlk4UJXGtfeH+er8mi0U=";

@ -2,21 +2,23 @@
buildGoModule rec { buildGoModule rec {
pname = "tflint"; pname = "tflint";
version = "0.35.0"; version = "0.36.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "terraform-linters"; owner = "terraform-linters";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-rLPKc9QeT9r0JUYcTMSHPa/4FxYiMLMdnv2iOMdBAy0="; sha256 = "sha256-DPgYc0nUrRkidWqhv0X9v+2VSNPy1+0ZQ2gCe7T2gu0=";
}; };
vendorSha256 = "sha256-J1PgrWFAu1LrAYdoJP3HUunz/MkJ4Co0+hc7e6nFTBo="; vendorSha256 = "sha256-Is4dpBu/Nm34NZ3NftSGTZnSR8831kM56dvBjtfUTGU=";
doCheck = false; doCheck = false;
subPackages = [ "." ]; subPackages = [ "." ];
ldflags = [ "-s" "-w" ];
meta = with lib; { meta = with lib; {
description = "Terraform linter focused on possible errors, best practices, and so on"; description = "Terraform linter focused on possible errors, best practices, and so on";
homepage = "https://github.com/terraform-linters/tflint"; homepage = "https://github.com/terraform-linters/tflint";

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "tfsec"; pname = "tfsec";
version = "1.19.1"; version = "1.20.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aquasecurity"; owner = "aquasecurity";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-xeAMwYpi9WvKALzOPLjVItHYzFJW+O++5jgqRSC7awk="; sha256 = "sha256-ikMmd+avT8Fl+oZti2aegX4knYmPgEE/FOMAMZriV0g=";
}; };
ldflags = [ ldflags = [
@ -21,7 +21,7 @@ buildGoModule rec {
# "-extldflags '-fno-PIC -static'" # "-extldflags '-fno-PIC -static'"
]; ];
vendorSha256 = "sha256-xDK40Vc2tHZ7apfKznt7EEz1vR6UhqtXHgYXR2mISiI="; vendorSha256 = "sha256-LRXnBSG+xpQ3QqF2SiC2s3luTaBxFHOF3XXxhFZV5D0=";
subPackages = [ subPackages = [
"cmd/tfsec" "cmd/tfsec"

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff"; pname = "sqlfluff";
version = "0.13.0"; version = "0.13.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-UFvrtLVHGlWUlvA7KLDgaCydE/UoxtYV+8RqLblOdns="; hash = "sha256-hFpz2p8lJ4HpuSMZ8IDtqp2PIJFqEcelbYVAQpldu4o=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "uncrustify"; pname = "uncrustify";
version = "0.74.0"; version = "0.75.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "uncrustify"; owner = "uncrustify";
repo = "uncrustify"; repo = "uncrustify";
rev = "uncrustify-${version}"; rev = "uncrustify-${version}";
sha256 = "0v48vhmzxjzysbf0vhxzayl2pkassvbabvwg84xd6b8n5i74ijxd"; sha256 = "sha256-UbcQvNnuN2VX60O9wXTksrijgrSGzYCseq0tGUtJ9Mg=";
}; };
nativeBuildInputs = [ cmake python3 ]; nativeBuildInputs = [ cmake python3 ];

@ -11,20 +11,22 @@ with python3.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "prospector"; pname = "prospector";
version = "1.5.1"; version = "1.7.7";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6.1"; disabled = pythonOlder "3.6.1";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "PyCQA"; owner = "PyCQA";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "17f822cxrvcvnrzdx1a9fyi9afljq80b6g6z1k2bqa1vs21gwv7l"; hash = "sha256-sbPZmVeJtNphtjuZEfKcUgty9bJ3E/2Ya9RuX3u/XEs=";
}; };
postPatch = '' postPatch = ''
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace 'pep8-naming = ">=0.3.3,<=0.10.0"' 'pep8-naming = "*"' --replace 'pep8-naming = ">=0.3.3,<=0.10.0"' 'pep8-naming = "*"' \
--replace 'mccabe = "^0.6.0"' 'mccabe = "*"'
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
@ -61,9 +63,7 @@ buildPythonApplication rec {
meta = with lib; { meta = with lib; {
description = "Tool to analyse Python code and output information about errors, potential problems, convention violations and complexity"; description = "Tool to analyse Python code and output information about errors, potential problems, convention violations and complexity";
homepage = "https://github.com/PyCQA/prospector"; homepage = "https://github.com/PyCQA/prospector";
license = licenses.gpl2; license = licenses.gpl2Plus;
maintainers = with maintainers; [ maintainers = with maintainers; [ kamadorueda ];
kamadorueda
];
}; };
} }

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-expand"; pname = "cargo-expand";
version = "1.0.16"; version = "1.0.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dtolnay"; owner = "dtolnay";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-NhBUN+pf+j/4IozFDEb+XZ1ijSk6dNvCANyez823a0c="; sha256 = "sha256-+LKZ0pbSlqY8rbz96HZ59XYKsSJDMOrJMxblXNj74Yw=";
}; };
cargoSha256 = "sha256-7rqtxyoo1SQ7Rae04+b+B0JgCKeW0p1j7bZzPpJ8+ks="; cargoSha256 = "sha256-ZEHc67jgLSZV6JH5/owAGTxxnbnYnx2fIUf0mQ14qvg=";
buildInputs = lib.optional stdenv.isDarwin libiconv; buildInputs = lib.optional stdenv.isDarwin libiconv;

@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ="; cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ=";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rust-analyzer"; owner = "rust-lang";
repo = "rust-analyzer"; repo = "rust-analyzer";
rev = version; rev = version;
sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA="; sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA=";

@ -3,7 +3,7 @@
# shellcheck shell=bash # shellcheck shell=bash
set -euo pipefail set -euo pipefail
cd "$(dirname "$0")" cd "$(dirname "$0")"
owner=rust-analyzer owner=rust-lang
repo=rust-analyzer repo=rust-analyzer
nixpkgs=../../../../.. nixpkgs=../../../../..

@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "taplo-cli"; pname = "taplo-cli";
version = "0.6.1"; version = "0.6.2";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-0U7qoRnId3gKTQYPwbvrt/vzGfiSX6kcGwgRNc1uZ/I="; sha256 = "sha256-vz3ClC2PI0ti+cItuVdJgP8KLmR2C+uGUzl3DfVuTrY=";
}; };
cargoSha256 = "sha256-FIcq8wwJrZRxATDr+jo4KOX4l6auriNg+rSpMNsG+Tk="; cargoSha256 = "sha256-m6wsca/muGPs58myQH7ZLPPM+eGP+GL2sC5suu+vWU0=";
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
buildInputs = lib.optional stdenv.isLinux openssl buildInputs = lib.optional stdenv.isDarwin Security;
++ lib.optional stdenv.isDarwin Security;
meta = with lib; { meta = with lib; {
description = "A TOML toolkit written in Rust"; description = "A TOML toolkit written in Rust";

@ -16,15 +16,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "deno"; pname = "deno";
version = "1.21.1"; version = "1.21.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "denoland"; owner = "denoland";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-97KWvaxjIxdWjpuJHYzKbYmQZvAcDW/rzj0VkvnQas4="; sha256 = "sha256-oRlrommD84x4M+Z/F70TjFwWSlvTb26v36zxgaMBifw=";
}; };
cargoSha256 = "sha256-cqKxKHX/xQLvDN5FwyjB/2aHgm3KZsjxHVRiugYIvQE="; cargoSha256 = "sha256-kVNT9B9B3Li9B8aRFkUx5WkGZH7eqSMQO0GRPTC5tgU=";
postPatch = '' postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds # upstream uses lld on aarch64-darwin for faster builds

@ -55,7 +55,7 @@ stdenv.mkDerivation {
description = "facetimehd calibration"; description = "facetimehd calibration";
homepage = "https://support.apple.com/kb/DL1837"; homepage = "https://support.apple.com/kb/DL1837";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ womfoo grahamc ]; maintainers = with maintainers; [ alexshpilkin womfoo grahamc ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
}; };

@ -1753,7 +1753,8 @@
nexia nexia
]; ];
"nextbus" = ps: with ps; [ "nextbus" = ps: with ps; [
]; # missing inputs: py_nextbusnext py-nextbusnext
];
"nextcloud" = ps: with ps; [ "nextcloud" = ps: with ps; [
nextcloudmonitor nextcloudmonitor
]; ];
@ -3501,6 +3502,7 @@
"netgear" "netgear"
"network" "network"
"nexia" "nexia"
"nextbus"
"nightscout" "nightscout"
"nina" "nina"
"no_ip" "no_ip"

@ -26,7 +26,7 @@ python3.pkgs.buildPythonPackage rec {
prometheus-client prometheus-client
pycryptodome pycryptodome
python-olm python-olm
python_magic python-magic
ruamel-yaml ruamel-yaml
unpaddedbase64 unpaddedbase64
yarl yarl

@ -22,7 +22,7 @@ python3.pkgs.buildPythonPackage rec {
prometheus-client prometheus-client
pycryptodome pycryptodome
python-olm python-olm
python_magic python-magic
qrcode qrcode
ruamel-yaml ruamel-yaml
unpaddedbase64 unpaddedbase64

@ -44,7 +44,7 @@ in python.pkgs.buildPythonPackage rec {
sqlalchemy sqlalchemy
CommonMark CommonMark
ruamel-yaml ruamel-yaml
python_magic python-magic
tulir-telethon tulir-telethon
telethon-session-sqlalchemy telethon-session-sqlalchemy
pillow pillow

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save