Merge remote-tracking branch 'origin/master' into haskell-updates

main
sternenseemann 3 years ago
commit a6f258f49f
  1. 27
      maintainers/maintainer-list.nix
  2. 8
      nixos/modules/programs/zsh/zsh-autosuggestions.nix
  3. 12
      nixos/modules/security/acme.nix
  4. 2
      pkgs/applications/graphics/f3d/default.nix
  5. 2
      pkgs/applications/misc/1password/default.nix
  6. 14
      pkgs/applications/misc/ArchiSteamFarm/deps.nix
  7. 26
      pkgs/applications/misc/cfm/default.nix
  8. 41
      pkgs/applications/misc/keepass-plugins/charactercopy/default.nix
  9. 40
      pkgs/applications/misc/keepass-plugins/keetraytotp/default.nix
  10. 39
      pkgs/applications/misc/keepass-plugins/qrcodeview/default.nix
  11. 3
      pkgs/applications/misc/translate-shell/default.nix
  12. 786
      pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
  13. 786
      pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
  14. 18
      pkgs/applications/networking/cluster/kops/default.nix
  15. 1
      pkgs/applications/networking/cluster/terraform-providers/default.nix
  16. 11
      pkgs/applications/networking/cluster/terraform-providers/providers.json
  17. 66
      pkgs/applications/networking/p2p/tribler/default.nix
  18. 32
      pkgs/applications/office/notion-app-enhanced/default.nix
  19. 8
      pkgs/applications/version-management/git-and-tools/delta/default.nix
  20. 47
      pkgs/applications/video/mpv/scripts/cutter.nix
  21. 5
      pkgs/applications/video/mpv/wrapper.nix
  22. 4
      pkgs/build-support/mono-dll-fixer/builder.sh
  23. 7
      pkgs/build-support/mono-dll-fixer/default.nix
  24. 13
      pkgs/build-support/rust/build-rust-package/sysroot/default.nix
  25. 21
      pkgs/build-support/rust/build-rust-package/sysroot/update-lockfile.sh
  26. 17
      pkgs/build-support/rust/sysroot/Cargo.lock
  27. 16
      pkgs/build-support/rust/sysroot/cargo.py
  28. 26
      pkgs/build-support/rust/sysroot/src.nix
  29. 27
      pkgs/build-support/rust/sysroot/update-lockfile.sh
  30. 8
      pkgs/desktops/gnome/core/sushi/default.nix
  31. 4
      pkgs/desktops/pantheon/apps/appcenter/default.nix
  32. 4
      pkgs/desktops/pantheon/apps/elementary-camera/default.nix
  33. 9
      pkgs/desktops/pantheon/apps/elementary-dock/default.nix
  34. 14
      pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
  35. 17
      pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch
  36. 29
      pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
  37. 33
      pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
  38. 29
      pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
  39. 19
      pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
  40. 19
      pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
  41. 28
      pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
  42. 16
      pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
  43. 19
      pkgs/desktops/pantheon/granite/default.nix
  44. 4
      pkgs/development/compilers/ghc/8.10.7.nix
  45. 4
      pkgs/development/compilers/ghc/8.8.4.nix
  46. 4
      pkgs/development/compilers/ghc/9.0.1.nix
  47. 4
      pkgs/development/compilers/ghc/9.2.1.nix
  48. 4
      pkgs/development/compilers/ghc/head.nix
  49. 21
      pkgs/development/compilers/rust/rust-src.nix
  50. 4
      pkgs/development/dhall-modules/dhall-grafana.nix
  51. 4
      pkgs/development/libraries/intel-media-driver/default.nix
  52. 5
      pkgs/development/libraries/libwebsockets/default.nix
  53. 5
      pkgs/development/libraries/openh264/default.nix
  54. 16
      pkgs/development/libraries/physics/yoda/default.nix
  55. 13
      pkgs/development/libraries/spice/default.nix
  56. 19
      pkgs/development/nim-packages/nim_builder/nim_builder.nim
  57. 2
      pkgs/development/node-packages/node-packages.json
  58. 1045
      pkgs/development/node-packages/node-packages.nix
  59. 37
      pkgs/development/php-packages/gnupg/default.nix
  60. 4
      pkgs/development/python-modules/ailment/default.nix
  61. 37
      pkgs/development/python-modules/aiohttp-apispec/unstable.nix
  62. 4
      pkgs/development/python-modules/angr/default.nix
  63. 4
      pkgs/development/python-modules/angrop/default.nix
  64. 47
      pkgs/development/python-modules/apispec/3.nix
  65. 4
      pkgs/development/python-modules/archinfo/default.nix
  66. 14
      pkgs/development/python-modules/autobahn/default.nix
  67. 19
      pkgs/development/python-modules/buildbot/default.nix
  68. 2
      pkgs/development/python-modules/buildbot/pkg.nix
  69. 10
      pkgs/development/python-modules/buildbot/plugins.nix
  70. 2
      pkgs/development/python-modules/buildbot/worker.nix
  71. 4
      pkgs/development/python-modules/claripy/default.nix
  72. 4
      pkgs/development/python-modules/cle/default.nix
  73. 4
      pkgs/development/python-modules/devolo-plc-api/default.nix
  74. 6
      pkgs/development/python-modules/discordpy/default.nix
  75. 19
      pkgs/development/python-modules/flask-httpauth/default.nix
  76. 28
      pkgs/development/python-modules/future-typing/default.nix
  77. 39
      pkgs/development/python-modules/glances-api/default.nix
  78. 4
      pkgs/development/python-modules/hacking/default.nix
  79. 4
      pkgs/development/python-modules/imap-tools/default.nix
  80. 2
      pkgs/development/python-modules/jinja2/2.nix
  81. 11
      pkgs/development/python-modules/nbclient/default.nix
  82. 13
      pkgs/development/python-modules/pyeclib/default.nix
  83. 19
      pkgs/development/python-modules/pyhaversion/default.nix
  84. 13
      pkgs/development/python-modules/pyramid_mako/default.nix
  85. 14
      pkgs/development/python-modules/python-opendata-transport/default.nix
  86. 11
      pkgs/development/python-modules/python-smarttub/default.nix
  87. 4
      pkgs/development/python-modules/pyvex/default.nix
  88. 25
      pkgs/development/python-modules/qcelemental/default.nix
  89. 29
      pkgs/development/python-modules/qcengine/default.nix
  90. 10
      pkgs/development/python-modules/slack-sdk/default.nix
  91. 4
      pkgs/development/python-modules/srpenergy/default.nix
  92. 4
      pkgs/development/python-modules/starkbank-ecdsa/default.nix
  93. 4
      pkgs/development/python-modules/types-pytz/default.nix
  94. 4
      pkgs/development/python-modules/types-setuptools/default.nix
  95. 69
      pkgs/development/python-modules/typical/default.nix
  96. 13
      pkgs/development/python-modules/typical/use-poetry-core.patch
  97. 8
      pkgs/development/python-modules/vilfo-api-client/default.nix
  98. 3
      pkgs/development/python-modules/watchdog/default.nix
  99. 2
      pkgs/development/python-modules/webargs/default.nix
  100. 4
      pkgs/development/tools/analysis/checkov/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

@ -8166,6 +8166,17 @@
githubId = 56316606;
name = "Amneesh Singh";
};
nazarewk = {
name = "Krzysztof Nazarewski";
email = "3494992+nazarewk@users.noreply.github.com";
matrix = "@nazarewk:matrix.org";
github = "nazarewk";
githubId = 3494992;
keys = [{
longkeyid = "rsa4096/0x916D8B67241892AE";
fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE";
}];
};
nbren12 = {
email = "nbren12@gmail.com";
github = "nbren12";
@ -11296,6 +11307,16 @@
githubId = 321799;
name = "Paul Colomiets";
};
taikx4 = {
email = "taikx4@taikx4szlaj2rsdupcwabg35inbny4jk322ngeb7qwbbhd5i55nf5yyd.onion";
github = "taikx4";
githubId = 94917129;
name = "taikx4";
keys = [{
longkeyid = "ed25519/0xCCD52C7B37BB837E";
fingerprint = "6B02 8103 C4E5 F68C D77C 9E54 CCD5 2C7B 37BB 837E";
}];
};
takagiy = {
email = "takagiy.4dev@gmail.com";
github = "takagiy";
@ -11677,6 +11698,12 @@
fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B";
}];
};
tmarkovski = {
email = "tmarkovski@gmail.com";
github = "tmarkovski";
githubId = 1280118;
name = "Tomislav Markovski";
};
tmountain = {
email = "tinymountain@gmail.com";
github = "tmountain";

@ -36,6 +36,13 @@ in
'';
};
async = mkOption {
type = types.bool;
default = true;
description = "Whether to fetch suggestions asynchronously";
example = false;
};
extraConfig = mkOption {
type = with types; attrsOf str;
default = {};
@ -56,6 +63,7 @@ in
export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}"
export ZSH_AUTOSUGGEST_STRATEGY=("${cfg.strategy}")
${optionalString (!cfg.async) "unset ZSH_AUTOSUGGEST_USE_ASYNC"}
${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)}
'';

@ -314,6 +314,9 @@ let
if [ -e renewed ]; then
rm renewed
${data.postRun}
${optionalString (data.reloadServices != [])
"systemctl --no-block try-reload-or-restart ${escapeShellArgs data.reloadServices}"
}
fi
'');
};
@ -474,6 +477,15 @@ let
description = "Group running the ACME client.";
};
reloadServices = mkOption {
type = types.listOf types.str;
default = [];
description = ''
The list of systemd services to call <code>systemctl try-reload-or-restart</code>
on.
'';
};
postRun = mkOption {
type = types.lines;
default = "";

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Fast and minimalist 3D viewer using VTK";
homepage = "https://kitware.github.io/F3D";
homepage = "https://f3d-app.github.io/f3d";
license = licenses.bsd3;
maintainers = with maintainers; [ bcdarwin ];
platforms = with platforms; unix;

@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
downloadPage = "https://app-updates.agilebits.com/product_history/CLI";
maintainers = with maintainers; [ joelburget marsam ];
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
};
}

