Merge master into haskell-updates

main
github-actions[bot] 2 years ago committed by GitHub
commit 03106b0236
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      doc/languages-frameworks/ocaml.section.md
  2. 2
      doc/languages-frameworks/vim.section.md
  3. 2
      lib/default.nix
  4. 12
      maintainers/maintainer-list.nix
  5. 2
      maintainers/scripts/luarocks-packages.csv
  6. 17
      nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
  7. 8
      nixos/doc/manual/release-notes/rl-2205.section.md
  8. 4
      nixos/modules/services/continuous-integration/buildbot/master.nix
  9. 4
      nixos/modules/services/networking/powerdns.nix
  10. 1
      nixos/modules/services/x11/desktop-managers/gnome.nix
  11. 1
      nixos/tests/powerdns.nix
  12. 544
      pkgs/applications/editors/vim/plugins/generated.nix
  13. 6
      pkgs/applications/editors/vim/plugins/vim-plugin-names
  14. 5
      pkgs/applications/editors/vscode/generic.nix
  15. 8
      pkgs/applications/emulators/rpcs3/default.nix
  16. 36
      pkgs/applications/misc/ablog/default.nix
  17. 39
      pkgs/applications/misc/electrum/default.nix
  18. 2
      pkgs/applications/misc/slic3r/default.nix
  19. 6
      pkgs/applications/misc/spicetify-cli/default.nix
  20. 2
      pkgs/applications/misc/stog/default.nix
  21. 786
      pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
  22. 786
      pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
  23. 85
      pkgs/applications/networking/browsers/firefox/common.nix
  24. 1
      pkgs/applications/networking/browsers/firefox/packages.nix
  25. 55
      pkgs/applications/networking/cluster/argocd-autopilot/default.nix
  26. 8
      pkgs/applications/networking/cluster/rancher/default.nix
  27. 140
      pkgs/applications/networking/cluster/terraform-providers/providers.json
  28. 7
      pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
  29. 2
      pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
  30. 4
      pkgs/applications/networking/instant-messengers/nheko/default.nix
  31. 9
      pkgs/applications/networking/irc/ircdog/default.nix
  32. 6
      pkgs/applications/networking/linssid/default.nix
  33. 4
      pkgs/applications/networking/mailreaders/thunderbird/packages.nix
  34. 158
      pkgs/applications/networking/n8n/node-packages.nix
  35. 2
      pkgs/applications/networking/p2p/twister/default.nix
  36. 4
      pkgs/applications/radio/pothos/default.nix
  37. 8
      pkgs/applications/science/astronomy/stellarium/default.nix
  38. 4
      pkgs/applications/science/chemistry/jmol/default.nix
  39. 4
      pkgs/applications/science/electronics/caneda/default.nix
  40. 4
      pkgs/applications/science/math/sage/README.md
  41. 2
      pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
  42. 10
      pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
  43. 16
      pkgs/applications/version-management/gitlab/data.json
  44. 8
      pkgs/applications/version-management/gitlab/gitaly/default.nix
  45. 4
      pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
  46. 4
      pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
  47. 22
      pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
  48. 92
      pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
  49. 202
      pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
  50. 2
      pkgs/applications/video/byzanz/default.nix
  51. 9
      pkgs/build-support/ocaml/dune.nix
  52. 58
      pkgs/data/fonts/mplus-outline-fonts/default.nix
  53. 5
      pkgs/desktops/gnome/core/gnome-keyring/default.nix
  54. 2
      pkgs/desktops/gnome/extensions/default.nix
  55. 4
      pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix
  56. 5
      pkgs/desktops/xfce/default.nix
  57. 4
      pkgs/development/compilers/ciao/default.nix
  58. 22
      pkgs/development/compilers/crystal/build-package.nix
  59. 4
      pkgs/development/compilers/emscripten/default.nix
  60. 2
      pkgs/development/compilers/ghcjs/ghcjs-base.nix
  61. 2
      pkgs/development/interpreters/scsh/default.nix
  62. 4
      pkgs/development/libraries/gdcm/default.nix
  63. 3
      pkgs/development/libraries/qwt/6_1.nix
  64. 21
      pkgs/development/libraries/qwt/default.nix
  65. 4
      pkgs/development/libraries/robin-map/default.nix
  66. 50
      pkgs/development/libraries/sdbus-cpp/default.nix
  67. 833
      pkgs/development/node-packages/node-packages.nix
  68. 69
      pkgs/development/ocaml-modules/bolt/default.nix
  69. 8
      pkgs/development/ocaml-modules/dune-action-plugin/default.nix
  70. 8
      pkgs/development/ocaml-modules/dune-glob/default.nix
  71. 10
      pkgs/development/ocaml-modules/dune-private-libs/default.nix
  72. 8
      pkgs/development/ocaml-modules/dune-site/default.nix
  73. 16
      pkgs/development/ocaml-modules/dyn/default.nix
  74. 33
      pkgs/development/ocaml-modules/fiat-p256/default.nix
  75. 7
      pkgs/development/ocaml-modules/janestreet/0.14.nix
  76. 2
      pkgs/development/ocaml-modules/ocplib-endian/default.nix
  77. 13
      pkgs/development/ocaml-modules/ordering/default.nix
  78. 16
      pkgs/development/ocaml-modules/stdune/default.nix
  79. 5
      pkgs/development/ocaml-modules/uutf/default.nix
  80. 2
      pkgs/development/ocaml-modules/wasm/default.nix
  81. 4
      pkgs/development/python-modules/aioairzone/default.nix
  82. 13
      pkgs/development/python-modules/aiogithubapi/default.nix
  83. 4
      pkgs/development/python-modules/aiowebostv/default.nix
  84. 4
      pkgs/development/python-modules/androidtv/default.nix
  85. 56
      pkgs/development/python-modules/ansible-later/default.nix
  86. 4
      pkgs/development/python-modules/arviz/default.nix
  87. 4
      pkgs/development/python-modules/asyncmy/default.nix
  88. 11
      pkgs/development/python-modules/asyncstdlib/default.nix
  89. 12
      pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
  90. 10
      pkgs/development/python-modules/azure-mgmt-signalr/default.nix
  91. 4
      pkgs/development/python-modules/debugpy/default.nix
  92. 6
      pkgs/development/python-modules/dnspython/default.nix
  93. 18
      pkgs/development/python-modules/editorconfig/default.nix
  94. 4
      pkgs/development/python-modules/elastic-apm/default.nix
  95. 8
      pkgs/development/python-modules/elkm1-lib/default.nix
  96. 4
      pkgs/development/python-modules/google-auth-oauthlib/default.nix
  97. 4
      pkgs/development/python-modules/google-cloud-vision/default.nix
  98. 44
      pkgs/development/python-modules/habanero/default.nix
  99. 4
      pkgs/development/python-modules/hahomematic/default.nix
  100. 43
      pkgs/development/python-modules/invocations/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

@ -38,8 +38,12 @@ Here is a simple package example.
- It uses the `fetchFromGitHub` fetcher to get its source.
- `useDune2 = true` ensures that Dune version 2 is used for the
build (this is the default; set to `false` to use Dune version 1).
- `duneVersion = "2"` ensures that Dune version 2 is used for the
build (this is the default; valid values are `"1"`, `"2"`, and `"3"`);
note that there is also a legacy `useDune2` boolean attribute:
set to `false` it corresponds to `duneVersion = "1"`; set to `true` it
corresponds to `duneVersion = "2"`. If both arguments (`duneVersion` and
`useDune2`) are given, the second one (`useDune2`) is silently ignored.
- It sets the optional `doCheck` attribute such that tests will be run with
`dune runtest -p angstrom` after the build (`dune build -p angstrom`) is
@ -67,7 +71,7 @@ Here is a simple package example.
buildDunePackage rec {
pname = "angstrom";
version = "0.15.0";
useDune2 = true;
duneVersion = "2";
minimalOCamlVersion = "4.04";

@ -286,7 +286,7 @@ Sample output1:
"reload" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "reload";
src = fetchgit {
url = "git://github.com/xolox/vim-reload";
url = "https://github.com/xolox/vim-reload";
rev = "0a601a668727f5b675cb1ddc19f6861f3f7ab9e1";
sha256 = "0vb832l9yxj919f5hfg6qj6bn9ni57gnjd3bj7zpq7d4iv2s4wdh";
};

@ -66,7 +66,7 @@ let
stringLength sub substring tail trace;
inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor
bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max
importJSON importTOML warn warnIf throwIfNot checkListOfEnum
importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum
info showWarnings nixpkgsVersion version isInOldestRelease
mod compare splitByAndCompare
functionArgs setFunctionArgs isFunction toFunction

@ -10438,6 +10438,12 @@
githubId = 811827;
name = "Gabriel Lievano";
};
rgrinberg = {
name = "Rudi Grinberg";
email = "me@rgrinberg.com";
github = "rgrinberg";
githubId = 139003;
};
rgrunbla = {
email = "remy@grunblatt.org";
github = "rgrunbla";
@ -12788,6 +12794,12 @@
githubId = 1983821;
name = "Eric Wolf";
};
uakci = {
name = "uakci";
email = "uakci@uakci.pl";
github = "uakci";
githubId = 6961268;
};
udono = {
email = "udono@virtual-things.biz";
github = "udono";

@ -81,6 +81,6 @@ rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,,
readline,,,,,,
say,https://github.com/Olivine-Labs/say.git,,,,,
std._debug,https://github.com/lua-stdlib/_debug.git,,,,,
std.normalize,git://github.com/lua-stdlib/normalize.git,,,,,
std.normalize,https://github.com/lua-stdlib/normalize.git,,,,,
stdlib,,,,41.2.2,,vyp
vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,

1 name src ref server version luaversion maintainers
81 readline
82 say https://github.com/Olivine-Labs/say.git
83 std._debug https://github.com/lua-stdlib/_debug.git
84 std.normalize git://github.com/lua-stdlib/normalize.git https://github.com/lua-stdlib/normalize.git
85 stdlib 41.2.2 vyp
86 vstruct https://github.com/ToxicFrog/vstruct.git

@ -15,6 +15,14 @@
<section xml:id="sec-release-22.05-highlights">
<title>Highlights</title>
<itemizedlist>
<listitem>
<para>
The <literal>firefox</literal> browser on
<literal>x86_64-linux</literal> is now making use of
profile-guided optimization resulting in a much more
responsive browsing experience.
</para>
</listitem>
<listitem>
<para>
<literal>security.acme.defaults</literal> has been added to
@ -135,7 +143,7 @@
<para>
<link xlink:href="https://frrouting.org/">FRRouting</link>, a
popular suite of Internet routing protocol daemons (BGP, BFD,
OSPF, IS-IS, VVRP and others). Available as
OSPF, IS-IS, VRRP and others). Available as
<link linkend="opt-services.frr.babel.enable">services.frr</link>
</para>
</listitem>
@ -698,6 +706,13 @@
before, you will need to have it enabled using GSettings.
</para>
</listitem>
<listitem>
<para>
<literal>services.telepathy</literal> will no longer be
enabled by default for GNOME desktops, one should enable it in
their configs if using Empathy or Polari.
</para>
</listitem>
<listitem>
<para>
If you previously used

