Merge remote-tracking branch 'origin/master' into staging-next

main
Martin Weinelt 2 years ago
commit d68657af92
  1. 2
      .github/workflows/periodic-merge-24h.yml
  2. 2
      .github/workflows/periodic-merge-6h.yml
  3. 2
      .github/workflows/update-terraform-providers.yml
  4. 10
      lib/licenses.nix
  5. 6
      nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
  6. 2
      nixos/doc/manual/release-notes/rl-2205.section.md
  7. 6
      nixos/modules/config/resolvconf.nix
  8. 2
      nixos/modules/services/games/minecraft-server.nix
  9. 310
      nixos/modules/services/misc/autorandr.nix
  10. 1
      nixos/tests/all-tests.nix
  11. 32
      nixos/tests/sfxr-qt.nix
  12. 44
      pkgs/applications/audio/patchage/default.nix
  13. 19
      pkgs/applications/audio/sfxr-qt/default.nix
  14. 6
      pkgs/applications/audio/sfxr-qt/test-export-square-wave/default.nix
  15. 29
      pkgs/applications/audio/sfxr-qt/test-export-square-wave/input.sfxj
  16. 9
      pkgs/applications/backup/pika-backup/default.nix
  17. 4
      pkgs/applications/editors/apostrophe/default.nix
  18. 63
      pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
  19. 3
      pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
  20. 1
      pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
  21. 24
      pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
  22. 3
      pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix
  23. 16
      pkgs/applications/editors/emacs/elisp-packages/plz/default.nix
  24. 1601
      pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
  25. 46
      pkgs/applications/graphics/sane/backends/brscan5/default.nix
  26. 4
      pkgs/applications/misc/koreader/default.nix
  27. 4
      pkgs/applications/misc/logseq/default.nix
  28. 91
      pkgs/applications/misc/organicmaps/default.nix
  29. 4
      pkgs/applications/networking/browsers/brave/default.nix
  30. 12
      pkgs/applications/networking/browsers/chromium/common.nix
  31. 4
      pkgs/applications/networking/browsers/opera/default.nix
  32. 4
      pkgs/applications/networking/browsers/vieb/default.nix
  33. 29
      pkgs/applications/networking/browsers/vieb/package.json
  34. 2757
      pkgs/applications/networking/browsers/vieb/yarn.lock
  35. 2876
      pkgs/applications/networking/browsers/vieb/yarn.nix
  36. 4
      pkgs/applications/networking/cluster/driftctl/default.nix
  37. 32
      pkgs/applications/networking/cluster/ocm/default.nix
  38. 27
      pkgs/applications/networking/cluster/pluto/default.nix
  39. 6
      pkgs/applications/networking/instant-messengers/gotktrix/default.nix
  40. 1
      pkgs/applications/radio/freedv/default.nix
  41. 49
      pkgs/applications/radio/srsran/default.nix
  42. 42
      pkgs/applications/science/electronics/kicad/versions.nix
  43. 81
      pkgs/applications/science/logic/klee/default.nix
  44. 98
      pkgs/applications/science/logic/klee/klee-uclibc.nix
  45. 7
      pkgs/applications/version-management/got/default.nix
  46. 5
      pkgs/applications/video/natron/default.nix
  47. 11
      pkgs/data/icons/flat-remix-icon-theme/default.nix
  48. 8
      pkgs/data/icons/humanity-icon-theme/default.nix
  49. 25
      pkgs/data/soundfonts/generaluser/default.nix
  50. 19
      pkgs/data/themes/greybird/default.nix
  51. 75
      pkgs/desktops/xfce/applications/orage/default.nix
  52. 4
      pkgs/development/guile-modules/guile-ssh/default.nix
  53. 4
      pkgs/development/interpreters/janet/default.nix
  54. 29
      pkgs/development/interpreters/jimtcl/default.nix
  55. 23
      pkgs/development/libraries/draco/default.nix
  56. 37
      pkgs/development/libraries/ffmpeg-sixel/default.nix
  57. 15
      pkgs/development/libraries/ffmpeg/3.4.nix
  58. 4
      pkgs/development/libraries/glib-testing/default.nix
  59. 3
      pkgs/development/libraries/gtk/4.x.nix
  60. 4
      pkgs/development/libraries/malcontent/default.nix
  61. 4
      pkgs/development/libraries/matio/default.nix
  62. 32
      pkgs/development/libraries/tinygltf/default.nix
  63. 3
      pkgs/development/mobile/genymotion/default.nix
  64. 4
      pkgs/development/ocaml-modules/asn1-combinators/default.nix
  65. 4
      pkgs/development/ocaml-modules/bigarray-compat/default.nix
  66. 4
      pkgs/development/ocaml-modules/bisect_ppx/default.nix
  67. 4
      pkgs/development/ocaml-modules/bos/default.nix
  68. 25
      pkgs/development/ocaml-modules/comparelib/default.nix
  69. 4
      pkgs/development/ocaml-modules/directories/default.nix
  70. 4
      pkgs/development/ocaml-modules/duration/default.nix
  71. 31
      pkgs/development/ocaml-modules/enumerate/default.nix
  72. 4
      pkgs/development/ocaml-modules/eqaf/default.nix
  73. 4
      pkgs/development/ocaml-modules/iter/default.nix
  74. 4
      pkgs/development/ocaml-modules/jingoo/default.nix
  75. 4
      pkgs/development/ocaml-modules/magic-mime/default.nix
  76. 4
      pkgs/development/ocaml-modules/markup/default.nix
  77. 4
      pkgs/development/ocaml-modules/mimic/default.nix
  78. 4
      pkgs/development/ocaml-modules/mirage-flow/default.nix
  79. 4
      pkgs/development/ocaml-modules/mirage-fs/default.nix
  80. 4
      pkgs/development/ocaml-modules/mirage-time/default.nix
  81. 4
      pkgs/development/ocaml-modules/ocplib-endian/default.nix
  82. 4
      pkgs/development/ocaml-modules/owl-base/default.nix
  83. 4
      pkgs/development/ocaml-modules/psmt2-frontend/default.nix
  84. 4
      pkgs/development/ocaml-modules/routes/default.nix
  85. 9
      pkgs/development/ocaml-modules/uutf/default.nix
  86. 4
      pkgs/development/python-modules/asyncssh/default.nix
  87. 4
      pkgs/development/python-modules/cvxopt/default.nix
  88. 5
      pkgs/development/python-modules/desktop-notifier/default.nix
  89. 4
      pkgs/development/python-modules/fastcore/default.nix
  90. 13
      pkgs/development/python-modules/gcovr/default.nix
  91. 4
      pkgs/development/python-modules/gphoto2/default.nix
  92. 8
      pkgs/development/python-modules/hacking/default.nix
  93. 4
      pkgs/development/python-modules/iminuit/default.nix
  94. 55
      pkgs/development/python-modules/openapi-core/default.nix
  95. 45
      pkgs/development/python-modules/pathable/default.nix
  96. 4
      pkgs/development/python-modules/python-crfsuite/default.nix
  97. 4
      pkgs/development/python-modules/sabyenc3/default.nix
  98. 2
      pkgs/development/python-modules/towncrier/default.nix
  99. 6
      pkgs/development/tools/analysis/tfsec/default.nix
  100. 4
      pkgs/development/tools/bazel-gazelle/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

@ -49,7 +49,7 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
- name: Comment on failure
uses: peter-evans/create-or-update-comment@v1
uses: peter-evans/create-or-update-comment@v2
if: ${{ failure() }}
with:
issue-number: 105153

@ -43,7 +43,7 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
- name: Comment on failure
uses: peter-evans/create-or-update-comment@v1
uses: peter-evans/create-or-update-comment@v2
if: ${{ failure() }}
with:
issue-number: 105153

@ -39,7 +39,7 @@ jobs:
title: ${{ steps.setup.outputs.title }}
token: ${{ secrets.GITHUB_TOKEN }}
- name: comment on failure
uses: peter-evans/create-or-update-comment@v1
uses: peter-evans/create-or-update-comment@v2
if: ${{ failure() }}
with:
issue-number: 153416