@ -55,10 +55,15 @@
(fetchNuGet { name = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; })
(fetchNuGet { name = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; })
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.10"; sha256 = "1dmcccml0lwxkiplfisxc70877h3s6p589nml19pi07iypvyxxjh"; })
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.12"; sha256 = "1cv7s0gh54jfrdgwa2cyarh1f6m59fpbfmqsszi27cdik0llh24s"; })
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.10"; sha256 = "1r9rf1j5v3hfn299zk71bjbbzslnypyqy1pz2xc4mirghwg18pqw"; })
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.12"; sha256 = "1hmr4l20fs8qqjvcfnlyb6ik6dh37mg0xa2wrvkn229pmiwp1rm9"; })
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; })
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1asph5v7kgmscfgsyv9gg7cwvg52gnm6m0ldm2m4pfkpsxqyp2mi"; })
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "0ir75jh4qas1v70y63hvd0rbyprcf97l47b2pgljhxk138z96s4y"; })
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "02kv8xh6xvpav7vqj281321ly1imghxcc18cdgadiq8dwgm87xwp"; })
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0qhyrprvbhcn980ycqvkchd4qy5shydi7pl0lbcl9cljivn60if3"; })
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "062zb8gqbzxq2xrmr8lbl215pnhw1fdidq43m975vsfgzmqrga8f"; })
(fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; version = "5.0.0"; sha256 = "192mn6r73xjw8fvlss6vrv34iiavq7k8pg0w7advgj6khklw4dzx"; })
(fetchNuGet { name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "5.0.0"; sha256 = "1q3z35pxgvpf6l6ywh5wb6gfly055rk99a80rjqisyrbmza1msd1"; })
(fetchNuGet { name = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; })
@ -73,14 +78,23 @@
(fetchNuGet { name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; })
(fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.10"; sha256 = "12zz674g6289z44rynnbsarqdh6md0qdl4srkzkqz9dvm1f2k4yn"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.12"; sha256 = "0v3df0hdv02xr7gmc9fmnwfrxf8xbqp9bci31a55xwj16jia692x"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.10"; sha256 = "0v90w0cr8zjayj0w0rb5ds1kjg77n7za1nr9rr1pnszw2xs00fmq"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.12"; sha256 = "0jvfxnc743qcg1qwlvclh6ww612mnsk5pk459awz5rivp3mdkfsb"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.10"; sha256 = "1z8l02ypzbhbh0jp89ibc4dx61dvaa4l7cdn4s2zs0l492nz2ni8"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.12"; sha256 = "0950m6x86jp5dybzakfsp74qzrk4pk8wkazc178v36j14sqmj2zq"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.10"; sha256 = "07yr09al8cci38zmwqghpsf8jsg51a8qv6p156ph8b5714iq5jjq"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.12"; sha256 = "173zymcac00rjb0l4yvksglj32b6fnwxzi60kpi0ki3z3a2k8kd3"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.10"; sha256 = "12xw4czsnsy4nara23jbvbsi8id9lms17xfyv0w4wsqhrp5kqbxi"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.12"; sha256 = "197xfhk7rwpn5kgc59slclkd0rp53034mfrrpajn2xbgjnmb07sj"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.10"; sha256 = "0ccsk1baj0bx1k7jqm7pnw77ns3m6h50cl8kxikjcm74jsz0vyx1"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.12"; sha256 = "1bpzbivp0n9cl05vlnirigzbvjs25mq7w56bg9zrnzlzjnhcwry2"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1fdbrjrmjd31y1amp0inlmki9w3fwzv8nz41pqmc943g3cpmyg9f"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "1pphlbhs1swr14g07hnvvwj9p983qqf6vqaq455bhpn6lin3z81f"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "0z8l0gzy9dih0mn5a2rknyph1w73y4m03s250wghym1zp6rz910p"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0cn3nq7vmjwk8b5bh7hb5wzidz1msjmwyng6k1ngqdm49w9f0m2g"; })
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "1s4klc4p5wiqiiqcfqyi56cci9f29b588h52vj7na7gfqry4b51l"; })
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })

@ -0,0 +1,26 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "cfm";
version = "0.6.6";
src = fetchFromGitHub {
owner = "willeccles";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uXL0RO9P+NYSZ0xCv91KzjHOJJI500YUT8IJkFS86pE=";
};
makeFlags = [
"DESTDIR=${placeholder "out"}"
"PREFIX="
];
meta = with lib; {
description = "Simple and fast TUI file manager with no dependencies";
license = licenses.mpl20;
maintainers = with maintainers; [ legendofmiracles ];
homepage = "https://github.com/willeccles/cfm";
platforms = platforms.all;
};
}

@ -0,0 +1,41 @@
{ lib, stdenv, buildEnv, fetchurl, mono }:
let
version = "1.0.0";
drv = stdenv.mkDerivation {
pname = "keepass-charactercopy";
inherit version;
src = fetchurl {
url = "https://github.com/SketchingDev/Character-Copy/releases/download/v${version}/CharacterCopy.plgx";
sha256 = "f8a81a60cd1aacc04c92a242479a8e4210452add019c52ebfbb1810b58d8800a";
};
dontUnpack = true;
installPhase = ''
mkdir -p $out/lib/dotnet/keepass/
cp $src $out/lib/dotnet/keepass/
'';
meta = with lib; {
description = "Enables KeePass to copy individual characters by index";
longDescription = ''
Character Copy is a lightweight KeePass plugin that integrates into KeePass' entry menu and
allows users to securely copy individual characters from
an entry's protected string fields, such as the password field
'';
homepage = "https://github.com/SketchingDev/Character-Copy";
platforms = [
"aarch64-linux"
"i686-linux"
"x86_64-linux"
];
# licensing info was found in source files https://github.com/SketchingDev/Character-Copy/search?q=license
license = licenses.gpl2;
maintainers = with maintainers; [ nazarewk ];
};
};
in
# Mono is required to compile plugin at runtime, after loading.
buildEnv { name = drv.name; paths = [ mono drv ]; }

@ -0,0 +1,40 @@
{ lib, stdenv, buildEnv, fetchurl, mono }:
let
version = "0.108.0";
drv = stdenv.mkDerivation {
pname = "keepass-keetraytotp";
inherit version;
src = fetchurl {
url = "https://github.com/KeeTrayTOTP/KeeTrayTOTP/releases/download/v${version}/KeeTrayTOTP.plgx";
sha256 = "4f7251a9bbb79cad04aee96d1809c6b36d43285a9f3834fef5330fc97ae8bc09";
};
dontUnpack = true;
installPhase = ''
mkdir -p $out/lib/dotnet/keepass/
cp $src $out/lib/dotnet/keepass/
'';
meta = with lib; {
description = "Augments KeePass with TOTP user interface";
longDescription = ''
This KeePass2 plugin adds advanced support for generating Time-based One-Time Passwords (TOTPs)
from the KeePass tray icon. It also provides a column in the main entry list to display and/or use TOTPs.
TOTPs can also be sent by auto-type. The plugin is compatible with Google, Dropbox, Steam, and many more services.
'';
homepage = "https://github.com/KeeTrayTOTP/KeeTrayTOTP";
platforms = [
"aarch64-linux"
"i686-linux"
"x86_64-linux"
];
license = licenses.gpl3;
maintainers = with maintainers; [ nazarewk ];
};
};
in
# Mono is required to compile plugin at runtime, after loading.
buildEnv { name = drv.name; paths = [ mono drv ]; }

@ -0,0 +1,39 @@
{ lib, stdenv, buildEnv, fetchurl, mono }:
let
version = "1.0.4";
drv = stdenv.mkDerivation {
pname = "keepass-qrcodeview";
inherit version;
src = fetchurl {
url = "https://github.com/JanisEst/KeePassQRCodeView/releases/download/v${version}/KeePassQRCodeView.plgx";
sha256 = "e13c9f02bb0d79b479ca0e92490b822b5b88f49bb18ba2954d3bbe0808f46e6d";
};
dontUnpack = true;
installPhase = ''
mkdir -p $out/lib/dotnet/keepass/
cp $src $out/lib/dotnet/keepass/
'';
meta = with lib; {
description = "Enables KeePass to display data as QR code images";
longDescription = ''
KeePassQRCodeView is a plugin for KeePass 2.x which shows QR codes for entry fields.
These codes can be scanned to copy the encoded data to the scanner (smartphone, ...)
'';
homepage = "https://github.com/JanisEst/KeePassQRCodeView";
platforms = [
"aarch64-linux"
"i686-linux"
"x86_64-linux"
];
license = licenses.mit;
maintainers = with maintainers; [ nazarewk ];
};
};
in
# Mono is required to compile plugin at runtime, after loading.
buildEnv { name = drv.name; paths = [ mono drv ]; }

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses }:
{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses, hexdump }:
stdenv.mkDerivation rec {
pname = "translate-shell";
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
rlwrap
groff
fribidi
hexdump
]}
'';