@ -6,6 +6,10 @@ In addition to numerous new and upgraded packages, this release has the followin
## Highlights {#sec-release-22.05-highlights}
- The `firefox` browser on `x86_64-linux` is now making use of
profile-guided optimization resulting in a much more responsive
browsing experience.
- `security.acme.defaults` has been added to simplify configuring
settings for many certificates at once. This also opens up the
the option to use DNS-01 validation when using `enableACME` on
@ -39,7 +43,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS).
- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.frr.babel.enable)
- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VRRP and others). Available as [services.frr](#opt-services.frr.babel.enable)
- [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable).
@ -281,6 +285,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `services.gnome.experimental-features.realtime-scheduling` option has been removed, as GNOME Shell now [uses rtkit](https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060). Use `security.rtkit.enable = true;` instead. As before, you will need to have it enabled using GSettings.
- `services.telepathy` will no longer be enabled by default for GNOME desktops, one should enable it in their configs if using Empathy or Polari.
- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`.
- Ntopng (`services.ntopng`) is updated to 5.2.1 and uses a separate Redis instance if `system.stateVersion` is at least `22.05`. Existing setups shouldn't be affected.

@ -64,7 +64,7 @@ in {
description = "Factory Steps";
default = [];
example = [
"steps.Git(repourl='git://github.com/buildbot/pyflakes.git', mode='incremental')"
"steps.Git(repourl='https://github.com/buildbot/pyflakes.git', mode='incremental')"
"steps.ShellCommand(command=['trial', 'pyflakes'])"
];
};
@ -74,7 +74,7 @@ in {
description = "List of Change Sources.";
default = [];
example = [
"changes.GitPoller('git://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
"changes.GitPoller('https://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
];
};

@ -24,14 +24,14 @@ in {
config = mkIf cfg.enable {
systemd.packages = [ pkgs.powerdns ];
systemd.packages = [ pkgs.pdns ];
systemd.services.pdns = {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" "mysql.service" "postgresql.service" "openldap.service" ];
serviceConfig = {
ExecStart = [ "" "${pkgs.powerdns}/bin/pdns_server --config-dir=${configDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ];
ExecStart = [ "" "${pkgs.pdns}/bin/pdns_server --config-dir=${configDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ];
};
};

@ -386,7 +386,6 @@ in
services.gnome.rygel.enable = mkDefault true;
services.gvfs.enable = true;
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
services.telepathy.enable = mkDefault true;
systemd.packages = with pkgs.gnome; [
gnome-session

@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
services.powerdns.extraConfig = ''
launch=gmysql
gmysql-user=pdns
zone-cache-refresh-interval=0
'';
services.mysql = {

File diff suppressed because it is too large Load Diff

@ -91,6 +91,7 @@ ckarnell/antonys-macro-repeater
clojure-vim/vim-jack-in
cloudhead/neovim-fuzzy
CoatiSoftware/vim-sourcetrail
coc-extensions/coc-svelte
cocopon/iceberg.vim
codota/tabnine-vim
cohama/lexima.vim
@ -158,6 +159,7 @@ ervandew/supertab
esneider/YUNOcommit.vim
euclidianAce/BetterLua.vim
euclio/vim-markdown-composer
evanleck/vim-svelte
f-person/git-blame.nvim
f3fora/cmp-spell
famiu/bufdelete.nvim
@ -261,6 +263,7 @@ hsitz/VimOrganizer
https://git.sr.ht/~whynothugo/lsp_lines.nvim
hura/vim-asymptote
iamcco/coc-spell-checker
iamcco/coc-tailwindcss
iamcco/markdown-preview.nvim
ianks/vim-tsx
idanarye/vim-merginal
@ -597,6 +600,7 @@ nvim-telescope/telescope-fzy-native.nvim
nvim-telescope/telescope-github.nvim
nvim-telescope/telescope-project.nvim
nvim-telescope/telescope-symbols.nvim
nvim-telescope/telescope-ui-select.nvim
nvim-telescope/telescope-z.nvim
nvim-telescope/telescope.nvim
nvim-treesitter/completion-treesitter
@ -727,7 +731,6 @@ sainnhe/everforest
sainnhe/gruvbox-material
sainnhe/sonokai
sakhnik/nvim-gdb
saltstack/salt-vim
samoshkin/vim-mergetool
sbdchd/neoformat
sblumentritt/bitbake.vim
@ -958,6 +961,7 @@ vimwiki/vimwiki
vito-c/jq.vim
vmchale/ats-vim
vmchale/dhall-vim
vmware-archive/salt-vim
vn-ki/coc-clap
voldikss/vim-floaterm
vuki656/package-info.nvim

@ -1,6 +1,6 @@
{ stdenv, lib, makeDesktopItem
, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook
, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook
, atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap
, writeShellScriptBin
@ -64,7 +64,7 @@ let
};
buildInputs = [ libsecret libXScrnSaver libxshmfence ]
++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk ] ++ atomEnv.packages);
++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages);
runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];
@ -72,6 +72,7 @@ let
dontBuild = true;
dontConfigure = true;
noDumpEnvVars = true;
installPhase = ''
runHook preInstall

@ -9,10 +9,10 @@
let
# Keep these separate so the update script can regex them
rpcs3GitVersion = "13327-6c096b72b";
rpcs3Version = "0.0.21-13327-6c096b72b";
rpcs3Revision = "6c096b72b5294758067a002f981563bbd618d30d";
rpcs3Sha256 = "0xmdhjskqbv02jvl43bvw0clsgh9gnahl50fr3q8lmpwpy13ldr4";
rpcs3GitVersion = "13352-e58906cb4";
rpcs3Version = "0.0.21-13352-e58906cb4";
rpcs3Revision = "e58906cb4df26c14fcade07d7c15ab432dae6882";
rpcs3Sha256 = "1bzx6af77z5l6jdgazw8x59pi2xhwkz0knynmf5kzww39m6npx0a";
ittapi = fetchFromGitHub {
owner = "intel";

@ -0,0 +1,36 @@
{ lib
, python3
}:
with python3.pkgs;
buildPythonApplication rec {
pname = "ablog";
version = "0.10.23";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-fqqB17dNzcDZmFw3nj85T5zvMzY6SN/JxbB3IASOas8=";
};
propagatedBuildInputs = [
feedgen
sphinx
invoke
watchdog
python-dateutil
];
checkInputs = [
pytestCheckHook
];
nativeBuildInputs = [ setuptools-scm ];
meta = with lib; {
description = "ABlog for blogging with Sphinx";
homepage = "https://ablog.readthedocs.io/en/latest/";
license = licenses.mit;
maintainers = with maintainers; [ rgrinberg ];
};
}

@ -21,7 +21,7 @@
}:
let
version = "4.1.5";
version = "4.2.1";
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0"
@ -37,7 +37,7 @@ let
owner = "spesmilo";
repo = "electrum";
rev = version;
sha256 = "1ps8yaps5kfd7yv7bpdvssbwm6f5qivxcvhwn17cpddc2760a7nk";
sha256 = "sha256-BoikYSsQZAv8WswIr5nmBsGmjZbTXaLAbdO2QtPvc7c=";
extraPostFetch = ''
mv $out ./all
@ -45,19 +45,6 @@ let
'';
};
py = python3.override {
packageOverrides = self: super: {
aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec {
version = "0.18.7";
src = oldAttrs.src.override {
inherit version;
sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0";
};
});
};
};
in
python3.pkgs.buildPythonApplication {
@ -66,7 +53,7 @@ python3.pkgs.buildPythonApplication {
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
sha256 = "188r4zji985z8pm9b942xhmvv174yndk6jxagxl7ljk03wl2wiwi";
sha256 = "sha256-2SxSTH9P380j2KaCbkXjgmQO7K2z81AG6PMA/EMggXA=";
};
postUnpack = ''
@ -74,27 +61,9 @@ python3.pkgs.buildPythonApplication {
cp -ar ${tests} $sourceRoot/electrum/tests
'';
postPatch = ''
substituteInPlace contrib/requirements/requirements.txt \
--replace "dnspython>=2.0,<2.1" "dnspython>=2.0"
# according to upstream, this is fine
# https://github.com/spesmilo/electrum/issues/7361
substituteInPlace contrib/requirements/requirements.txt \
--replace "qdarkstyle<2.9" "qdarkstyle>=2.7"
'';
patches = [
# trezorlib 0.13 compatibility
(fetchpatch {
url = "https://github.com/spesmilo/electrum/commit/97e61cfacdca374103e4184f0f9a07a0c5757afb.patch";
sha256 = "sha256-RGVBO9IskC+lQOHNGjrqH6EM/inNPJlcD9sSWedyT5E=";
})
];
nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
propagatedBuildInputs = with py.pkgs; [
propagatedBuildInputs = with python3.pkgs; [
aiohttp
aiohttp-socks
aiorpcx

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
pname = "slic3r";
src = fetchgit {
url = "git://github.com/alexrj/Slic3r";
url = "https://github.com/alexrj/Slic3r";
rev = version;
sha256 = "1pg4jxzb7f58ls5s8mygza8kqdap2c50kwlsdkf28bz1xi611zbi";
};

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.9.2";
version = "2.9.4";
src = fetchFromGitHub {
owner = "khanhas";
repo = pname;
rev = "v${version}";
sha256 = "sha256-r6xm0Gq2QXWQEcYEu1n0y6S4r4odzYP8Srr0U+jZr6U=";
sha256 = "sha256-dHkbjmb9qlMO+pYUmdnoztkrMqPW6GfceAUxgnRmlDA=";
};
vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs=";
vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng=";
# used at runtime, but not installed by default
postInstall = ''

@ -10,7 +10,7 @@ else
buildDunePackage rec {
pname = "stog";
version = "0.20.0";
useDune2 = true;
duneVersion = "3";
minimalOCamlVersion = "4.12";
src = fetchFromGitLab {
domain = "framagit.org";

@ -83,6 +83,7 @@
, gssSupport ? true, libkrb5
, jemallocSupport ? true, jemalloc
, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages
, pgoSupport ? (stdenv.isLinux && stdenv.isx86_64 && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run
, pipewireSupport ? waylandSupport && webrtcSupport
, pulseaudioSupport ? stdenv.isLinux, libpulseaudio
, waylandSupport ? true, libxkbcommon, libdrm
@ -98,10 +99,18 @@
, googleAPISupport ? geolocationSupport
, webrtcSupport ? !privacySupport
# digital rights managemewnt
# This flag controls whether Firefox will show the nagbar, that allows
# users at runtime the choice to enable Widevine CDM support when a site
# requests it.
# Controlling the nagbar and widevine CDM at runtime is possible by setting
# `browser.eme.ui.enabled` and `media.gmp-widevinecdm.enabled` accordingly
, drmSupport ? true
## other
, crashreporterSupport ? false
, drmSupport ? false
, safeBrowsingSupport ? false
# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
@ -126,7 +135,7 @@
}:
assert stdenv.cc.libc or null != null;
assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "pipewireSupport requires both wayland and webrtc support.";
assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "${pname}: pipewireSupport requires both wayland and webrtc support.";
let
flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
@ -140,12 +149,10 @@ let
bootBintools = null;
};
buildStdenv = if ltoSupport
# LTO requires LLVM bintools including ld.lld and llvm-ar.
then overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override {
inherit (llvmPackages) bintools;
})
else stdenv;
# LTO requires LLVM bintools including ld.lld and llvm-ar.
buildStdenv = overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override {
inherit (llvmPackages) bintools;
});
# Compile the wasm32 sysroot to build the RLBox Sandbox
# https://hacks.mozilla.org/2021/12/webassembly-and-back-again-fine-grained-sandboxing-in-firefox-95/
@ -164,6 +171,13 @@ buildStdenv.mkDerivation ({
inherit src unpackPhase meta;
# Add another configure-build-profiling run before the final configure phase if we build with pgo
preConfigurePhases = lib.optionals pgoSupport [
"configurePhase"
"buildPhase"
"profilingPhase"
];
patches = [
]
++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch
@ -199,6 +213,7 @@ buildStdenv.mkDerivation ({
which
wrapGAppsHook
]
++ lib.optionals pgoSupport [ xvfb-run ]
++ extraNativeBuildInputs;
setOutputFlags = false; # `./mach configure` doesn't understand `--*dir=` flags.
@ -214,6 +229,9 @@ buildStdenv.mkDerivation ({
export MOZ_OBJDIR=$(pwd)/mozobj
export MOZBUILD_STATE_PATH=$(pwd)/mozbuild
# Don't try to send libnotify notifications during build
export MOZ_NOSPAM=1
# Set consistent remoting name to ensure wmclass matches with desktop file
export MOZ_APP_REMOTINGNAME="${binaryName}"
@ -228,6 +246,25 @@ buildStdenv.mkDerivation ({
# RBox WASM Sandboxing
export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc
export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++
'' + lib.optionalString pgoSupport ''
if [ -e "$TMPDIR/merged.profdata" ]; then
echo "Configuring with profiling data"
for i in "''${!configureFlagsArray[@]}"; do
if [[ ''${configureFlagsArray[i]} = "--enable-profile-generate=cross" ]]; then
unset 'configureFlagsArray[i]'
fi
done
configureFlagsArray+=(
"--enable-profile-use=cross"
"--with-pgo-profile-path="$TMPDIR/merged.profdata""
"--with-pgo-jarlog="$TMPDIR/jarlog""
)
else
echo "Configuring to generate profiling data"
configureFlagsArray+=(
"--enable-profile-generate=cross"
)
fi
'' + lib.optionalString googleAPISupport ''
# Google API key used by Chromium and Firefox.
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
@ -258,7 +295,6 @@ buildStdenv.mkDerivation ({
"--with-system-webp"
"--with-system-zlib"
]
++ lib.optional (!ltoSupport) "--with-clang-path=${llvmPackages.clang}/bin/clang"
# LTO is done using clang and lld on Linux.
++ lib.optionals ltoSupport [
"--enable-lto=cross" # Cross-Language LTO
@ -277,7 +313,7 @@ buildStdenv.mkDerivation ({
++ flag gssSupport "negotiateauth"
++ flag webrtcSupport "webrtc"
++ flag crashreporterSupport "crashreporter"
++ lib.optional drmSupport "--enable-eme=widevine"
++ lib.optional (!drmSupport) "--disable-eme"
++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
else [ "--disable-debug" "--enable-optimize" ])
@ -336,10 +372,35 @@ buildStdenv.mkDerivation ({
++ lib.optional jemallocSupport jemalloc
++ extraBuildInputs;
profilingPhase = lib.optionalString pgoSupport ''
# Package up Firefox for profiling
./mach package
# Run profiling
(
export HOME=$TMPDIR
export LLVM_PROFDATA=llvm-profdata
export JARLOG_FILE="$TMPDIR/jarlog"
xvfb-run -w 10 -s "-screen 0 1920x1080x24" \
./mach python ./build/pgo/profileserver.py
)
# Copy profiling data to a place we can easily reference
cp ./merged.profdata $TMPDIR/merged.profdata
# Clean build dir
./mach clobber
'';
preBuild = ''
cd mozobj
'';
postBuild = ''
cd ..
'';
makeFlags = extraMakeFlags;
separateDebugInfo = enableDebugSymbols;
enableParallelBuilding = true;
@ -347,6 +408,10 @@ buildStdenv.mkDerivation ({
# tests were disabled in configureFlags
doCheck = false;
preInstall = ''
cd mozobj
'';
postInstall = lib.optionalString buildStdenv.isLinux ''
# Remove SDK cruft. FIXME: move to a separate output?
rm -rf $out/share/idl $out/include $out/lib/${binaryName}-devel-*

@ -78,5 +78,6 @@ rec {
}).override {
crashreporterSupport = false;
enableOfficialBranding = false;
pgoSupport = false; # Profiling gets stuck and doesn't terminate.
};
}

@ -0,0 +1,55 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "argocd-autopilot";
version = "0.3.0";
commit = "c8d17bef976649e4dc2428c14c39e30a0f846552";
src = fetchFromGitHub {
owner = "argoproj-labs";
repo = "argocd-autopilot";
rev = "v${version}";
sha256 = "sha256-tggE1T+oD/dJS9tD9xOExjhy+T1GDd0vwTerD3P2KvA=";
};
vendorSha256 = "sha256-v8UMSObE6w+ULzueEK0UFeebLqoamy/788SQLBmJZ8U=";
proxyVendor = true;
ldflags =
let package_url = "github.com/argoproj-labs/argocd-autopilot/pkg/store"; in
[
"-s"
"-w"
"-X ${package_url}.binaryName=${pname}"
"-X ${package_url}.version=${src.rev}"
"-X ${package_url}.buildDate=unknown"
"-X ${package_url}.gitCommit=${commit}"
"-X ${package_url}.installationManifestURL=github.com/argoproj-labs/argocd-autopilot/manifests/base?ref=${src.rev}"
"-X ${package_url}.installationManifestsNamespacedURL=github.com/argoproj-labs/argocd-autopilot/manifests/insecure?ref=${src.rev}"
];
subPackages = [ "cmd" ];
doInstallCheck = true;
installCheckPhase = ''
$out/bin/argocd-autopilot version | grep ${src.rev} > /dev/null
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install -Dm755 "$GOPATH/bin/cmd" -T $out/bin/argocd-autopilot
runHook postInstall
'';
meta = with lib; {
description = "ArgoCD Autopilot";
downloadPage = "https://github.com/argoproj-labs/argocd-autopilot";
homepage = "https://argocd-autopilot.readthedocs.io/en/stable/";
license = licenses.asl20;
maintainers = with maintainers; [ sagikazarmark bryanasdev000 ];
};
}

@ -1,14 +1,14 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "rancher-cli";
version = "2.6.0";
pname = "rancher";
version = "2.6.4";
src = fetchFromGitHub {
owner = "rancher";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-RfhcTo10nkHmKGwmS8WdjBioZhDIGSQ9vPPOv3Wg0Y4=";
sha256 = "sha256-5ceyScsCidJpHGfwhsq7/hDd3CClx29cD5Cdc1PSxTU=";
};
ldflags = [
@ -25,8 +25,6 @@ buildGoModule rec {
mv $out/bin/cli $out/bin/rancher
'';
doCheck = true;
doInstallCheck = true;
installCheckPhase = ''
$out/bin/rancher | grep ${version} > /dev/null

@ -40,10 +40,10 @@
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
"rev": "v1.161.0",
"sha256": "sha256-vQrX9mFZLy16aV6hEA8X9MV995Ew+lJb8PxCvxDGoN0=",
"vendorSha256": "sha256-rIydGW7X0tL+ZwV1wEu3Zz3FZPrNozQI0Qx+Ee9tAik=",
"version": "1.161.0"
"rev": "v1.162.0",
"sha256": "sha256-xqZv15Tst+7o9HhNu6/bW+a4z7FTkra+MfS8jKrfeNs=",
"vendorSha256": "sha256-RbOf/S0rkbhW0s+/YOqu+BQuE0V4aS2x36Xf+hgBkqY=",
"version": "1.162.0"
},
"ansible": {
"owner": "nbering",
@ -94,10 +94,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
"rev": "v4.6.0",
"sha256": "sha256-Bq6DrwN4212LeBHb/j60v/fEvZwFseSRB8KZ3hrJYmQ=",
"vendorSha256": "sha256-hbN5apdCiA4eN0uCWlTRAEunO4nFB/VX+gchxp/6BJQ=",
"version": "4.6.0"
"rev": "v4.8.0",
"sha256": "sha256-Ere41qols4lNnoAIZGWQmituukLnPNbv5d8C/e3rQgI=",
"vendorSha256": "sha256-ZXH9YlSii2z1s6Y/TfZVBje0/xQ2DXw3ZpgcBPeQZ2I=",
"version": "4.8.0"
},
"azuread": {
"owner": "hashicorp",
@ -112,10 +112,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
"repo": "terraform-provider-azurerm",
"rev": "v2.99.0",
"sha256": "sha256-HXLr22UVciRvW1iaa46sy37ivG41hKqhrQtCXpnl8ss=",
"rev": "v3.0.2",
"sha256": "sha256-T24bfys9OxBnGN4YtJEsJmSUK26a5hMnbgZUANcpg3k=",
"vendorSha256": null,
"version": "2.99.0"
"version": "3.0.2"
},
"azurestack": {
"owner": "hashicorp",
@ -203,10 +203,10 @@
"owner": "cloudfoundry-community",
"provider-source-address": "registry.terraform.io/cloudfoundry-community/cloudfoundry",
"repo": "terraform-provider-cloudfoundry",
"rev": "v0.15.0",
"sha256": "0kg9aivxlbkqgrwv0j02hfsaky5q4f0bmqihn589dsdk7jds66i7",
"vendorSha256": "19h526ag7p2jkdp0610slbpsz8q3njvj9d4xmsfdsv3r8pz7xzls",
"version": "0.15.0"
"rev": "v0.15.2",
"sha256": "sha256-I4E+UyiaxEa/UK699xys75IMhNccnBcJ8tgJ3XH0NPg=",
"vendorSha256": "sha256-mxsGmI26ZQlj0eagqScF6IeZFX0T6iLqqpgc0ZLpU1E=",
"version": "0.15.2"
},
"cloudinit": {
"owner": "hashicorp",
@ -392,10 +392,10 @@
"owner": "integrations",
"provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github",
"rev": "v4.22.0",
"sha256": "sha256-bSKK72dBxfZCwSq3/vg97Dq1o/121KSM4h14MC87BMo=",
"rev": "v4.23.0",
"sha256": "sha256-N7PFLh7qr8OPB92ePLS1B/KexipKV5LFRWvrxdS8cGk=",
"vendorSha256": null,
"version": "4.22.0"
"version": "4.23.0"
},
"gitlab": {
"owner": "gitlabhq",
@ -574,10 +574,10 @@
"owner": "gavinbunney",
"provider-source-address": "registry.terraform.io/gavinbunney/kubectl",
"repo": "terraform-provider-kubectl",
"rev": "v1.13.1",
"sha256": "0jm6zri6j3wdgwg8wixfh6w8il3vnqmwlbpa6scbfa8zq71qi1a0",
"vendorSha256": "1ahxhb6ws1mq4x7nbww8di0b19z6669gn18scqipvxcvmsihfx4m",
"version": "1.13.1"
"rev": "v1.14.0",
"sha256": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=",
"vendorSha256": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=",
"version": "1.14.0"
},
"kubernetes": {
"owner": "hashicorp",
@ -610,10 +610,10 @@
"owner": "linode",
"provider-source-address": "registry.terraform.io/linode/linode",
"repo": "terraform-provider-linode",
"rev": "v1.26.1",
"sha256": "sha256-bd0raIIh/VmTlSVYnNd98fpppRKnO46g8FI5OwZPjMg=",
"vendorSha256": "sha256-SCTWvTgJ0QYh2DEbTI9coa3Fp4fBHusytF+JFzAq2XA=",
"version": "1.26.1"
"rev": "v1.26.3",
"sha256": "sha256-BVPlzrsX04XCaypKhqM9uvDrevak+qXe+x4mSo2G3kY=",
"vendorSha256": "sha256-mp1w1JXqrpLl8+pFlrBx/P9ZnGKIu8O/FgR73ff/wpQ=",
"version": "1.26.3"
},
"linuxbox": {
"owner": "numtide",
@ -701,10 +701,10 @@
"owner": "NaverCloudPlatform",
"provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud",
"repo": "terraform-provider-ncloud",
"rev": "v2.2.5",
"sha256": "0hspr6iv69izg1y8s1sj24kgy562jggn9nwqgprn4zca7vsrl29r",
"vendorSha256": "1hiz0pphl4jxfglxj28rm58ih7c5dabhd2gaig23hcqvczhf1wd2",
"version": "2.2.5"
"rev": "v2.2.6",
"sha256": "sha256-Sw3Z6hi+nm/e+lMQQkk8KIa2AK2+q+0gBUe091GnQq0=",
"vendorSha256": "sha256-ovHg4GcbMzjEi+qJBpdqhR0YUakZCdnpc10SCu8FP8I=",
"version": "2.2.6"
},
"netlify": {
"owner": "AegirHealth",
@ -719,10 +719,10 @@
"owner": "newrelic",
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v2.41.1",
"sha256": "sha256-fd4S78viG38Y8xCNnX4l4/dQ/x8JA6Ej/kd556jvBOU=",
"vendorSha256": "sha256-Dvm8vmlfV7LH73Y2jNTO106V/fOA7K78jFclbFKZVXA=",
"version": "2.41.1"
"rev": "v2.41.2",
"sha256": "sha256-LCA1K4md1wRRkB7oerUn1MM0TRLcqQBoVpvoxCMGSs8=",
"vendorSha256": "sha256-G/GWIE+XeLiHW0xxyjbIpncAnpBmC/+iZnI8MFmi80k=",
"version": "2.41.2"
},
"nomad": {
"owner": "hashicorp",
@ -765,19 +765,19 @@
"owner": "nutanix",
"provider-source-address": "registry.terraform.io/nutanix/nutanix",
"repo": "terraform-provider-nutanix",
"rev": "v1.4.0",
"sha256": "sha256-zOGZxDxGMeubZQ3u+7Qoj+gy29Et7yeFNFWpXbLllEY=",
"rev": "v1.4.1",
"sha256": "sha256-NUu5MB2Y7wWDgKXMfKKygNUmpvfkEVF2Z1lBMpktIdc=",
"vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=",
"version": "1.4.0"
"version": "1.4.1"
},
"oci": {
"owner": "oracle",
"provider-source-address": "registry.terraform.io/oracle/oci",
"repo": "terraform-provider-oci",
"rev": "v4.68.0",
"sha256": "sha256-f1Nk5NurQvJuGyGrZQnZIXIpaH1qFAX+oTBNan6rORI=",
"rev": "v4.69.0",
"sha256": "sha256-VwL+i4HtvAJi3R57cjUrg+7rx1LxEUAMwkorCvJ9DcU=",
"vendorSha256": null,
"version": "4.68.0"
"version": "4.69.0"
},
"okta": {
"owner": "okta",
@ -811,10 +811,10 @@
"owner": "OpenNebula",
"provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
"repo": "terraform-provider-opennebula",
"rev": "v0.4.2",
"sha256": "sha256-h2trcyXJcdWQyonjdDLkJkcawE4AoFYnzLZtKPotMY0=",
"rev": "v0.4.3",
"sha256": "sha256-mnRRMubaz5hin4kG5NK+GMtTPcsIJu6GS8PKDitNszg=",
"vendorSha256": "sha256-JTQJH0f8m6yBL8+jk6q02WPuvyre3mHql9Zy9OJW32M=",
"version": "0.4.2"
"version": "0.4.3"
},
"openstack": {
"owner": "terraform-provider-openstack",
@ -829,10 +829,10 @@
"owner": "opentelekomcloud",
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.28.0",
"sha256": "sha256-D+sIpGNQQ5UUNoesX6zd8BHo5RYfoTb/9x3lvFyoD50=",
"rev": "v1.28.2",
"sha256": "sha256-qp5H37Zf9oPYA2vvWKuEpfUeHIfK1NYE9Uk7dcX9izA=",
"vendorSha256": "sha256-FMcPG7EJvU6XNKd2+8+xmjqSI0Ec9Xx/6gZvK9zJ3wg=",
"version": "1.28.0"
"version": "1.28.2"
},
"opsgenie": {
"owner": "opsgenie",
@ -991,10 +991,10 @@
"owner": "splunk-terraform",
"provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",
"repo": "terraform-provider-signalfx",
"rev": "v6.10.0",
"sha256": "sha256-ZfNxab95ZDz68fEPfYd+w0E/fS/FPBVIs4kHTBhG858=",
"vendorSha256": "sha256-bX01PcLLpgWFMWxWPaUW8iEHxllqCmIX1/OIicB/h0M=",
"version": "6.10.0"
"rev": "v6.11.0",
"sha256": "sha256-ezd4TzckY5yx/UjwGxH36VX+owI8fBUmxtQFztOsFvs=",
"vendorSha256": "sha256-PVbqS37MBkIrr8CO6LxB0NjWWiTI5NFDipX6GvokrnY=",
"version": "6.11.0"
},
"skytap": {
"owner": "skytap",
@ -1009,10 +1009,10 @@
"owner": "chanzuckerberg",
"provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake",
"repo": "terraform-provider-snowflake",
"rev": "v0.28.8",
"sha256": "sha256-v5+qmBqPJk9BTkjmXRn2yiIHlFkFcqoH7RuenM54Eys=",
"rev": "v0.29.0",
"sha256": "sha256-CdJHknGzEKfbxzrtqmevKwiYTs1UoRFRj6/ShQ9mdIc=",
"vendorSha256": "sha256-G/UIKuKtolLY7RIQF06wzn/ZYTMihEmJZ1DqVcHFGdg=",
"version": "0.28.8"
"version": "0.29.0"
},
"sops": {
"owner": "carlpett",
@ -1072,19 +1072,19 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.66.0",
"sha256": "sha256-wbG2O6i0Ai86P+uk9rTsut+DEZcRFJCh93CfIEOfP2A=",
"rev": "v1.66.1",
"sha256": "sha256-kzEU+yDm8O9tBNkf+qy945drnPj8wNR4VfBPO6fcbGE=",
"vendorSha256": null,
"version": "1.66.0"
"version": "1.66.1"
},
"tfe": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/tfe",
"repo": "terraform-provider-tfe",
"rev": "v0.28.1",
"sha256": "0xvah6qaf6kxgxhgzgh4rqswjda3366i6gqqwaiw4gc3w0ks2i3g",
"vendorSha256": "1qxbsnay75v6ss3fvi00rif10ra1l23b107d0v5cc1il4smqc36g",
"version": "0.28.1"
"rev": "v0.29.0",
"sha256": "sha256-2RksakMtNF0FGdUmJ4BBF6pvO2SrW0BNlQo95GIJSK4=",
"vendorSha256": "sha256-Nh22X4Unt77oWs/jf2PjZcxrz0nkyJrOY55ZbA972v8=",
"version": "0.29.0"
},
"thunder": {
"owner": "a10networks",
@ -1145,10 +1145,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/vault",
"repo": "terraform-provider-vault",
"rev": "v3.3.1",
"sha256": "1mxy44dl1wr99v6b0gvzcf9d5nfky0avmx4fq83h9vfnvq7rmrhn",
"vendorSha256": "0x9cyxnaqkfpzx9ml7qqhl98jslpy1v965kd11kgcvqpr9lmc77x",
"version": "3.3.1"
"rev": "v3.4.0",
"sha256": "sha256-guacIY3iXieTiEXJ8mnq6gNWHs1doTNGJ8Su5PTfnaY=",
"vendorSha256": "sha256-JiNYM8P6ExGVVOVBYA2WJSZOpZ0PAyoncENqYRXPo7c=",
"version": "3.4.0"
},
"vcd": {
"owner": "vmware",
@ -1209,19 +1209,19 @@
"owner": "vultr",
"provider-source-address": "registry.terraform.io/vultr/vultr",
"repo": "terraform-provider-vultr",
"rev": "v2.9.1",
"sha256": "1w6699ngk6vcjii9skhrzv93p79mn6rmyqbb7fdchrwcvamk3y9a",
"rev": "v2.10.0",
"sha256": "sha256-4WoTMyGKBTYzoqt0Ih+khfsaeJuKox5Sq9ak9xwvvJQ=",
"vendorSha256": null,
"version": "2.9.1"
"version": "2.10.0"
},
"wavefront": {
"owner": "vmware",
"provider-source-address": "registry.terraform.io/vmware/wavefront",
"repo": "terraform-provider-wavefront",
"rev": "v3.0.1",
"sha256": "sha256-6SQjYaN0yhcHdmM+vGvIDPHKxN34ns3Yz+CMTEo13s0=",
"rev": "v3.0.2",
"sha256": "sha256-HCo6Hw724kQrPOCHoyByThq7L5NIZ/0AHmnQD27RUFA=",
"vendorSha256": "sha256-PdSW3tyQUWbBiaM9U3NsqX/j4fMw9ZmjEDdyjxmRfD0=",
"version": "3.0.1"
"version": "3.0.2"
},
"yandex": {
"owner": "yandex-cloud",

@ -81,6 +81,9 @@ in nodejs-14_x.pkgs.deltachat-desktop.override rec {
npm prune --production
install -D $out/lib/node_modules/deltachat-desktop/build/icon.png \
$out/share/icons/hicolor/scalable/apps/deltachat.png
awk '!/^#/ && NF' build/packageignore_list \
| xargs -I {} sh -c "rm -rf {}" || true
@ -91,10 +94,6 @@ in nodejs-14_x.pkgs.deltachat-desktop.override rec {
$out/lib/node_modules/deltachat-desktop/html-dist/fonts
done
mkdir -p $out/share/icons/hicolor/scalable/apps
ln -s $out/lib/node_modules/deltachat-desktop/build/icon.png \
$out/share/icons/hicolor/scalable/apps/deltachat.png
makeWrapper ${electronExec} $out/bin/deltachat \
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \
--add-flags $out/lib/node_modules/deltachat-desktop

@ -25,7 +25,7 @@
"react-dom": "^17.0.2",
"react-qr-reader": "^2.2.1",
"react-qr-svg": "^2.1.0",
"react-string-replace": "^0.4.4",
"react-string-replace": "^1.0.0",
"react-virtualized-auto-sizer": "^1.0.5",
"react-window": "^1.8.6",
"react-window-infinite-loader": "^1.0.7",

@ -33,13 +33,13 @@
mkDerivation rec {
pname = "nheko";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "Nheko-Reborn";
repo = "nheko";
rev = "v${version}";
sha256 = "sha256-roC1OIq0Vmj5rABNtH4IOMHX9aSlOMFC7ZHueuj/PmE=";
sha256 = "sha256-h1Yahz7Rt7+r55RFTSVj6E14nWnjCs0CecljceaWgaQ=";
};
nativeBuildInputs = [

@ -5,21 +5,22 @@
buildGoPackage rec {
pname = "ircdog";
version = "0.2.1";
version = "0.3.0";
goPackagePath = "github.com/goshuirc/ircdog";
goPackagePath = "github.com/ergochat/ircdog";
src = fetchFromGitHub {
owner = "goshuirc";
repo = pname;
rev = "v${version}";
sha256 = "1ppbznlkv7vajfbimxbyiq5y6pkfhm6ylhl408rwq1bawl28hpkl";
sha256 = "sha256-x3ihWLgVYu17vG1xQTgIr4TSkeZ467TZBV1fPTPnZgw=";
fetchSubmodules = true;
};
meta = with lib; {
description = "ircdog is a simple wrapper over the raw IRC protocol that can respond to pings, and interprets formatting codes";
homepage = "https://github.com/goshuirc/ircdog";
homepage = "https://github.com/ergochat/ircdog";
changelog = "https://github.com/ergochat/ircdog/releases/tag/v${version}";
license = licenses.isc;
maintainers = with maintainers; [ hexa ];
};

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt, wrapQtAppsHook }:
{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt6_1, wrapQtAppsHook }:
stdenv.mkDerivation rec {
pname = "linssid";
@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
buildInputs = [ qtbase qtsvg boost qwt ];
buildInputs = [ qtbase qtsvg boost qwt6_1 ];
patches = [ ./0001-unbundled-qwt.patch ];
postPatch = ''
sed -e "s|/usr/include/qt5.*$|& ${qwt}/include|" -i linssid-app/linssid-app.pro
sed -e "s|/usr/include/qt5.*$|& ${qwt6_1}/include|" -i linssid-app/linssid-app.pro
sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro
sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \
-e "s|/usr|$out|g" \

@ -8,7 +8,7 @@ let
in
rec {
thunderbird = common rec {
thunderbird = (common rec {
pname = "thunderbird";
version = "91.7.0";
application = "comm/mail";
@ -35,5 +35,7 @@ rec {
updateScript = callPackage ./update.nix {
attrPath = "thunderbird-unwrapped";
};
}).override {
pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable"
};
}

@ -139,13 +139,13 @@ let
sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==";
};
};
"@fontsource/open-sans-4.5.6" = {
"@fontsource/open-sans-4.5.8" = {
name = "_at_fontsource_slash_open-sans";
packageName = "@fontsource/open-sans";
version = "4.5.6";
version = "4.5.8";
src = fetchurl {
url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.6.tgz";
sha512 = "bQuNS0H1VL1VLC6FwmReHlpJaICVe/seODU3Q9cpTQbJ5OtRD4TwWMrAjfTxqcFNollA6O0AlE4BnRSWMQLfvw==";
url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.8.tgz";
sha512 = "3b94XDdRLqL7OlE7OjWg/4pgG825Juw8PLVEDm6h5pio0gMU89ICxfatGxHsBxMGfqad+wnvdmUweZWlELDFpQ==";
};
};
"@icetee/ftp-0.3.15" = {
@ -481,13 +481,13 @@ let
sha512 = "BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg==";
};
};
"@types/node-17.0.21" = {
"@types/node-17.0.23" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "17.0.21";
version = "17.0.23";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz";
sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==";
url = "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz";
sha512 = "UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==";
};
};
"@types/node-fetch-2.6.1" = {
@ -967,13 +967,13 @@ let
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
};
};
"aws-sdk-2.1096.0" = {
"aws-sdk-2.1101.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
version = "2.1096.0";
version = "2.1101.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1096.0.tgz";
sha512 = "q+hotU57U8bGpz1pf5CkO4z630ay0xGJ9HedahKPZ0Xk3/X0GH+QFYPBWJ5IMTtO30bjfPH0zTaL2vJmMXLBrQ==";
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1101.0.tgz";
sha512 = "7lyVb7GXGl8yyu954Qxf6vU6MrcgFlmKyTLBVXJyo3Phn1OB+qOExA55WtSC6gQiQ7e5TeWOn1RUHLg30ywTBA==";
};
};
"aws-sign2-0.7.0" = {
@ -1768,13 +1768,13 @@ let
sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
};
};
"convict-6.2.1" = {
"convict-6.2.2" = {
name = "convict";
packageName = "convict";
version = "6.2.1";
version = "6.2.2";
src = fetchurl {
url = "https://registry.npmjs.org/convict/-/convict-6.2.1.tgz";
sha512 = "Mn4AJiYkR3TAZH1Xm/RU7gFS/0kM5TBSAQDry8y40Aez0ASY+3boUhv+3QE5XbOXiXM2JjdhkKve3IsBvWCibQ==";
url = "https://registry.npmjs.org/convict/-/convict-6.2.2.tgz";
sha512 = "3MsROJiEFN3BAzeFit1t87t7EUFzd44MNd13MLSikV2dsnDl7znwKgtYPPONtnDzxiDW0nBAsxVhSRNrjUrTTg==";
};
};
"cookie-0.4.1" = {
@ -4252,13 +4252,13 @@ let
sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
};
};
"micromatch-4.0.4" = {
"micromatch-4.0.5" = {
name = "micromatch";
packageName = "micromatch";
version = "4.0.4";
version = "4.0.5";
src = fetchurl {
url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz";
sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==";
url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz";
sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==";
};
};
"millisecond-0.1.2" = {
@ -4324,13 +4324,13 @@ let
sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==";
};
};
"minimist-1.2.5" = {
"minimist-1.2.6" = {
name = "minimist";
packageName = "minimist";
version = "1.2.5";
version = "1.2.6";
src = fetchurl {
url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz";
sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==";
};
};
"minipass-2.9.0" = {
@ -4351,13 +4351,13 @@ let
sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
};
};
"mkdirp-0.5.5" = {
"mkdirp-0.5.6" = {
name = "mkdirp";
packageName = "mkdirp";
version = "0.5.5";
version = "0.5.6";
src = fetchurl {
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz";
sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==";
};
};
"mkdirp-1.0.4" = {
@ -4504,49 +4504,49 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
"n8n-core-0.110.0" = {
"n8n-core-0.111.0" = {
name = "n8n-core";
packageName = "n8n-core";
version = "0.110.0";
version = "0.111.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.110.0.tgz";
sha512 = "E+BrrAxO1TZbu19NDO66rubih6DNSoUdceM6S9pjtAEQukya9J2BAqnPsrZJ7Trs97W2q8G4wSKP4G6lzKobhQ==";
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.111.0.tgz";
sha512 = "fZLLJ60yIuuX+geKGQrO6jk+kxn1UaCJMoWEi2FVE+InTmi+/r51Bv6LGoapoW0Oz+Em+CDq0wE7Yzg3xNx7fw==";
};
};
"n8n-design-system-0.15.0" = {
"n8n-design-system-0.16.0" = {
name = "n8n-design-system";
packageName = "n8n-design-system";
version = "0.15.0";
version = "0.16.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.15.0.tgz";
sha512 = "ZHlJJdaZ8ug9OV/SbqdF4FSEqTAoGBO+jqPECcUiYmHbL3BHcY8ZgWcnzmTnIPYTRGtIdc8snv3ti1USgASE5Q==";
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.16.0.tgz";
sha512 = "X7Qa+DoXRyJL4gqh7x59udnPIBYAUgDvhchL33dpI/Rgq9gaFajT9eAuOFQnXKMUaL0FZ5hu3rRGcAmwwEA/bA==";
};
};
"n8n-editor-ui-0.136.0" = {
"n8n-editor-ui-0.137.0" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
version = "0.136.0";
version = "0.137.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.136.0.tgz";
sha512 = "582dHNfp4upne8IhcaYznSPq26wsruAK5ZmOSfjcQMJqVBOm26IKFXCwn7ZL3KxNznmlHLHTfbAsrjE+ZTKPTA==";
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.137.0.tgz";
sha512 = "/wYAIh/3RtVaFxY+vtVEACfo6xsVOi3cEPWd+GSFCK/AMxXs517CNGbwNz54geqaGNUH+rhhUz87C0pG+TgiUg==";
};
};
"n8n-nodes-base-0.167.0" = {
"n8n-nodes-base-0.168.0" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
version = "0.167.0";
version = "0.168.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.167.0.tgz";
sha512 = "9+pCjtPDptMO3nBqfizwsQ7+C+QUYPbW4YGT/X0+CaF+2wMkGEbKGADH6V0eWHHWKtzcyoLXqldSnilboXXxmw==";
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.168.0.tgz";
sha512 = "TyIL5Gwn+qvfi+1nNkQTPfrJYMqjx2P2OCiDWAMfzahauJyJpfJMYpIEKF3UxoKXCfWpBYPmHVoov6GadEOR1w==";
};
};
"n8n-workflow-0.92.0" = {
"n8n-workflow-0.93.0" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
version = "0.92.0";
version = "0.93.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.92.0.tgz";
sha512 = "d16p4co9I6v+AxVOxXyeWAgUY/7PwwlgJFaKH8XTA/fRARah3/DzLdb9Kmq5I1fqtr1VoZ+a1uTQCJi11bnRzA==";
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.93.0.tgz";
sha512 = "IqZrnTKdIZD7aeL9/FiwoI7w1WBgeBmqZVXRF+OGtIHooK/lDkHpy17hoXXqAyeATiVf2licgl8F/zMvSsnuJA==";
};
};
"named-placeholders-1.1.2" = {
@ -4693,13 +4693,13 @@ let
sha512 = "AtiTVUFHLiiDnMQ43zi0YgkzHOEWUkhDgPlBXrsDzJiJvB29Alo4OKxHQ0ugF3gRqRQIneCLtZU3yiUo7pItZw==";
};
};
"nodemailer-6.7.2" = {
"nodemailer-6.7.3" = {
name = "nodemailer";
packageName = "nodemailer";
version = "6.7.2";
version = "6.7.3";
src = fetchurl {
url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.2.tgz";
sha512 = "Dz7zVwlef4k5R71fdmxwR8Q39fiboGbu3xgswkzGwczUfjp873rVxt1O46+Fh0j1ORnAC6L9+heI8uUpO6DT7Q==";
url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.3.tgz";
sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g==";
};
};
"nopt-4.0.3" = {
@ -6430,22 +6430,22 @@ let
sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==";
};
};
"ssh2-1.7.0" = {
"ssh2-1.8.0" = {
name = "ssh2";
packageName = "ssh2";
version = "1.7.0";
version = "1.8.0";
src = fetchurl {
url = "https://registry.npmjs.org/ssh2/-/ssh2-1.7.0.tgz";
sha512 = "u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g==";
url = "https://registry.npmjs.org/ssh2/-/ssh2-1.8.0.tgz";
sha512 = "NVIRkIwJvWl+mcRozp+EBzHMVCcbDKBea64ToPdZEk43yAVGwmfqYZRPFRnnvGjsKC34wYCmiupTcKgCVNVNNg==";
};
};
"ssh2-sftp-client-7.2.2" = {
"ssh2-sftp-client-7.2.3" = {
name = "ssh2-sftp-client";
packageName = "ssh2-sftp-client";
version = "7.2.2";
version = "7.2.3";
src = fetchurl {
url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.2.tgz";
sha512 = "qZYivU1zezyRomCf+TtsCYVAsc0TDQWzxJMMUN8NknEPonm2TYGxJAzrW8acUh2ILYgA0ZPOJElLV/qp9nRVYQ==";
url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.3.tgz";
sha512 = "Bmq4Uewu3e0XOwu5bnPbiS5KRQYv+dff5H6+85V4GZrPrt0Fkt1nUH+uXanyAkoNxUpzjnAPEEoLdOaBO9c3xw==";
};
};
"sshpk-1.17.0" = {
@ -7579,10 +7579,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
version = "0.169.0";
version = "0.170.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n/-/n8n-0.169.0.tgz";
sha512 = "mqZJUnulA/xNelNxebJeYioQeLtzNSFD8vzEsoxzoVbeaRkXQeC6CVBCldSGUMMSPcw2QchnzAKp9YauRE5cAA==";
url = "https://registry.npmjs.org/n8n/-/n8n-0.170.0.tgz";
sha512 = "aY4A9+P7K6iinxFyDZl9Jdin283csAbiMStjfxLX5IfO75/aNbjXhSmpjclV9PCUuuTonvoMiVMTvpbCaeImqg==";
};
dependencies = [
(sources."@azure/abort-controller-1.0.5" // {
@ -7642,7 +7642,7 @@ in
sources."kuler-2.0.0"
];
})
sources."@fontsource/open-sans-4.5.6"
sources."@fontsource/open-sans-4.5.8"
sources."@icetee/ftp-0.3.15"
sources."@kafkajs/confluent-schema-registry-1.0.6"
sources."@kwsites/file-exists-1.1.1"
@ -7694,7 +7694,7 @@ in
sources."@types/lodash-4.14.180"
sources."@types/lossless-json-1.0.1"
sources."@types/mime-1.3.2"
sources."@types/node-17.0.21"
sources."@types/node-17.0.23"
(sources."@types/node-fetch-2.6.1" // {
dependencies = [
sources."form-data-3.0.1"
@ -7763,7 +7763,7 @@ in
];
})
sources."avsc-5.7.3"
(sources."aws-sdk-2.1096.0" // {
(sources."aws-sdk-2.1101.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@ -7934,7 +7934,7 @@ in
})
sources."content-disposition-0.5.4"
sources."content-type-1.0.4"
sources."convict-6.2.1"
sources."convict-6.2.2"
sources."cookie-0.4.1"
sources."cookie-parser-1.4.6"
sources."cookie-signature-1.0.6"
@ -8277,7 +8277,7 @@ in
sources."merge-descriptors-1.0.1"
sources."merge2-1.4.1"
sources."methods-1.1.2"
sources."micromatch-4.0.4"
sources."micromatch-4.0.5"
sources."millisecond-0.1.2"
sources."mime-1.6.0"
sources."mime-db-1.52.0"
@ -8285,7 +8285,7 @@ in
sources."mimic-fn-2.1.0"
sources."minimalistic-assert-1.0.1"
sources."minimatch-3.1.2"
sources."minimist-1.2.5"
sources."minimist-1.2.6"
(sources."minipass-2.9.0" // {
dependencies = [
sources."yallist-3.1.1"
@ -8327,19 +8327,19 @@ in
];
})
sources."mz-2.7.0"
(sources."n8n-core-0.110.0" // {
(sources."n8n-core-0.111.0" // {
dependencies = [
sources."qs-6.10.3"
];
})
sources."n8n-design-system-0.15.0"
sources."n8n-editor-ui-0.136.0"
(sources."n8n-nodes-base-0.167.0" // {
sources."n8n-design-system-0.16.0"
sources."n8n-editor-ui-0.137.0"
(sources."n8n-nodes-base-0.168.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
})
sources."n8n-workflow-0.92.0"
sources."n8n-workflow-0.93.0"
(sources."named-placeholders-1.1.2" // {
dependencies = [
sources."lru-cache-4.1.5"
@ -8371,14 +8371,14 @@ in
sources."node-fetch-2.6.7"
(sources."node-pre-gyp-0.11.0" // {
dependencies = [
sources."mkdirp-0.5.5"
sources."mkdirp-0.5.6"
sources."rimraf-2.7.1"
sources."semver-5.7.1"
];
})
sources."node-ssh-12.0.4"
sources."nodeify-1.0.1"
sources."nodemailer-6.7.2"
sources."nodemailer-6.7.3"
sources."nopt-4.0.3"
sources."normalize-path-3.0.0"
sources."npm-bundled-1.1.2"
@ -8643,8 +8643,8 @@ in
sources."sqlstring-2.3.3"
sources."sse-channel-3.1.1"
sources."ssf-0.11.2"
sources."ssh2-1.7.0"
sources."ssh2-sftp-client-7.2.2"
sources."ssh2-1.8.0"
sources."ssh2-sftp-client-7.2.3"
sources."sshpk-1.17.0"
sources."stack-trace-0.0.10"
sources."standard-as-callback-2.1.0"
@ -8662,7 +8662,7 @@ in
sources."supports-color-7.2.0"
(sources."tar-4.4.19" // {
dependencies = [
sources."mkdirp-0.5.5"
sources."mkdirp-0.5.6"
sources."yallist-3.1.1"
];
})

@ -7,7 +7,7 @@ let
twisterHTML = srcOnly {
name = "twister-html";
src = fetchgit {
url = "git://github.com/miguelfreitas/twister-html.git";
url = "https://github.com/miguelfreitas/twister-html.git";
rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b";
sha256 = "0scjbin6s1kmi0bqq0dx0qyjw4n5xgmj567n0156i39f9h0dabqy";
};

@ -9,7 +9,7 @@
, poco
, qtbase
, qtsvg
, libsForQt5
, qwt6_1
, nlohmann_json
, soapysdr-with-plugins
, portaudio
@ -38,7 +38,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config doxygen wrapQtAppsHook ];
buildInputs = [
pcre poco qtbase qtsvg libsForQt5.qwt nlohmann_json
pcre poco qtbase qtsvg qwt6_1 nlohmann_json
soapysdr-with-plugins portaudio alsa-lib muparserx python3
];

@ -1,25 +1,25 @@
{ stdenv, lib, mkDerivation, fetchFromGitHub
, cmake, freetype, libpng, libGLU, libGL, openssl, perl, libiconv
, qtscript, qtserialport, qttools
, qtscript, qtserialport, qttools, qtcharts
, qtmultimedia, qtlocation, qtbase, wrapQtAppsHook
}:
mkDerivation rec {
pname = "stellarium";
version = "0.21.3";
version = "0.22.0";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${version}";
sha256 = "sha256-TQMLy5ziBF7YqPDzPwgjY5FHxxMUe7MXo/TGxQ1nGcg=";
sha256 = "sha256-scG/SS9emEmrZunv6n3Vzcchoh0Cf9rDOkuxAMnxNk4=";
};
nativeBuildInputs = [ cmake perl wrapQtAppsHook ];
buildInputs = [
freetype libpng libGLU libGL openssl libiconv qtscript qtserialport qttools
qtmultimedia qtlocation qtbase
qtmultimedia qtlocation qtbase qtcharts
];
preConfigure = lib.optionalString stdenv.isDarwin ''

@ -25,14 +25,14 @@ let
};
in
stdenv.mkDerivation rec {
version = "14.32.33";
version = "14.32.39";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
sha256 = "sha256-aImV5zgXjsXdRJLrYIomDymXHRhxuOwGYAwpMIr7wak=";
sha256 = "sha256-ekwipWWGsXYECJBOmw0+uIWHDpdF8T8jZUo6LeqD6Io=";
};
patchPhase = ''

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt6_1}:
mkDerivation rec {
pname = "caneda";
@ -12,7 +12,7 @@ mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase qttools qtsvg qwt ];
buildInputs = [ qtbase qttools qtsvg qwt6_1 ];
meta = {
description = "Open source EDA software focused on easy of use and portability";

@ -17,7 +17,7 @@ If the build broke as a result of a package update, try those solutions in order
- fix the problem yourself. First clone the sagemath source and then check out the sage version you want to patch:
```
[user@localhost ~]$ git clone git://github.com/sagemath/sage.git
[user@localhost ~]$ git clone https://github.com/sagemath/sage.git
[user@localhost ~]$ cd sage
[user@localhost sage]$ git checkout 8.2 # substitute the relevant version here
```
@ -41,7 +41,7 @@ You can [login the sage trac using GitHub](https://trac.sagemath.org/login). You
Here's the gist, assuming you want to use ssh key authentication. First, [add your public ssh key](https://trac.sagemath.org/prefs/sshkeys). Then:
```
[user@localhost ~]$ git clone git://github.com/sagemath/sage.git
[user@localhost ~]$ git clone https://github.com/sagemath/sage.git
[user@localhost ~]$ cd sage
[user@localhost sage]$ git remote add trac git@trac.sagemath.org:sage.git -t master
[user@localhost sage]$ git checkout -b u/gh-<your-github-username>/<your-branch-name> develop

@ -5,7 +5,7 @@ stdenv.mkDerivation {
version = "2015-06-04";
src = fetchgit {
url = "git://github.com/purcell/darcs-to-git.git";
url = "https://github.com/purcell/darcs-to-git.git";
rev = "e5fee32495908fe0f7d700644c7b37347b7a0a5b";
sha256 = "0lxcx0x0m1cv2j4x9ykpjf6r2zg6lh5rya016x93vkmlzxm3f0ji";
};

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-branchless";
version = "0.3.9";
version = "0.3.10";
src = fetchFromGitHub {
owner = "arxanas";
repo = "git-branchless";
rev = "v${version}";
sha256 = "sha256-SEmIZy8ql1MxcFR6zeif03DVha/SRZHajVwt3QOBBYU=";
sha256 = "sha256-TLqAU1/olSS59Zeb+2m9Jq19EYTO1TnbKPYciHPKO2A=";
};
cargoSha256 = "sha256-mKfPxU1JoN/xLdPdwy3vo1M0qF9ag0T4Ls4dfvHn6Pc=";
cargoSha256 = "sha256-sA4KWGW4bxGUkotTWHUcRqcoaUJsSUCTK8hUkKiRcnY=";
nativeBuildInputs = [ pkg-config ];
@ -39,8 +39,8 @@ rustPlatform.buildRustPackage rec {
];
preCheck = ''
export PATH_TO_GIT=${git}/bin/git
export GIT_EXEC_PATH=$(${git}/bin/git --exec-path)
export TEST_GIT=${git}/bin/git
export TEST_GIT_EXEC_PATH=$(${git}/bin/git --exec-path)
'';
# FIXME: these tests deadlock when run in the Nix sandbox
checkFlags = [

@ -1,14 +1,14 @@
{
"version": "14.8.4",
"repo_hash": "0ra4d324all26crz84iys9xb40ykpiaqj4z2790zaw1s45wakmgj",
"yarn_hash": "106js1j6wii2axh1dxvlfr7mqhvsnsb5qs0danp9c3h1ihd4nz91",
"version": "14.9.1",
"repo_hash": "0jkhvglisaj3h9ls8q8wrxnnp4xp3zggc8vmwg6jqqjsmbpi332h",
"yarn_hash": "1bq1ka0nlb2nkjx70qpwpm8x6crbkfj0c8m39pwwc42j8wn10r9g",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v14.8.4-ee",
"rev": "v14.9.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "14.8.4",
"GITLAB_PAGES_VERSION": "1.54.0",
"GITLAB_SHELL_VERSION": "13.23.2",
"GITLAB_WORKHORSE_VERSION": "14.8.4"
"GITALY_SERVER_VERSION": "14.9.1",
"GITLAB_PAGES_VERSION": "1.56.0",
"GITLAB_SHELL_VERSION": "13.24.0",
"GITLAB_WORKHORSE_VERSION": "14.9.1"
}
}

@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "14.8.4";
version = "14.9.1";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
in
@ -23,10 +23,10 @@ buildGoModule {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-3doXqYj1XsOifAr78ds5ioa6gUfw8uyUwn7JzqlMVSE=";
sha256 = "sha256-mk6JZuu6b2r/OqRI4ZUf8AV/ObRKhTIQT9bQE8sH894=";
};
vendorSha256 = "sha256-Qw9/nlo1eB5dPcldXe9doy4QA4DDVUDad3o4kbdNu34=";
vendorSha256 = "sha256-kEjgWA/Task23PScPYrqdDu3vdVR/FJl7OilUug/Bds=";
passthru = {
inherit rubyEnv;
@ -41,7 +41,7 @@ buildGoModule {
postInstall = ''
mkdir -p $ruby
cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby
cp -rv $src/ruby/{bin,lib,proto} $ruby
mv $out/bin/gitaly-git2go $out/bin/gitaly-git2go-${version}
'';

@ -2,12 +2,12 @@
buildGoModule rec {
pname = "gitlab-shell";
version = "13.23.2";
version = "13.24.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "sha256-aee+Tn81o1iK1Xm5et6lKUN8//lyGh3NGs96Mwg4nFc=";
sha256 = "sha256-/SH1YNmZr/NuCvyL6tmyTj1C2LUuxldeHwmJHWKPz2M=";
};
buildInputs = [ ruby ];

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "14.8.4";
version = "14.9.1";
src = fetchFromGitLab {
owner = data.owner;
@ -16,7 +16,7 @@ buildGoModule rec {
sourceRoot = "source/workhorse";
vendorSha256 = "sha256-ps/MjNY2woHrfcsNZTurnO2TbasWdS3LiuPUfVD2Ypc=";
vendorSha256 = "sha256-ubuMuO8tDjdVZWehsmsJqUgvmySIBJ15D9GHZFzApFw=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;

@ -11,6 +11,8 @@ gem 'responders', '~> 3.0'
gem 'sprockets', '~> 3.7.0'
gem 'view_component', '~> 2.50.0'
# Default values for AR models
gem 'default_value_for', '~> 3.4.0'
@ -153,7 +155,7 @@ gem 'html-pipeline', '~> 2.13.2'
gem 'deckar01-task_list', '2.3.1'
gem 'gitlab-markup', '~> 1.8.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.23.2'
gem 'commonmarker', '~> 0.23.4'
gem 'kramdown', '~> 2.3.1'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.3.2'
@ -290,7 +292,7 @@ gem 'autoprefixer-rails', '10.2.5.1'
gem 'terser', '1.0.2'
gem 'addressable', '~> 2.8'
gem 'tanuki_emoji', '~> 0.5'
gem 'tanuki_emoji', '~> 0.6'
gem 'gon', '~> 6.4.0'
gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0'
@ -302,6 +304,9 @@ gem 'rack-attack', '~> 6.3.0'
# Sentry integration
gem 'sentry-raven', '~> 3.1'
gem 'sentry-ruby', '~> 5.1.1'
gem 'sentry-rails', '~> 5.1.1'
gem 'sentry-sidekiq', '~> 5.1.1'
# PostgreSQL query parsing
#
@ -374,7 +379,7 @@ group :development, :test do
gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 6.6.0', require: false
gem 'gitlab-styles', '~> 7.0.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false
@ -393,14 +398,16 @@ group :development, :test do
gem 'parallel', '~> 1.19', require: false
gem 'test_file_finder', '~> 0.1.3'
gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup'
end
group :development, :test, :danger do
gem 'gitlab-dangerfiles', '~> 2.8.0', require: false
gem 'gitlab-dangerfiles', '~> 2.11.0', require: false
end
group :development, :test, :coverage do
gem 'simplecov', '~> 0.18.5', require: false
gem 'simplecov', '~> 0.21', require: false
gem 'simplecov-lcov', '~> 0.8.0', require: false
gem 'simplecov-cobertura', '~> 1.3.1', require: false
gem 'undercover', '~> 0.4.4', require: false
@ -418,6 +425,7 @@ group :test do
gem 'fuubar', '~> 2.2.0'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-benchmark', '~> 0.6.0'
gem 'rspec-parameterized', require: false
gem 'capybara', '~> 3.35.3'
@ -473,7 +481,7 @@ gem 'ssh_data', '~> 1.2'
gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 14.8.0.pre.rc1'
gem 'gitaly', '~> 14.9.0.pre.rc4'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
@ -534,4 +542,4 @@ gem 'ipaddress', '~> 0.8.3'
gem 'parslet', '~> 1.8'
gem 'ipynbdiff', '0.3.8'
gem 'ipynbdiff', '0.4.4'

@ -132,8 +132,11 @@ GEM
bcrypt (3.1.16)
benchmark (0.1.1)
benchmark-ips (2.3.0)
benchmark-malloc (0.2.0)
benchmark-memory (0.1.2)
memory_profiler (~> 0.9)
benchmark-perf (0.6.0)
benchmark-trend (0.4.0)
better_errors (2.9.1)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
@ -192,7 +195,7 @@ GEM
open4 (~> 1.3)
coderay (1.1.3)
colored2 (3.1.2)
commonmarker (0.23.2)
commonmarker (0.23.4)
concurrent-ruby (1.1.9)
connection_pool (2.2.5)
contracts (0.11.0)
@ -214,7 +217,7 @@ GEM
css_parser (1.7.0)
addressable
daemons (1.3.1)
danger (8.4.2)
danger (8.4.5)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
@ -231,6 +234,7 @@ GEM
danger
gitlab (~> 4.2, >= 4.2.0)
database_cleaner (1.7.0)
dead_end (3.1.1)
deckar01-task_list (2.3.1)
html-pipeline
declarative (0.0.20)
@ -240,13 +244,15 @@ GEM
activerecord (>= 3.2.0, < 7.0)
deprecation_toolkit (1.5.1)
activesupport (>= 4.2)
derailed_benchmarks (1.8.1)
derailed_benchmarks (2.1.1)
benchmark-ips (~> 2)
dead_end
get_process_mem (~> 0)
heapy (~> 0)
memory_profiler (~> 0)
mini_histogram (>= 0.2.1)
memory_profiler (>= 0, < 2)
mini_histogram (>= 0.3.0)
rack (>= 1)
rack-test
rake (> 10, < 14)
ruby-statistics (>= 2.1)
thor (>= 0.19, < 2)
@ -268,7 +274,7 @@ GEM
diffy (3.3.0)
discordrb-webhooks (3.4.2)
rest-client (>= 2.0.0)
docile (1.3.2)
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (5.5.0.rc2)
@ -365,7 +371,7 @@ GEM
fast_blank (1.0.0)
fast_gettext (2.1.0)
ffaker (2.10.0)
ffi (1.15.3)
ffi (1.15.5)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
@ -428,7 +434,7 @@ GEM
ruby-progressbar (~> 1.4)
fuzzyurl (0.9.0)
gemoji (3.0.1)
get_process_mem (0.2.5)
get_process_mem (0.2.7)
ffi (~> 1.0)
gettext (3.3.6)
locale (>= 2.0.5)
@ -442,7 +448,7 @@ GEM
rails (>= 3.2.0)
git (1.7.0)
rchardet (~> 1.8)
gitaly (14.8.0.pre.rc1)
gitaly (14.9.0.pre.rc4)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab (4.16.1)
@ -450,8 +456,8 @@ GEM
terminal-table (~> 1.5, >= 1.5.1)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-dangerfiles (2.8.0)
danger (>= 8.3.1)
gitlab-dangerfiles (2.11.0)
danger (>= 8.4.5)
danger-gitlab (>= 8.0.0)
gitlab-experiment (0.7.0)
activesupport (>= 3.0)
@ -488,7 +494,7 @@ GEM
openid_connect (~> 1.2)
gitlab-sidekiq-fetcher (0.8.0)
sidekiq (~> 6.1)
gitlab-styles (6.6.0)
gitlab-styles (7.0.0)
rubocop (~> 0.91, >= 0.91.1)
rubocop-gitlab-security (~> 0.1.1)
rubocop-graphql (~> 0.10)
@ -632,7 +638,7 @@ GEM
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.9.1)
i18n (1.10.0)
concurrent-ruby (~> 1.0)
i18n_data (0.8.0)
icalendar (2.4.1)
@ -641,9 +647,9 @@ GEM
invisible_captcha (1.1.0)
rails (>= 4.2)
ipaddress (0.8.3)
ipynbdiff (0.3.8)
diffy (= 3.3.0)
json (= 2.5.1)
ipynbdiff (0.4.4)
diffy (~> 3.3)
json (~> 2.5, >= 2.5.1)
jaeger-client (1.1.0)
opentracing (~> 0.3)
thrift
@ -1052,6 +1058,11 @@ GEM
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
rspec-benchmark (0.6.0)
benchmark-malloc (~> 0.2)
benchmark-perf (~> 0.6)
benchmark-trend (~> 0.4)
rspec (>= 3.0)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.1)
@ -1097,7 +1108,7 @@ GEM
parser (>= 2.7.1.5)
rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51)
rubocop-graphql (0.10.3)
rubocop-graphql (0.13.0)
rubocop (>= 0.87, < 2)
rubocop-performance (1.9.2)
rubocop (>= 0.90.0, < 2.0)
@ -1118,7 +1129,7 @@ GEM
ruby-saml (1.13.0)
nokogiri (>= 1.10.5)
rexml
ruby-statistics (2.1.2)
ruby-statistics (3.0.0)
ruby2_keywords (0.0.4)
ruby_parser (3.15.0)
sexp_processor (~> 4.9)
@ -1156,8 +1167,19 @@ GEM
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sentry-rails (5.1.1)
railties (>= 5.0)
sentry-ruby-core (~> 5.1.1)
sentry-raven (3.1.2)
faraday (>= 1.0)
sentry-ruby (5.1.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
sentry-ruby-core (= 5.1.1)
sentry-ruby-core (5.1.1)
concurrent-ruby
sentry-sidekiq (5.1.1)
sentry-ruby-core (~> 5.1.1)
sidekiq (>= 3.0)
set (1.0.1)
settingslogic (2.0.9)
sexp_processor (4.15.1)
@ -1171,19 +1193,22 @@ GEM
sidekiq-cron (1.2.0)
fugit (~> 1.1)
sidekiq (>= 4.2.1)
sigdump (0.2.4)
signet (0.14.0)
addressable (~> 2.3)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simple_po_parser (1.1.2)
simplecov (0.18.5)
simplecov (0.21.2)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-cobertura (1.3.1)
simplecov (~> 0.8)
simplecov-html (0.12.3)
simplecov-lcov (0.8.0)
simplecov_json_formatter (0.1.4)
sixarm_ruby_unaccent (1.2.0)
slack-messenger (2.3.4)
snowplow-tracker (0.6.1)
@ -1242,7 +1267,7 @@ GEM
sys-filesystem (1.4.3)
ffi (~> 1.1)
sysexits (1.2.0)
tanuki_emoji (0.5.0)
tanuki_emoji (0.6.0)
temple (0.8.2)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
@ -1256,7 +1281,7 @@ GEM
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (1.1.0)
thor (1.2.1)
thrift (0.14.0)
tilt (2.0.10)
timecop (0.9.1)
@ -1330,6 +1355,9 @@ GEM
activerecord (>= 3.0)
activesupport (>= 3.0)
version_sorter (2.2.4)
view_component (2.50.0)
activesupport (>= 5.0.0, < 8.0)
method_source (~> 1.0)
vmstat (2.3.0)
warden (1.2.8)
rack (>= 2.0.6)
@ -1408,7 +1436,7 @@ DEPENDENCIES
capybara-screenshot (~> 1.0.22)
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.7)
commonmarker (~> 0.23.2)
commonmarker (~> 0.23.4)
concurrent-ruby (~> 1.1)
connection_pool (~> 2.0)
countries (~> 3.0)
@ -1456,10 +1484,10 @@ DEPENDENCIES
gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gitaly (~> 14.8.0.pre.rc1)
gitaly (~> 14.9.0.pre.rc4)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 2.8.0)
gitlab-dangerfiles (~> 2.11.0)
gitlab-experiment (~> 0.7.0)
gitlab-fog-azure-rm (~> 1.2.0)
gitlab-labkit (~> 0.22.0)
@ -1470,7 +1498,7 @@ DEPENDENCIES
gitlab-net-dns (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.9.0)
gitlab-sidekiq-fetcher (= 0.8.0)
gitlab-styles (~> 6.6.0)
gitlab-styles (~> 7.0.0)
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.4.0)
@ -1500,7 +1528,7 @@ DEPENDENCIES
icalendar
invisible_captcha (~> 1.1.0)
ipaddress (~> 0.8.3)
ipynbdiff (= 0.3.8)
ipynbdiff (= 0.4.4)
jira-ruby (~> 2.1.4)
js_regex (~> 3.7)
json (~> 2.5.1)
@ -1588,6 +1616,7 @@ DEPENDENCIES
rexml (~> 3.2.5)
rouge (~> 3.27.0)
rqrcode-rails3 (~> 0.1.7)
rspec-benchmark (~> 0.6.0)
rspec-parameterized
rspec-rails (~> 5.0.1)
rspec-retry (~> 0.6.1)
@ -1606,13 +1635,17 @@ DEPENDENCIES
sd_notify (~> 0.1.0)
seed-fu (~> 2.3.7)
selenium-webdriver (~> 3.142)
sentry-rails (~> 5.1.1)
sentry-raven (~> 3.1)
sentry-ruby (~> 5.1.1)
sentry-sidekiq (~> 5.1.1)
settingslogic (~> 2.0.9)
shoulda-matchers (~> 4.0.1)
sidekiq (~> 6.4)
sidekiq-cron (~> 1.2)
sigdump (~> 0.2.4)
simple_po_parser (~> 1.1.2)
simplecov (~> 0.18.5)
simplecov (~> 0.21)
simplecov-cobertura (~> 1.3.1)
simplecov-lcov (~> 0.8.0)
slack-messenger (~> 2.3.4)
@ -1627,7 +1660,7 @@ DEPENDENCIES
stackprof (~> 0.2.15)
state_machines-activerecord (~> 0.8.0)
sys-filesystem (~> 1.4.3)
tanuki_emoji (~> 0.5)
tanuki_emoji (~> 0.6)
terser (= 1.0.2)
test-prof (~> 1.0.7)
test_file_finder (~> 0.1.3)
@ -1644,6 +1677,7 @@ DEPENDENCIES
valid_email (~> 0.1)
validates_hostname (~> 1.0.11)
version_sorter (~> 2.2.4)
view_component (~> 2.50.0)
vmstat (~> 2.3.0)
warning (~> 1.2.0)
webauthn (~> 2.3)
@ -1653,4 +1687,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.1)
BUNDLED WITH
2.3.6
2.3.9