@ -389,6 +389,11 @@ in mkLicense lset) ({
free = false;
};
generaluser = {
fullName = "GeneralUser GS License v2.0";
url = "http://www.schristiancollins.com/generaluser.php"; # license included in sources
};
gpl1Only = {
spdxId = "GPL-1.0-only";
fullName = "GNU General Public License v1.0 only";
@ -607,6 +612,11 @@ in mkLicense lset) ({
fullName = "Enlightenment License (e16)";
};
mit0 = {
spdxId = "MIT-0";
fullName = "MIT No Attribution";
};
mpl10 = {
spdxId = "MPL-1.0";
fullName = "Mozilla Public License 1.0";

@ -1613,6 +1613,12 @@
warning.
</para>
</listitem>
<listitem>
<para>
<literal>services.autorandr</literal> now allows for adding
hooks and profiles declaratively.
</para>
</listitem>
<listitem>
<para>
The <literal>pomerium-cli</literal> command has been moved out

@ -571,6 +571,8 @@ In addition to numerous new and upgraded packages, this release has the followin
Reason is that the old name has been deprecated upstream.
Using the old option name will still work, but produce a warning.
- `services.autorandr` now allows for adding hooks and profiles declaratively.
- The `pomerium-cli` command has been moved out of the `pomerium` package into
the `pomerium-cli` package, following upstream's repository split. If you are
using the `pomerium-cli` command, you should now install the `pomerium-cli`

@ -47,8 +47,8 @@ in
enable = mkOption {
type = types.bool;
default = false;
internal = true;
default = !(config.environment.etc ? "resolv.conf");
defaultText = literalExpression ''!(config.environment.etc ? "resolv.conf")'';
description = ''
DNS configuration is managed by resolvconf.
'';
@ -110,8 +110,6 @@ in
config = mkMerge [
{
networking.resolvconf.enable = !(config.environment.etc ? "resolv.conf");
environment.etc."resolvconf.conf".text =
if !cfg.enable then
# Force-stop any attempts to use resolvconf

@ -153,7 +153,7 @@ in {
type = types.separatedString " ";
default = "-Xmx2048M -Xms2048M";
# Example options from https://minecraft.gamepedia.com/Tutorials/Server_startup_script
example = "-Xmx2048M -Xms4092M -XX:+UseG1GC -XX:+CMSIncrementalPacing "
example = "-Xms4092M -Xmx4092M -XX:+UseG1GC -XX:+CMSIncrementalPacing "
+ "-XX:+CMSClassUnloadingEnabled -XX:ParallelGCThreads=2 "
+ "-XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10";
description = "JVM options for the Minecraft server.";

@ -5,6 +5,243 @@ with lib;
let
cfg = config.services.autorandr;
hookType = types.lines;
matrixOf = n: m: elemType:
mkOptionType rec {
name = "matrixOf";
description =
"${toString n}×${toString m} matrix of ${elemType.description}s";
check = xss:
let listOfSize = l: xs: isList xs && length xs == l;
in listOfSize n xss
&& all (xs: listOfSize m xs && all elemType.check xs) xss;
merge = mergeOneOption;
getSubOptions = prefix: elemType.getSubOptions (prefix ++ [ "*" "*" ]);
getSubModules = elemType.getSubModules;
substSubModules = mod: matrixOf n m (elemType.substSubModules mod);
functor = (defaultFunctor name) // { wrapped = elemType; };
};
profileModule = types.submodule {
options = {
fingerprint = mkOption {
type = types.attrsOf types.str;
description = ''
Output name to EDID mapping.
Use <code>autorandr --fingerprint</code> to get current setup values.
'';
default = { };
};
config = mkOption {
type = types.attrsOf configModule;
description = "Per output profile configuration.";
default = { };
};
hooks = mkOption {
type = hooksModule;
description = "Profile hook scripts.";
default = { };
};
};
};
configModule = types.submodule {
options = {
enable = mkOption {
type = types.bool;
description = "Whether to enable the output.";
default = true;
};
crtc = mkOption {
type = types.nullOr types.ints.unsigned;
description = "Output video display controller.";
default = null;
example = 0;
};
primary = mkOption {
type = types.bool;
description = "Whether output should be marked as primary";
default = false;
};
position = mkOption {
type = types.str;
description = "Output position";
default = "";
example = "5760x0";
};
mode = mkOption {
type = types.str;
description = "Output resolution.";
default = "";
example = "3840x2160";
};
rate = mkOption {
type = types.str;
description = "Output framerate.";
default = "";
example = "60.00";
};
gamma = mkOption {
type = types.str;
description = "Output gamma configuration.";
default = "";
example = "1.0:0.909:0.833";
};
rotate = mkOption {
type = types.nullOr (types.enum [ "normal" "left" "right" "inverted" ]);
description = "Output rotate configuration.";
default = null;
example = "left";
};
transform = mkOption {
type = types.nullOr (matrixOf 3 3 types.float);
default = null;
example = literalExpression ''
[
[ 0.6 0.0 0.0 ]
[ 0.0 0.6 0.0 ]
[ 0.0 0.0 1.0 ]
]
'';
description = ''
Refer to
<citerefentry>
<refentrytitle>xrandr</refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>
for the documentation of the transform matrix.
'';
};
dpi = mkOption {
type = types.nullOr types.ints.positive;
description = "Output DPI configuration.";
default = null;
example = 96;
};
scale = mkOption {
type = types.nullOr (types.submodule {
options = {
method = mkOption {
type = types.enum [ "factor" "pixel" ];
description = "Output scaling method.";
default = "factor";
example = "pixel";
};
x = mkOption {
type = types.either types.float types.ints.positive;
description = "Horizontal scaling factor/pixels.";
};
y = mkOption {
type = types.either types.float types.ints.positive;
description = "Vertical scaling factor/pixels.";
};
};
});
description = ''
Output scale configuration.
</para><para>
Either configure by pixels or a scaling factor. When using pixel method the
<citerefentry>
<refentrytitle>xrandr</refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>
option
<parameter class="command">--scale-from</parameter>
will be used; when using factor method the option
<parameter class="command">--scale</parameter>
will be used.
</para><para>
This option is a shortcut version of the transform option and they are mutually
exclusive.
'';
default = null;
example = literalExpression ''
{
x = 1.25;
y = 1.25;
}
'';
};
};
};
hooksModule = types.submodule {
options = {
postswitch = mkOption {
type = types.attrsOf hookType;
description = "Postswitch hook executed after mode switch.";
default = { };
};
preswitch = mkOption {
type = types.attrsOf hookType;
description = "Preswitch hook executed before mode switch.";
default = { };
};
predetect = mkOption {
type = types.attrsOf hookType;
description = ''
Predetect hook executed before autorandr attempts to run xrandr.
'';
default = { };
};
};
};
hookToFile = folder: name: hook:
nameValuePair "xdg/autorandr/${folder}/${name}" {
source = "${pkgs.writeShellScriptBin "hook" hook}/bin/hook";
};
profileToFiles = name: profile:
with profile;
mkMerge ([
{
"xdg/autorandr/${name}/setup".text = concatStringsSep "\n"
(mapAttrsToList fingerprintToString fingerprint);
"xdg/autorandr/${name}/config".text =
concatStringsSep "\n" (mapAttrsToList configToString profile.config);
}
(mapAttrs' (hookToFile "${name}/postswitch.d") hooks.postswitch)
(mapAttrs' (hookToFile "${name}/preswitch.d") hooks.preswitch)
(mapAttrs' (hookToFile "${name}/predetect.d") hooks.predetect)
]);
fingerprintToString = name: edid: "${name} ${edid}";
configToString = name: config:
if config.enable then
concatStringsSep "\n" ([ "output ${name}" ]
++ optional (config.position != "") "pos ${config.position}"
++ optional (config.crtc != null) "crtc ${toString config.crtc}"
++ optional config.primary "primary"
++ optional (config.dpi != null) "dpi ${toString config.dpi}"
++ optional (config.gamma != "") "gamma ${config.gamma}"
++ optional (config.mode != "") "mode ${config.mode}"
++ optional (config.rate != "") "rate ${config.rate}"
++ optional (config.rotate != null) "rotate ${config.rotate}"
++ optional (config.transform != null) ("transform "
+ concatMapStringsSep "," toString (flatten config.transform))
++ optional (config.scale != null)
((if config.scale.method == "factor" then "scale" else "scale-from")
+ " ${toString config.scale.x}x${toString config.scale.y}"))
else ''
output ${name}
off
'';
in {
@ -22,6 +259,67 @@ in {
for further reference.
'';
};
hooks = mkOption {
type = hooksModule;
description = "Global hook scripts";
default = { };
example = ''
{
postswitch = {
"notify-i3" = "''${pkgs.i3}/bin/i3-msg restart";
"change-background" = readFile ./change-background.sh;
"change-dpi" = '''
case "$AUTORANDR_CURRENT_PROFILE" in
default)
DPI=120
;;
home)
DPI=192
;;
work)
DPI=144
;;
*)
echo "Unknown profle: $AUTORANDR_CURRENT_PROFILE"
exit 1
esac
echo "Xft.dpi: $DPI" | ''${pkgs.xorg.xrdb}/bin/xrdb -merge
'''
};
}
'';
};
profiles = mkOption {
type = types.attrsOf profileModule;
description = "Autorandr profiles specification.";
default = { };
example = literalExpression ''
{
"work" = {
fingerprint = {
eDP1 = "<EDID>";
DP1 = "<EDID>";
};
config = {
eDP1.enable = false;
DP1 = {
enable = true;
crtc = 0;
primary = true;
position = "0x0";
mode = "3840x2160";
gamma = "1.0:0.909:0.833";
rate = "60.00";
rotate = "left";
};
};
hooks.postswitch = readFile ./work-postswitch.sh;
};
}
'';
};
};
};
@ -30,7 +328,15 @@ in {
services.udev.packages = [ pkgs.autorandr ];
environment.systemPackages = [ pkgs.autorandr ];
environment = {
systemPackages = [ pkgs.autorandr ];
etc = mkMerge ([
(mapAttrs' (hookToFile "postswitch.d") cfg.hooks.postswitch)
(mapAttrs' (hookToFile "preswitch.d") cfg.hooks.preswitch)
(mapAttrs' (hookToFile "predetect.d") cfg.hooks.predetect)
(mkMerge (mapAttrsToList profileToFiles cfg.profiles))
]);
};
systemd.services.autorandr = {
wantedBy = [ "sleep.target" ];
@ -49,5 +355,5 @@ in {
};
meta.maintainers = with maintainers; [ ];
meta.maintainers = with maintainers; [ alexnortung ];
}

@ -472,6 +472,7 @@ in
seafile = handleTest ./seafile.nix {};
searx = handleTest ./searx.nix {};
service-runner = handleTest ./service-runner.nix {};
sfxr-qt = handleTest ./sfxr-qt.nix {};
shadow = handleTest ./shadow.nix {};
shadowsocks = handleTest ./shadowsocks {};
shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix {};

@ -0,0 +1,32 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "sfxr-qt";
meta = with pkgs.lib.maintainers; {
maintainers = [ fgaz ];
};
machine = { config, pkgs, ... }: {
imports = [
./common/x11.nix
];
services.xserver.enable = true;
sound.enable = true;
environment.systemPackages = [ pkgs.sfxr-qt ];
};
enableOCR = true;
testScript =
''
machine.wait_for_x()
# Add a dummy sound card, or the program won't start
machine.execute("modprobe snd-dummy")
machine.execute("sfxr-qt >&2 &")
machine.wait_for_window(r"sfxr")
machine.sleep(10)
machine.wait_for_text("requency")
machine.screenshot("screen")
'';
})

@ -1,24 +1,46 @@
{ lib, stdenv, alsa-lib, boost, dbus-glib, fetchsvn, ganv, glibmm
, gtkmm2, libjack2, pkg-config, python2, wafHook
{ lib
, stdenv
, fetchFromGitLab
, alsa-lib
, boost
, dbus-glib
, ganv
, glibmm
, gtkmm2
, libjack2
, pkg-config
, python3
, wafHook
}:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "patchage";
version = "1.0.1";
src = fetchsvn {
url = "http://svn.drobilla.net/lad/trunk/patchage/";
rev = "5821";
sha256 = "1ar64l0sg468qzxj7i6ppgfqjpm92awcp5lzskamrf3ln17lrgj7";
version = "1.0.4";
src = fetchFromGitLab {
owner = "drobilla";
repo = pname;
rev = "v${version}";
hash = "sha256-feQXACsn2i2pJXs0EA9tIbtpl9Lxx5K4G7eG5VWuDV0=";
fetchSubmodules = true;
};
buildInputs = [
alsa-lib boost dbus-glib ganv glibmm gtkmm2 libjack2
pkg-config python2 wafHook
alsa-lib
boost
dbus-glib
ganv
glibmm
gtkmm2
libjack2
pkg-config
python3
wafHook
];
meta = {
description = "Modular patch bay for Jack and ALSA systems";
homepage = "http://non.tuxfamily.org";
homepage = "https://drobilla.net/software/patchage.html";
license = lib.licenses.lgpl3;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.nico202 ];

@ -1,6 +1,7 @@
{ lib
, mkDerivation
, fetchFromGitHub
, fetchpatch
, cmake
, extra-cmake-modules
, qtbase
@ -8,17 +9,19 @@
, SDL
, python3
, catch2
, callPackage
, nixosTests
}:
mkDerivation rec {
pname = "sfxr-qt";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "agateau";
repo = "sfxr-qt";
rev = version;
sha256 = "sha256-Mn+wcwu70BwsTLFlc12sOOe6U1AJ8hR7bCIPlPnCooE=";
sha256 = "sha256-Ce5NJe1f+C4pPmtenHYvtkxste+nPuxJoB+N7K2nyRo=";
fetchSubmodules = true;
};
@ -26,6 +29,13 @@ mkDerivation rec {
cp ${catch2}/include/catch2/catch.hpp 3rdparty/catch2/single_include/catch2/catch.hpp
'';
# Remove on next release
patches = [(fetchpatch {
name = "sfxr-qr-missing-qpainterpath-include";
url = "https://github.com/agateau/sfxr-qt/commit/ef051f473654052112b647df987eb263e38faf47.patch";
sha256 = "sha256-bqMnxHUzdS5oG/2hfr5MvkpwrtZW+GTN5fS2WpV2W2c=";
})];
nativeBuildInputs = [
cmake
extra-cmake-modules
@ -40,6 +50,11 @@ mkDerivation rec {
doCheck = true;
passthru.tests = {
export-square-wave = callPackage ./test-export-square-wave {};
sfxr-qt-starts = nixosTests.sfxr-qt;
};
meta = with lib; {
homepage = "https://github.com/agateau/sfxr-qt";
description = "A sound effect generator, QtQuick port of sfxr";

@ -0,0 +1,6 @@
{ runCommand, sfxr-qt }:
runCommand "sfxr-qt-test-export-square-wave" ''
mkdir $out
${sfxr-qt}/bin/sfxr-qt --export --output $out/output.wav ${./input.sfxj}
''

@ -0,0 +1,29 @@
{
"properties": {
"attackTime": 0,
"baseFrequency": 1,
"changeAmount": 0,
"changeSpeed": 0,
"decayTime": 1,
"deltaSlide": 0,
"dutySweep": 0,
"hpFilterCutoff": 0,
"hpFilterCutoffSweep": 0,
"lpFilterCutoff": 1,
"lpFilterCutoffSweep": 0,
"lpFilterResonance": 0,
"minFrequency": 0,
"phaserOffset": 0,
"phaserSweep": 0,
"repeatSpeed": 0,
"slide": 0,
"squareDuty": 0,
"sustainPunch": 0,
"sustainTime": 1,
"vibratoDepth": 0,
"vibratoSpeed": 0,
"volume": 1,
"waveForm": "Square"
},
"version": 1
}

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, rustPlatform
, substituteAll
, desktop-file-utils
@ -40,6 +41,13 @@ stdenv.mkDerivation rec {
src = ./borg-path.patch;
borg = "${borgbackup}/bin/borg";
})
# Fix build with meson 0.61, can be removed on next release.
# https://gitlab.gnome.org/World/pika-backup/-/issues/156
# https://github.com/mesonbuild/meson/issues/9441
(fetchpatch {
url = "https://gitlab.gnome.org/World/pika-backup/-/commit/54be149c88fd69fb9e74b7362fe7182863237869.patch";
sha256 = "sha256-Tffxo5hlf/gSkp1GfyL4eHthX49tuTq6B+S53N8oA2M=";
})
];
postPatch = ''
@ -73,5 +81,6 @@ stdenv.mkDerivation rec {
changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ];
platforms = platforms.linux;
};
}

@ -13,14 +13,14 @@ let
in stdenv.mkDerivation rec {
pname = "apostrophe";
version = "2.5";
version = "2.6.1";
src = fetchFromGitLab {
owner = "World";
repo = pname;
domain = "gitlab.gnome.org";
rev = "v${version}";
sha256 = "06yfiflmj3ip7ppcz41nb3xpgb5ggw5h74w0v87yaqqkq7qh31lp";
sha256 = "awaXXSUiEIzOAj9Zw8K961HuIKsLFi3QKETUTTIaTjk=";
};
nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils

@ -429,10 +429,10 @@
elpaBuild {
pname = "buffer-env";
ename = "buffer-env";
version = "0.2";
version = "0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/buffer-env-0.2.tar";
sha256 = "1420qln8ww43d6gs70cnxab6lf10dhmk5yk29pwsvjk86afhwhwf";
url = "https://elpa.gnu.org/packages/buffer-env-0.3.tar";
sha256 = "0h92pia258fndihnwmnak10ix00dmfanadnsnzbdah3q64416qhz";
};
packageRequires = [ emacs ];
meta = {
@ -1206,10 +1206,10 @@
elpaBuild {
pname = "ebdb";
ename = "ebdb";
version = "0.8.12";
version = "0.8.14";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-0.8.12.tar";
sha256 = "1k53crdmaw6lzvprsmpdfvg96ck54bzs4z1d4q9x890anglxq5m6";
url = "https://elpa.gnu.org/packages/ebdb-0.8.14.tar";
sha256 = "0h7yva7p4b4lapi7pwcibf75nqmazjf3r67ibnkc8l9salfhml25";
};
packageRequires = [ emacs seq ];
meta = {
@ -1266,10 +1266,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20220316";
version = "20220324";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20220316.tar";
sha256 = "1ax487ca2rsq6ck2g0694fq3z7a89dy4pcns15wd7ygkf3a4sykf";
url = "https://elpa.gnu.org/packages/eev-20220324.tar";
sha256 = "0x1fhjj7g96xmp8pnj3k23xi61nfzaj04bzx050qjc1dvdg8gpfa";
};
packageRequires = [ emacs ];
meta = {
@ -1324,10 +1324,10 @@
elpaBuild {
pname = "eldoc";
ename = "eldoc";
version = "1.11.0";
version = "1.11.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eldoc-1.11.0.el";
sha256 = "1py9l1vl7s90y5kfpglhy11jswam2gcrqap09h6wb5ldnyb8cgq2";
url = "https://elpa.gnu.org/packages/eldoc-1.11.1.tar";
sha256 = "065clc07nrgp56cgynqhq3fmnwd64ccg2jxzikzb0f2zkn10vc90";
};
packageRequires = [ emacs ];
meta = {
@ -2073,10 +2073,10 @@
elpaBuild {
pname = "isearch-mb";
ename = "isearch-mb";
version = "0.4";
version = "0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/isearch-mb-0.4.tar";
sha256 = "11q9sdi6l795hspi7hr621bbra66pxsgrkry95k7wxjkmibcbsxr";
url = "https://elpa.gnu.org/packages/isearch-mb-0.5.tar";
sha256 = "0fah8dmh9jv05i93ccn9dvl7qmfy32vwxqdzkf1v8gr1plsyjyx7";
};
packageRequires = [ emacs ];
meta = {
@ -3295,10 +3295,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
version = "0.4.19";
version = "0.4.20";
src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.4.19.tar";
sha256 = "1l9ivg6x084r235jpd90diaa4v29r1kyfsblzsb8blskb9ka5b56";
url = "https://elpa.gnu.org/packages/phps-mode-0.4.20.tar";
sha256 = "0xb4i3s6yira1kfqwrs72ajvpqc6pw7gqlxmfmdhyyvib6p93l6m";
};
packageRequires = [ emacs ];
meta = {
@ -3396,6 +3396,21 @@
license = lib.licenses.free;
};
}) {};
pulsar = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "pulsar";
ename = "pulsar";
version = "0.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pulsar-0.2.0.tar";
sha256 = "0vil6gv7w6d77hksc2pbrwjdd8dp3ka4kf5kihx04r95032pky62";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/pulsar.html";
license = lib.licenses.free;
};
}) {};
pyim = callPackage ({ async, elpaBuild, emacs, fetchurl, lib, xr }:
elpaBuild {
pname = "pyim";
@ -3725,10 +3740,10 @@
elpaBuild {
pname = "repology";
ename = "repology";
version = "1.2.2";
version = "1.2.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/repology-1.2.2.tar";
sha256 = "0ggb0zgz24hs5andhyrlpqm0gda0gf1wynzkarj4z7gpk5p9wrpr";
url = "https://elpa.gnu.org/packages/repology-1.2.3.tar";
sha256 = "1ngx23b7dilyps20nznrrn867kbxyn6nryf4p1sy5m576hkw18kn";
};
packageRequires = [ emacs ];
meta = {
@ -4700,10 +4715,10 @@
elpaBuild {
pname = "vertico-posframe";
ename = "vertico-posframe";
version = "0.5.2";
version = "0.5.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.2.tar";
sha256 = "0gzvm0la706kg3aqgrd6crz6353sp47dnpxdj9l2avb31avyqmv9";
url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.3.tar";
sha256 = "12jcb4im1ys2s0wbv9nfmgpcrz037zagd677qjm8hz8fn29xdh6n";
};
packageRequires = [ emacs posframe vertico ];
meta = {

@ -2,10 +2,11 @@
# Updating
To update the list of packages from MELPA,
To update the list of packages from ELPA,
1. Run `./update-elpa`.
2. Check for evaluation errors:
# "../../../../../" points to the default.nix from root of Nixpkgs tree
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages
3. Run `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix`

@ -6,6 +6,7 @@ To update the list of packages from MELPA,
1. Run `./update-melpa`
2. Check for evaluation errors:
# "../../../../../" points to the default.nix from root of Nixpkgs tree
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages
3. Run `git commit -m "melpa-packages $(date -Idate)" recipes-archive-melpa.json`

@ -712,10 +712,10 @@
elpaBuild {
pname = "geiser";
ename = "geiser";
version = "0.23";
version = "0.23.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-0.23.tar";
sha256 = "1g82jaldq4rxiyhnzyqf82scys1545djc3y2nn9ih292g8rwqqms";
url = "https://elpa.nongnu.org/nongnu/geiser-0.23.2.tar";
sha256 = "1rdz13rjfp8j2ik3vbw1jvacjri3abghlq6aqfvkd7vwm21h30ih";
};
packageRequires = [ emacs project transient ];
meta = {
@ -802,10 +802,10 @@
elpaBuild {
pname = "geiser-guile";
ename = "geiser-guile";
version = "0.23";
version = "0.23.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.23.tar";
sha256 = "0fxn15kpljkdj1vvrv51232km49z2sbr6q9ghpvqwkgi0z9khxz6";
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.23.2.tar";
sha256 = "1z2khagg425y5cfja694zxrj3lyw3awsmqd86b2hpqhrylrb8jaa";
};
packageRequires = [ emacs geiser ];
meta = {
@ -1063,10 +1063,10 @@
elpaBuild {
pname = "helm";
ename = "helm";
version = "3.8.4";
version = "3.8.5";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/helm-3.8.4.tar";
sha256 = "0yc7ijap3g68w7npgwymzlp5bcawk3lhnp0004m03zfdbxhmkq0z";
url = "https://elpa.nongnu.org/nongnu/helm-3.8.5.tar";
sha256 = "1h71qcik375zhkk4rgcxj6ffnzpns2lvzwq82yfhmmhzrrxhds0z";
};
packageRequires = [ helm-core popup ];
meta = {
@ -1078,10 +1078,10 @@
elpaBuild {
pname = "helm-core";
ename = "helm-core";
version = "3.8.4";
version = "3.8.5";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.4.tar";
sha256 = "0a1liapy345nlqjgxbzad0mkdbs4g6619cqplwiyh89x0lm0jprx";
url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.5.tar";
sha256 = "0117y2gazm8h5fxj23166a53w4r68r1mscgardk0y6xd6lz73yz9";
};
packageRequires = [ async emacs ];
meta = {

@ -6,7 +6,8 @@ To update the list of packages from nongnu (ELPA),
1. Run `./update-nongnu`.
2. Check for evaluation errors:
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.nongnuPackages
# "../../../../../" points to the default.nix from root of Nixpkgs tree
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../../ -A emacs.pkgs.nongnuPackages
3. Run `git commit -m "nongnu-packages $(date -Idate)" -- nongnu-generated.nix`
*/

@ -2,21 +2,29 @@
trivialBuild {
pname = "plz";
version = "unstable-2021-08-22";
version = "0.pre+date=2021-08-22";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "plz.el";
rev = "7e456638a651bab3a814e3ea81742dd917509cbb";
sha256 = "sha256-8kn9ax1AVF6f9iCTqvVeJZihs03pYAhLjUDooG/ubxY=";
hash = "sha256-8kn9ax1AVF6f9iCTqvVeJZihs03pYAhLjUDooG/ubxY=";
};
postPatch = ''
substituteInPlace ./plz.el --replace 'plz-curl-program "curl"' 'plz-curl-program "${curl}/bin/curl"'
substituteInPlace ./plz.el \
--replace 'plz-curl-program "curl"' 'plz-curl-program "${curl}/bin/curl"'
'';
meta = {
description = "plz is an HTTP library for Emacs";
description = "An HTTP library for Emacs";
longDescription = ''
plz is an HTTP library for Emacs. It uses curl as a backend, which avoids
some of the issues with using Emacss built-in url library. It supports
both synchronous and asynchronous requests. Its API is intended to be
simple, natural, and expressive. Its code is intended to be simple and
well-organized. Every feature is tested against httpbin.org.
'';
license = lib.licenses.gpl3Only;
platforms = lib.platforms.all;
};

@ -5,21 +5,22 @@ let
${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
${file}
'';
system = stdenv.hostPlatform.system;
in
stdenv.mkDerivation rec {
pname = "brscan5";
version = "1.2.7-0";
version = "1.2.9-0";
src = {
"i686-linux" = fetchurl {
url = "https://download.brother.com/welcome/dlf104034/${pname}-${version}.i386.deb";
sha256 = "647d06f629c22408d25be7c0bf49a4b1c7280bf78a27aa2cde6c3e3fa8b6807a";
sha256 = "ac23c9a435818955e7882ab06380adf346203ff4e45f384b40e84b8b29642f07";
};
"x86_64-linux" = fetchurl {
url = "https://download.brother.com/welcome/dlf104033/${pname}-${version}.amd64.deb";
sha256 = "867bd88ab0d90f8e9391dc8127385095127e533cb6bd2d5d13449df602b165ae";
sha256 = "4ec23ff4b457323ae778e871a0f1abcc1848ea105af17850b57f7dcaddcfd96d";
};
}."${stdenv.hostPlatform.system}";
}."${system}" or (throw "Unsupported system: ${system}");
unpackPhase = ''
ar x $src
@ -30,21 +31,28 @@ stdenv.mkDerivation rec {
buildInputs = [ libusb1 avahi-compat stdenv.cc.cc glib ];
dontBuild = true;
postPatch = ''
${myPatchElf "opt/brother/scanner/brscan5/brsaneconfig5"}
${myPatchElf "opt/brother/scanner/brscan5/brscan_cnetconfig"}
${myPatchElf "opt/brother/scanner/brscan5/brscan_gnetconfig"}
for a in opt/brother/scanner/brscan5/*.so.* opt/brother/scanner/brscan5/brscan_[cg]netconfig; do
if ! test -L $a; then
patchelf --set-rpath ${lib.makeLibraryPath buildInputs} $a
fi
done
# driver is hardcoded to look in /opt/brother/scanner/brscan5/models for model metadata.
# patch it to look in /etc/opt/brother/scanner/models instead, so nixos environment.etc can make it available
printf '/etc/opt/brother/scanner/models\x00' | dd of=opt/brother/scanner/brscan5/libsane-brother5.so.1.0.7 bs=1 seek=84632 conv=notrunc
'';
postPatch =
let
patchOffsetBytes =
if system == "x86_64-linux" then 84632
else if system == "i686-linux" then 77396
else throw "Unsupported system: ${system}";
in
''
${myPatchElf "opt/brother/scanner/brscan5/brsaneconfig5"}
${myPatchElf "opt/brother/scanner/brscan5/brscan_cnetconfig"}
${myPatchElf "opt/brother/scanner/brscan5/brscan_gnetconfig"}
for file in opt/brother/scanner/brscan5/*.so.* opt/brother/scanner/brscan5/brscan_[cg]netconfig; do
if ! test -L $file; then
patchelf --set-rpath ${lib.makeLibraryPath buildInputs} $file
fi
done
# driver is hardcoded to look in /opt/brother/scanner/brscan5/models for model metadata.
# patch it to look in /etc/opt/brother/scanner/models instead, so nixos environment.etc can make it available
printf '/etc/opt/brother/scanner/models\x00' | dd of=opt/brother/scanner/brscan5/libsane-brother5.so.1.0.7 bs=1 seek=${toString patchOffsetBytes} conv=notrunc
'';
installPhase = with lib; ''
runHook preInstall

@ -13,12 +13,12 @@
let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
in stdenv.mkDerivation rec {
pname = "koreader";
version = "2022.03";
version = "2022.03.1";
src = fetchurl {
url =
"https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
sha256 = "sha256-xR92sCeP7wcYukUGxoG9LQyk4k/qkmnxqmjY4Umt05I=";
sha256 = "sha256-ZoqITWPR60G4xY9InrtIY9rCWUk0PidGFZokHLWl5ps=";
};
sourceRoot = ".";

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.6.3";
version = "0.6.5";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "o3tBHk7bauNczz6lPS3lV0mpYEaBa0lh/mAJKJM2eWU=";
sha256 = "WKROcCv0IzRnQd74j5Iget5jlfyDbeJ/PXgZmSNrSsQ=";
name = "${pname}-${version}.AppImage";
};

@ -0,0 +1,91 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, ninja
, pkg-config
, which
, python3
, rsync
, makeWrapper
, qtbase
, qtsvg
, libGLU
, libGL
, zlib
, icu
, freetype
}:
mkDerivation rec {
pname = "organicmaps";
version = "2022.03.23-4-android";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = version;
sha256 = "sha256-4VBsHq8z/odD7Nrk9e0sYMEBBLeTAHsWsdgPIN1KVZo=";
fetchSubmodules = true;
};
postPatch = ''
# Disable certificate check. It's dependent on time
echo "exit 0" > tools/unix/check_cert.sh
# crude fix for https://github.com/organicmaps/organicmaps/issues/1862
echo "echo ${lib.replaceStrings ["." "-" "android"] ["" "" ""] version}" > tools/unix/version.sh
'';
nativeBuildInputs = [
cmake
ninja
pkg-config
which
python3
rsync
makeWrapper
];
# Most dependencies are vendored
buildInputs = [
qtbase
qtsvg
libGLU
libGL
zlib
icu
freetype
];
# Yes, this is PRE configure. The configure phase uses cmake
preConfigure = ''
bash ./configure.sh
'';
postInstall = ''
install -Dm755 OMaps $out/bin/OMaps
# Tell the program that the read-only and the read-write data locations
# are different, and create the read-write one.
wrapProgram $out/bin/OMaps \
--add-flags "-resources_path $out/share/organicmaps/data" \
--add-flags '-data_path "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' \
--run 'mkdir -p "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"'
mkdir -p $out/share/organicmaps
cp -r ../data $out/share/organicmaps/data
install -Dm644 ../qt/res/logo.png $out/share/icons/hicolor/96x96/apps/organicmaps.png
install -Dm644 ../qt/res/OrganicMaps.desktop $out/share/applications/OrganicMaps.desktop
'';
meta = with lib; {
homepage = "https://organicmaps.app/";
description = "Detailed Offline Maps for Travellers, Tourists, Hikers and Cyclists";
license = licenses.asl20;
maintainers = with maintainers; [ fgaz ];
platforms = platforms.all;
mainProgram = "OMaps";
broken = stdenv.isDarwin; # "invalid application of 'sizeof' to a function type"
};
}

@ -91,11 +91,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.36.116";
version = "1.36.122";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "whGV0VgCm6JSyrcFQTKbM35b/qLQdBmChTrYuyC+OlI=";
sha256 = "aBHoEu1egRPMpeUBgRl2V5J3op1Ju+CvprG14dIWc8M=";
};
dontConfigure = true;

@ -23,7 +23,7 @@
, libusb1, re2
, ffmpeg, libxslt, libxml2
, nasm
, nspr, nss, systemd
, nspr, nss
, util-linux, alsa-lib
, bison, gperf, libkrb5
, glib, gtk3, dbus-glib
@ -47,6 +47,8 @@
, ungoogled ? false, ungoogled-chromium
# Optional dependencies:
, libgcrypt ? null # gnomeSupport || cupsSupport
, systemdSupport ? stdenv.isLinux
, systemd
}:
buildFun:
@ -139,7 +141,7 @@ let
libusb1 re2
ffmpeg libxslt libxml2
nasm
nspr nss systemd
nspr nss
util-linux alsa-lib
bison gperf libkrb5
glib gtk3 dbus-glib
@ -151,7 +153,8 @@ let
libdrm wayland mesa.drivers libxkbcommon
curl
libepoxy
] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ]
] ++ optional systemdSupport systemd
++ optionals gnomeSupport [ gnome2.GConf libgcrypt ]
++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals cupsSupport [ libgcrypt cups ]
++ optional pulseSupport libpulseaudio;
@ -204,9 +207,10 @@ let
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \
chrome/browser/shell_integration_linux.cc
'' + lib.optionalString systemdSupport ''
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
device/udev_linux/udev?_loader.cc
'' + ''
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
gpu/config/gpu_info_collector_linux.cc

@ -50,11 +50,11 @@ let
in stdenv.mkDerivation rec {
pname = "opera";
version = "84.0.4316.31";
version = "84.0.4316.42";
src = fetchurl {
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
sha256 = "sha256-ypSnarhtJNQn3yOtydjmf6WmHAYbOfMg3xatCxTfIMY=";
sha256 = "sha256-ZjVuw30YfHQ69BVxPvIde6VuOcqtnXrGwhZpA26vLpw=";
};
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";

@ -2,13 +2,13 @@
mkYarnPackage rec {
pname = "vieb";
version = "6.2.0";
version = "7.1.2";
src = fetchFromGitHub {
owner = "Jelmerro";
repo = pname;
rev = version;
sha256 = "sha256-FuaN9iUxR5Y6SnNmuegmNJXn1BYKgcobquTL3thuByM=";
sha256 = "sha256-4LGg3w/rleTyHJd4867dog+/fIXhtKbYgF1bYKwoh/I=";
};
packageJSON = ./package.json;

@ -1,7 +1,7 @@
{
"name": "vieb",
"productName": "Vieb",
"version": "5.3.0",
"version": "7.1.2",
"description": "Vim Inspired Electron Browser",
"main": "app/index.js",
"scripts": {
@ -14,7 +14,7 @@
"fix": "eslint --fix app .eslintrc.js build.js",
"lint": "eslint app .eslintrc.js build.js",
"start": "electron app",
"test": "jest --testEnvironment jsdom --coverage --collectCoverageFrom 'app/**/*.js' -u && npm run lint && echo 'All good :)'"
"test": "TZ=UTC jest --testEnvironment jsdom --coverage --collectCoverageFrom 'app/**/*.js' -u && npm run lint && echo 'All good :)'"
},
"repository": "https://github.com/Jelmerro/Vieb",
"homepage": "https://vieb.dev",
@ -28,23 +28,18 @@
"email": "Jelmerro@users.noreply.github.com",
"license": "GPL-3.0-or-later",
"devDependencies": {
"archiver": "5.3.0",
"electron": "13.1.4",
"electron-builder": "22.11.7",
"eslint": "7.29.0",
"eslint-plugin-compat": "3.9.0",
"eslint-plugin-sort-keys-fix": "1.1.1",
"jest": "27.0.6",
"jest-environment-jsdom": "27.0.6"
"electron": "17.0.1",
"electron-builder": "22.14.13",
"eslint": "8.9.0",
"eslint-plugin-sort-keys": "2.3.5",
"jest": "27.5.1",
"jest-environment-jsdom": "27.5.1"
},
"dependencies": {
"7zip-bin": "5.1.1",
"@cliqz/adblocker-electron": "1.22.2",
"@cliqz/adblocker-electron-preload": "1.22.2",
"is-svg": "4.3.1",
"@cliqz/adblocker-electron": "1.23.6",
"@cliqz/adblocker-electron-preload": "1.23.6",
"is-svg": "4.3.2",
"rimraf": "3.0.2"
},
"browserslist": [
"last 2 Chrome versions"
]
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "driftctl";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "snyk";
repo = "driftctl";
rev = "v${version}";
sha256 = "sha256-jKaJqmJMOz+2pWXTgVtnJbYbikdTfW8nWQJKWVxqv5I=";
sha256 = "sha256-opR1NkMGptZilSPVZ7yNjYBBjnOXxrqAFCYzQ1tNS78=";
};
vendorSha256 = "sha256-I0OCRhUvuaF4k5qqPaV6R24mrd9AG5GgQCCF6yodK0E=";

@ -0,0 +1,32 @@
{ lib, buildGoModule, fetchFromGitHub, testVersion, ocm }:
buildGoModule rec {
pname = "ocm";
version = "0.1.62";
src = fetchFromGitHub {
owner = "openshift-online";
repo = "ocm-cli";
rev = "v${version}";
sha256 = "0kv0zcx6wdlyid37ygzg05xyyk77ybd2qcdgbswjv6crcjh1xdrd";
};
vendorSha256 = "sha256-nXUrbF9mcHy8G7c+ktQixBmmf6x066gpuaZ0eUsJQwc=";
# Tests expect the binary to be located in the root directory.
preCheck = ''
ln -s $GOPATH/bin/ocm ocm
'';
passthru.tests.version = testVersion {
package = ocm;
command = "ocm version";
};
meta = with lib; {
description = "CLI for the Red Hat OpenShift Cluster Manager";
license = licenses.asl20;
homepage = "https://github.com/openshift-online/ocm-cli";
maintainers = with maintainers; [ stehessel ];
};
}

@ -0,0 +1,27 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "pluto";
version = "5.6.0";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = "pluto";
rev = "v${version}";
sha256 = "0nr8h8vg8ifgibgw80rs4mk63bj3qhmd37lfjc89iyml4g6p9mwr";
};
vendorSha256 = "08x5mzypg66s54apkd7hhj6bi5pgbch9if2dbr58ksd3arkji2pv";
ldflags = [
"-w" "-s"
"-X main.version=v${version}"
];
meta = with lib; {
homepage = "https://github.com/FairwindsOps/pluto";
description = "Find deprecated Kubernetes apiVersions";
license = licenses.asl20;
maintainers = with maintainers; [ peterromfeldhk ];
};
}

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "gotktrix";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "diamondburned";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9feKg/rnkWdJRolHBQ5WT6Rl3xTFe82M8HyxJK3VuN4=";
sha256 = "sha256-K+q0sykdOMnAWypOXnwTU5oTokpYw61CTsAW1gIvGSQ=";
};
vendorSha256 = "sha256-eO/2MvWOVCeeCsiU2mSwgSEVlSbCXOp8qHyoG0lmk+Q=";
vendorSha256 = "sha256-Br9KgUoN01yoGujgbj5UEoB57K87oEH/o40rrRtIZVY=";
buildInputs = [
gtk4

@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21;
maintainers = with maintainers; [ mvs ];
platforms = platforms.unix;
broken = stdenv.isDarwin; # see https://github.com/NixOS/nixpkgs/issues/165422
};
}

@ -0,0 +1,49 @@
{ stdenv
, lib
, cmake
, fetchFromGitHub
, pkg-config
, fftwFloat
, mbedtls
, boost
, lksctp-tools
, libconfig
, pcsclite
, uhd
, soapysdr
, libbladeRF
}:
stdenv.mkDerivation rec {
pname = "srsran";
version = "21.10";
src = fetchFromGitHub {
owner = "srsran";
repo = "srsran";
rev = "release_${builtins.replaceStrings ["."] ["_"] version}";
sha256 = "sha256-uJv8khevp7g2p4zT6bkrut67kvMu+fuL1VHDDit0viw=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
fftwFloat
mbedtls
boost
libconfig
lksctp-tools
pcsclite
uhd
soapysdr
libbladeRF
];
meta = with lib; {
homepage = "https://www.srslte.com/";
description = "Open-source 4G and 5G software radio suite.";
license = licenses.agpl3;
platforms = with platforms; linux ;
maintainers = with maintainers; [ hexagonal-sun ];
};
}

@ -3,45 +3,45 @@
{
"kicad" = {
kicadVersion = {
version = "6.0.2";
version = "6.0.4";
src = {
rev = "378541a8ebe8a691b61c8ed1b4012c71343acfbb";
sha256 = "1lcl25zkqkyj5rvw9rad3n7bklpg10kmhmhkyyrgg8ql7di6wa0f";
rev = "6f826c9f35a3dc9a104bb24a0a89a2e04b2d9721";
sha256 = "0lki59ws0ncqkp9wxrhyni1ck2sx5z07mmpkjg0d9jpkync9hx9y";
};
};
libVersion = {
version = "6.0.2";
version = "6.0.4";
libSources = {
symbols.rev = "80a176076a8f3785a4cd64e55ec87f27f6fcc163";
symbols.sha256 = "1f57wv5b95iqd64k8ab82fvxnh5q890v7bzclmn019gl6ikisxj5";
templates.rev = "c9a51b852eacc3e64639548032b50edd80ddb27c";
symbols.rev = "9d00fbb9373571e54d9f29985b21a03d862795a4";
symbols.sha256 = "12lyc187337bf2frl3jvwqdwwnd69f7l414k3kxhccs3sa2mcf1y";
templates.rev = "c4f4fe4b821e062a3ddd275f9313d5d81ff8f8d7";
templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm";
footprints.rev = "c81b399054b0d3842094d7e8dfe08eb04310573a";
footprints.sha256 = "1xmnq2731v2afan1d08xb1qqgl5xd01v5jphi6cdmw28ri555cna";
packages3d.rev = "75175a21b720c59a26efce9a8c6dba3d032392a9";
packages3d.sha256 = "10zf8hp85ksi84cbiczsksn0ygvri4ffsa126v73nnkx6irw6nkk";
footprints.rev = "c48d3dfcfa6ce58ec11e10b7a74878bb69fae580";
footprints.sha256 = "0px2g9jansky0rvc0bdjylbmv8xwhc0q63g88hd2nzbknqli9f1y";
packages3d.rev = "b1de0b5c3edc16999602b809a05017da62ff52cc";
packages3d.sha256 = "0ms9py93qyihxrhh9wm2ziycmdn88m36r8adx22ynjnxixw1f9ja";
};
};
};
"kicad-unstable" = {
kicadVersion = {
version = "2022-01-13";
version = "2022-03-19";
src = {
rev = "33a4c9b08e040a17daefae9069fdf834063555b4";
sha256 = "1ma0i0vgvdsjrmlfzdi34byly7n1vsaynwp9f1hny4s1m53nirha";
rev = "58c146a7c00ee64ca07cacbcc594121f40aa2aeb";
sha256 = "0gcbl11pq0dgp590hdwsh5np7spixk5kgva0v8mx9rqd374z4bdm";
};
};
libVersion = {
version = "2022-01-13";
version = "2022-03-19";
libSources = {
symbols.rev = "e3b198d827817b79fb8a6df07f0cfc1cb9140edf";
symbols.sha256 = "1azjx1bmxaz8bniyw75lq60mc8hvay00jn9qdc2zp7isy3c9ibp0";
symbols.rev = "9b8d3163450172a7f368462c6d005841ad199144";
symbols.sha256 = "12lyc187337bf2frl3jvwqdwwnd69f7l414k3kxhccs3sa2mcf1y";
templates.rev = "a27d83f0a20f0be0c1ab04b139a0c518da51a5d4";
templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm";
footprints.rev = "a939c691f1c515d6830e54cf035a420de3e5a92c";
footprints.sha256 = "13g6y1l95znz6ixc4dpqsxp3icrzs951xpabnzr5znw42577gm9j";
packages3d.rev = "196a26294d8e501b0e8b06c1df1abae0ebe23051";
packages3d.sha256 = "0ywlk00dfwv7hc494finmazdh3g1yx0ir7bvnd8zp6cq4ql0nwl4";
footprints.rev = "c871df2c81a894bc5e91d2d517b76884d5a918aa";
footprints.sha256 = "0px2g9jansky0rvc0bdjylbmv8xwhc0q63g88hd2nzbknqli9f1y";
packages3d.rev = "6ff98426fd51d53c55bc48025d66d3d0b0c5df92";
packages3d.sha256 = "0ms9py93qyihxrhh9wm2ziycmdn88m36r8adx22ynjnxixw1f9ja";
};
};
};

@ -1,5 +1,5 @@
{ stdenv
, lib
{ lib
, callPackage
, fetchFromGitHub
, fetchpatch
, cmake
@ -14,13 +14,37 @@
, sqlite
, gtest
, lit
# Build KLEE in debug mode. Defaults to false.
, debug ? false
# Include debug info in the build. Defaults to true.
, includeDebugInfo ? true
# Enable KLEE asserts. Defaults to true, since LLVM is built with them.
, asserts ? true
# Build the KLEE runtime in debug mode. Defaults to true, as this improves
# stack traces of the software under test.
, debugRuntime ? true
# Enable runtime asserts. Default false.
, runtimeAsserts ? false
# Extra klee-uclibc config.
, extraKleeuClibcConfig ? {}
}:
let
# Python used for KLEE tests.
kleePython = python3.withPackages (ps: with ps; [ tabulate ]);
# The klee-uclibc derivation.
kleeuClibc = callPackage ./klee-uclibc.nix {
inherit clang_9 llvmPackages_9 extraKleeuClibcConfig debugRuntime runtimeAsserts;
};
in
stdenv.mkDerivation rec {
clang_9.stdenv.mkDerivation rec {
pname = "klee";
version = "2.2";
src = fetchFromGitHub {
@ -30,11 +54,12 @@ stdenv.mkDerivation rec {
sha256 = "Ar3BKfADjJvvP0dI9+x/l3RDs8ncx4jmO7ol4MgOr4M=";
};
buildInputs = [
llvmPackages_9.llvm clang_9 z3 stp cryptominisat
llvmPackages_9.llvm
z3 stp cryptominisat
gperftools sqlite
];
nativeBuildInputs = [
cmake
cmake clang_9
];
checkInputs = [
gtest
@ -46,14 +71,17 @@ stdenv.mkDerivation rec {
];
cmakeFlags = let
buildType = if debug then "Debug" else "Release";
in
[
"-DCMAKE_BUILD_TYPE=${buildType}"
"-DKLEE_RUNTIME_BUILD_TYPE=${buildType}"
"-DENABLE_POSIX_RUNTIME=ON"
"-DENABLE_UNIT_TESTS=ON"
"-DENABLE_SYSTEM_TESTS=ON"
onOff = val: if val then "ON" else "OFF";
in [
"-DCMAKE_BUILD_TYPE=${if debug then "Debug" else if !debug && includeDebugInfo then "RelWithDebInfo" else "MinSizeRel"}"
"-DKLEE_RUNTIME_BUILD_TYPE=${if debugRuntime then "Debug" else "Release"}"
"-DKLEE_ENABLE_TIMESTAMP=${onOff false}"
"-DENABLE_KLEE_UCLIBC=${onOff true}"
"-DKLEE_UCLIBC_PATH=${kleeuClibc}"
"-DENABLE_KLEE_ASSERTS=${onOff asserts}"
"-DENABLE_POSIX_RUNTIME=${onOff true}"
"-DENABLE_UNIT_TESTS=${onOff true}"
"-DENABLE_SYSTEM_TESTS=${onOff true}"
"-DGTEST_SRC_DIR=${gtest.src}"
"-DGTEST_INCLUDE_DIR=${gtest.src}/googletest/include"
"-Wno-dev"
@ -66,21 +94,40 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
/* This patch is currently necessary for the unit test suite to run correctly.
* See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03136.html
* and https://github.com/klee/klee/pull/1458 for more information.
*/
patches = map fetchpatch [
/* This patch is currently necessary for the unit test suite to run correctly.
* See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03136.html
* and https://github.com/klee/klee/pull/1458 for more information.
*/
{
name = "fix-gtest";
sha256 = "F+/6videwJZz4sDF9lnV4B8lMx6W11KFJ0Q8t1qUDf4=";
url = "https://github.com/klee/klee/pull/1458.patch";
}
# This patch fixes test compile issues with glibc 2.33+.
{
name = "fix-glibc-2.33";
sha256 = "PzxqtFyLy9KF1eA9AAKg1tu+ggRdvu7leuvXifayIcc=";
url = "https://github.com/klee/klee/pull/1385.patch";
}
# /etc/mtab doesn't exist in the Nix build sandbox.
{
name = "fix-etc-mtab-in-tests";
sha256 = "2Yb/rJA791esNNqq8uAXV+MML4YXIjPKkHBOufvyRoQ=";
url = "https://github.com/klee/klee/pull/1471.patch";
}
];
doCheck = true;
checkTarget = "check";
passthru = {
# Let the user depend on `klee.uclibc` for klee-uclibc
uclibc = kleeuClibc;
};
meta = with lib; {
description = "A symbolic virtual machine built on top of LLVM";
longDescription = ''

@ -0,0 +1,98 @@
{ lib
, fetchurl
, fetchFromGitHub
, which
, linuxHeaders
, clang_9
, llvmPackages_9
, python3
, debugRuntime ? true
, runtimeAsserts ? false
, extraKleeuClibcConfig ? {}
}:
let
localeSrcBase = "uClibc-locale-030818.tgz";
localeSrc = fetchurl {
url = "http://www.uclibc.org/downloads/${localeSrcBase}";
sha256 = "xDYr4xijjxjZjcz0YtItlbq5LwVUi7k/ZSmP6a+uvVc=";
};
resolvedExtraKleeuClibcConfig = lib.mapAttrsToList (name: value: "${name}=${value}") (extraKleeuClibcConfig // {
"UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA" = "n";
"RUNTIME_PREFIX" = "/";
"DEVEL_PREFIX" = "/";
});
in
clang_9.stdenv.mkDerivation rec {
pname = "klee-uclibc";
version = "1.2";
src = fetchFromGitHub {
owner = "klee";
repo = "klee-uclibc";
rev = "klee_uclibc_v${version}";
sha256 = "qdrGMw+2XwpDsfxdv6swnoaoACcF5a/RWgUxUYbtPrI=";
};
nativeBuildInputs = [
clang_9
llvmPackages_9.llvm
python3
which
];
# Some uClibc sources depend on Linux headers.
UCLIBC_KERNEL_HEADERS = "${linuxHeaders}/include";
# HACK: needed for cross-compile.
# See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03141.html
KLEE_CFLAGS = "-idirafter ${clang_9}/resource-root/include";
prePatch = ''
patchShebangs ./configure
patchShebangs ./extra
'';
# klee-uclibc configure does not support --prefix, so we override configurePhase entirely
configurePhase = ''
./configure ${lib.escapeShellArgs (
["--make-llvm-lib"]
++ lib.optional (!debugRuntime) "--enable-release"
++ lib.optional runtimeAsserts "--enable-assertions"
)}
# Set all the configs we care about.
configs=(
PREFIX=$out
)
for value in ${lib.escapeShellArgs resolvedExtraKleeuClibcConfig}; do
configs+=("$value")
done
for configFile in .config .config.cmd; do
for config in "''${configs[@]}"; do
prefix="''${config%%=*}="
if grep -q "$prefix" "$configFile"; then
sed -i "s"'\001'"''${prefix}"'\001'"#''${prefix}"'\001'"g" "$configFile"
fi
echo "$config" >> "$configFile"
done
done
'';
# Link the locale source into the correct place
preBuild = ''
ln -sf ${localeSrc} extra/locale/${localeSrcBase}
'';
makeFlags = ["HAVE_DOT_CONFIG=y"];
meta = with lib; {
description = "A modified version of uClibc for KLEE.";
longDescription = ''
klee-uclibc is a bitcode build of uClibc meant for compatibility with the
KLEE symbolic virtual machine.
'';
homepage = "https://klee.github.io/";
license = licenses.lgpl3;
maintainers = with maintainers; [ numinit ];
};
}

@ -2,12 +2,11 @@
stdenv.mkDerivation rec {
pname = "got";
version = "0.67";
version = "0.68.1";
src = fetchurl {
url =
"https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
sha256 = "sha256-37Ncljw2tibVRrynDlbxk7d5IS+5QypNFvKIkZ5JvME=";
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
sha256 = "122wignzrhsw00mfnh7mxcxvjyp9rk73yxzfyvmg7f5kmb0hng35";
};
nativeBuildInputs = [ pkg-config ];

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages,
cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
poppler, imagemagick, openexr, ffmpeg_3, opencolorio_1, openimageio,
poppler, imagemagick, openexr, ffmpeg, opencolorio_1, openimageio,
qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }:
let
@ -74,7 +74,7 @@ let
sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libpng ffmpeg_3 openexr opencolorio_1 openimageio boost libGL
libpng ffmpeg openexr opencolorio_1 openimageio boost libGL
seexpr libraw openjpeg libwebp
];
})
@ -135,5 +135,6 @@ stdenv.mkDerivation {
license = lib.licenses.gpl2;
maintainers = [ maintainers.puffnfresh ];
platforms = platforms.linux;
broken = true; # Last evaluated on Hydra on 2021-05-18
};
}

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }:
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "flat-remix-icon-theme";
version = "20211106";
version = "20220304";
src = fetchFromGitHub {
owner = "daniruiz";
repo = "flat-remix";
rev = version;
sha256 = "1dlz88bg764zzd0s3yqci4m1awhwdrrql9l9plsjjzgdx9r7ndmf";
sha256 = "sha256-SE3e3lPGLw6gONVQD8Joj6KNnXC/UygT0fy0AgH8us8=";
};
nativeBuildInputs = [
@ -36,7 +36,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Flat remix is a pretty simple icon theme inspired on material design";
homepage = "https://drasite.com/flat-remix";
license = with licenses; [ gpl3 ];
license = with licenses; [ gpl3Only ];
# breeze-icons and pantheon.elementary-icon-theme dependencies are restricted to linux
platforms = platforms.linux;
maintainers = with maintainers; [ mschneider ];
};

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, gtk3, gnome, hicolor-icon-theme }:
{ lib, stdenvNoCC, fetchurl, gtk3, gnome, hicolor-icon-theme }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "humanity-icon-theme";
version = "0.6.15";
version = "0.6.16";
src = fetchurl {
url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}.tar.xz";
sha256 = "19ja47468s3jfabvakq9wknyfclfr31a9vd11p3mhapfq8jv9g4x";
sha256 = "sha256-AyHl4zMyFE2/5Cui3Y/SB1yEUuyafDdybFPrafo4Ki0=";
};
nativeBuildInputs = [

@ -0,0 +1,25 @@
{ lib, stdenv, fetchzip }:
stdenv.mkDerivation rec {
pname = "generaluser";
version = "1.471";
# we can't use fetchurl since stdenv does not handle unpacking *.zip's by default.
src = fetchzip {
# Linked on http://www.schristiancollins.com/generaluser.php:
url = "https://www.dropbox.com/s/4x27l49kxcwamp5/GeneralUser_GS_${version}.zip";
sha256 = "sha256-lwUlWubXiVZ8fijKuNF54YQjT0uigjNAbjKaNjmC51s=";
};
installPhase = ''
install -Dm644 GeneralUser*.sf2 $out/share/soundfonts/GeneralUser-GS.sf2
'';
meta = with lib; {
description = "a SoundFont bank featuring 259 instrument presets and 11 drum kits";
homepage = "http://www.schristiancollins.com/generaluser.php";
license = licenses.generaluser;
platforms = platforms.all;
maintainers = with maintainers; [ ckie ];
};
}

@ -1,14 +1,25 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }:
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, sassc
, gdk-pixbuf
, librsvg
, gtk-engine-murrine
, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "greybird";
version = "3.22.15";
version = "3.23.1";
src = fetchFromGitHub {
owner = "shimmerproject";
repo = pname;
rev = "v${version}";
sha256 = "1fk66fxy2lif9ngazlgkpsziw216i4b1ld2zm97cadf7n97376g9";
sha256 = "hfi2TBRrZTSN43tYKMPvb/dWwwUE7RakKTMBziHnCWA=";
};
nativeBuildInputs = [
@ -27,6 +38,8 @@ stdenv.mkDerivation rec {
gtk-engine-murrine
];
passthru.updateScript = gitUpdater { inherit pname version; rev-prefix = "v"; };
meta = with lib; {
description = "Grey and blue theme from the Shimmer Project for GTK-based environments";
homepage = "https://github.com/shimmerproject/Greybird";

@ -1,25 +1,34 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, dbus-glib, gtk2, libical, libnotify, tzdata
, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true, wrapGAppsHook, xfce }:
assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null;
let
inherit (lib) optionals;
in
stdenv.mkDerivation rec {
{ lib
, mkXfceDerivation
, dbus-glib
, gtk3
, libical
, libnotify
, libxfce4ui
, popt
, tzdata
, xfce4-panel
, withPanelPlugin ? true
}:
mkXfceDerivation {
category = "apps";
pname = "orage";
version = "4.12.1";
src = fetchurl {
url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-PPmqRBroPIaIhl+CIXAlzfPrqhUszkVxd3uMKqjdkGI=";
};
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
buildInputs = [ dbus-glib gtk2 libical libnotify popt ]
++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ];
version = "4.16.0";
odd-unstable = false;
sha256 = "sha256-Q2vTjfhbhG7TrkGeU5oVBB+UvrV5QFtl372wgHU4cxw=";
buildInputs = [
dbus-glib
gtk3
libical
libnotify
libxfce4ui
popt
]
++ lib.optionals withPanelPlugin [
xfce4-panel
];
postPatch = ''
substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
@ -27,27 +36,13 @@ stdenv.mkDerivation rec {
substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
'';
postConfigure = "rm -rf libical"; # ensure pkgs.libical is used instead of one included in the orage sources
patches = [
# Fix build with libical 3.0
(fetchpatch {
name = "fix-libical3.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/libical3.patch?h=orage-4.10";
sha256 = "sha256-bsnQMGmeo4mRNGM/7UYXez2bNopXMHRFX7VFVg0IGtE=";
})
];
passthru.updateScript = xfce.archiveUpdater {
category = "apps";
inherit pname version;
};
postConfigure = ''
# ensure pkgs.libical is used instead of one included in the orage sources
rm -rf libical
'';
meta = with lib; {
description = "Simple calendar application with reminders";
homepage = "https://git.xfce.org/archive/orage/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
description = "Simple calendar application for Xfce";
maintainers = with maintainers; [ ] ++ teams.xfce.members;
};
}

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "guile-ssh";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "artyom-poptsov";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dcG3Q1K1/CxrMeEUWSZ3Qu57Aesalydg4UjkIqg1NJ0=";
sha256 = "sha256-+BhyaBieqMwTgsSLci3HJdCrNQmfPN/jK2Od5DQs9n8=";
};
configureFlags = [ "--with-guilesitedir=\${out}/share/guile/site" ];

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
version = "1.20.0";
version = "1.21.0";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mCeOaTbOQej4Uza9fg+xop77z31SQ3sO09dZK8SVAyU=";
sha256 = "sha256-chVnD5mxnA50yEL65KUYJwpkZ4jPWiLVHHXeeFxtHBo=";
};
# This release fails the test suite on darwin, remove when debugged.

@ -1,20 +1,30 @@
{ lib, stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }:
{ lib
, stdenv
, fetchFromGitHub
let
makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL");
, asciidoc
, pkg-config
, inetutils
in stdenv.mkDerivation rec {
, sqlite
, readline
, SDL
, SDL_gfx
}:
stdenv.mkDerivation rec {
pname = "jimtcl";
version = "0.79";
version = "0.81";
src = fetchFromGitHub {
owner = "msteveb";
repo = "jimtcl";
rev = version;
sha256 = "1k88hz0v3bi19xdvlp0i9nsx38imzwpjh632w7326zwbv2wldf0h";
sha256 = "sha256-OpM9y7fQ+18qxl3/5wUCrNA9qiCdA0vTHqLYSw2lvJs=";
};
nativeBuildInputs = [
pkg-config
asciidoc
];
@ -35,8 +45,6 @@ in stdenv.mkDerivation rec {
"--ipv6"
];
NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_gfx ]);
enableParallelBuilding = true;
doCheck = true;
@ -45,6 +53,9 @@ in stdenv.mkDerivation rec {
rm tests/exec2.test
'';
# test posix-1.6 needs the "hostname" command
checkInputs = [ inetutils ];
postInstall = ''
ln -sr $out/lib/libjim.so.${version} $out/lib/libjim.so
'';
@ -54,6 +65,6 @@ in stdenv.mkDerivation rec {
homepage = "http://jim.tcl.tk/";
license = lib.licenses.bsd2;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ dbohdan vrthra ];
maintainers = with lib.maintainers; [ dbohdan fgaz vrthra ];
};
}

@ -1,35 +1,52 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, cmake
, python3
, gtest
, withAnimation ? true
, withTranscoder ? true
, eigen
, ghc_filesystem
, tinygltf
}:
let
cmakeBool = b: if b then "ON" else "OFF";
in
stdenv.mkDerivation rec {
version = "1.5.0";
version = "1.5.2";
pname = "draco";
src = fetchFromGitHub {
owner = "google";
repo = "draco";
rev = version;
hash = "sha256-BoJg2lZBPVVm6Nc0XK8QSISpe+B8tpgRg9PFncN4+fY=";
sha256 = "sha256-o6KQJFrnxx2kz6g3vXk1w435OmaJhAJjzsKM/gmVJ2M=";
fetchSubmodules = true;
};
buildInputs = [ gtest ]
++ lib.optionals withTranscoder [ eigen ghc_filesystem tinygltf ];
nativeBuildInputs = [ cmake python3 ];
cmakeFlags = [
"-DDRACO_ANIMATION_ENCODING=${cmakeBool withAnimation}"
"-DDRACO_TRANSCODER_SUPPORTED=${cmakeBool withTranscoder}"
"-DDRACO_GOOGLETEST_PATH=${gtest}"
"-DBUILD_SHARED_LIBS=${cmakeBool true}"
"-DDRACO_TRANSCODER_SUPPORTED=${cmakeBool withTranscoder}"
] ++ lib.optionals withTranscoder [
"-DDRACO_EIGEN_PATH=${eigen}/include/eigen3"
"-DDRACO_FILESYSTEM_PATH=${ghc_filesystem}"
"-DDRACO_TINYGLTF_PATH=${tinygltf}"
];
passthru.updateScript = nix-update-script {
attrPath = pname;
};
meta = with lib; {
description = "Library for compressing and decompressing 3D geometric meshes and point clouds";
homepage = "https://google.github.io/draco/";

@ -1,37 +0,0 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel, yasm
}:
stdenv.mkDerivation {
pname = "ffmpeg-sixel";
version = "nightly-2.3.x";
src = fetchFromGitHub {
owner = "saitoha";
repo = "FFmpeg-SIXEL";
rev = "8566fdb8b7516b54aed58f329dc216e06fc10052";
sha256 = "00s2lggfdj2ibpngpyqqg7360p7yb69ys1ppg59yvv0m0mxk5x3k";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libsixel
yasm
];
configurePhase = ''
./configure --enable-libsixel --prefix=$out
'';
postInstall = ''
mv $out/bin/ffmpeg $out/bin/ffmpeg-sixel
'';
meta = with lib; {
description = "A complete, cross-platform solution to record, convert and stream audio and video, extended to support console graphics";
homepage = "http://www.ffmpeg.org/";
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ vrthra ];
};
}

@ -1,15 +0,0 @@
{ callPackage
# Darwin frameworks
, Cocoa, CoreMedia
, ...
}@args:
callPackage ./generic.nix (rec {
version = branch;
branch = "3.4.8";
sha256 = "1d0r4yja2dkkyhdwx1migq46gsrcbajiv66263a5sq5bfr9dqkch";
darwinFrameworks = [ Cocoa CoreMedia ];
knownVulnerabilities = [
"CVE-2021-30123"
];
} // args)

@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "glib-testing";
version = "0.1.0";
version = "0.1.1";
outputs = [ "out" "dev" "devdoc" "installedTests" ];
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "pwithnall";
repo = "libglib-testing";
rev = version;
sha256 = "0xmycsrlqyji6sc2i4wvp2gxf3897z65a57ygihfnpjpyl7zlwkr";
sha256 = "U3epLDdLES7MA71z7Q1WXMjzySTFERWBU0u8poObbEo=";
};
patches = [

@ -202,6 +202,9 @@ stdenv.mkDerivation rec {
for f in $dev/bin/gtk4-encode-symbolic-svg; do
wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
done
'' + lib.optionalString broadwaySupport ''
# Broadway daemon
moveToOutput bin/gtk4-broadwayd "$out"
'';
# Wrap demos

@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "malcontent";
version = "0.10.3";
version = "0.10.4";
outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ];
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "pwithnall";
repo = pname;
rev = version;
sha256 = "sha256-SA4QyzV/aNUmyr9BYTsemx5x7S6WpxdTBK6zmVMkwh4=";
sha256 = "sha256-s2wQLb3tCfO3p8yYG8Nc6pu+y2TLfrmo7Ug1LgDLEdw=";
};
patches = [

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "matio";
version = "1.5.21";
version = "1.5.22";
src = fetchurl {
url = "mirror://sourceforge/matio/${pname}-${version}.tar.gz";
sha256 = "sha256-IYCRd+VYOefJTa2nRO5Vwd6n11fdqriWBXdtUBIvsGU=";
sha256 = "sha256-gMPR4iLhFXaLV7feZAo30O58t6O9A52z6pQecfxSBMM=";
};
meta = with lib; {

@ -0,0 +1,32 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, cmake
}:
stdenv.mkDerivation rec {
version = "2.5.0";
pname = "tinygltf";
src = fetchFromGitHub {
owner = "syoyo";
repo = "tinygltf";
rev = "v${version}";
sha256 = "sha256-Pw4iNJs0bKALVPFBYUJe5/WjHxdffungCKfJFJEpDas=";
};
nativeBuildInputs = [ cmake ];
passthru.updateScript = nix-update-script {
attrPath = pname;
};
meta = with lib; {
description = "Header only C++11 tiny glTF 2.0 library";
homepage = "https://github.com/syoyo/tinygltf";
license = licenses.mit;
maintainers = with maintainers; [ jansol ];
platforms = platforms.all;
};
}

@ -61,7 +61,8 @@ stdenv.mkDerivation rec {
patchExecutable() {
patchInterpreter "$1"
wrapProgram "$out/libexec/genymotion/$1" \
--set "LD_LIBRARY_PATH" "${libPath}"
--set "LD_LIBRARY_PATH" "${libPath}" \
--unset "QML2_IMPORT_PATH"
}
patchTool() {

@ -6,13 +6,13 @@ buildDunePackage rec {
minimumOCamlVersion = "4.05";
pname = "asn1-combinators";
version = "0.2.5";
version = "0.2.6";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz";
sha256 = "1pbcdwm12hnfpd1jv2b7cjfkj5r7h61xp2gr8dysb8waa455kwln";
sha256 = "sha256-ASreDYhp72IQY3UsHPjqAm9rxwL+0Q35r1ZojikbGpE=";
};
propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ];

@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "bigarray-compat";
version = "1.0.0";
version = "1.1.0";
useDune2 = true;
@ -12,7 +12,7 @@ buildDunePackage rec {
owner = "mirage";
repo = pname;
rev = "v${version}";
sha256 = "06j1dwlpisxshdd0nab4n4x266gg1s1n8na16lpgw3fvcznwnimz";
sha256 = "sha256-2JVopggK2JuXWEPu8qn12F1jQIJ9OV89XY1rHtUqLkI=";
};
meta = {

@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "bisect_ppx";
version = "2.6.1";
version = "2.8.1";
src = fetchFromGitHub {
owner = "aantron";
repo = "bisect_ppx";
rev = version;
sha256 = "sha256-YeLDlH3mUbVEY4OmzlrvSwVUav3uMtSsTFlOsQKnz84=";
sha256 = "sha256-pOeeSxzUF1jXQjA71atSZALdgQ2NB9qpKo5iaDnPwhQ=";
};
minimumOCamlVersion = "4.08";

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-bos";
version = "0.2.0";
version = "0.2.1";
src = fetchurl {
url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz";
sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc";
sha256 = "sha256-2NYueGsQ1pfgRXIFqO7eqifrzJDxhV8Y3xkMrC49jzc=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];

@ -1,25 +0,0 @@
{ lib, buildOcaml, fetchFromGitHub, type_conv, camlp4 }:
buildOcaml rec {
pname = "comparelib";
version = "113.00.00";
minimumSupportedOcamlVersion = "4.00";
src = fetchFromGitHub {
owner = "janestreet";
repo = "comparelib";
rev = version;
sha256 = "sha256-gtJvXAUxiIt/L9bCzS+8wHcCQ+QpBubwcjDcyN0K2MA=";
};
buildInputs = [ camlp4 ];
propagatedBuildInputs = [ type_conv ];
meta = with lib; {
homepage = "https://github.com/janestreet/comparelib";
description = "Syntax extension for deriving \"compare\" functions automatically";
license = licenses.asl20;
maintainers = [ maintainers.ericbmerritt ];
};
}

@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "directories";
version = "0.2";
version = "0.5";
useDune2 = true;
minimumOCamlVersion = "4.07";
@ -11,7 +11,7 @@ buildDunePackage rec {
owner = "ocamlpro";
repo = pname;
rev = version;
sha256 = "0s7ginh0g0fhw8xf9v58cx99a8q9jqsf4i0p134m5qzf84qpjwff";
sha256 = "sha256-31CGhmmfOORJ1ewgp+IU+p1+f2kfX/W+lxK7EGU62vc=";
};
meta = {

@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "duration";
version = "0.1.3";
version = "0.2.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/hannesm/duration/releases/download/${version}/duration-${version}.tbz";
sha256 = "0m9r0ayhpl98g9vdxrbjdcllns274jilic5v8xj1x7dphw21p95h";
sha256 = "sha256-rRT7daWm9z//fvFyEXiSXuVVzw8jsj46sykYS8DBzmk=";
};
doCheck = lib.versionAtLeast ocaml.version "4.05";

@ -1,31 +0,0 @@
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }:
assert lib.versionAtLeast (lib.getVersion ocaml) "4.00";
if lib.versionAtLeast ocaml.version "4.06"
then throw "enumerate-111.08.00 is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
pname = "ocaml-enumerate";
version = "111.08.00";
src = fetchurl {
url = "https://ocaml.janestreet.com/ocaml-core/${lib.versions.majorMinor version}.00/individual/enumerate-${version}.tar.gz";
sha256 = "0b6mx5p01lcpimvak4wx6aj2119707wsfzd83rwgb91bhpgzh156";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ type_conv camlp4 ];
strictDeps = true;
createFindlibDestdir = true;
meta = {
homepage = "https://ocaml.janestreet.com/";
description = "Quotation expanders for enumerating finite types";
license = lib.licenses.asl20;
platforms = ocaml.meta.platforms or [ ];
};
}

@ -3,12 +3,12 @@
buildDunePackage rec {
minimumOCamlVersion = "4.03";
pname = "eqaf";
version = "0.7";
version = "0.8";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-v${version}.tbz";
sha256 = "1q09pwhs121vpficl2af1yzs4y7dd9bc1lcxbqyfc4x4m6p6drhh";
sha256 = "sha256-EUWhYBB0N9eUPgLkht9r0jPTk37BpZfX+jntuUcc+HU=";
};
propagatedBuildInputs = [ cstruct bigarray-compat ];

@ -4,7 +4,7 @@
buildDunePackage rec {
pname = "iter";
version = "1.3";
version = "1.4";
useDune2 = true;
@ -12,7 +12,7 @@ buildDunePackage rec {
owner = "c-cube";
repo = pname;
rev = "v${version}";
sha256 = "sha256:0xgkplpbi41sw0yv1wfd12cfbybls6cal8qxddmd9x8khgk5s3vx";
sha256 = "sha256-Kk92GM7IVXOSVBkeN6wj67Q3UGCyuOOVi2umpn1AZTo=";
};
buildInputs = [ dune-configurator ];

@ -3,7 +3,7 @@
buildDunePackage rec {
pname = "jingoo";
version = "1.4.2";
version = "1.4.4";
useDune2 = true;
@ -13,7 +13,7 @@ buildDunePackage rec {
owner = "tategakibunko";
repo = "jingoo";
rev = "v${version}";
sha256 = "0q947aik4i4z5wjllhwlkxh60qczwgra21yyrrzwhi9y5bnf8346";
sha256 = "sha256-qIw69OE7wYyZYKnIc9QrmF8MzY5Fg5pBFyIpexmaYxA=";
};
buildInputs = [ menhir ];

@ -2,11 +2,11 @@
buildDunePackage rec {
pname = "magic-mime";
version = "1.1.3";
version = "1.2.0";
src = fetchurl {
url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${version}/magic-mime-v${version}.tbz";
sha256 = "1xqjs8bba567yzrzgnr88j5ck97d36zw68zr9v29liya37k6rcvz";
sha256 = "sha256-8SG2dQD43Zfi/J/V0BxzJeTIS8XAI3RCd5+9b6IGlPU=";
};
minimalOCamlVersion = "4.03";

@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "markup";
version = "1.0.0";
version = "1.0.2";
useDune2 = true;
@ -10,7 +10,7 @@ buildDunePackage rec {
owner = "aantron";
repo = "markup.ml";
rev = version;
sha256 = "sha256-yapjqAcn0XSC6Guoj69sXNpLZ2urXANkWhcafpPLEyY=";
sha256 = "sha256-FcN9EBap93gFeOwSrRxs2sQrjZGs8/YnaEX7zHLmeM8=";
};
propagatedBuildInputs = [ uchar uutf ];

@ -5,14 +5,14 @@
buildDunePackage rec {
pname = "mimic";
version = "0.0.3";
version = "0.0.4";
minimumOCamlVersion = "4.08";
useDune2 = true;
src = fetchurl {
url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz";
sha256 = "e4743cd2e4f8242eb1ce9d8086fd2affba0eb6a62131309ffa279108bd3dbbcb";
sha256 = "sha256-1Wb2xufgGKp3FJ+FYjK45i9B5+HohdPX+w9Sw0ph5JY=";
};
propagatedBuildInputs = [

@ -2,14 +2,14 @@
buildDunePackage rec {
pname = "mirage-flow";
version = "2.0.1";
version = "3.0.0";
useDune2 = true;
minimumOCamlVersion = "4.05";
src = fetchurl {
url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-v${version}.tbz";
sha256 = "13v05x34six0z6bc2is8qhvbxk4knxh80ardi5x4rl738vlq3mn9";
sha256 = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw=";
};
propagatedBuildInputs = [ cstruct fmt ocaml_lwt ];

@ -4,13 +4,13 @@
buildDunePackage rec {
pname = "mirage-fs";
version = "3.0.1";
version = "4.0.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/mirage-fs/releases/download/v${version}/mirage-fs-v${version}.tbz";
sha256 = "0px18bgk528vr7iw78r0j3z4sdcz684sfcj47ibbly2adbvd64yk";
sha256 = "sha256-PYZ2HCPuxOv4FU7EHymsa1oIZU7q8TSzzRvlngYdZ3s=";
};
propagatedBuildInputs = [ cstruct fmt lwt mirage-device mirage-kv ];

@ -4,13 +4,13 @@ buildDunePackage rec {
minimumOCamlVersion = "4.06";
pname = "mirage-time";
version = "2.0.1";
version = "3.0.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/mirage-time/releases/download/v${version}/mirage-time-v${version}.tbz";
sha256 = "1w6mm4g7fc19cs0ncs0s9fsnb1k1s04qqzs9bsqvq8ngsb90cbh0";
sha256 = "sha256-DUCUm1jix+i3YszIzgZjRQRiM8jJXQ49F6JC/yicvXw=";
};
propagatedBuildInputs = [ ocaml_lwt ];

@ -1,14 +1,14 @@
{ lib, buildDunePackage, fetchFromGitHub, cppo }:
buildDunePackage rec {
version = "1.1";
version = "1.2";
pname = "ocplib-endian";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocplib-endian";
rev = version;
sha256 = "sha256-zKsSkhlZBXSqPtw+/WN3pwo9plM9rDZfMbGVfosqb10=";
sha256 = "sha256-THTlhOfXAPaqTt1qBkht+D67bw6M175QLvXoUMgjks4=";
};
useDune2 = true;

@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "owl-base";
version = "1.0.1";
version = "1.0.2";
useDune2 = true;
src = fetchurl {
url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz";
sha256 = "72ca9f6edd302fdfa16c7559cedac7ac2c885466a367e17ea1ea8807b2dd13ef";
sha256 = "sha256-ONIQzmwcLwljH9WZUUMOTzZLWuA2xx7RsyzlWbKikmM=";
};
minimumOCamlVersion = "4.10";

@ -1,14 +1,14 @@
{ lib, fetchFromGitHub, buildDunePackage, menhir }:
buildDunePackage rec {
version = "0.3.1";
version = "0.4.0";
pname = "psmt2-frontend";
src = fetchFromGitHub {
owner = "ACoquereau";
repo = pname;
rev = version;
sha256 = "038jrfsq09nhnzpjiishg4adk09w3aw1bpczgbj66lqqilkd6gci";
sha256 = "sha256-cYY9x7QZjH7pdJyHMqfMXgHZ3/zJLp/6ntY6OSIo6Vs=";
};
useDune2 = true;

@ -2,14 +2,14 @@
buildDunePackage rec {
pname = "routes";
version = "0.9.1";
version = "1.0.0";
useDune2 = true;
minimalOCamlVersion = "4.05";
src = fetchurl {
url = "https://github.com/anuragsoni/routes/releases/download/${version}/routes-${version}.tbz";
sha256 = "0h2c1p5w6237c1lmsl5c8q2dj5dq20gf2cmb12nbmlfn12sfmcrl";
sha256 = "sha256-WSlASDTA1UX+NhW38/XuLkOkdwjIxz0OUkX6Nd2iROg=";
};
meta = with lib; {

@ -1,16 +1,15 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, cmdliner , topkg, uchar }:
let
pname = "uutf";
webpage = "https://erratique.ch/software/${pname}";
in
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "1.0.2";
version = "1.0.3";
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "1nx1rly3qj23jzn9yk3x6fwqimcxjd84kv5859vvhdg56psq26p6";
url = "https://erratique.ch/software/${pname}/releases/${pname}${version}.tbz";
sha256 = "sha256-h3KlYT0ecCmM4U3zMkGjaF8h5O9r20zwP+mF+x7KBWg=";
};
nativeBuildInputs = [ ocaml ocamlbuild findlib topkg ];
@ -23,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Non-blocking streaming Unicode codec for OCaml";
homepage = webpage;
homepage = "https://erratique.ch/software/uutf";
platforms = ocaml.meta.platforms or [];
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "asyncssh";
version = "2.9.0";
version = "2.10.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-PMM32AZhlGVFW/GH6KkeP1dUI3GBhOI4+a6MQcTzOvE=";
sha256 = "sha256-WF5JmDzHlXFB4D7p9IvRU2pepXFdCqHOnM4Ecobmaws=";
};
propagatedBuildInputs = [

@ -17,13 +17,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
buildPythonPackage rec {
pname = "cvxopt";
version = "1.2.7";
version = "1.3.0";
disabled = isPyPy; # hangs at [translation:info]
src = fetchPypi {
inherit pname version;
sha256 = "3f9db1f4d4e820aaea81d6fc21054c89dc6327c84f935dd5a1eda1af11e1d504";
sha256 = "sha256-ALGyMvnR+QLVeKnXWBS2f6AgdY1a5CLijKjO9iafpcY=";
};
buildInputs = [ blas lapack ];

@ -10,14 +10,15 @@
buildPythonPackage rec {
pname = "desktop-notifier";
version = "3.3.2";
version = "3.3.5";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = pname;
rev = "v${version}";
sha256 = "sha256-h7an/Fm9pNnThCHXg9PAKG822dqXE/CUuW8lDJlwMfw=";
sha256 = "sha256-tXvA1EddTrOcTupQqZrX58jXiAqB5gMJP+OE3fZxGJI=";
};
propagatedBuildInputs = [

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "fastcore";
version = "1.3.29";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "fastai";
repo = pname;
rev = version;
sha256 = "sha256-V5mJJqWsCy8Wes8VzEkCKeb2/1ahvtbUO80R8IFLvNU=";
sha256 = "sha256-U7tZkqfBbl5IVZlC2/JBIx7Bm5iIiXTMSm0QHmzNiys=";
};
propagatedBuildInputs = [

@ -4,15 +4,19 @@
, jinja2
, lxml
, pygments
, pythonOlder
}:
buildPythonPackage rec {
pname = "gcovr";
version = "5.0";
version = "5.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "1d80264cbaadff356b3dda71b8c62b3aa803e5b3eb6d526a24932cd6660a2576";
hash = "sha256-d4CEQ1m/8LlsBBR9r/8l5uWF4FWFvVQjabvDd9ad4SE=";
};
propagatedBuildInputs = [
@ -33,8 +37,9 @@ buildPythonPackage rec {
];
meta = with lib; {
description = "A Python script for summarizing gcov data";
license = licenses.bsd0;
description = "Python script for summarizing gcov data";
homepage = "https://www.gcovr.com/";
license = licenses.bsd0;
maintainers = with maintainers; [ ];
};
}

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "gphoto2";
version = "2.3.2";
version = "2.3.3";
src = fetchPypi {
inherit pname version;
sha256 = "3b1b52ec3004ad6a6927a015b0572878a0a56314caaf1e62b07550e7a2e09465";
sha256 = "sha256-bhHGvUGzXrk7snMzv+R0fd/gnZTFJ3xfse5i2Krpl3I=";
};
nativeBuildInputs = [ pkg-config ];

@ -20,6 +20,10 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "flake8<3.9.0,>=3.8.0" "flake8"
substituteInPlace hacking/checks/python23.py \
--replace 'H236: class Foo(object):\n __metaclass__ = \' 'Okay: class Foo(object):\n __metaclass__ = \'
substituteInPlace hacking/checks/except_checks.py \
--replace 'H201: except:' 'Okay: except:'
'';
nativeBuildInputs = [ pbr ];
@ -35,9 +39,7 @@ buildPythonPackage rec {
];
checkPhase = ''
stestr run -e <(echo "
hacking.tests.test_doctest.HackingTestCase.test_flake8
")
stestr run
'';
pythonImportsCheck = [ "hacking" ];

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "iminuit";
version = "2.9.0";
version = "2.10.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "656410ceffead79a52d3d727fdcd2bac78d7774239bef0efc3b7a86bae000ff3";
sha256 = "sha256-k7M8ptL/1z6AtA6KQAyj28cOBWYvG9OQ4rYEAnkQFIU=";
};
nativeBuildInputs = [ cmake ];

@ -1,34 +1,40 @@
{ lib
, attrs
, buildPythonPackage
, dictpath
, django
, djangorestframework
, falcon
, fetchFromGitHub
, flask
, isodate
, dictpath
, openapi-spec-validator
, openapi-schema-validator
, six
, lazy-object-proxy
, attrs
, werkzeug
, parse
, mock
, more-itertools
, openapi-schema-validator
, openapi-spec-validator
, parse
, pytestCheckHook
, falcon
, flask
, django
, djangorestframework
, pythonOlder
, responses
, mock
, six
, webob
, werkzeug
, python
}:
buildPythonPackage rec {
pname = "openapi-core";
version = "0.14.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "p1c2u";
repo = "openapi-core";
rev = version;
sha256 = "1npsibyf8zx6z230yl19kyap8g25kqvgm7z1w6rm6jxv58yqsp7r";
hash = "sha256-+VyNPSq7S1Oz4eGf+jaeRTx0lZ8pUA+G+KZ/5PyK+to=";
};
postPatch = ''
@ -36,26 +42,27 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [
isodate
attrs
dictpath
openapi-spec-validator
isodate
lazy-object-proxy
more-itertools
openapi-schema-validator
openapi-spec-validator
parse
six
lazy-object-proxy
attrs
werkzeug
parse
more-itertools
];
checkInputs = [
pytestCheckHook
falcon
flask
django
djangorestframework
responses
falcon
flask
mock
pytestCheckHook
responses
webob
];
disabledTestPaths = [
@ -63,6 +70,8 @@ buildPythonPackage rec {
"tests/integration/validation"
# requires secrets and additional configuration
"tests/integration/contrib/test_django.py"
# Unable to detect SECRET_KEY and ROOT_URLCONF
"tests/integration/contrib/test_django.py"
];
disabledTests = [

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, poetry-core
}:
buildPythonPackage rec {
pname = "pathable";
version = "0.4.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "p1c2u";
repo = pname;
rev = version;
hash = "sha256-3qekweG+o7f6nm1cnCEHrWYn/fQ42GZrZkPwGbZcU38=";
};
nativeBuildInputs = [
poetry-core
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
sed -i "/--cov/d" pyproject.toml
'';
pythonImportsCheck = [
"pathable"
];
meta = with lib; {
description = "Library for object-oriented paths";
homepage = "https://github.com/p1c2u/pathable";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "python-crfsuite";
version = "0.9.7";
version = "0.9.8";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "1ryfcdfpqbrf8rcd2rlay2gfiba3px3q508543jf81shrv93hi9v";
sha256 = "sha256-DgPPbro2KHF8zwbfoPSiuoYohgrbF0y/0lCnpGkoZaE=";
};
preCheck = ''

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "sabyenc3";
version = "5.1.1";
version = "5.1.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-muqJCn5FcSp5KNZqfW433NCOxfj1DvFvlZPClmNkPR0=";
hash = "sha256-p/7uNtarig1lfPF+dL4OPPdKnfpkveZC8wgwsQy2o2s=";
};
# Tests are not included in pypi distribution

@ -7,6 +7,7 @@
, pytestCheckHook
, toml
, twisted
, setuptools
, git # shells out to git
}:
@ -25,6 +26,7 @@ buildPythonPackage rec {
incremental
jinja2
toml
setuptools
];
# zope.interface collision

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "tfsec";
version = "1.13.2";
version = "1.15.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ixiuAm1MCLS7daUwiFUPoO86YOoz9qEkQT5i/YlIdf0=";
sha256 = "sha256-4YojzVwvPc+9Mn+xyRMxGEKv68eekXpH0RzSsrd8voY=";
};
ldflags = [
@ -21,7 +21,7 @@ buildGoModule rec {
# "-extldflags '-fno-PIC -static'"
];
vendorSha256 = "sha256-WlZJvBIdJCMA+GJ0svEzwqrdPz2wnlJx/csVarjyExw=";
vendorSha256 = "sha256-/r1KMX5YqJ3bVXNYJWv10cHkBQMuS90KMGXWUB6Idw8=";
subPackages = [
"cmd/tfsec"

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "bazel-gazelle";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WWAOhV1H/OnARjhoWQYNmd9/y8pD3bRkhncmzt/36mA=";
sha256 = "sha256-wMhFhJruXHuAq81A4efxvR9eJ5YTp7QTnr1gj8RrIX8=";
};
vendorSha256 = null;

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

Loading…
Cancel
Save