@ -52,21 +52,21 @@ rec {
mkKops = generic;
kops_1_19 = mkKops rec {
version = "1.19.2";
sha256 = "15csxih1xy8myky37n5dyzp5mc31pc4bq9asaw6zz51mgw8ad5r9";
kops_1_20 = mkKops rec {
version = "1.20.3";
sha256 = "sha256-Yrh0wFz7MQgTDwENqQouYh3pr1gOq64Rqft5yxIiCAo=";
rev = "v${version}";
};
kops_1_20 = mkKops rec {
version = "1.20.2";
sha256 = "011ib3xkj6nn7qax8d0ns8y4jhkwwmry1qnzxklvzssaxhmzs557";
kops_1_21 = mkKops rec {
version = "1.21.4";
sha256 = "sha256-f2xOVa3N/GH5IoI6H/QwDdKTeQoF/kEHX6lNytCZ9cs=";
rev = "v${version}";
};
kops_1_21 = mkKops rec {
version = "1.21.1";
sha256 = "sha256-/C/fllgfAovHuyGRY+LM09bsUpYdA8zDw1w0b9HnlBc=";
kops_1_22 = mkKops rec {
version = "1.22.2";
sha256 = "sha256-9LT4/iwlPFiz+hUHE0y8DK8T9xwL9HkrrFUXrEqKbM8=";
rev = "v${version}";
};
}

@ -17,6 +17,7 @@ let
inherit (data) owner repo rev sha256;
};
vendorSha256 = data.vendorSha256 or null;
deleteVendor = data.deleteVendor or false;
# Terraform allow checking the provider versions, but this breaks
# if the versions are not provided via file paths.

@ -34,11 +34,14 @@
"version": "1.8.0"
},
"alicloud": {
"owner": "terraform-providers",
"deleteVendor": true,
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
"rev": "v1.86.0",
"sha256": "1hbv9ah7fd173sapwgsbg7790piwxw9zx90wfj5vz5b96ggbg28d",
"version": "1.86.0"
"rev": "v1.144.0",
"sha256": "14nphpz15p83n6fsvvrnaz96nb87wvb10ri21hlhlsm2579zcbqd",
"vendorSha256": "1k28fcfm7437i7gfbcbrigk2i50c1mix7z1rb2g617prih84wa6y",
"version": "1.144.0"
},
"archive": {
"owner": "hashicorp",

@ -1,26 +1,35 @@
{ stdenv, fetchurl, python3Packages, makeWrapper
, enablePlayer ? true, libvlc, qt5, lib }:
{ stdenv, lib, fetchurl, python3, makeWrapper
, libtorrent-rasterbar-1_2_x, qt5
}:
let
libtorrent = (python3.pkgs.toPythonModule (
libtorrent-rasterbar-1_2_x.override { python = python3; })).python;
aiohttp-apispec = python3.pkgs.callPackage
../../../../development/python-modules/aiohttp-apispec/unstable.nix { };
in
stdenv.mkDerivation rec {
pname = "tribler";
version = "7.4.4";
version = "7.10.0";
src = fetchurl {
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
sha256 = "0hxiyf1k07ngym2p8r1b5mcx1y2crkyz43gi9sgvsvsyijyaff3p";
sha256 = "1x45z23d1cqf0lai7wg5ki7gi2vba5hqk0swhggzplcjwma4wmh9";
};
nativeBuildInputs = [
python3Packages.wrapPython
python3.pkgs.wrapPython
makeWrapper
];
buildInputs = [
python3Packages.python
python3.pkgs.python
];
pythonPath = with python3Packages; [
libtorrent-rasterbar
pythonPath = [
libtorrent
] ++ (with python3.pkgs; [
twisted
netifaces
pycrypto
@ -42,49 +51,44 @@ stdenv.mkDerivation rec {
pony
lz4
pyqtgraph
pyyaml
aiohttp
aiohttp-apispec
faker
sentry-sdk
pytest-asyncio
pytest-timeout
asynctest
yappi
# there is a BTC feature, but it requires some unclear version of
# bitcoinlib, so this doesn't work right now.
# bitcoinlib
];
postPatch = ''
${lib.optionalString enablePlayer ''
substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')"
substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" \
--replace "if vlc and vlc.plugin_path" "if vlc" \
--replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'"
''}
'';
]);
installPhase = ''
mkdir -pv $out
# Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
wrapPythonPrograms
cp -prvd ./* $out/
makeWrapper ${python3Packages.python}/bin/python $out/bin/tribler \
makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \
--set _TRIBLERPATH $out \
--set PYTHONPATH $out:$program_PYTHONPATH \
--set _TRIBLERPATH $out/src \
--set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \
--set NO_AT_BRIDGE 1 \
--run 'cd $_TRIBLERPATH' \
--add-flags "-O $out/run_tribler.py" \
${lib.optionalString enablePlayer ''
--prefix LD_LIBRARY_PATH : ${libvlc}/lib
''}
--add-flags "-O $out/src/run_tribler.py"
mkdir -p $out/share/applications $out/share/icons $out/share/man/man1
cp $out/Tribler/Main/Build/Ubuntu/tribler.desktop $out/share/applications/tribler.desktop
cp $out/Tribler/Main/Build/Ubuntu/tribler_big.xpm $out/share/icons/tribler.xpm
cp $out/Tribler/Main/Build/Ubuntu/tribler.1 $out/share/man/man1/tribler.1
mkdir -p $out/share/applications $out/share/icons
cp $out/build/debian/tribler/usr/share/applications/tribler.desktop $out/share/applications/tribler.desktop
cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm
'';
meta = with lib; {
maintainers = with maintainers; [ xvapx ];
maintainers = with maintainers; [ xvapx viric ];
homepage = "https://www.tribler.org/";
description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
license = licenses.lgpl21;
platforms = platforms.linux;
broken = true; # 2021-03-17 see https://github.com/NixOS/nixpkgs/issues/93053
};
}

@ -0,0 +1,32 @@
{ appimageTools, lib, fetchurl }:
let
pname = "notion-app-enhanced";
version = "2.0.16-5";
name = "${pname}-v${version}";
src = fetchurl {
url = "https://github.com/notion-enhancer/notion-repackaged/releases/download/v${version}/Notion-Enhanced-${version}.AppImage";
sha256 = "1v733b4clc9sjgb72fasmbqiyz26d09f3kmvd1nqshwp5d14dajz";
};
appimageContents = appimageTools.extract { inherit name src; };
in appimageTools.wrapType2 {
inherit name src;
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
meta = with lib; {
description = "Notion Desktop builds with Notion Enhancer for Windows, MacOS and Linux.";
homepage = "https://github.com/notion-enhancer/desktop";
license = licenses.unfree;
maintainers = with maintainers; [ sei40kr ];
platforms = [ "x86_64-linux" ];
};
}

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
version = "0.9.2";
version = "0.10.0";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
sha256 = "sha256-DJG8C7oSTf4YKeSVytN4pVF4qVImg1bsTYbnfkR+U94=";
sha256 = "sha256-PkVZag/h1KzOWsE6+61HIixs+DldrGk9khlZy7DEbC8=";
};
cargoSha256 = "sha256-mweH+ZIcNGGmoGUhnmZzaB5y14eO/XkHqrL8Nz/b3Jg=";
cargoSha256 = "sha256-o1HyPJ81g9fLA7CKQNKg1EctoIh3W0uGzKF2YNE+Ado=";
nativeBuildInputs = [ installShellFiles ];
@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec {
description = "A syntax-highlighting pager for git";
changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ marsam zowoq ];
maintainers = with maintainers; [ marsam zowoq SuperSandro2000 ];
};
}

@ -0,0 +1,47 @@
{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper }:
stdenvNoCC.mkDerivation {
pname = "video-cutter";
version = "unstable-2021-02-03";
src = fetchFromGitHub {
owner = "rushmj";
repo = "mpv-video-cutter";
rev = "718d6ce9356e63fdd47208ec44f575a212b9068a";
sha256 = "sha256-ramID1DPl0UqEzevpqdYKb9aaW3CAy3Dy9CPb/oJ4eY=";
};
dontBuild = true;
dontCheck = true;
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
substituteInPlace cutter.lua \
--replace '~/.config/mpv/scripts/c_concat.sh' '${placeholder "out"}/share/mpv/scripts/c_concat.sh'
# needs to be ran separately so that we can replace everything, and not every single mention explicitly
# original script places them in the scripts folder, just spawning unnecessary errors
# i know that hardcoding .config and especially the .mpv directory isn't best practice, but I didn't want to deviate too much from upstream
substituteInPlace cutter.lua \
--replace '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter"
'';
installPhase = ''
install -Dm755 c_concat.sh $out/share/mpv/scripts/c_concat.sh
install cutter.lua $out/share/mpv/scripts/cutter.lua
wrapProgram $out/share/mpv/scripts/c_concat.sh \
--run "mkdir -p ~/.config/mpv/cutter/"
'';
passthru.scriptName = "cutter.lua";
meta = with lib; {
description = "Cut videos and concat them automatically";
homepage = "https://github.com/rushmj/mpv-video-cutter";
# repo doesn't have a license
license = licenses.unfree;
maintainers = with maintainers; [ legendofmiracles ];
};
}

@ -80,7 +80,10 @@ let
makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs}
'';
meta.mainProgram = "mpv";
meta = {
inherit (mpv.meta) homepage description longDescription maintainers;
mainProgram = "mpv";
};
};
in
lib.makeOverridable wrapper

@ -1,4 +0,0 @@
source $stdenv/setup
substitute $dllFixer $out --subst-var-by perl $perl/bin/perl
chmod +x $out

@ -1,8 +1,11 @@
{stdenv, perl}:
stdenv.mkDerivation {
name = "mono-dll-fixer";
builder = ./builder.sh;
dllFixer = ./dll-fixer.pl;
dontUnpack = true;
installPhase = ''
substitute $dllFixer $out --subst-var-by perl $perl/bin/perl
chmod +x $out
'';
inherit perl;
}

@ -3,17 +3,8 @@
{ shortTarget, originalCargoToml, target, RUSTFLAGS }:
let
cargoSrc = stdenv.mkDerivation {
name = "cargo-src";
preferLocalBuild = true;
phases = [ "installPhase" ];
installPhase = ''
RUSTC_SRC=${rustPlatform.rustcSrc.override { minimalContent = false; }} ORIG_CARGO=${originalCargoToml} \
${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py}
mkdir -p $out
cp Cargo.toml $out/Cargo.toml
cp ${./Cargo.lock} $out/Cargo.lock
'';
cargoSrc = import ../../sysroot/src.nix {
inherit stdenv rustPlatform buildPackages originalCargoToml;
};
in rustPlatform.buildRustPackage {
inherit target RUSTFLAGS;

@ -1,21 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p python3 python3.pkgs.toml cargo
set -e
HERE=$(dirname "${BASH_SOURCE[0]}")
NIXPKGS_ROOT="$HERE/../../../.."
# https://unix.stackexchange.com/a/84980/390173
tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-lockfile')
cd "$tempdir"
nix-build -E "with import (/. + \"${NIXPKGS_ROOT}\") {}; pkgs.rustPlatform.rustcSrc.override { minimalContent = false; }"
RUSTC_SRC="$(pwd)/result" python3 "$HERE/cargo.py"
RUSTC_BOOTSTRAP=1 cargo build || echo "Build failure is expected. All that's needed is the lockfile."
cp Cargo.lock "$HERE"
rm -rf "$tempdir"

@ -10,9 +10,9 @@ dependencies = [
[[package]]
name = "compiler_builtins"
version = "0.1.36"
version = "0.1.52"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cd0782e0a7da7598164153173e5a5d4d9b1da094473c98dce0ff91406112369"
checksum = "b6591c2442ee984e2b264638a8b5e7ae44fd47b32d28e3a08e2e9c3cdb0c2fb0"
dependencies = [
"rustc-std-workspace-core",
]
@ -21,9 +21,22 @@ dependencies = [
name = "core"
version = "0.0.0"
[[package]]
name = "nixpkgs-sysroot-stub-crate"
version = "0.0.0"
dependencies = [
"alloc",
"compiler_builtins",
"core",
]
[[package]]
name = "rustc-std-workspace-core"
version = "1.99.0"
dependencies = [
"core",
]
[[patch.unused]]
name = "rustc-std-workspace-alloc"
version = "1.99.0"

@ -6,7 +6,7 @@ orig_cargo = os.environ['ORIG_CARGO'] if 'ORIG_CARGO' in os.environ else None
base = {
'package': {
'name': 'alloc',
'name': 'nixpkgs-sysroot-stub-crate',
'version': '0.0.0',
'authors': ['The Rust Project Developers'],
'edition': '2018',
@ -17,17 +17,19 @@ base = {
'features': ['rustc-dep-of-std', 'mem'],
},
'core': {
'path': os.path.join(rust_src, 'libcore'),
'path': os.path.join(rust_src, 'core'),
},
'alloc': {
'path': os.path.join(rust_src, 'alloc'),
},
},
'lib': {
'name': 'alloc',
'path': os.path.join(rust_src, 'liballoc/lib.rs'),
},
'patch': {
'crates-io': {
'rustc-std-workspace-core': {
'path': os.path.join(rust_src, 'tools/rustc-std-workspace-core'),
'path': os.path.join(rust_src, 'rustc-std-workspace-core'),
},
'rustc-std-workspace-alloc': {
'path': os.path.join(rust_src, 'rustc-std-workspace-alloc'),
},
},
},

@ -0,0 +1,26 @@
{ lib, stdenv, rustPlatform, buildPackages
, originalCargoToml ? null
}:
stdenv.mkDerivation {
name = "cargo-src";
preferLocalBuild = true;
unpackPhase = "true";
dontConfigure = true;
dontBuild = true;
installPhase = ''
export RUSTC_SRC=${rustPlatform.rustLibSrc.override { }}
''
+ lib.optionalString (originalCargoToml != null) ''
export ORIG_CARGO=${originalCargoToml}
''
+ ''
${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py}
mkdir -p $out/src
touch $out/src/lib.rs
cp Cargo.toml $out/Cargo.toml
cp ${./Cargo.lock} $out/Cargo.lock
'';
}

@ -0,0 +1,27 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p python3 python3.pkgs.toml cargo
set -eu pipefile
HERE=$(readlink -e $(dirname "${BASH_SOURCE[0]}"))
NIXPKGS_ROOT="$HERE/../../../.."
# https://unix.stackexchange.com/a/84980/390173
tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-lockfile')
cd "$tempdir"
mkdir -p src
touch src/lib.rs
RUSTC_SRC=$(nix-build "${NIXPKGS_ROOT}" -A pkgs.rustPlatform.rustLibSrc --no-out-link)
ln -s $RUSTC_SRC/{core,alloc} ./
export RUSTC_SRC
python3 "$HERE/cargo.py"
export RUSTC_BOOTSTRAP=1
cargo generate-lockfile
cp Cargo.lock "$HERE"
rm -rf "$tempdir"

@ -8,7 +8,8 @@
, gnome
, gtksourceview4
, gjs
, webkitgtk_4_1
, libsoup
, webkitgtk
, icu
, wrapGAppsHook
, gst_all_1
@ -48,11 +49,14 @@ stdenv.mkDerivation rec {
gtksourceview4
gdk-pixbuf
librsvg
webkitgtk_4_1
libsoup
webkitgtk
libepoxy
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
];
# See https://github.com/NixOS/nixpkgs/issues/31168

@ -31,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "appcenter";
version = "3.8.2";
version = "3.9.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-NHKP1vzb8qu+EkUWDvLWLl4U4pW9ZxbE7YFI6Vwesfg=";
sha256 = "sha256-+r19n42FPoBArZNDF4ZAdUBZqsSxpLwpeBoyaRJBCrg=";
};
passthru = {

@ -25,7 +25,7 @@
stdenv.mkDerivation rec {
pname = "elementary-camera";
version = "6.0.1";
version = "6.0.2";
repoName = "camera";
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "sha256-OdBinryF6XTcvtY4A1wdDVazjf/VritEGF97ts6d4RY=";
sha256 = "sha256-uVeV+LKA/W7WVUAvVWaSNRzeh1MUrhRjvS0HuhZZJ04=";
};
nativeBuildInputs = [

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, vala
, atk
@ -28,7 +29,7 @@
stdenv.mkDerivation rec {
pname = "elementary-dock";
version = "unstable-2021-07-16";
version = "unstable-2021-11-08";
outputs = [ "out" "dev" ];
@ -37,8 +38,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = "05fd6fccdf1a769f6737a0d7e57e092825348660";
sha256 = "0lqqq5cx0kk8y7qyjx7z2k3v1kw2xxzns968ianarcji19wzcns4";
rev = "51e8d3ddfbed0dfce3158d80f997ab183e92567b";
sha256 = "sha256-w6HGxEAXNod/uMEEfSz9nRNTRrCbcEqJCP9EFkVbX1U=";
};
nativeBuildInputs = [

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, pantheon
@ -8,32 +9,35 @@
, pkg-config
, vala
, libgee
, gnome-settings-daemon
, granite
, gsettings-desktop-schemas
, gtk3
, libhandy
, libxml2
, libgnomekbd
, libxklavier
, ibus
, onboard
, switchboard
}:
stdenv.mkDerivation rec {
pname = "switchboard-plug-keyboard";
version = "2.5.1";
version = "2.6.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1p1l7dx5v1zzz89hhhkm6n3ls7ig4cf2prh1099f1c054qiy9b0y";
sha256 = "sha256-Bl0T+8upTdBnLs03UIimcAg0LO40KwuMZRNSM+y/3Hc=";
};
patches = [
./0001-Remove-Install-Unlisted-Engines-function.patch
(substituteAll {
src = ./fix-paths.patch;
ibus = ibus;
inherit ibus onboard;
})
];
@ -52,7 +56,9 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gnome-settings-daemon # media-keys
granite
gsettings-desktop-schemas
gtk3
ibus
libgee

@ -1,8 +1,8 @@
diff --git a/src/Views/InputMethod.vala b/src/Views/InputMethod.vala
index 6d79fdc..de4276e 100644
index 7f73c1e1..1f0d6400 100644
--- a/src/Views/InputMethod.vala
+++ b/src/Views/InputMethod.vala
@@ -325,7 +325,7 @@ public class Pantheon.Keyboard.InputMethodPage.Page : Gtk.Grid {
@@ -328,7 +328,7 @@ public class Pantheon.Keyboard.InputMethodPage.Page : Gtk.Grid {
private void spawn_ibus_daemon () {
bool is_spawn_succeeded = false;
try {
@ -11,3 +11,16 @@ index 6d79fdc..de4276e 100644
} catch (GLib.SpawnError e) {
warning (e.message);
set_visible_view (e.message);
diff --git a/src/Views/Layout.vala b/src/Views/Layout.vala
index 75d2d805..b86252a4 100644
--- a/src/Views/Layout.vala
+++ b/src/Views/Layout.vala
@@ -219,7 +219,7 @@ namespace Pantheon.Keyboard {
onscreen_keyboard_settings.clicked.connect (() => {
try {
- var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE);
+ var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE);
appinfo.launch (null, null);
} catch (Error e) {
warning ("Unable to launch onboard-settings: %s", e.message);

@ -1,6 +1,6 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pantheon
, meson
@ -25,28 +25,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
version = "6.0.0";
version = "6.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0349150kxdv14ald79pzn7lasiqipyc37fgchygbc8hsy62d9a32";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/switchboard-plug-pantheon-shell/pull/286
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-pantheon-shell/commit/0c3207ffaeaa82ca3c743bc9ec772185fbd7e8cf.patch";
sha256 = "11ymzqx6has4zf8y0xy7pfhymcl128hzzjcgp46inshjf99v5kiv";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-rwneQ1bqpWDyTHULMtGqhPdpSDa4ObnVortmL0E+gHA=";
};
nativeBuildInputs = [
@ -73,6 +58,12 @@ stdenv.mkDerivation rec {
wingpanel
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Desktop Plug";
homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell";

@ -1,6 +1,6 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pantheon
, meson
@ -8,8 +8,10 @@
, ninja
, pkg-config
, vala
, elementary-settings-daemon
, libgee
, granite
, gsettings-desktop-schemas
, gala
, gtk3
, glib
@ -20,28 +22,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-security-privacy";
version = "2.2.5";
version = "2.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1ydr1xpbyxjcnd36c9j7a64srbz6gpbshwhcqj6591kmiqhmvknk";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/switchboard-plug-security-privacy/pull/130
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-security-privacy/commit/18fe438baba651670d7f0534856c3b2433e3d75d.patch";
sha256 = "19qwm725k6h41kgg4a98i4rxx45s4bb1wxx0fzkh75gz9syfi58w";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-pkpS7BR/eXA0rWV1C5AR+FdF5OkDnV8YDBAt1ZkaVPo=";
};
nativeBuildInputs = [
@ -53,9 +40,11 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-settings-daemon # settings schema
gala
glib
granite
gsettings-desktop-schemas
gtk3
libgee
polkit
@ -68,6 +57,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Security & Privacy Plug";
homepage = "https://github.com/elementary/switchboard-plug-security-privacy";

@ -1,6 +1,6 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pantheon
, meson
@ -17,28 +17,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-sound";
version = "2.2.7";
version = "2.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0yjqws7ryfid9lcafgzzbfnjjwccsankscwdwqfw486qid85whzc";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/switchboard-plug-sound/pull/203
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-sound/commit/1f3b9f001ace4c457ab194158dff04ba5e25d278.patch";
sha256 = "1lmf2bbif2wkfv500nxbqxp8jdmnjg8yk8xhx3g2g55d15rc5hk4";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-yHuboDpIcioZPNgpmnrM6J2eUCJpoNDdvgu27YuN65I=";
};
nativeBuildInputs = [
@ -57,6 +42,12 @@ stdenv.mkDerivation rec {
switchboard
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Sound Plug";
homepage = "https://github.com/elementary/switchboard-plug-sound";

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, pantheon
@ -10,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "elementary-gtk-theme";
version = "6.1.0";
version = "6.1.1";
repoName = "stylesheet";
@ -18,13 +19,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "sha256-YvBjMbC3aQtYc/jPZmGdL4VfBH/VuxQ70PD0BWg9DTg=";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-gciBn5MQ5Cu+dROL5kCt2GCbNA7W4HOWXyjMBd4OP+8=";
};
nativeBuildInputs = [
@ -34,6 +29,12 @@ stdenv.mkDerivation rec {
sassc
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "GTK theme designed to be smooth, attractive, fast, and usable";
homepage = "https://github.com/elementary/stylesheet";

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, pantheon
@ -13,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "elementary-icon-theme";
version = "6.0.0";
version = "6.1.0";
repoName = "icons";
@ -21,13 +22,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0k94zi8fzi0nf5q471fmrlz8jjkv8m6vav1spzv7ynkg2hik8d9b";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-WR4HV0nJKj0WeSFHXLK64O0LhX8myAJE4w0aztyhPn4=";
};
nativeBuildInputs = [
@ -57,6 +52,12 @@ stdenv.mkDerivation rec {
postFixup = "gtk-update-icon-cache $out/share/icons/elementary";
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Named, vector icons for elementary OS";
longDescription = ''

@ -1,5 +1,7 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, substituteAll
, pantheon
@ -14,6 +16,7 @@
, libgee
, elementary-icon-theme
, elementary-gtk-theme
, elementary-settings-daemon
, gettext
, libhandy
, wrapGAppsHook
@ -22,7 +25,7 @@
stdenv.mkDerivation rec {
pname = "elementary-onboarding";
version = "6.0.0";
version = "6.1.0";
repoName = "onboarding";
@ -30,13 +33,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1mpw0j8ymb41py9v9qlk4nwy1lnwj7k388c7gqdv34ynck0ymfi4";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-9voy9eje3VlV4IMM664EyjKWTfSVogX5JoRCqhsUXTE=";
};
nativeBuildInputs = [
@ -52,6 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = [
elementary-gtk-theme
elementary-icon-theme
elementary-settings-daemon # settings schema
glib
granite
gtk3
@ -64,6 +62,12 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
appcenter = appcenter;
})
# Provides the directory where the locales are actually installed
# https://github.com/elementary/onboarding/pull/147
(fetchpatch {
url = "https://github.com/elementary/onboarding/commit/af19c3dbefd1c0e0ec18eddacc1f21cb991f5513.patch";
sha256 = "sha256-fSFfjSd33W7rXXEUHY8b3rv9B9c31XfCjxjRxBBrqjs=";
})
];
postPatch = ''
@ -71,6 +75,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Onboarding app for new users designed for elementary OS";
homepage = "https://github.com/elementary/onboarding";

@ -18,19 +18,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-network";
version = "2.3.1";
version = "2.3.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-xr1ZihWK8fU8M/rXRKk5dOjoQNe3aJO8ouKC/iVZ7Sk=";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-4Fg8/Gm9mUqaL3wEc8h+/pMvOfD75ILjo7LhLz6LQmo=";
};
nativeBuildInputs = [
@ -49,6 +43,12 @@ stdenv.mkDerivation rec {
wingpanel
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Network Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-network";

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, python3
@ -18,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "granite";
version = "6.1.2";
version = "6.2.0";
outputs = [ "out" "dev" ];
@ -26,13 +27,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-d48KQH8uwkSZWQEFSq1BD+TVUi9PWVVtMjKYmleRW58=";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-WM0Wo9giVP5pkMFaPCHsMfnAP6xD71zg6QLCYV6lmkY=";
};
nativeBuildInputs = [
@ -58,6 +53,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "An extension to GTK used by elementary OS";
longDescription = ''

@ -15,7 +15,7 @@
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
buildLlvmPackages, llvmPackages
buildTargetLlvmPackages, llvmPackages
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
@ -122,7 +122,7 @@ let
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
] ++ lib.optional useLLVM buildLlvmPackages.llvm;
] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;

@ -14,7 +14,7 @@
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
buildLlvmPackages, llvmPackages
buildTargetLlvmPackages, llvmPackages
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
@ -130,7 +130,7 @@ let
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
] ++ lib.optional useLLVM buildLlvmPackages.llvm;
] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;

@ -16,7 +16,7 @@
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
buildLlvmPackages, llvmPackages
buildTargetLlvmPackages, llvmPackages
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
@ -117,7 +117,7 @@ let
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
] ++ lib.optional useLLVM buildLlvmPackages.llvm;
] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;

@ -16,7 +16,7 @@
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
buildLlvmPackages, llvmPackages
buildTargetLlvmPackages, llvmPackages
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
@ -117,7 +117,7 @@ let
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
] ++ lib.optional useLLVM buildLlvmPackages.llvm;
] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;

@ -21,7 +21,7 @@
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
buildLlvmPackages, llvmPackages
buildTargetLlvmPackages, llvmPackages
, # If enabled, GHC will be built with the GPL-free but slightly slower native
# bignum backend instead of the faster but GPLed gmp backend.
@ -130,7 +130,7 @@ let
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
] ++ lib.optional useLLVM buildLlvmPackages.llvm;
] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;

@ -1,4 +1,4 @@
{ stdenv, rustc, minimalContent ? true }:
{ lib, stdenv, rustc, minimalContent ? true }:
stdenv.mkDerivation {
name = "rust-src";
@ -6,9 +6,20 @@ stdenv.mkDerivation {
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
mv src $out
rm -rf $out/{${if minimalContent
then "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,tools,vendor,stdarch"
else "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,vendor"
}}
rm -rf $out/{${lib.concatStringsSep "," ([
"ci"
"doc"
"etc"
"grammar"
"llvm-project"
"llvm-emscripten"
"rtstartup"
"rustllvm"
"test"
"vendor"
] ++ lib.optionals minimalContent [
"tools"
"stdarch"
])}}
'';
}

@ -1,4 +1,4 @@
{ dhallPackages, buildDhallGitHubPackage }:
{ buildDhallGitHubPackage, Prelude }:
buildDhallGitHubPackage {
name = "grafana";
@ -7,5 +7,5 @@ buildDhallGitHubPackage {
# 2021-11-12
rev = "d5630dc55deacf5100a99802a4df1d9680b263b3";
sha256 = "01320hpqgr5r4grsydmdl9yznmly1ssnlc9gcwa8rj1ah0a8xlgz";
dependencies = [ dhallPackages.Prelude ];
dependencies = [ Prelude ];
}

@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
version = "21.4.1";
version = "21.4.2";
outputs = [ "out" "dev" ];
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
sha256 = "1gf3gkxr68n8ca5bk269w469jykq90z8d3a9v0gag02cl1d6ca3i";
sha256 = "0hphpv3n2cdxmbyiwly7v9r0ijdq6hfnw604xz42jqgh9idi6h55";
};
patches = [

@ -5,6 +5,8 @@
, openssl
, zlib
, libuv
# External poll is required for e.g. mosquitto, but discouraged by the maintainer.
, withExternalPoll ? false
}:
let
@ -29,7 +31,8 @@ let
"-DLWS_WITH_SOCKS5=ON"
# Required since v4.2.0
"-DLWS_BUILD_HASH=no_hash"
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON";
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"
++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON";
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";

@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nasm ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
makeFlags = [
"PREFIX=${placeholder "out"}"
"ARCH=${stdenv.hostPlatform.linuxArch}"
];
meta = with lib; {
description = "A codec library which supports H.264 encoding and decoding";

@ -2,22 +2,13 @@
stdenv.mkDerivation rec {
pname = "yoda";
version = "1.9.2";
version = "1.9.3";
src = fetchurl {
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
hash = "sha256-zb7j7fBMv2brJ+gUMMDTKFEJDC2embENe3wXdx0VTOA=";
hash = "sha256-XRUYL7gAoNX/ykdD+CwpXsYu5yzz5GJbZNAIP/+gR98=";
};
patches = [
# Prevent ROOT from initializing X11 or Cocoa (helps with sandboxing)
(fetchpatch {
url = "https://gitlab.com/hepcedar/yoda/-/commit/36c035f4f0385dec58702f09564ca66a14ca2c3e.diff";
sha256 = "sha256-afB+y33TVNJtxY5As18EcutJEGDE4g0UzMxzA+YgICk=";
excludes = [ "ChangeLog" ];
})
];
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
buildInputs = [ python ]
++ (with python.pkgs; [ numpy matplotlib ])
@ -41,11 +32,10 @@ stdenv.mkDerivation rec {
doInstallCheck = true;
installCheckTarget = "check";
enableParallelChecking = false; # testreader consumes output of testwriter
meta = {
description = "Provides small set of data analysis (specifically histogramming) classes";
license = lib.licenses.gpl3;
license = lib.licenses.gpl3Only;
homepage = "https://yoda.hepforge.org";
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ veprbl ];

@ -24,6 +24,16 @@
, orc
}:
let
# This file was mistakenly not included with the 0.15.0 release tarball.
# Should be fixed with the next release.
# https://gitlab.freedesktop.org/spice/spice/-/issues/56
doxygen_sh = fetchurl {
url = "https://gitlab.freedesktop.org/spice/spice/-/raw/v0.15.0/doxygen.sh";
sha256 = "0g4bx91qclihp1jfhdhyj7wp4hf4289794xxbw32kk58lnd7bzkg";
};
in
stdenv.mkDerivation rec {
pname = "spice";
version = "0.15.0";
@ -34,10 +44,10 @@ stdenv.mkDerivation rec {
};
postPatch = ''
install ${doxygen_sh} doxygen.sh
patchShebangs build-aux
'';
nativeBuildInputs = [
glib
meson
@ -74,7 +84,6 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgstreamer=1.0"
"-Dcelt051=disabled"
];
postInstall = ''

@ -64,6 +64,19 @@ proc getNimbleValues(filePath, key: string): seq[string] =
if s.len > 0 and s[0] == '"':
s = s.unescape()
proc getOutputDir(name: string): string =
## Return the output directory for output `name`.
## If `name` is not a valid output then the first output
## is returned as a default.
let outputs = splitWhitespace getEnv("outputs")
doAssert(outputs.len > 0)
if outputs.contains name:
result = getEnv(name)
if result == "":
result = getEnv("out")
if result == "":
result = getEnv(outputs[0], "/dev/null")
proc configurePhase*() =
## Generate "config.nims" which will be read by the Nim
## compiler during later phases.
@ -103,14 +116,14 @@ proc buildPhase*() =
nf = getNimbleFilePath()
bins = nf.getNimbleValues("bin")
srcDir = nf.getNimbleValue("srcDir", ".")
binDir = getenv("outputBin", getenv("out", "/dev/null")) / "bin"
binDir = getOutputDir("bin") / "bin"
if bins != @[]:
for bin in bins:
cmds.add("nim compile $# --outdir:$# $#" %
[getenv"nimFlags", binDir, normalizedPath(srcDir / bin)])
if getEnvBool"nimDoc":
echo "generating documentation"
let docDir = getenv("outputDoc", (getenv("out", "/dev/null") / "doc"))
let docDir = getOutputDir("doc") / "doc"
for path in walkFiles(srcDir / "*.nim"):
cmds.add("nim doc --outdir:$# $#" % [docDir, path])
if cmds.len > 0:
@ -126,7 +139,7 @@ proc installPhase*() =
let
nf = getNimbleFilePath()
srcDir = nf.getNimbleValue("srcDir", ".")
devDir = getenv("outputDev", getenv("out", "/dev/null"))
devDir = getOutputDir "dev"
echo "Install ", srcDir, " to ", devDir
copyDir(normalizedPath(srcDir), normalizedPath(devDir / srcDir))
copyFile(nf, devDir / nf.extractFilename)

@ -20,6 +20,7 @@
, "alex"
, "alloy"
, "asar"
, "audiosprite"
, "autoprefixer"
, "aws-azure-login"
, "awesome-lint"
@ -209,6 +210,7 @@
, "npm-check-updates"
, "npm-merge-driver"
, {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"}
, "nrm"
, "ocaml-language-server"
, "parcel-bundler"
, "parsoid"

File diff suppressed because it is too large Load Diff

@ -0,0 +1,37 @@
{ buildPecl, lib, gpgme, file, gnupg }:
buildPecl {
pname = "gnupg";
version = "1.5.0";
sha256 = "0r0akrjjf9i460z11llybdr6sg2rlcz38nwfy0yqz443ljdggxfl";
buildInputs = [ gpgme ];
checkInputs = [ gnupg ];
postPhpize = ''
substituteInPlace configure \
--replace '/usr/bin/file' '${file}/bin/file' \
--replace 'SEARCH_PATH="/usr/local /usr /opt"' 'SEARCH_PATH="${gpgme.dev}"'
'';
postConfigure = with lib; ''
substituteInPlace Makefile \
--replace 'run-tests.php' 'run-tests.php -q --offline'
substituteInPlace tests/gnupg_res_init_file_name.phpt \
--replace '/usr/bin/gpg' '${gnupg}/bin/gpg' \
--replace 'string(12)' 'string(${toString (stringLength "${gnupg}/bin/gpg")})'
substituteInPlace tests/gnupg_oo_init_file_name.phpt \
--replace '/usr/bin/gpg' '${gnupg}/bin/gpg' \
--replace 'string(12)' 'string(${toString (stringLength "${gnupg}/bin/gpg")})'
'';
doCheck = true;
meta = with lib; {
description = "PHP wrapper for GpgME library that provides access to GnuPG";
license = licenses.bsd3;
homepage = "https://pecl.php.net/package/gnupg";
maintainers = with maintainers; [ taikx4 ] ++ teams.php.members;
};
}

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.0.10576";
version = "9.0.10651";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-s8GZV+hcuAZJhKVoLAtC2mwHlqr/vJ6P5mwlNDczEyY=";
sha256 = "sha256-Cgd6lT7iqpvY5OJgBFNMkDJVV7uF6WwVdzQwGGZo4Qc=";
};
propagatedBuildInputs = [ pyvex ];

@ -0,0 +1,37 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder
, aiohttp, webargs, fetchFromGitHub, callPackage
}:
let
apispec3 = callPackage ../apispec/3.nix {};
jinja2 = callPackage ../jinja2/2.nix {};
in
buildPythonPackage rec {
pname = "aiohttp-apispec";
version = "unstable-2021-21-08";
# unstable so we can use latest webargs
src = fetchFromGitHub {
owner = "maximdanilchenko";
repo = "aiohttp-apispec";
rev = "cfa19646394480dda289f6b7af19b7d50f245d81";
sha256 = "uEgDRAlMjTa4rvdE3fkORCHIlCLzxPJJ2/m4ZRU3eIQ=";
fetchSubmodules = false;
};
propagatedBuildInputs = [ aiohttp webargs apispec3 jinja2 ];
pythonImportsCheck = [
"aiohttp_apispec"
];
# Requires pytest-sanic, currently broken in nixpkgs
doCheck = false;
meta = with lib; {
description = "Build and document REST APIs with aiohttp and apispec";
homepage = "https://github.com/maximdanilchenko/aiohttp-apispec/";
license = licenses.mit;
maintainers = [ maintainers.viric ];
};
}

@ -44,14 +44,14 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.0.10576";
version = "9.0.10651";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-lRoJZX7HPZE6y7v5AuU1C6sjOIXXefv8M/qPiNQtobw=";
sha256 = "sha256-aywfB2oEPyh+MbN5jb+qA3DMUi8Pp/f2OhuUzoTAIoA=";
};
propagatedBuildInputs = [

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "angrop";
version = "9.0.10576";
version = "9.0.10651";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-i4F6VyJYJ6XON9G43Z2VwWAPHGRxR9DzxnEDGiJ8LSE=";
sha256 = "sha256-tJ+yeaBI4eBxvvN2rqAfun3aSxDLrSFtfu00d4O1sak=";
};
propagatedBuildInputs = [

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchPypi
, pyyaml
, prance
, marshmallow
, pytestCheckHook
, mock
, openapi-spec-validator
}:
buildPythonPackage rec {
pname = "apispec";
version = "3.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "d23ebd5b71e541e031b02a19db10b5e6d5ef8452c552833e3e1afc836b40b1ad";
};
propagatedBuildInputs = [
pyyaml
prance
];
postPatch = ''
rm tests/test_ext_marshmallow.py
'';
checkInputs = [
openapi-spec-validator
marshmallow
mock
pytestCheckHook
];
pythonImportsCheck = [
"apispec"
];
meta = with lib; {
description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification";
homepage = "https://github.com/marshmallow-code/apispec";
license = licenses.mit;
maintainers = [ maintainers.viric ];
};
}

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.0.10576";
version = "9.0.10651";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-K36tAsVfminDFK09jE6+ruROkaLfCTNPCL5ziZJOrVk=";
sha256 = "sha256-Lvobjbjl1gfW3HllHfsxHnLOB4hRGbZ9Hhuf14zd94w=";
};
checkInputs = [

@ -23,12 +23,14 @@
buildPythonPackage rec {
pname = "autobahn";
version = "21.3.1";
version = "21.11.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "00wf9dkfgakg80gy62prg650lb8zz9y9fdlxwxcznwp8hgsw29p1";
sha256 = "sha256-vW9GMVQZygpb5BCfc3QQIIrV8ZcY9nympKZ0zGbKmxg=";
};
propagatedBuildInputs = [
@ -64,9 +66,13 @@ buildPythonPackage rec {
export USE_ASYNCIO=1
'';
pytestFlagsArray = [ "--pyargs autobahn" ];
pytestFlagsArray = [
"--pyargs autobahn"
];
pythonImportsCheck = [ "autobahn" ];
pythonImportsCheck = [
"autobahn"
];
meta = with lib; {
description = "WebSocket and WAMP in Python for Twisted and asyncio";

@ -1,9 +1,9 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
, python, twisted, jinja2, zope_interface, sqlalchemy
, sqlalchemy-migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq
, txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial
, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins
, parameterized, git, openssh, glibcLocales, ldap3, nixosTests
, python, twisted, jinja2, zope_interface, sqlalchemy, alembic, python-dateutil
, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, txrequests, pypugjs, boto3
, moto, mock, lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker
, buildbot-pkg, buildbot-plugins, parameterized, git, openssh, glibcLocales
, nixosTests
}:
let
@ -31,11 +31,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "3.3.0";
version = "3.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-FST+mCIQpzxc/5iQdsSNBlKxY985v+z6Xeh8ZQRu2FE=";
sha256 = "sha256-14w1sF1aOpfUW76uhAIUpdrjAEhQkEWcRGg9Osc+qFk=";
};
propagatedBuildInputs = [
@ -44,7 +44,7 @@ let
jinja2
zope_interface
sqlalchemy
sqlalchemy-migrate
alembic
python-dateutil
txaio
autobahn
@ -74,9 +74,6 @@ let
git
openssh
glibcLocales
# optional dependency that was accidentally made required for tests
# https://github.com/buildbot/buildbot/pull/5857
ldap3
];
patches = [

@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-PVmDJN3/PMsvZrrwSNaUUQLPkOMWO6edIEEfZSwspTs=";
sha256 = "sha256-NAc85JomnxS052SjCu8+UQ/hik2gbq1u7/gc21Nj67Q=";
};
postPatch = ''

@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-KFGTNudUxjSV6406NV4QJP8t9t5p2ckMlntkqsf1x2U=";
sha256 = "sha256-65ZbCiNtxH3YjAcdhv5cwSUNrLT65jlQh/2oL8342Tw=";
};
# Remove unneccessary circular dependency on buildbot
@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-UoKCRAnPAQjb7Fgm+YkGv1boXY+xSDkYA3E2EiEkNGE=";
sha256 = "sha256-2wu6rE5tgjPXxlcIND8s+DAmX9CF29M3ElonV0L8WOs=";
};
buildInputs = [ buildbot-pkg ];
@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Ccmk8TPtMfGrlNaBKhos1s/G1pHzf+zSD+A88F+/8+c=";
sha256 = "sha256-Vu4CouTuVyxpmx5C4fthQJPdFBAtN1jliQjy4pLYAzc=";
};
buildInputs = [ buildbot-pkg ];
@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-oHvn7E4NS0RhTU2hDn1GgFjalYCoXUNCtGEz2lHel+M=";
sha256 = "sha256-BDzI4VBbNGCKRxv6294IIVkDXZV0KHauvUYDjIVovvE=";
};
buildInputs = [ buildbot-pkg ];
@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-HoiR2WF6EWebbb9c3WcLU2H17HMqkrF6JNOwpUk9CbU=";
sha256 = "sha256-hkcxwZWFJOLHMIRJfzzMTEoH6oc2UblJEKFjYthFfDc=";
};
buildInputs = [ buildbot-pkg ];

@ -7,7 +7,7 @@ buildPythonPackage (rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-nDP46rLWYXXKJktR6NTWLb0erC6FU8fXe9FAIX+MWuU=";
sha256 = "sha256-SFZ0Q51hrBb7eBMGzvVOhc/ogFCIO/Mo7U9652WJ2GU=";
};
propagatedBuildInputs = [ twisted future ];

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.0.10576";
version = "9.0.10651";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-86ySQ/2l1h5vayMfAsr9ShyE8oRKL37sT3bfrgIGFHY=";
sha256 = "sha256-ishKQ3BdY7sPRyhr04dB3gtGC/JqoJ/W0Cv/hxTkJXg=";
};
# Use upstream z3 implementation

@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.0.10576";
version = "9.0.10651";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ftaFISU37GcCFTybxV31PwUl2vrbKVm/S00Qo+pUxgo=";
sha256 = "sha256-XhU0SS0zWPtI4t49oboc5/Fr34dR6oqm8hlI4f4q8Bk=";
};
propagatedBuildInputs = [

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "devolo-plc-api";
version = "0.6.3";
version = "0.6.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "2Fake";
repo = "devolo_plc_api";
rev = "v${version}";
sha256 = "6EIT6ifC4M4qj/2dZYVZ3fb3bPs25R7IEh/MduYTTkU=";
sha256 = "sha256-hlIHNVJG/2hU5psGXhi05SCupORfgIjB+YT/ZlJEqFM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

@ -11,6 +11,8 @@
buildPythonPackage rec {
pname = "discord.py";
version = "1.7.3";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
@ -30,6 +32,8 @@ buildPythonPackage rec {
patchPhase = ''
substituteInPlace "discord/opus.py" \
--replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'"
substituteInPlace requirements.txt \
--replace "aiohttp>=3.6.0,<3.8.0" "aiohttp>=3.6.0,<4"
'';
# Only have integration tests with discord
@ -49,7 +53,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python wrapper for the Discord API";
homepage = "https://discordpy.rtfd.org/";
maintainers = [ maintainers.ivar ];
license = licenses.mit;
maintainers = with maintainers; [ ivar ];
};
}

@ -1,24 +1,23 @@
{ lib, python, isPy3k, buildPythonPackage, fetchPypi, flask }:
{ lib, python, buildPythonPackage, fetchPypi, pytestCheckHook, flask }:
buildPythonPackage rec {
pname = "Flask-HTTPAuth";
version = "4.4.0";
pname = "flask-httpauth";
version = "4.5.0";
disabled = !isPy3k;
disabled = python.pythonOlder "3";
src = fetchPypi {
inherit pname version;
sha256 = "0fl1if91hg2c92b6sic7h2vhxxvb06ri7wflmwp0pfiwbaisgamw";
pname = "Flask-HTTPAuth";
version = version;
sha256 = "0ada63rkcvwkakjyx4ay98fjzwx5h55br12ys40ghkc5lbyl0l1r";
};
checkInputs = [ pytestCheckHook ];
propagatedBuildInputs = [ flask ];
pythonImportsCheck = [ "flask_httpauth" ];
checkPhase = ''
${python.interpreter} -m unittest discover
'';
meta = with lib; {
description = "Extension that provides HTTP authentication for Flask routes";
homepage = "https://github.com/miguelgrinberg/Flask-HTTPAuth";

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, typing-extensions
}:
buildPythonPackage rec {
pname = "future-typing";
version = "0.4.1";
src = fetchPypi {
pname = "future_typing";
inherit version;
sha256 = "65fdc5034a95db212790fee5e977fb0a2df8deb60dccf3bac17d6d2b1a9bbacd";
};
doCheck = false; # No tests in pypi source. Did not get tests from GitHub source to work.
pythonImportsCheck = [ "future_typing" ];
meta = with lib; {
description = "Use generic type hints and new union syntax `|` with python 3.6+";
homepage = "https://github.com/PrettyWood/future-typing";
license = licenses.mit;
maintainers = with maintainers; [ kfollesdal ];
};
}

@ -1,29 +1,50 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, aiohttp
, async-timeout
, httpx
, poetry-core
, pytest-asyncio
, pytest-httpx
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "glances-api";
version = "0.2.1";
version = "0.3.2";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "home-assistant-ecosystem";
repo = "python-glances-api";
rev = version;
sha256 = "sha256-mbkZZg2fmus4kOXFxHE/UV/nxemFAsoEZu8IUa7SPsg=";
sha256 = "sha256-zVK63SI8ZeVrY2iEEkgp8pq6RDheKeApb9/RWgZCKGI=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
async-timeout
httpx
];
# no tests are present
doCheck = false;
pythonImportsCheck = [ "glances_api" ];
checkInputs = [
pytest-asyncio
pytest-httpx
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'httpx = ">=0.20,<1"' 'httpx = ">=0.19,<1"'
'';
pythonImportsCheck = [
"glances_api"
];
meta = with lib; {
description = "Python API for interacting with Glances";

@ -35,7 +35,9 @@ buildPythonPackage rec {
];
checkPhase = ''
stestr run
stestr run -e <(echo "
hacking.tests.test_doctest.HackingTestCase.test_flake8
")
'';
pythonImportsCheck = [ "hacking" ];

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
version = "0.50.0";
version = "0.50.1";
disabled = isPy27;
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "v${version}";
sha256 = "sha256-4OMWLWvNRg7z4KAAkB1l5YaWILFwIepZOWhBd64SGWI=";
hash = "sha256-d9caVmXV/yynimXYZNspGar4BXXXec/d8kw2DDEgvpY=";
};
checkInputs = [

@ -24,7 +24,7 @@ buildPythonPackage rec {
doCheck = !stdenv.is32bit || isPy3k;
checkPhase = ''
pytest -v tests
pytest -v tests -W ignore::ResourceWarning -W ignore::DeprecationWarning
'';
meta = with lib; {

@ -6,25 +6,18 @@
buildPythonPackage rec {
pname = "nbclient";
version = "0.5.8";
version = "0.5.9";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-NPUsycuDGl2MzXAxU341THXcYaJEh/mYcS0Sid4yCiU=";
sha256 = "sha256-meRt2vrNC4YSk78kb+2FQKGErfo6p9ZB+JAx7AcHAeA=";
};
inherit doCheck;
checkInputs = [ pytest xmltodict nbconvert ipywidgets ];
propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];
postFixup = ''
# Remove until fixed by upstream
# https://github.com/jupyter/nbclient/pull/173#issuecomment-968760082
rm $out/bin/.jupyter-run-wrapped
rm $out/bin/jupyter-run
'';
meta = with lib; {
homepage = "https://github.com/jupyter/nbclient";
description = "A client library for executing notebooks";

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, liberasurecode, six }:
{ lib, stdenv, buildPythonPackage, fetchPypi, liberasurecode, six }:
buildPythonPackage rec {
pname = "pyeclib";
@ -13,11 +13,16 @@ buildPythonPackage rec {
# patch dlopen call
substituteInPlace src/c/pyeclib_c/pyeclib_c.c \
--replace "liberasurecode.so" "${liberasurecode}/lib/liberasurecode.so"
# python's platform.platform() doesn't return "Darwin" (anymore?)
substituteInPlace setup.py \
--replace '"Darwin"' '"macOS"'
'';
preBuild = ''
# required for the custom find_library function in setup.py
export LD_LIBRARY_PATH="${lib.makeLibraryPath [ liberasurecode ]}"
preBuild = let
ldLibraryPathEnvName = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
in ''
# required for the custom _find_library function in setup.py
export ${ldLibraryPathEnvName}="${lib.makeLibraryPath [ liberasurecode ]}"
'';
buildInputs = [ liberasurecode ];

@ -1,7 +1,6 @@
{ lib
, aiohttp
, aresponses
, async-timeout
, awesomeversion
, buildPythonPackage
, fetchFromGitHub
@ -12,21 +11,20 @@
buildPythonPackage rec {
pname = "pyhaversion";
version = "21.10.0";
version = "21.11.1";
format = "setuptools";
# Only 3.8.0 and beyond are supported
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "sha256-EvVkewFgkfYL6BjmJ/IWeuCyR+0R0ZxI35i9sxKcqxo=";
sha256 = "sha256-wh6NJRDgOrEHYEN3QlC4lOZHPnPeiPCJFF1xLoixQ14=";
};
propagatedBuildInputs = [
aiohttp
async-timeout
awesomeversion
];
@ -36,7 +34,16 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "pyhaversion" ];
postPatch = ''
# Upstream doesn't set a version for the tagged releases
substituteInPlace setup.py \
--replace "main" ${version}
'';
pythonImportsCheck = [
"pyhaversion"
];
meta = with lib; {
description = "Python module to the newest version number of Home Assistant";

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, webtest
, pyramid
, Mako
@ -15,6 +16,15 @@ buildPythonPackage rec {
sha256 = "0066c863441f1c3ddea60cee1ccc50d00a91a317a8052ca44131da1a12a840e2";
};
patches = [
# Fix tests with pyramid >= 2.0
# https://github.com/Pylons/pyramid_mako/pull/54
(fetchpatch {
url = "https://github.com/Pylons/pyramid_mako/commit/c0f9e7e0146a7f94e35a9401b1519ac8b7765f5b.patch";
sha256 = "15swfm0a07bdl32s85426rmjh72jwfasjcrl849ppg035z75q9fx";
})
];
buildInputs = [ webtest ];
propagatedBuildInputs = [ pyramid Mako ];
@ -23,8 +33,5 @@ buildPythonPackage rec {
description = "Mako template bindings for the Pyramid web framework";
license = licenses.bsd0;
maintainers = with maintainers; [];
# broken on pyramid>=2.0
# https://github.com/Pylons/pyramid_mako/issues/53
broken = true;
};
}

@ -2,30 +2,34 @@
, buildPythonPackage
, fetchPypi
, aiohttp
, async-timeout
, urllib3
, pythonOlder
}:
buildPythonPackage rec {
pname = "python-opendata-transport";
version = "0.2.2";
version = "0.3.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "python_opendata_transport";
inherit version;
sha256 = "sha256-Z0VHkKYHpwbBwwFrMtA5JRy0m7f0566IjCmGizoKEoo=";
sha256 = "sha256-CpzMMp2C3UOiUna9EcUucD/PKv7AZlkaU8QJfWntoi8=";
};
propagatedBuildInputs = [
aiohttp
async-timeout
urllib3
];
# no tests are present
doCheck = false;
pythonImportsCheck = [ "opendata_transport" ];
pythonImportsCheck = [
"opendata_transport"
];
meta = with lib; {
description = "Python client for interacting with transport.opendata.ch";

@ -14,6 +14,8 @@
buildPythonPackage rec {
pname = "python-smarttub";
version = "0.0.27";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
@ -36,7 +38,14 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "smarttub" ];
postPatch = ''
substituteInPlace setup.py \
--replace "aiohttp~=3.7.3" "aiohttp>=3.7.4,<4"
'';
pythonImportsCheck = [
"smarttub"
];
meta = with lib; {
description = "Python API for SmartTub enabled hot tubs";

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.0.10576";
version = "9.0.10651";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-pOQZXymIuffUfShAUrXqlxwWCIRKZpkMZcJS1fad2bs=";
sha256 = "sha256-GuZqaEI7y/kLNV7RfEMBXQgFsdVuRh1ouweTwlXE6r4=";
};
postPatch = lib.optionalString stdenv.isDarwin ''

@ -1,26 +1,35 @@
{ buildPythonPackage, lib, fetchPypi, numpy
, pydantic, pint, networkx, pytest-runner, pytest-cov, pytest
{ buildPythonPackage, lib, fetchPypi
, networkx
, numpy
, pint
, pydantic
, pytestCheckHook
} :
buildPythonPackage rec {
pname = "qcelemental";
version = "0.23.0";
checkInputs = [ pytest-runner pytest-cov pytest ];
propagatedBuildInputs = [ numpy pydantic pint networkx ];
version = "0.24.0";
src = fetchPypi {
inherit pname version;
sha256 = "642bc86ce937621ddfb1291cbff0851be16b26feb5eec562296999e36181cee3";
sha256 = "sha256-XcsR89tu26EG5AcXqmndkESLGWZ8eKmTkjaLziosawE=";
};
propagatedBuildInputs = [
numpy
pydantic
pint
networkx
];
checkInputs = [ pytestCheckHook ];
doCheck = true;
meta = with lib; {
description = "Periodic table, physical constants, and molecule parsing for quantum chemistry";
homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/en/latest/";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = [ maintainers.sheepforce ];
};
}

@ -1,28 +1,31 @@
{ buildPythonPackage, lib, fetchPypi, pyyaml, qcelemental, pydantic
, py-cpuinfo, psutil, pytest-runner, pytest, pytest-cov
} :
{ buildPythonPackage
, lib
, fetchPypi
, psutil
, py-cpuinfo
, pydantic
, pyyaml
, qcelemental
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "qcengine";
version = "0.20.1";
version = "0.21.0";
checkInputs = [
pytest-runner
pytest-cov
pytest
];
checkInputs = [ pytestCheckHook ];
propagatedBuildInputs = [
psutil
py-cpuinfo
pydantic
pyyaml
qcelemental
pydantic
py-cpuinfo
psutil
];
src = fetchPypi {
inherit pname version;
sha256 = "hZxE7b0bOx/B8Kz4cgBC7wV23OikRxwrdZ4UQ8G/yhg=";
sha256 = "sha256-ZsPKvbaZ7BBZuOmzq12ism/HyWYcLlQHgZaTzmIsMq4=";
};
doCheck = true;

@ -20,14 +20,16 @@
buildPythonPackage rec {
pname = "slack-sdk";
version = "3.11.2";
version = "3.12.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
sha256 = "sha256-jfFNka+PZXXYz6r7gwoxoqK7SX2RRcDNlCSqVG3JPY0=";
sha256 = "sha256-1IR0pQOxLjxqmjbq6zmp2rU1rBDabADva1R4YBNw+PA=";
};
propagatedBuildInputs = [
@ -66,7 +68,9 @@ buildPythonPackage rec {
"test_interactions"
];
pythonImportsCheck = [ "slack_sdk" ];
pythonImportsCheck = [
"slack_sdk"
];
meta = with lib; {
description = "Slack Developer Kit for Python";

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "srpenergy";
version = "1.3.2";
version = "1.3.5";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "lamoreauxlab";
repo = "srpenergy-api-client-python";
rev = version;
sha256 = "03kldjk90mrnzf2hpd7xky0lpph853mjxc34kfa2m5mbpbpkxz9c";
sha256 = "sha256-s90+gzjcG27pUcMGpzf2rf+mR8/fmpvwBXGfvv3rNGI=";
};
propagatedBuildInputs = [

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "starkbank-ecdsa";
version = "2.0.2";
version = "2.0.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "starkbank";
repo = "ecdsa-python";
rev = "v${version}";
sha256 = "sha256-4QFAtGqHJZSVyrGPuMdJwvF761/P6YAHjjKmCpPyGdU=";
sha256 = "sha256-UA+UuSxKZZN7Zb23HWsCD6UZK6lROpy3OfLN7MAlMM0=";
};
checkInputs = [

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "types-pytz";
version = "2021.3.0";
version = "2021.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-hqYZZ4NNzuqvmLaQLtg1fv3SYruK/K9LyMzs90hZJ3g=";
sha256 = "sha256-3/138+/s07FVXxh6m/OmONVfrClnALgpxBvVHscqbrc=";
};
# Modules doesn't have tests

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
version = "57.4.2";
version = "57.4.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "1y0vx949wx5w4ra854ykwvgmdcwsb6v7jk29m4x1l79857sa16al";
sha256 = "sha256-G8mgC66QHvk5wXIK4EDJ8RJ+eeYOBFiO0VBsYmhThe0=";
};
# Module doesn't have tests

@ -0,0 +1,69 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, inflection
, pendulum
, fastjsonschema
, typing-extensions
, orjson
, future-typing
, poetry-core
, pydantic
, sqlalchemy
, pandas
, mypy
}:
buildPythonPackage rec {
pname = "typical";
version = "2.7.9";
format = "pyproject";
src = fetchFromGitHub {
owner = "seandstewart";
repo = "typical";
rev = "v${version}";
sha256 = "sha256-ITIsSM92zftnvqLiVGFl//IbBb8N3ffkkqohzOx2JO4=";
};
patches = [
./use-poetry-core.patch
];
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
inflection
pendulum
fastjsonschema
orjson
typing-extensions
future-typing
];
checkInputs = [
pytestCheckHook
mypy
pydantic
sqlalchemy
pandas
];
disabledTests = [
"test_ujson" # We use orjson
];
disabledTestPaths = [
"benchmark/"
];
pythonImportsCheck = [ "typic" ];
meta = with lib; {
homepage = "https://python-typical.org/";
description = "Typical: Python's Typing Toolkit.";
license = licenses.mit;
maintainers = with maintainers; [ kfollesdal ];
};
}

@ -0,0 +1,13 @@
diff --git a/pyproject.toml b/pyproject.toml
index a588a0d..43da394 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -154,7 +154,7 @@ exclude = '''
[build-system]
requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
+build-backend = "poetry.core.masonry.api"
[bumpver]
current_version = "v2.7.5"

@ -4,19 +4,20 @@
, setuptools-scm
, getmac
, requests
, semver
, pytestCheckHook
, responses
}:
buildPythonPackage rec {
pname = "vilfo-api-client";
version = "0.3.3";
version = "0.4.1";
src = fetchFromGitHub {
owner = "ManneW";
repo = "vilfo-api-client-python";
rev = "v${version}";
sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf";
rev = version;
sha256 = "sha256-j06Bbv0hWSmrlCv8RfgvfGTyOF+vSX+zZnX3AvG5Hys=";
};
postPatch = ''
@ -33,6 +34,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
getmac
requests
semver
];
checkInputs = [

@ -46,6 +46,7 @@ buildPythonPackage rec {
license = licenses.asl20;
maintainers = with maintainers; [ goibhniu ];
# error: use of undeclared identifier 'kFSEventStreamEventFlagItemCloned'
broken = stdenv.isDarwin;
# builds fine on aarch64-darwin
broken = stdenv.isDarwin && !stdenv.isAarch64;
};
}

@ -16,8 +16,8 @@ buildPythonPackage rec {
"webargs"
];
propagatedBuildInputs = [ marshmallow ];
checkInputs = [
pytestCheckHook
pytest-aiohttp

@ -56,13 +56,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.598";
version = "2.0.603";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
sha256 = "sha256-h+pKg6rBF+f/EZaCcMQDISrE3jO55biHdn5tLPEUu1g=";
sha256 = "sha256-EJ0i3HOCurjCQEdZBzELBCcIS7sT71vEBjjdNpCmt00=";
};
nativeBuildInputs = with py.pkgs; [

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

Loading…
Cancel
Save