@ -499,6 +499,16 @@
};
version = "2.3.0";
};
benchmark-malloc = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0svyac8alxbmip6b9rp34wq5lcimdaapjkaqdw1385i66l28ziip";
type = "gem";
};
version = "0.2.0";
};
benchmark-memory = {
dependencies = ["memory_profiler"];
groups = ["default"];
@ -510,6 +520,26 @@
};
version = "0.1.2";
};
benchmark-perf = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08cngwnwk2h6cdxx3dyckxcg7d0yi3pm83c26kfzkq1xkyah2azy";
type = "gem";
};
version = "0.6.0";
};
benchmark-trend = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10axhj80jan0b7c77hm0aj2yxv0dh9clfy4pppxvxfj3yjlh4nny";
type = "gem";
};
version = "0.4.0";
};
better_errors = {
dependencies = ["coderay" "erubi" "rack"];
groups = ["development"];
@ -784,10 +814,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sshs8mvjgk73sfz3bi9apq0p99kfj7n9bg1cyldl4yyy2z05prs";
sha256 = "1kn7x7smqsk0x2iq17dbbaay0qimmgza8wbdlrs66dvn0l2wpncm";
type = "gem";
};
version = "0.23.2";
version = "0.23.4";
};
concurrent-ruby = {
groups = ["default" "development" "test"];
@ -921,10 +951,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07mxkgksgilfipd97rgfhx7c421j1fx7rk6lf0k18bkccyg1r8vn";
sha256 = "1bmbqxscz0whc3kf5622ffp83k96h0vx71bhb5rzi3zzmg6b4vkl";
type = "gem";
};
version = "8.4.2";
version = "8.4.5";
};
danger-gitlab = {
dependencies = ["danger" "gitlab"];
@ -947,6 +977,16 @@
};
version = "1.7.0";
};
dead_end = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nrg9cwy21iwzl1djp1hamy24q3pfhvvrjqi9q0bwj81gizxy48h";
type = "gem";
};
version = "3.1.1";
};
deckar01-task_list = {
dependencies = ["html-pipeline"];
groups = ["default"];
@ -1011,15 +1051,15 @@
version = "1.5.1";
};
derailed_benchmarks = {
dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor"];
dependencies = ["benchmark-ips" "dead_end" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rack-test" "rake" "ruby-statistics" "thor"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05nryqr18w61dyk9amajh7chn07zxardxnywayyis72kmd8f9q29";
sha256 = "1cxaqvfhm8xpv3hvpwn7y4g5315zzf5gsdffdkm1bisjviwvmc15";
type = "gem";
};
version = "1.8.1";
version = "2.1.1";
};
device_detector = {
groups = ["default"];
@ -1095,14 +1135,14 @@
version = "3.4.2";
};
docile = {
groups = ["default" "development" "test"];
groups = ["coverage" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif";
sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz";
type = "gem";
};
version = "1.3.2";
version = "1.4.0";
};
domain_name = {
dependencies = ["unf"];
@ -1594,10 +1634,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq";
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
type = "gem";
};
version = "1.15.3";
version = "1.15.5";
};
ffi-compiler = {
dependencies = ["ffi" "rake"];
@ -1817,14 +1857,14 @@
};
get_process_mem = {
dependencies = ["ffi"];
groups = ["default" "puma" "unicorn"];
groups = ["default" "puma" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q7pivp9z9pdxc2ha32q7x9zgqy8m9jf87g6n5mvi5l6knxya8sh";
sha256 = "1fkyyyxjcx4iigm8vhraa629k2lxa1npsv4015y82snx84v3rzaa";
type = "gem";
};
version = "0.2.5";
version = "0.2.7";
};
gettext = {
dependencies = ["locale" "text"];
@ -1876,10 +1916,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dl80qvyl1jbcc1iabpja3pnsrfag92h25c2r3vqn3bd0x9q4iwc";
sha256 = "13yq0ln40iy0wjapdg5phkqgr2bbdfk3xccyr1828yxpgkd44716";
type = "gem";
};
version = "14.8.0.pre.rc1";
version = "14.9.0.pre.rc4";
};
github-markup = {
groups = ["default"];
@ -1919,10 +1959,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xd7sgl5iwxq2mvx7ql1wpciqrnj2z1ycjxm5ddrdi4kcl9f94z4";
sha256 = "1in56r2mdi6ghwx4nxvfihb2sg73xhnpw0w42wc5f57wwy6m1s24";
type = "gem";
};
version = "2.8.0";
version = "2.11.0";
};
gitlab-experiment = {
dependencies = ["activesupport" "request_store"];
@ -2036,10 +2076,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xs7v0sj3j4d5yflfn8n5azh5qwxsrc432q7v4nckg9irwqj99js";
sha256 = "10fmvx2vx2v0mbwv5d4wcpc2iyp5y8lwxn9hjpzkk5bvxkk4c493";
type = "gem";
};
version = "6.6.0";
version = "7.0.0";
};
gitlab_chronic_duration = {
dependencies = ["numerizer"];
@ -2520,10 +2560,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8";
sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
type = "gem";
};
version = "1.9.1";
version = "1.10.0";
};
i18n_data = {
groups = ["default"];
@ -2583,10 +2623,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0raj4xwp2dz1xrzcpqqdp5ygfpjdy7jx28ziqg9f73hf850j90d1";
sha256 = "0cgrr3pc0y11gas6k2js33qghj7rpdh99vavda712wbq3hz42jx2";
type = "gem";
};
version = "0.3.8";
version = "0.4.4";
};
jaeger-client = {
dependencies = ["opentracing" "thrift"];
@ -4468,6 +4508,17 @@
};
version = "3.10.0";
};
rspec-benchmark = {
dependencies = ["benchmark-malloc" "benchmark-perf" "benchmark-trend" "rspec"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kyn7p409n75ikb7z9v3dbzjyyinkwi88f66alj9lnf2gssss50h";
type = "gem";
};
version = "0.6.0";
};
rspec-core = {
dependencies = ["rspec-support"];
groups = ["default" "development" "test"];
@ -4605,10 +4656,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hvm17hm7xjqcfn70c7h3rrz2y2mrazqmkp5ains08j0zd39x7rh";
sha256 = "18md69dkz0s5xm93c4psmvy4c0nx3a7yi61vfjn46cw6yk54fm7b";
type = "gem";
};
version = "0.10.3";
version = "0.13.0";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];
@ -4697,14 +4748,14 @@
version = "1.13.0";
};
ruby-statistics = {
groups = ["default"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xmd9dk1fcmii38apwn3py00qfqxd5yzylafm49n24plzwv913nh";
sha256 = "10fwxwhby6n1q1k61bic2s0mddlfwb9x7a7306vir4s60cvh20v1";
type = "gem";
};
version = "2.1.2";
version = "3.0.0";
};
ruby2_keywords = {
groups = ["danger" "default" "development" "test"];
@ -4896,6 +4947,17 @@
};
version = "3.142.7";
};
sentry-rails = {
dependencies = ["railties" "sentry-ruby-core"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zv5db0wrvs4gjgrqz7fzpihgil1p9b8hm4bmf25ihyxfskz0vlh";
type = "gem";
};
version = "5.1.1";
};
sentry-raven = {
dependencies = ["faraday"];
groups = ["default"];
@ -4907,6 +4969,39 @@
};
version = "3.1.2";
};
sentry-ruby = {
dependencies = ["concurrent-ruby" "sentry-ruby-core"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09f1zkc99m1z89qf40bd2ik4fdkchm5h5rb77bz2zhn1f8xmcjaf";
type = "gem";
};
version = "5.1.1";
};
sentry-ruby-core = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "012xra6f9b9y00wvnd2vks5kw3wrjaz3flm692j8sd3qxs8xhbhm";
type = "gem";
};
version = "5.1.1";
};
sentry-sidekiq = {
dependencies = ["sentry-ruby-core" "sidekiq"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1byig501hvjyc3y0x5x0w3h0k3c6lw9j10f3kxx7z8zvfy2n3hz4";
type = "gem";
};
version = "5.1.1";
};
set = {
groups = ["default"];
platforms = [];
@ -4980,6 +5075,16 @@
};
version = "1.2.0";
};
sigdump = {
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mqf06iw7rymv54y7rgbmfi6ppddgjjmxzi3hrw658n1amp1gwhb";
type = "gem";
};
version = "0.2.4";
};
signet = {
dependencies = ["addressable" "faraday" "jwt" "multi_json"];
groups = ["default"];
@ -5002,15 +5107,15 @@
version = "1.1.2";
};
simplecov = {
dependencies = ["docile" "simplecov-html"];
groups = ["development" "test"];
dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"];
groups = ["coverage" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ycx5q699ycbjhp28sjbkrd62vwxlrb7fh4v2m7sjsp2qhi6cf6r";
sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr";
type = "gem";
};
version = "0.18.5";
version = "0.21.2";
};
simplecov-cobertura = {
dependencies = ["simplecov"];
@ -5043,6 +5148,16 @@
};
version = "0.8.0";
};
simplecov_json_formatter = {
groups = ["coverage" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j";
type = "gem";
};
version = "0.1.4";
};
sixarm_ruby_unaccent = {
groups = ["default"];
platforms = [];
@ -5290,10 +5405,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qw0qa3xz4h3izwl5qsvmg5vvfsfjhmv4mdxaw1v1w1qgp7j7gws";
sha256 = "0an1311bpyhd9kzak1qpd4jks336i47gbvx3zdrnn1rdxppimsac";
type = "gem";
};
version = "0.5.0";
version = "0.6.0";
};
temple = {
groups = ["default" "development" "test"];
@ -5374,10 +5489,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
type = "gem";
};
version = "1.1.0";
version = "1.2.1";
};
thrift = {
groups = ["default"];
@ -5736,6 +5851,17 @@
};
version = "2.2.4";
};
view_component = {
dependencies = ["activesupport" "method_source"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1syhbmnrqklahqaaac13jx6rwpc6z210f53apwglngp2xdibxkf1";
type = "gem";
};
version = "2.50.0";
};
vmstat = {
groups = ["default"];
platforms = [];

@ -5,7 +5,7 @@ stdenv.mkDerivation {
pname = "byzanz";
src = fetchgit {
url = "git://github.com/GNOME/byzanz";
url = "https://gitlab.gnome.org/Archive/byzanz";
rev = "1875a7f6a3903b83f6b1d666965800f47db9286a";
sha256 = "0a72fw2mxl8vdcdnzy0bwis4jk28pd7nc8qgr4vhyw5pd48dynvh";
};

@ -1,8 +1,11 @@
{ lib, stdenv, ocaml, findlib, dune_1, dune_2 }:
{ lib, stdenv, ocaml, findlib, dune_1, dune_2, dune_3 }:
{ pname, version, nativeBuildInputs ? [], enableParallelBuilding ? true, ... }@args:
let Dune = if args.useDune2 or true then dune_2 else dune_1; in
let Dune =
let dune-version = args . duneVersion or (if args.useDune2 or true then "2" else "1"); in
{ "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}"
; in
if (args ? minimumOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion) ||
(args ? minimalOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimalOCamlVersion)
@ -31,7 +34,7 @@ stdenv.mkDerivation ({
runHook postInstall
'';
} // (builtins.removeAttrs args [ "minimalOCamlVersion" ]) // {
} // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // {
name = "ocaml${ocaml.version}-${pname}-${version}";

@ -1,25 +1,45 @@
{ lib, fetchzip }:
{ lib, fetchzip, fetchFromGitHub }:
let
version = "063a";
in fetchzip {
name = "mplus-${version}";
let pname = "mplus-outline-fonts";
in {
osdnRelease = fetchzip {
name = "${pname}-osdn";
url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-063a.tar.xz";
sha256 = "16jirhkjs46ac8cdk2w4xkpv989gmz7i8gnrq9bck13rbil7wlzr";
postFetch = ''
mkdir -p $out/share/fonts/truetype/${pname}
tar xvJf $downloadedFile
mv */*.ttf $out/share/fonts/truetype/${pname}
'';
url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz";
postFetch = ''
tar -xJf $downloadedFile --strip-components=1
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
'';
meta = with lib; {
description = "M+ Outline Fonts (legacy OSDN release)";
homepage = "https://mplus-fonts.osdn.jp";
maintainers = with maintainers; [ henrytill uakci ];
platforms = platforms.all;
license = licenses.mit;
};
};
sha256 = "1khbkch2r96ppifc93bmy1v047pgciyhfmcjb98ggncp5ix885xz";
githubRelease = fetchFromGitHub {
name = "${pname}-github";
owner = "coz-m";
repo = "MPLUS_FONTS";
rev = "336fec4e9e7c1e61bd22b82e6364686121cf3932";
sha256 = "1ha92hyzcfbbq682c50k8clbhigc09rcb9mxjzjwqfj9rfp348id";
postFetch = ''
mkdir -p $out/share/fonts/{truetype,opentype}/${pname}
tar xvzf $downloadedFile
mv */fonts/ttf/* $out/share/fonts/truetype/${pname}
mv */fonts/otf/* $out/share/fonts/opentype/${pname}
'';
meta = with lib; {
description = "M+ Outline Fonts";
homepage = "https://mplus-fonts.osdn.jp/about-en.html";
license = licenses.mit;
maintainers = with maintainers; [ henrytill ];
platforms = platforms.all;
meta = with lib; {
description = "M+ Outline Fonts (GitHub release)";
homepage = "https://mplusfonts.github.io";
maintainers = with maintainers; [ henrytill uakci ];
platforms = platforms.all;
license = licenses.ofl;
};
};
}

@ -5,7 +5,7 @@
, dbus
, libgcrypt
, pam
, python2
, python3
, glib
, libxslt
, gettext
@ -51,8 +51,7 @@ stdenv.mkDerivation rec {
p11-kit
];
# In 3.20.1, tests do not support Python 3
checkInputs = [ dbus python2 ];
checkInputs = [ dbus python3 ];
configureFlags = [
"--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories

@ -60,7 +60,7 @@ in rec {
gnome41Extensions = mapUuidNames (produceExtensionsList "41");
gnome42Extensions = mapUuidNames (produceExtensionsList "42");
gnomeExtensions = lib.trivial.pipe (gnome41Extensions // gnome42Extensions) [
gnomeExtensions = lib.trivial.pipe (gnome40Extensions // gnome41Extensions // gnome42Extensions) [
# Apply some custom patches for automatically packaged extensions
(callPackage ./extensionOverrides.nix {})
# Add all manually packaged extensions

@ -12,13 +12,13 @@
mkDerivation rec {
pname = "bismuth";
version = "2.3.0";
version = "3.0.0";
src = fetchFromGitHub {
owner = "Bismuth-Forge";
repo = pname;
rev = "v${version}";
sha256 = "sha256-b+dlBv1M4//oeCGM2qrQ3s6z2yLql6eQWNqId3JB3Z4=";
sha256 = "sha256-6kSqZtJijQBqvYcyAoSRLl/RxgUubst2SJw/adiBIj4=";
};
cmakeFlags = [

@ -169,8 +169,6 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4_power_manager = xfce4-power-manager;
xfce4_appfinder = xfce4-appfinder;
xfce4_dev_tools = xfce4-dev-tools;
xfce4mixer = xfce4-mixer;
xfce4mixer_pulse = xfce4-mixer-pulse;
xfce4notifyd = xfce4-notifyd;
xfce4taskmanager = xfce4-taskmanager;
xfce4terminal = xfce4-terminal;
@ -204,8 +202,6 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4_windowck_plugin = xfce4-windowck-plugin;
xfce4_pulseaudio_plugin = xfce4-pulseaudio-plugin;
xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18
gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17
xfce4-dict-plugin = throw "deprecated 2020-04-19: xfce4-dict-plugin is now part of xfce4-dict."; # added 2020-04-19
# added 2019-11-04
@ -217,7 +213,6 @@ lib.makeScope pkgs.newScope (self: with self; {
xinitrc = xfce4-session.xinitrc;
libglade = throw "libglade has been removed";
inherit (pkgs.gnome) gtksourceview;
xfce4-mixer-pulse = xfce4-mixer;
thunar-bare = thunar.override {
thunarPlugins = [];
};

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "ciao";
version = "1.20.0";
version = "1.21.0-m1";
src = fetchFromGitHub {
owner = "ciao-lang";
repo = "ciao";
rev = "v${version}";
sha256 = "sha256-Xp0ZQRi7mOO2WN/2hO6zgobDG3S0BEV+SgsaduBZ30U=";
sha256 = "sha256-o9EQS7KsoTg458Uw+1shgKE6NlZO495XE/rLq6/1S4g=";
};
configurePhase = ''

@ -1,4 +1,15 @@
{ stdenv, lib, crystal, shards, git, pkg-config, which, linkFarm, fetchFromGitHub, installShellFiles }:
{ stdenv
, lib
, crystal
, shards
, git
, pkg-config
, which
, linkFarm
, fetchFromGitHub
, installShellFiles
, removeReferencesTo
}:
{
# Some projects do not include a lock file, so you can pass one
@ -60,7 +71,13 @@ stdenv.mkDerivation (mkDerivationArgs // {
buildInputs = args.buildInputs or [ ] ++ [ crystal ]
++ lib.optional (format != "crystal") shards;
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkg-config which ];
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
git
installShellFiles
removeReferencesTo
pkg-config
which
];
buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([
"runHook preBuild"
@ -102,6 +119,7 @@ stdenv.mkDerivation (mkDerivationArgs // {
installManPage man/*.?
fi
'') ++ [
"remove-references-to -t ${lib.getLib crystal} $out/bin/*"
"runHook postInstall"
]));

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "emscripten";
version = "2.0.27";
version = "3.0.0";
llvmEnv = symlinkJoin {
name = "emscripten-llvm-${version}";
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "emscripten-core";
repo = "emscripten";
sha256 = "1dpfib2nmbvskqlaqw3kvaay69qpa7d155hd4w05c2xgmahmrd4n";
sha256 = "sha256-HlXcPKlmBTwEKgTfeMg6QoMKMbK++bpv2fu1DyolrHs=";
rev = version;
};

@ -10,7 +10,7 @@ mkDerivation {
pname = "ghcjs-base";
version = "0.2.0.3";
src = fetchgit {
url = "git://github.com/ghcjs/ghcjs-base";
url = "https://github.com/ghcjs/ghcjs-base";
sha256 = "15fdkjv0l7hpbbsn5238xxgzfdg61g666nzbv2sgxkwryn5rycv0";
rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2";
};

@ -5,7 +5,7 @@ stdenv.mkDerivation {
version = "0.7pre";
src = fetchgit {
url = "git://github.com/scheme/scsh.git";
url = "https://github.com/scheme/scsh.git";
rev = "f99b8c5293628cfeaeb792019072e3a96841104f";
fetchSubmodules = true;
sha256 = "0ci2h9hhv8pl12sdyl2qwal3dhmd7zgm1pjnmd4kg8r1hnm6vidx";

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "gdcm";
version = "3.0.10";
version = "3.0.11";
src = fetchFromGitHub {
owner = "malaterre";
repo = "GDCM";
rev = "v${version}";
sha256 = "sha256-KFN13kGE0E8gQBgtErvkW7Fa+3YYqQh0RA2bPS90WUI=";
sha256 = "sha256-rGR0yQImLG3kBp6/QoEMLFrFtgAIN6y9lZ3OmtAUVcY=";
};
cmakeFlags = [

@ -24,9 +24,8 @@ stdenv.mkDerivation rec {
description = "Qt widgets for technical applications";
homepage = "http://qwt.sourceforge.net/";
# LGPL 2.1 plus a few exceptions (more liberal)
license = lib.licenses.qwt;
license = licenses.qwt;
platforms = platforms.unix;
maintainers = [ maintainers.bjornfor ];
branch = "6";
};
}

@ -1,25 +1,24 @@
{ lib, stdenv, fetchurl, qt4, qmake4Hook }:
{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
stdenv.mkDerivation rec {
pname = "qwt";
version = "5.2.3";
version = "6.2.0";
src = fetchurl {
url = "mirror://sourceforge/qwt/${pname}-${version}.tar.bz2";
sha256 = "1dqa096mm6n3bidfq2b67nmdsvsw4ndzzd1qhl6hn8skcwqazzip";
url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2";
sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA=";
};
propagatedBuildInputs = [ qt4 ];
nativeBuildInputs = [ qmake4Hook ];
propagatedBuildInputs = [ qtbase qtsvg qttools ];
nativeBuildInputs = [ qmake ];
postPatch = ''
sed -e "s@\$\$\[QT_INSTALL_PLUGINS\]@$out/lib/qt4/plugins@" -i designer/designer.pro
sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri
sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri
'';
preConfigure = ''
qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${pname}-${version}"
'';
qmakeFlags = [ "-after doc.path=$out/share/doc/qwt-${version}" ];
dontWrapQtApps = true;
meta = with lib; {
description = "Qt widgets for technical applications";

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "robin-map";
version = "0.6.3";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Tessil";
repo = pname;
rev = "v${version}";
sha256 = "1li70vwsksva9c4yly90hjafgqfixi1g6d52qq9p6r60vqc4pkjj";
sha256 = "sha256-h59khOUg7vzw64EAMT/uzTKHzx2M9q+pc2BhfGQiY3Q=";
};
nativeBuildInputs = [ cmake ];

@ -0,0 +1,50 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, systemd
, expat
}:
stdenv.mkDerivation rec {
pname = "sdbus-cpp";
version = "1.1.0";
src = fetchFromGitHub {
owner = "kistler-group";
repo = "sdbus-cpp";
rev = "v${version}";
sha256 = "sha256-AjaZ6YmMlnN0jAcUBkft01XHkrze0nSr3dUMechsLrQ=";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
systemd
expat
];
cmakeFlags = [
"-DBUILD_CODE_GEN=ON"
];
meta = with lib; {
homepage = "https://github.com/Kistler-Group/sdbus-cpp";
changelog = "https://github.com/Kistler-Group/sdbus-cpp/blob/v${version}/ChangeLog";
description = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API";
longDescription = ''
sdbus-c++ is a high-level C++ D-Bus library for Linux designed to provide expressive, easy-to-use API in modern C++.
It adds another layer of abstraction on top of sd-bus, a nice, fresh C D-Bus implementation by systemd.
It's been written primarily as a replacement of dbus-c++, which currently suffers from a number of (unresolved) bugs,
concurrency issues and inherent design complexities and limitations.
'';
mainProgram = "sdbus-c++-xml2cpp";
license = licenses.lgpl2Only;
platforms = platforms.linux;
maintainers = [ maintainers.ivar ];
};
}

File diff suppressed because it is too large Load Diff

@ -1,69 +0,0 @@
{ lib, stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, which, camlp4 }:
let inherit (lib) getVersion versionAtLeast; in
assert versionAtLeast (getVersion ocaml) "4.00.0";
assert versionAtLeast (getVersion findlib) "1.3.3";
if versionAtLeast ocaml.version "4.06"
then throw "bolt is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
pname = "bolt";
version = "1.4";
src = fetchurl {
url = "https://forge.ocamlcore.org/frs/download.php/1043/bolt-${version}.tar.gz";
sha256 = "1c807wrpxra9sbb34lajhimwra28ldxv04m570567lh2b04n38zy";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild which camlp4 ];
strictDeps = true;
patches = [
(fetchpatch {
url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/bolt/bolt.1.4/files/opam.patch";
sha256 = "08cl39r98w312sw23cskd5wian6zg20isn9ki41hnbcgkazhi7pb";
})
];
postPatch = ''
patch myocamlbuild.ml <<EOF
70,74c70
< let camlp4of =
< try
< let path_bin = Filename.concat (Sys.getenv "PATH_OCAML_PREFIX") "bin" in
< Filename.concat path_bin "camlp4of"
< with _ -> "camlp4of" in
---
> let camlp4of = "camlp4of" in
EOF
'';
# The custom `configure` script does not expect the --prefix
# option. Installation is handled by ocamlfind.
dontAddPrefix = true;
dontAddStaticConfigureFlags = true;
configurePlatforms = [ ];
createFindlibDestdir = true;
buildFlags = [ "all" ];
doCheck = true;
checkTarget = "tests";
meta = with lib; {
homepage = "http://bolt.x9c.fr";
description = "A logging tool for the OCaml language";
longDescription = ''
Bolt is a logging tool for the OCaml language. It is inspired by and
modeled after the famous log4j logging framework for Java.
'';
license = licenses.lgpl3;
platforms = ocaml.meta.platforms or [ ];
maintainers = [ maintainers.jirkamarsik ];
};
}

@ -1,17 +1,17 @@
{ lib, buildDunePackage, dune_2, dune-glob, dune-private-libs }:
{ lib, buildDunePackage, dune_3, dune-glob, dune-private-libs }:
buildDunePackage rec {
pname = "dune-action-plugin";
inherit (dune_2) src version patches;
inherit (dune_3) src version;
useDune2 = true;
duneVersion = "3";
dontAddPrefix = true;
propagatedBuildInputs = [ dune-glob dune-private-libs ];
meta = with lib; {
inherit (dune_2.meta) homepage;
inherit (dune_3.meta) homepage;
description = "API for writing dynamic Dune actions";
maintainers = [ maintainers.marsam ];
license = licenses.mit;

@ -1,17 +1,17 @@
{ lib, buildDunePackage, dune_2, dune-private-libs }:
{ lib, buildDunePackage, dune_3, dune-private-libs }:
buildDunePackage rec {
pname = "dune-glob";
inherit (dune_2) src version patches;
inherit (dune_3) src version;
useDune2 = true;
duneVersion = "3";
dontAddPrefix = true;
propagatedBuildInputs = [ dune-private-libs ];
meta = with lib; {
inherit (dune_2.meta) homepage;
inherit (dune_3.meta) homepage;
description = "Glob string matching language supported by dune";
maintainers = [ maintainers.marsam ];
license = licenses.mit;

@ -1,16 +1,18 @@
{ lib, buildDunePackage, dune_2 }:
{ lib, buildDunePackage, dune_3, stdune }:
buildDunePackage rec {
pname = "dune-private-libs";
useDune2 = true;
duneVersion = "3";
inherit (dune_2) src version patches;
inherit (dune_3) src version;
minimumOCamlVersion = "4.08";
minimalOCamlVersion = "4.08";
dontAddPrefix = true;
propagatedBuildInputs = [ stdune ];
meta = with lib; {
description = "Private libraries of Dune";
maintainers = [ maintainers.marsam ];

@ -1,10 +1,10 @@
{ lib, buildDunePackage, dune_2, dune-private-libs }:
{ lib, buildDunePackage, dune_3, dune-private-libs }:
buildDunePackage rec {
pname = "dune-site";
inherit (dune_2) src version patches;
inherit (dune_3) src version;
useDune2 = true;
duneVersion = "3";
dontAddPrefix = true;
@ -12,7 +12,7 @@ buildDunePackage rec {
meta = with lib; {
description = "A library for embedding location information inside executable and libraries";
inherit (dune_2.meta) homepage;
inherit (dune_3.meta) homepage;
maintainers = with lib.maintainers; [ ];
license = licenses.mit;
};

@ -0,0 +1,16 @@
{ lib, buildDunePackage, dune_3, ordering }:
buildDunePackage {
pname = "dyn";
inherit (dune_3) version src;
duneVersion = "3";
dontAddPrefix = true;
propagatedBuildInputs = [ ordering ];
meta = dune_3.meta // {
description = "Dynamic type";
};
}

@ -1,33 +0,0 @@
{ lib, buildDunePackage, fetchurl, alcotest, asn1-combinators, benchmark
, bigarray-compat, cstruct, eqaf, hex, ppx_deriving_yojson, rresult
, stdlib-shims, yojson, dune-configurator }:
buildDunePackage rec {
pname = "fiat-p256";
version = "0.2.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/fiat/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "0086h9qkvnqfm8acrxqbki54z619nj73x7f0d01v5vg2naznx7w9";
};
# Make tests compatible with alcotest 1.4.0
postPatch = ''
substituteInPlace test/wycheproof/test.ml --replace \
'Printf.ksprintf Alcotest.fail' 'Printf.ksprintf (fun s -> Alcotest.fail s)'
'';
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ bigarray-compat cstruct eqaf hex ];
checkInputs = [ alcotest asn1-combinators benchmark
ppx_deriving_yojson rresult stdlib-shims yojson ];
doCheck = true;
meta = with lib; {
description = "Primitives for Elliptic Curve Cryptography taken from Fiat";
homepage = "https://github.com/mirage/fiat";
license = licenses.mit;
maintainers = with maintainers; [ sternenseemann ];
};
}

@ -241,6 +241,13 @@ with self;
doCheck = false; # we don't have quickcheck_deprecated
};
core_unix = janePackage {
pname = "core_unix";
hash = "0irfmpx6iksxk2r8mdizjn75h71qh4p2f1s9x2ggckzqj9y904ck";
meta.description = "Unix-specific portions of Core";
propagatedBuildInputs = [ core ];
};
csvfields = janePackage {
pname = "csvfields";
hash = "09jmz6y6nwd96dcx6g8ydicxssi72v1ks276phbc9n19wwg9hkaz";

@ -11,7 +11,7 @@ buildDunePackage rec {
sha256 = "sha256-THTlhOfXAPaqTt1qBkht+D67bw6M175QLvXoUMgjks4=";
};
useDune2 = true;
minimalOCamlVersion = "4.03";
nativeBuildInputs = [ cppo ];

@ -0,0 +1,13 @@
{ lib, buildDunePackage, dune_3 }:
buildDunePackage {
pname = "ordering";
inherit (dune_3) version src;
duneVersion = "3";
dontAddPrefix = true;
meta = dune_3.meta // {
description = "Element ordering";
};
}

@ -0,0 +1,16 @@
{ lib, buildDunePackage, dune_3, dyn, ordering }:
buildDunePackage {
pname = "stdune";
inherit (dune_3) version src;
duneVersion = "3";
dontAddPrefix = true;
propagatedBuildInputs = [ dyn ordering ];
meta = dune_3.meta // {
description = "Dune's unstable standard library";
};
}

@ -3,6 +3,9 @@ let
pname = "uutf";
in
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.03")
"${pname} is not available with OCaml ${ocaml.version}"
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "1.0.3";
@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Non-blocking streaming Unicode codec for OCaml";
homepage = "https://erratique.ch/software/uutf";
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
};

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
if !lib.versionAtLeast ocaml.version "4.02"
if !lib.versionAtLeast ocaml.version "4.03"
|| lib.versionOlder "4.13" ocaml.version
then throw "wasm is not available for OCaml ${ocaml.version}"
else

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioairzone";
version = "0.1.2";
version = "0.2.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = pname;
rev = version;
hash = "sha256-8OpC/w83us85NWpRXXLsWsLNiPG3v+8BHAToADdLaP4=";
hash = "sha256-jMmPACC8eVDYqBI2642R/ChKFObmK+yWRzRBQUmi1C0=";
};
propagatedBuildInputs = [

@ -5,6 +5,7 @@
, backoff
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytest-asyncio
, pytestCheckHook
, pythonOlder
@ -12,8 +13,8 @@
buildPythonPackage rec {
pname = "aiogithubapi";
version = "22.2.4";
format = "setuptools";
version = "22.3.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -21,9 +22,13 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "sha256-2RYpeyX88+eEilK/wLDJ6Ock1JBgIUPWbm/ZBJSQ2pg=";
hash = "sha256-5gKANZtDhIoyfyLdS15JDWTxHBFkaHDUlbVVhRs7MSE=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
async-timeout
@ -39,7 +44,7 @@ buildPythonPackage rec {
postPatch = ''
# Upstream is releasing with the help of a CI to PyPI, GitHub releases
# are not in their focus
substituteInPlace setup.py \
substituteInPlace pyproject.toml \
--replace 'version="main",' 'version="${version}",'
'';

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aiowebostv";
version = "0.1.3";
version = "0.2.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "v${version}";
hash = "sha256-UKDcIo0jhI84WDcSK3fciRqzKjHwbZXkqHjdo7Xt4iE=";
hash = "sha256-A7GiAQIuEXmCfo2pDJESCdAEaLumi1ACXnBMdGKwSvE=";
};
propagatedBuildInputs = [

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "androidtv";
version = "0.0.65";
version = "0.0.66";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "JeffLIrion";
repo = "python-androidtv";
rev = "v${version}";
hash = "sha256-bhXmPplRT9gzeD/GdD2HxN+Z4vvaiaxBwkqSml9SJUs=";
hash = "sha256-gSbckVjM49nVfzpk9sfynJDx15+zQ/KgaI7oxEkXQpo=";
};
propagatedBuildInputs = [

@ -1,16 +1,18 @@
{ buildPythonPackage
, fetchFromGitHub
, lib
# pythonPackages
{ lib
, anyconfig
, appdirs
, buildPythonPackage
, colorama
, fetchFromGitHub
, flake8
, jsonschema
, nested-lookup
, pathspec
, poetry-core
, pytest-mock
, python-json-logger
, pytestCheckHook
, pythonOlder
, pyyaml
, toolz
, unidiff
@ -22,24 +24,15 @@ buildPythonPackage rec {
version = "2.0.6";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "thegeeklab";
repo = "ansible-later";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vg9ryzl9ZeOGuFLL1yeJ3vGNPdo3ONmCQozY6DK6miY=";
hash = "sha256-vg9ryzl9ZeOGuFLL1yeJ3vGNPdo3ONmCQozY6DK6miY=";
};
postInstall = ''
rm $out/lib/python*/site-packages/LICENSE
'';
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'PyYAML = "6.0"' 'PyYAML = "*"' \
--replace 'unidiff = "0.7.3"' 'unidiff = "*"' \
--replace 'jsonschema = "4.4.0"' 'jsonschema = "*"'
'';
nativeBuildInputs = [
poetry-core
];
@ -51,6 +44,7 @@ buildPythonPackage rec {
flake8
jsonschema
nested-lookup
pathspec
python-json-logger
pyyaml
toolz
@ -58,12 +52,30 @@ buildPythonPackage rec {
yamllint
];
# no tests
doCheck = false;
pythonImportsCheck = [ "ansiblelater" ];
checkInputs = [
pytest-mock
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'version = "0.0.0"' 'version = "${version}"' \
--replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" "" \
--replace 'PyYAML = "6.0"' 'PyYAML = "*"' \
--replace 'unidiff = "0.7.3"' 'unidiff = "*"' \
--replace 'jsonschema = "4.4.0"' 'jsonschema = "*"'
'';
postInstall = ''
rm $out/lib/python*/site-packages/LICENSE
'';
pythonImportsCheck = [
"ansiblelater"
];
meta = with lib; {
description = "Another best practice scanner for Ansible roles and playbooks";
description = "Best practice scanner for Ansible roles and playbooks";
homepage = "https://github.com/thegeeklab/ansible-later";
license = licenses.mit;
maintainers = with maintainers; [ tboerger ];

@ -25,13 +25,13 @@
buildPythonPackage rec {
pname = "arviz";
version = "0.11.4";
version = "0.12.0";
src = fetchFromGitHub {
owner = "arviz-devs";
repo = "arviz";
rev = "v${version}";
sha256 = "0vindadyxhxhrhbalys6kzrda2d4qpqbqbsbwfprp8pxkldgk548";
sha256 = "sha256-ClARxgfji/CavEy8g5oeYK7pwSZS1yUIZnBiyTbZ/zU=";
};
propagatedBuildInputs = [

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "asyncmy";
version = "0.2.3";
version = "0.2.4";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "long2ice";
repo = pname;
rev = "v${version}";
sha256 = "ys9RYaosc4noJsWYsVo9+6W7JaG4r6lsz6UH4o08q4A=";
sha256 = "sha256-nuk8Zh82qN60FrH6Jjv7RDDDQsfZ5EmbaQe5EAcB2Tk=";
};
nativeBuildInputs = [

@ -8,15 +8,16 @@
buildPythonPackage rec {
pname = "asyncstdlib";
version = "3.10.3";
disabled = pythonOlder "3.7";
version = "3.10.4";
format = "flit";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "maxfischer2781";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Q547XKsn4/U7XbDhZADF4qPpFxAGPmv9bAXSQZnNUIo=";
hash = "sha256-zPWXI5iHMCkSVjyNRcXplTadobYCeMv3Unjt+QVF8D8=";
};
propagatedBuildInputs = [
@ -27,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "asyncstdlib" ];
pythonImportsCheck = [
"asyncstdlib"
];
meta = with lib; {
description = "Python library that extends the Python asyncio standard library";

@ -3,28 +3,30 @@
, fetchPypi
, azure-common
, azure-mgmt-core
, azure-mgmt-nspkg
, msrestazure
, pythonOlder
}:
buildPythonPackage rec {
pname = "azure-mgmt-cognitiveservices";
version = "13.0.0";
version = "13.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "dc6116e8394d45312c7ad5a9098ce0dd2370bd92d43afd33d8b3bfab724fa498";
hash = "sha256-FXS834v5uDGiEGcQMIv9iaHxhfcW9uY3VmX7l91Tfj4=";
};
propagatedBuildInputs = [
msrestazure
azure-common
azure-mgmt-core
azure-mgmt-nspkg
];
# has no tests
# Module has no tests
doCheck = false;
meta = with lib; {

@ -5,17 +5,20 @@
, msrestazure
, azure-common
, azure-mgmt-core
, azure-mgmt-nspkg
, pythonOlder
}:
buildPythonPackage rec {
pname = "azure-mgmt-signalr";
version = "1.0.0";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "43fe90b5c5eb5aa00afcaf2895f1d4417f89ddb7f76bd61204e1253a6767ef7c";
hash = "sha256-lUNIDyP5W+8aIX7manfMqaO2IJJm/+2O+Buv+Bh4EZE=";
};
propagatedBuildInputs = [
@ -23,7 +26,6 @@ buildPythonPackage rec {
msrestazure
azure-common
azure-mgmt-core
azure-mgmt-nspkg
];
# has no tests

@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "debugpy";
version = "1.5.1";
version = "1.6.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "Microsoft";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dPP4stLt5nl9B9afPmH6/hpGKXBsaTpvYZQSHxU6KaY=";
sha256 = "sha256-WfZz2SimOTpG8CWNUic8NSp4Qd2JTXk+7JSUEPhuQ6Q=";
};
patches = [

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, pythonOlder
@ -24,6 +25,11 @@ buildPythonPackage rec {
disabledTests = [
# dns.exception.SyntaxError: protocol not found
"test_misc_good_WKS_text"
] ++ lib.optionals stdenv.isDarwin [
# unable to get local issuer certificate
"test_async"
"test_query"
"test_resolver_override"
];
nativeBuildInputs = [

@ -4,6 +4,14 @@
, cmake
}:
let
tests = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-core-test";
rev = "e407c1592df0f8e91664835324dea85146f20189";
sha256 = "sha256-9WSEkMJOewPqJjB6f7J6Ir0L+U712hkaN+GszjnGw7c=";
};
in
buildPythonPackage rec {
pname = "editorconfig";
version = "0.12.3";
@ -12,10 +20,16 @@ buildPythonPackage rec {
owner = "editorconfig";
repo = "editorconfig-core-py";
rev = "v${version}";
sha256 = "sha256-KwfGWc2mYhUP6SN4vhIO0eX0dasBRC2LSeLEOA/NqG8=";
fetchSubmodules = true;
sha256 = "sha256-ZwoTMgk18+BpPNtXKQUMXGcl2Lp+1RQVyPHgk6gHWh8=";
# workaround until https://github.com/editorconfig/editorconfig-core-py/pull/40 is merged
# fetchSubmodules = true;
};
postUnpack = ''
cp -r ${tests}/* source/tests
chmod +w -R source/tests
'';
nativeBuildInputs = [
cmake
];

@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "elastic-apm";
version = "6.8.0";
version = "6.8.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "elastic";
repo = "apm-agent-python";
rev = "v${version}";
sha256 = "sha256-5G+ALFDEClItXvSQFGari0QdhW+RGV8FukxUoxqphFg=";
sha256 = "sha256-bH7XCk1jPsGalFQ68rQhSyZv9nCZE+xUJyWX828PQQI=";
};
propagatedBuildInputs = [

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "elkm1-lib";
version = "1.2.0";
version = "1.2.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "gwww";
repo = "elkm1";
rev = version;
hash = "sha256-+rFW7qFpay/ebUz9EEB8nn0kuqVtVmG5ZHOWG2bMPts=";
hash = "sha256-Jr9f+essHB1FkzD6zM0G6jgE9C9lfDJuFIPrKRhVt+g=";
};
nativeBuildInputs = [
@ -36,7 +36,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "elkm1_lib" ];
pythonImportsCheck = [
"elkm1_lib"
];
meta = with lib; {
description = "Python module for interacting with ElkM1 alarm/automation panel";

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-auth-oauthlib";
version = "0.5.1";
version = "0.4.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-MFlrgk/GgI/ayi8EjkmYzED7SzWZ6upm0o3HCFs2xbg=";
sha256 = "sha256-qQoHL2mT8sMnBnv2UnAEY4TNpajssguU6ppofx8jOno=";
};
propagatedBuildInputs = [

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-vision";
version = "2.7.1";
version = "2.7.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-Ty80C73K3/TebsdSHinmp2y8TKgOftqT5PIDafq1GgM=";
hash = "sha256-4NTWyf3rndw1zHINlBMtoEmdfSXGnU/jEhxab807Vg4=";
};
propagatedBuildInputs = [

@ -1,26 +1,31 @@
{ buildPythonPackage, lib, fetchFromGitHub
, requests, tqdm
, nose, vcrpy
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
, tqdm
, nose
, vcrpy
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "habanero";
version = "1.0.0";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
# Install from Pypi is failing because of a missing file (Changelog.rst)
src = fetchFromGitHub {
owner = "sckott";
repo = pname;
rev = "v${version}";
sha256 = "0lhbd5c4sypcd65nh4cgxddsqrxwg89nn1qiii6m5l4fzsvblggv";
hash = "sha256-jxaO8nCR5jhXCPjhjVLKaGeQp9JF3ECQ1+j3TOJKawg=";
};
propagatedBuildInputs = [ requests tqdm ];
# almost the entirety of the test suite makes network calls
pytestFlagsArray = [
"test/test-filters.py"
propagatedBuildInputs = [
requests
tqdm
];
checkInputs = [
@ -28,10 +33,19 @@ buildPythonPackage rec {
vcrpy
];
meta = {
pythonImportsCheck = [
"habanero"
];
# almost the entirety of the test suite makes network calls
pytestFlagsArray = [
"test/test-filters.py"
];
meta = with lib; {
description = "Python interface to Library Genesis";
homepage = "https://habanero.readthedocs.io/en/latest/";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.nico202 ];
homepage = "https://habanero.readthedocs.io/";
license = licenses.mit;
maintainers = with maintainers; [ nico202 ];
};
}

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "0.38.5";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
sha256 = "sha256-RzTRRWHmdEjDQM/x4pX1gy7mIJD3K2hjQRAkz53xL50=";
sha256 = "sha256-neYFYzBNx/Rm3PWCsQ5ooisU3Z+kJO+O+KNpbwSsUB4=";
};
propagatedBuildInputs = [

@ -0,0 +1,43 @@
{ buildPythonPackage
, blessings
, fetchFromGitHub
, invoke
, lib
, releases
, semantic-version
, tabulate
, twine
}:
buildPythonPackage rec {
pname = "invocations";
version = "2.6.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "pyinvoke";
repo = pname;
rev = version;
hash = "sha256-eyOJKVRfn7elyEkERl7hvRTNFmq7O9Pr03lBS6xp0wE=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "semantic_version>=2.4,<2.7" "semantic_version" \
--replace "tabulate==0.7.5" "tabulate"
'';
propagatedBuildInputs = [ blessings invoke releases semantic-version tabulate twine ];
# There's an error loading the test suite. See https://github.com/pyinvoke/invocations/issues/29.
doCheck = false;
pythonImportsCheck = [ "invocations" ];
meta = with lib; {
description = "Common/best-practice Invoke tasks and collections";
homepage = "https://invocations.readthedocs.io/";
license = licenses.bsd2;
maintainers = with maintainers; [ samuela ];
};
}

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

Loading…
Cancel
Save