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

main
Martin Weinelt 2 years ago
commit 6451e9d4a5
  1. 4
      CONTRIBUTING.md
  2. 2
      lib/systems/examples.nix
  3. 40
      maintainers/maintainer-list.nix
  4. 16
      nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
  5. 3
      nixos/doc/manual/release-notes/rl-2211.section.md
  6. 2
      nixos/modules/hardware/gpgsmartcards.nix
  7. 2
      nixos/modules/i18n/input-method/ibus.nix
  8. 2
      nixos/modules/module-list.nix
  9. 2
      nixos/modules/programs/captive-browser.nix
  10. 152
      nixos/modules/services/databases/dragonflydb.nix
  11. 2
      nixos/modules/services/misc/nix-daemon.nix
  12. 60
      nixos/modules/services/misc/persistent-evdev.nix
  13. 2
      nixos/modules/services/monitoring/mimir.nix
  14. 2
      nixos/modules/services/system/localtime.nix
  15. 1
      nixos/modules/services/web-apps/hedgedoc.nix
  16. 50
      nixos/modules/virtualisation/amazon-ec2-amis.nix
  17. 2
      nixos/tests/all-tests.nix
  18. 2
      nixos/tests/mimir.nix
  19. 4
      pkgs/applications/audio/picard/default.nix
  20. 8
      pkgs/applications/editors/atom/env.nix
  21. 135
      pkgs/applications/editors/kodestudio/default.nix
  22. 51
      pkgs/applications/editors/textadept/10/default.nix
  23. 42
      pkgs/applications/editors/textadept/10/deps.nix
  24. 4
      pkgs/applications/editors/textadept/default.nix
  25. 0
      pkgs/applications/editors/textadept/deps.nix
  26. 4
      pkgs/applications/editors/vscode/extensions/default.nix
  27. 4
      pkgs/applications/graphics/drawio/default.nix
  28. 28
      pkgs/applications/graphics/inkscape/default.nix
  29. 91
      pkgs/applications/misc/authy/default.nix
  30. 72
      pkgs/applications/misc/cura/stable.nix
  31. 12
      pkgs/applications/misc/galculator/default.nix
  32. 4
      pkgs/applications/misc/gnome-secrets/default.nix
  33. 8
      pkgs/applications/misc/haxor-news/default.nix
  34. 4
      pkgs/applications/misc/obsidian/default.nix
  35. 25
      pkgs/applications/misc/plover/default.nix
  36. 20
      pkgs/applications/misc/privacyidea/default.nix
  37. 2
      pkgs/applications/misc/sway-launcher-desktop/default.nix
  38. 6
      pkgs/applications/misc/ydict/default.nix
  39. 8
      pkgs/applications/networking/cluster/fluxcd/default.nix
  40. 6
      pkgs/applications/networking/cluster/roxctl/default.nix
  41. 9
      pkgs/applications/networking/cluster/terraform-providers/providers.json
  42. 5
      pkgs/applications/networking/cluster/terraform/default.nix
  43. 14
      pkgs/applications/networking/cluster/tgswitch/default.nix
  44. 11
      pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
  45. 4
      pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
  46. 4
      pkgs/applications/networking/instant-messengers/gajim/default.nix
  47. 60
      pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
  48. 67
      pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix
  49. 8
      pkgs/applications/networking/instant-messengers/slack-term/default.nix
  50. 40
      pkgs/applications/networking/instant-messengers/torchat/default.nix
  51. 8
      pkgs/applications/networking/mujmap/default.nix
  52. 4
      pkgs/applications/networking/sniffers/wireshark/default.nix
  53. 4
      pkgs/applications/office/appflowy/default.nix
  54. 12
      pkgs/applications/science/astronomy/gpredict/default.nix
  55. 1
      pkgs/applications/science/logic/coq/default.nix
  56. 4
      pkgs/applications/system/glances/default.nix
  57. 8
      pkgs/applications/video/qarte/default.nix
  58. 4
      pkgs/applications/virtualization/containerd/default.nix
  59. 4
      pkgs/applications/virtualization/cri-o/default.nix
  60. 4
      pkgs/applications/window-managers/fbpanel/default.nix
  61. 1
      pkgs/build-support/trivial-builders.nix
  62. 8
      pkgs/data/misc/hackage/pin.json
  63. 5
      pkgs/desktops/cdesktopenv/default.nix
  64. 5
      pkgs/development/compilers/gcl/default.nix
  65. 43
      pkgs/development/compilers/gmqcc/default.nix
  66. 1
      pkgs/development/coq-modules/bignums/default.nix
  67. 7
      pkgs/development/coq-modules/coq-elpi/default.nix
  68. 5
      pkgs/development/go-modules/generic/default.nix
  69. 29
      pkgs/development/haskell-modules/configuration-common.nix
  70. 4
      pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
  71. 7
      pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
  72. 5
      pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
  73. 40
      pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
  74. 4
      pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
  75. 10
      pkgs/development/haskell-modules/configuration-nix.nix
  76. 1616
      pkgs/development/haskell-modules/hackage-packages.nix
  77. 9
      pkgs/development/haskell-modules/hoogle.nix
  78. 2
      pkgs/development/interpreters/ruby/default.nix
  79. 8
      pkgs/development/libraries/glpk/default.nix
  80. 4
      pkgs/development/libraries/hidapi/default.nix
  81. 6
      pkgs/development/libraries/libagar/libagar_test.nix
  82. 6
      pkgs/development/libraries/libdeltachat/default.nix
  83. 4
      pkgs/development/libraries/libmediaart/default.nix
  84. 3
      pkgs/development/libraries/libosinfo/default.nix
  85. 4
      pkgs/development/libraries/opencv/4.x.nix
  86. 5
      pkgs/development/libraries/physics/cernlib/default.nix
  87. 2263
      pkgs/development/node-packages/node-packages.nix
  88. 20
      pkgs/development/ocaml-modules/elpi/default.nix
  89. 16
      pkgs/development/ocaml-modules/posix/time2.nix
  90. 11
      pkgs/development/ocaml-modules/srt/default.nix
  91. 22
      pkgs/development/ocaml-modules/unix-errno/default.nix
  92. 4
      pkgs/development/python-modules/adb-shell/default.nix
  93. 4
      pkgs/development/python-modules/aioairzone/default.nix
  94. 4
      pkgs/development/python-modules/asdf/default.nix
  95. 4
      pkgs/development/python-modules/atenpdu/default.nix
  96. 102
      pkgs/development/python-modules/bravado-core/default.nix
  97. 4
      pkgs/development/python-modules/browser-cookie3/default.nix
  98. 39
      pkgs/development/python-modules/dash/default.nix
  99. 4
      pkgs/development/python-modules/databricks-connect/default.nix
  100. 10
      pkgs/development/python-modules/deezer-python/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

@ -104,10 +104,10 @@ This also works for PR's that have already been merged, and might take a couple
You can also create the backport manually:
1. Take note of the commits in which the change was introduced into `master` branch.
2. Check out the target _release branch_, e.g. `release-21.11`. Do not use a _channel branch_ like `nixos-21.11` or `nixpkgs-21.11-darwin`.
2. Check out the target _release branch_, e.g. `release-22.05`. Do not use a _channel branch_ like `nixos-22.05` or `nixpkgs-22.05-darwin`.
3. Create a branch for your change, e.g. `git checkout -b backport`.
4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-21.11`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[21.11]`.
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.05`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.05]`.
6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier.
## Criteria for Backporting changes

@ -306,8 +306,6 @@ rec {
# BSDs
amd64-netbsd = lib.warn "The amd64-netbsd system example is deprecated. Use x86_64-netbsd instead." x86_64-netbsd;
x86_64-netbsd = {
config = "x86_64-unknown-netbsd";
libc = "nblibc";

@ -2334,6 +2334,12 @@
githubId = 3956062;
name = "Simon Lackerbauer";
};
cimm = {
email = "8k9ft8m5gv@astil.be";
github = "cimm";
githubId = 68112;
name = "Simon";
};
cirno-999 = {
email = "reverene@protonmail.com";
github = "cirno-999";
@ -8793,17 +8799,6 @@
githubId = 3073833;
name = "Massimo Redaelli";
};
mrhedgehog = {
name = "Mr Hedgehog";
email = "hedgehog@mrhedgehog.xyz";
matrix = "@mrhedgehog:jupiterbroadcasting.com";
github = "ModdedGamers";
githubId = 35778371;
keys = [{
longkeyid = "rsa4096/0x7D5107866B1C6752";
fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752";
}];
};
mrkkrp = {
email = "markkarpov92@gmail.com";
github = "mrkkrp";
@ -9098,6 +9093,12 @@
githubId = 3747396;
name = "Nathan Isom";
};
necrophcodr = {
email = "nc@scalehost.eu";
github = "necrophcodr";
githubId = 575887;
name = "Steffen Rytter Postas";
};
neilmayhew = {
email = "nix@neil.mayhew.name";
github = "neilmayhew";
@ -9856,6 +9857,12 @@
githubId = 6931743;
name = "pasqui23";
};
patricksjackson = {
email = "patrick@jackson.dev";
github = "patricksjackson";
githubId = 160646;
name = "Patrick Jackson";
};
patryk27 = {
email = "pwychowaniec@pm.me";
github = "Patryk27";
@ -12767,6 +12774,17 @@
githubId = 8547242;
name = "Stefan Rohrbacher";
};
thehedgeh0g = {
name = "The Hedgehog";
email = "hedgehog@mrhedgehog.xyz";
matrix = "@mrhedgehog:jupiterbroadcasting.com";
github = "ModdedGamers";
githubId = 35778371;
keys = [{
longkeyid = "rsa4096/0x7D5107866B1C6752";
fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752";
}];
};
thelegy = {
email = "mail+nixos@0jb.de";
github = "thelegy";

@ -48,6 +48,13 @@
<link xlink:href="options.html#opt-virtualisation.appvm.enable">virtualisation.appvm</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://dragonflydb.io/">dragonflydb</link>,
a modern replacement for Redis and Memcached. Available as
<link linkend="opt-services.dragonflydb.enable">services.dragonflydb</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/leetronics/infnoise">infnoise</link>,
@ -55,6 +62,15 @@
<link xlink:href="options.html#opt-services.infnoise.enable">services.infnoise</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/aiberia/persistent-evdev">persistent-evdev</link>,
a daemon to add virtual proxy devices that mirror a physical
input device but persist even if the underlying hardware is
hot-plugged. Available as
<link linkend="opt-services.persistent-evdev.enable">services.persistent-evdev</link>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.11-incompatibilities">

@ -25,8 +25,11 @@ In addition to numerous new and upgraded packages, this release has the followin
- [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable).
- [dragonflydb](https://dragonflydb.io/), a modern replacement for Redis and Memcached. Available as [services.dragonflydb](#opt-services.dragonflydb.enable).
- [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle.
Available as [services.infnoise](options.html#opt-services.infnoise.enable).
- [persistent-evdev](https://github.com/aiberia/persistent-evdev), a daemon to add virtual proxy devices that mirror a physical input device but persist even if the underlying hardware is hot-plugged. Available as [services.persistent-evdev](#opt-services.persistent-evdev.enable).
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

@ -19,7 +19,7 @@ let
# per debian's udev deb hook (https://man7.org/linux/man-pages/man1/dh_installudev.1.html)
destination = "60-scdaemon.rules";
scdaemonUdevRulesPkg = pkgs.runCommandNoCC "scdaemon-udev-rules" {} ''
scdaemonUdevRulesPkg = pkgs.runCommand "scdaemon-udev-rules" {} ''
loc="$out/lib/udev/rules.d/"
mkdir -p "''${loc}"
cp "${scdaemonRules}" "''${loc}/${destination}"

@ -67,7 +67,7 @@ in
programs.dconf.packages = [ ibusPackage ];
services.dbus.packages = [
ibusAutostart
ibusPackage
];
environment.variables = {

@ -348,6 +348,7 @@
./services/databases/clickhouse.nix
./services/databases/cockroachdb.nix
./services/databases/couchdb.nix
./services/databases/dragonflydb.nix
./services/databases/firebird.nix
./services/databases/foundationdb.nix
./services/databases/hbase.nix
@ -605,6 +606,7 @@
./services/misc/packagekit.nix
./services/misc/paperless.nix
./services/misc/parsoid.nix
./services/misc/persistent-evdev.nix
./services/misc/plex.nix
./services/misc/plikd.nix
./services/misc/podgrab.nix

@ -98,7 +98,7 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [
(pkgs.runCommandNoCC "captive-browser-desktop-item" { } ''
(pkgs.runCommand "captive-browser-desktop-item" { } ''
install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop
'')
];

@ -0,0 +1,152 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.dragonflydb;
dragonflydb = pkgs.dragonflydb;
settings =
{
port = cfg.port;
dir = "/var/lib/dragonflydb";
keys_output_limit = cfg.keysOutputLimit;
} //
(lib.optionalAttrs (cfg.bind != null) { bind = cfg.bind; }) //
(lib.optionalAttrs (cfg.requirePass != null) { requirepass = cfg.requirePass; }) //
(lib.optionalAttrs (cfg.maxMemory != null) { maxmemory = cfg.maxMemory; }) //
(lib.optionalAttrs (cfg.memcachePort != null) { memcache_port = cfg.memcachePort; }) //
(lib.optionalAttrs (cfg.dbNum != null) { dbnum = cfg.dbNum; }) //
(lib.optionalAttrs (cfg.cacheMode != null) { cache_mode = cfg.cacheMode; });
in
{
###### interface
options = {
services.dragonflydb = {
enable = mkEnableOption "DragonflyDB";
user = mkOption {
type = types.str;
default = "dragonfly";
description = "The user to run DragonflyDB as";
};
port = mkOption {
type = types.port;
default = 6379;
description = "The TCP port to accept connections.";
};
bind = mkOption {
type = with types; nullOr str;
default = "127.0.0.1";
description = ''
The IP interface to bind to.
<literal>null</literal> means "all interfaces".
'';
};
requirePass = mkOption {
type = with types; nullOr str;
default = null;
description = "Password for database";
example = "letmein!";
};
maxMemory = mkOption {
type = with types; nullOr ints.unsigned;
default = null;
description = ''
The maximum amount of memory to use for storage (in bytes).
<literal>null</literal> means this will be automatically set.
'';
};
memcachePort = mkOption {
type = with types; nullOr port;
default = null;
description = ''
To enable memcached compatible API on this port.
<literal>null</literal> means disabled.
'';
};
keysOutputLimit = mkOption {
type = types.ints.unsigned;
default = 8192;
description = ''
Maximum number of returned keys in keys command.
<literal>keys</literal> is a dangerous command.
We truncate its result to avoid blowup in memory when fetching too many keys.
'';
};
dbNum = mkOption {
type = with types; nullOr ints.unsigned;
default = null;
description = "Maximum number of supported databases for <literal>select</literal>";
};
cacheMode = mkOption {
type = with types; nullOr bool;
default = null;
description = ''
Once this mode is on, Dragonfly will evict items least likely to be stumbled
upon in the future but only when it is near maxmemory limit.
'';
};
};
};
###### implementation
config = mkIf config.services.dragonflydb.enable {
users.users = optionalAttrs (cfg.user == "dragonfly") {
dragonfly.description = "DragonflyDB server user";
dragonfly.isSystemUser = true;
dragonfly.group = "dragonfly";
};
users.groups = optionalAttrs (cfg.user == "dragonfly") { dragonfly = { }; };
environment.systemPackages = [ dragonflydb ];
systemd.services.dragonflydb = {
description = "DragonflyDB server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${dragonflydb}/bin/dragonfly --alsologtostderr ${builtins.concatStringsSep " " (attrsets.mapAttrsToList (n: v: "--${n} ${strings.escapeShellArg v}") settings)}";
User = cfg.user;
# Filesystem access
ReadWritePaths = [ settings.dir ];
StateDirectory = "dragonflydb";
StateDirectoryMode = "0700";
# Process Properties
LimitMEMLOCK = "infinity";
# Caps
CapabilityBoundingSet = "";
NoNewPrivileges = true;
# Sandboxing
ProtectSystem = "strict";
ProtectHome = true;
PrivateTmp = true;
PrivateDevices = true;
ProtectKernelTunables = true;
ProtectKernelModules = true;
ProtectControlGroups = true;
LockPersonality = true;
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
RestrictRealtime = true;
PrivateMounts = true;
MemoryDenyWriteExecute = true;
};
};
};
}

@ -734,7 +734,7 @@ in
CPUSchedulingPolicy = cfg.daemonCPUSchedPolicy;
IOSchedulingClass = cfg.daemonIOSchedClass;
IOSchedulingPriority = cfg.daemonIOSchedPriority;
LimitNOFILE = 4096;
LimitNOFILE = 1048576;
};
restartTriggers = [ nixConf ];

@ -0,0 +1,60 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.persistent-evdev;
settingsFormat = pkgs.formats.json {};
configFile = settingsFormat.generate "persistent-evdev-config" {
cache = "/var/cache/persistent-evdev";
devices = lib.mapAttrs (virt: phys: "/dev/input/by-id/${phys}") cfg.devices;
};
in
{
options.services.persistent-evdev = {
enable = lib.mkEnableOption "virtual input devices that persist even if the backing device is hotplugged";
devices = lib.mkOption {
default = {};
type = with lib.types; attrsOf str;
description = ''
A set of virtual proxy device labels with backing physical device ids.
Physical devices should already exist in <filename class="devicefile">/dev/input/by-id/</filename>.
Proxy devices will be automatically given a <literal>uinput-</literal> prefix.
See the <link xlink:href="https://github.com/aiberia/persistent-evdev#example-usage-with-libvirt">
project page</link> for example configuration of virtual devices with libvirt
and remember to add <literal>uinput-*</literal> devices to the qemu
<literal>cgroup_device_acl</literal> list (see <xref linkend="opt-virtualisation.libvirtd.qemu.verbatimConfig"/>).
'';
example = lib.literalExpression ''
{
persist-mouse0 = "usb-Logitech_G403_Prodigy_Gaming_Mouse_078738533531-event-if01";
persist-mouse1 = "usb-Logitech_G403_Prodigy_Gaming_Mouse_078738533531-event-mouse";
persist-mouse2 = "usb-Logitech_G403_Prodigy_Gaming_Mouse_078738533531-if01-event-kbd";
persist-keyboard0 = "usb-Microsoft_Natural®_Ergonomic_Keyboard_4000-event-kbd";
persist-keyboard1 = "usb-Microsoft_Natural®_Ergonomic_Keyboard_4000-if01-event-kbd";
}
'';
};
};
config = lib.mkIf cfg.enable {
systemd.services.persistent-evdev = {
documentation = [ "https://github.com/aiberia/persistent-evdev/blob/master/README.md" ];
description = "Persistent evdev proxy";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Restart = "on-failure";
ExecStart = "${pkgs.persistent-evdev}/bin/persistent-evdev.py ${configFile}";
CacheDirectory = "persistent-evdev";
};
};
services.udev.packages = [ pkgs.persistent-evdev ];
};
meta.maintainers = with lib.maintainers; [ lodi ];
}

@ -53,7 +53,7 @@ in {
else cfg.configFile;
in
{
ExecStart = "${pkgs.grafana-mimir}/bin/mimir --config.file=${conf}";
ExecStart = "${pkgs.mimir}/bin/mimir --config.file=${conf}";
DynamicUser = true;
Restart = "always";
ProtectSystem = "full";

@ -5,6 +5,8 @@ with lib;
let
cfg = config.services.localtimed;
in {
imports = [ (lib.mkRenamedOptionModule [ "services" "localtime" ] [ "services" "localtimed" ]) ];
options = {
services.localtimed = {
enable = mkOption {

@ -1027,6 +1027,7 @@ in
${pkgs.envsubst}/bin/envsubst \
-o ${cfg.workDir}/config.json \
-i ${prettyJSON cfg.configuration}
mkdir -p ${cfg.configuration.uploadsPath}
'';
serviceConfig = {
WorkingDirectory = cfg.workDir;

@ -440,5 +440,53 @@ let self = {
"21.11".ap-east-1.aarch64-linux.hvm-ebs = "ami-0aa3b50a4f2822a00";
"21.11".sa-east-1.aarch64-linux.hvm-ebs = "ami-00f68eff453d3fe69";
latest = self."21.11";
# 22.05.342.a634c8f6c1f
"22.05".eu-west-1.x86_64-linux.hvm-ebs = "ami-00badba5cfa0a0c0d";
"22.05".af-south-1.x86_64-linux.hvm-ebs = "ami-0d3a6166c1ea4d7b4";
"22.05".ap-east-1.x86_64-linux.hvm-ebs = "ami-06445325c360470d8";
"22.05".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-009c422293bcf3721";
"22.05".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0bfc0397525a67ed8";
"22.05".ap-northeast-3.x86_64-linux.hvm-ebs = "ami-0a1fb4d4e08a6065e";
"22.05".ap-south-1.x86_64-linux.hvm-ebs = "ami-07ad258dcc69239d2";
"22.05".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0f59f7f33cba8b1a4";
"22.05".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0d1e49fe30aec165d";
"22.05".ap-southeast-3.x86_64-linux.hvm-ebs = "ami-0f5cb24a1e3fc62dd";
"22.05".ca-central-1.x86_64-linux.hvm-ebs = "ami-0551a595ba7916462";
"22.05".eu-central-1.x86_64-linux.hvm-ebs = "ami-0702eee2e75d541d1";
"22.05".eu-north-1.x86_64-linux.hvm-ebs = "ami-0fc6838942cb7d9cb";
"22.05".eu-south-1.x86_64-linux.hvm-ebs = "ami-0df9463b8965cdb80";
"22.05".eu-west-2.x86_64-linux.hvm-ebs = "ami-08f3c1eb533a42ac1";
"22.05".eu-west-3.x86_64-linux.hvm-ebs = "ami-04b50c79dc4009c97";
"22.05".me-south-1.x86_64-linux.hvm-ebs = "ami-05c52087afab7024d";
"22.05".sa-east-1.x86_64-linux.hvm-ebs = "ami-0732aa0f0c28f281b";
"22.05".us-east-1.x86_64-linux.hvm-ebs = "ami-0223db08811f6fb2d";
"22.05".us-east-2.x86_64-linux.hvm-ebs = "ami-0a743534fa3e51b41";
"22.05".us-west-1.x86_64-linux.hvm-ebs = "ami-0d72ab697beab5ea5";
"22.05".us-west-2.x86_64-linux.hvm-ebs = "ami-034946f0c47088751";
"22.05".eu-west-1.aarch64-linux.hvm-ebs = "ami-08114069426233360";
"22.05".af-south-1.aarch64-linux.hvm-ebs = "ami-0a9b83913abd61694";
"22.05".ap-east-1.aarch64-linux.hvm-ebs = "ami-03966ad4547f532b7";
"22.05".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-0eb7e152c8d5aae7d";
"22.05".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-08369e00c5528762b";
"22.05".ap-northeast-3.aarch64-linux.hvm-ebs = "ami-0fa14b8d48cdd57c3";
"22.05".ap-south-1.aarch64-linux.hvm-ebs = "ami-0f2ca3b542ff0913b";
"22.05".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-087def0511ef2687d";
"22.05".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-0aa90985199011f04";
"22.05".ap-southeast-3.aarch64-linux.hvm-ebs = "ami-0c86c52790deefa23";
"22.05".ca-central-1.aarch64-linux.hvm-ebs = "ami-06e932cc9c20403e4";
"22.05".eu-central-1.aarch64-linux.hvm-ebs = "ami-07680df1026a9b54c";
"22.05".eu-north-1.aarch64-linux.hvm-ebs = "ami-0cbe9f2725e4de706";
"22.05".eu-south-1.aarch64-linux.hvm-ebs = "ami-01a83c3892925765f";
"22.05".eu-west-2.aarch64-linux.hvm-ebs = "ami-049024d086d039b54";
"22.05".eu-west-3.aarch64-linux.hvm-ebs = "ami-0c0ebe20ebfc635a1";
"22.05".me-south-1.aarch64-linux.hvm-ebs = "ami-0d662fcaac553e945";
"22.05".sa-east-1.aarch64-linux.hvm-ebs = "ami-0888c8f703e00fdb8";
"22.05".us-east-1.aarch64-linux.hvm-ebs = "ami-03536a13324333073";
"22.05".us-east-2.aarch64-linux.hvm-ebs = "ami-067611519fa817aaa";
"22.05".us-west-1.aarch64-linux.hvm-ebs = "ami-0f96be48071c13ab2";
"22.05".us-west-2.aarch64-linux.hvm-ebs = "ami-084bc5d777585adfb";
latest = self."22.05";
}; in self

@ -170,7 +170,7 @@ in {
frr = handleTest ./frr.nix {};
fsck = handleTest ./fsck.nix {};
ft2-clone = handleTest ./ft2-clone.nix {};
grafana-mimir = handleTest ./grafana-mimir.nix {};
mimir = handleTest ./mimir.nix {};
gerrit = handleTest ./gerrit.nix {};
geth = handleTest ./geth.nix {};
ghostunnel = handleTest ./ghostunnel.nix {};

@ -1,5 +1,5 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "grafana-mimir";
name = "mimir";
nodes = {
server = { ... }: {
environment.systemPackages = [ pkgs.jq ];

@ -18,13 +18,13 @@ let
in
pythonPackages.buildPythonApplication rec {
pname = "picard";
version = "2.8";
version = "2.8.1";
src = fetchFromGitHub {
owner = "metabrainz";
repo = pname;
rev = "refs/tags/release-${version}";
sha256 = "sha256-DG5b3mw6AL4HSF3diGXOqIeH/eXGqLOsbcnPbD6kznE=";
sha256 = "sha256-KEKOouTNmmZiPyKo8xCQv6Zkreidtz2DaEbHjuwJJvY=";
};
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]

@ -1,13 +1,13 @@
{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr
, gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk
, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr
, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk
, at-spi2-core, libdbusmenu, libdrm, mesa
}:
let
packages = [
stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3
fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr gconf nss
stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype
fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify

@ -1,135 +0,0 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
, # Patchelf dependencies:
alsa-lib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU, libGL
, openssl, xorg, zlib
}:
let
version = "17.1";
sha256 = if stdenv.hostPlatform.system == "x86_64-linux" then "1kddisnvlk48jip6k59mw3wlkrl7rkck2lxpaghn0gfx02cvms5f"
else if stdenv.hostPlatform.system == "i686-cygwin" then "1izp42afrlh4yd322ax9w85ki388gnkqfqbw8dwnn4k3j7r5487z"
else throw "Unsupported system: ${stdenv.hostPlatform.system}";
urlBase = "https://github.com/Kode/KodeStudio/releases/download/v${version}/KodeStudio-";
urlStr = if stdenv.hostPlatform.system == "x86_64-linux" then urlBase + "linux64.tar.gz"
else if stdenv.hostPlatform.system == "i686-cygwin" then urlBase + "win32.zip"
else throw "Unsupported system: ${stdenv.hostPlatform.system}";
in
stdenv.mkDerivation {
pname = "kodestudio";
inherit version;
src = fetchurl {
url = urlStr;
inherit sha256;
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libXScrnSaver ];
desktopItem = makeDesktopItem {
name = "kodestudio";
exec = "kodestudio";
icon = "kodestudio";
comment = "Kode Studio is an IDE for Kha based on Visual Studio Code";
desktopName = "Kode Studio";
genericName = "Text Editor";
categories = [ "GNOME" "GTK" "Utility" "TextEditor" "Development" ];
};
sourceRoot = ".";
installPhase = ''
mkdir -p $out
cp -r ./* $out
'';
postFixup = lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") ''
# Patch Binaries
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out:${atomEnv.libPath}" \
$out/kodestudio
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsa-lib}/lib:${libGL}/lib:${libGLU}/lib:${lib.getLib openssl}/lib" \
$out/resources/app/extensions/krom/Krom/linux/Krom
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib" \
$out/resources/app/extensions/kha/Kha/Kore/Tools/krafix/krafix-linux64
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib" \
$out/resources/app/extensions/kha/Kha/Kore/Tools/kraffiti/kraffiti-linux64
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" \
$out/resources/app/extensions/kha/Kha/Tools/kravur/kravur-linux64
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib:${zlib}/lib" \
$out/resources/app/extensions/kha/Kha/Tools/haxe/haxe-linux64
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib:${libvorbis}/lib:${libogg}/lib:${flac.out}/lib" \
$out/resources/app/extensions/kha/Kha/Tools/oggenc/oggenc-linux64
# Patch Shared Objects
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/libnode.so
patchelf --set-rpath ".:${stdenv.cc.libc}/lib" $out/libffmpeg.so
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8_libplatform.so
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libicuuc.so
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8_libbase.so
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8.so
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libicui18n.so
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/RPi/libneko.so
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/Linux64/libneko.so
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/Linux/libneko.so
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/pty.js/build/Release/pty.node
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/gc-signals/build/Release/gcsignals.node
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/gc-signals/build/Release/obj.target/gcsignals.node
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/oniguruma/build/Release/onig_scanner.node
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/oniguruma/build/Release/obj.target/onig_scanner.node
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${xorg.libX11}/lib" $out/resources/app/node_modules/native-keymap/build/Release/keymapping.node
patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${xorg.libX11}/lib" $out/resources/app/node_modules/native-keymap/build/Release/obj.target/keymapping.node
# Rewrite VSCODE_PATH inside bin/kodestudio to $out
substituteInPlace $out/bin/kodestudio --replace "/usr/share/kodestudio" $out
# Patch library calls that expects nix store files to be mode 644:
# A stat is made on srcFile (in the nix store), and its mode used
# for destFile, but it expects the mode to be read write, whereas
# all regular files in the nix store are made read only.
# (33188 is 100644 octal, the required mode)
substituteInPlace $out/resources/app/extensions/kha/Kha/Tools/khamake/node_modules/fs-extra/lib/copy-sync/copy-file-sync.js --replace "stat.mode" "33188"
substituteInPlace $out/resources/app/extensions/kha/Kha/Kore/Tools/koremake/node_modules/fs-extra/lib/copy-sync/copy-file-sync.js --replace "stat.mode" "33188"
# Wrap preload libXss
wrapProgram $out/bin/kodestudio \
--prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
'';
meta = with lib; {
description = ''
An IDE for Kha based on Visual Studio Code
'';
longDescription = ''
Kode Studio is an IDE for Kha based on Visual Studio Code.
Kha and Kore are multimedia frameworks for Haxe and C++ respectively
(with JavaScript coming soon). Using Kha or Kore you can access all
hardware at the lowest possible level in a completely portable way.
'';
homepage = "http://kode.tech/";
downloadPage = "https://github.com/Kode/KodeStudio/releases";
license = licenses.mit;
maintainers = [ maintainers.patternspandemic ];
platforms = [ "x86_64-linux" "i686-cygwin" ];
};
}

@ -1,51 +0,0 @@
{ lib, gcc10Stdenv, fetchhg, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
gcc10Stdenv.mkDerivation rec {
version = "10.8";
pname = "textadept";
nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
gtk2 ncurses glib zip
];
src = fetchhg {
url = "http://foicica.com/hg/textadept";
rev = "textadept_${version}";
sha256 = "sha256-dEZSx2tuHTWYhk9q5iGlrWTAvDvKaM8HaHwXcFcv33s=";
};
preConfigure =
lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params:
"ln -s ${fetchurl params} $PWD/src/${name}"
) (import ./deps.nix)) + ''
cd src
make deps
'';
postBuild = ''
make curses
'';
preInstall = ''
mkdir -p $out/share/applications
mkdir -p $out/share/pixmaps
'';
postInstall = ''
make curses install PREFIX=$out MAKECMDGOALS=curses
'';
makeFlags = [
"PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps"
];
meta = with lib; {
description = "An extensible text editor based on Scintilla with Lua scripting";
homepage = "http://foicica.com/textadept";
license = licenses.mit;
maintainers = with maintainers; [ raskin mirrexagon ];
platforms = platforms.linux;
};
}

@ -1,42 +0,0 @@
{
"99fa62b828ee.zip" = {
url = "http://foicica.com/hg/scintilla/archive/99fa62b828ee.zip";
sha256 = "sha256-QO4iGhx72CfB1/0Pp/Qab92qm98VZn/EkrHZGndoHVc=";
};
"lua-5.3.5.tar.gz" = {
url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz";
sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc";
};
"lpeg-1.0.2.tar.gz" = {
url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz";
sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4=";
};
"v1_7_0_2.zip" = {
url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip";
sha256 = "sha256-kXSriR8dOStCpYeyr7c3+VZez4qGDS5aK/9FeFj1hHg=";
};
"db67f8a489e8.zip" = {
url = "http://foicica.com/hg/gtdialog/archive/db67f8a489e8.zip";
sha256 = "sha256-UIvjbDrg3jyz7t2tm4y1zzH/TG6Kqaz3LE5y2U6OHuM=";
};
"cdk-5.0-20150928.tgz" = {
url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz";
sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
};
"libtermkey-0.20.tar.gz" = {
url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz";
sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc";
};
"pdcurs36.zip" = {
url = "http://prdownloads.sourceforge.net/pdcurses/pdcurs36.zip";
sha256 = "0y91zpygrxms7d1l5ksrz42bkvq8jd2xqlj5j7wgyxcl58chcw9b";
};
"bombay.zip" = {
url = "http://foicica.com/hg/bombay/archive/b25520cc76bb.zip";
sha256 = "07spq7jmkfyq20gv67yffara3ln3ns2xi0k02m2mxdms3xm1q36h";
};
"cloc-1.60.pl" = {
url = "http://prdownloads.sourceforge.net/cloc/cloc-1.60.pl";
sha256 = "0p504bi19va3dh274v7lb7giqrydwa5yyry60f7jpz84y6z71a2a";
};
}

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "11.3";
pname = "textadept11";
pname = "textadept";
nativeBuildInputs = [ pkg-config unzip zip ];
buildInputs = [
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
description = "An extensible text editor based on Scintilla with Lua scripting.";
homepage = "http://foicica.com/textadept";
license = licenses.mit;
maintainers = with maintainers; [ raskin mirrexagon ];
maintainers = with maintainers; [ raskin mirrexagon patricksjackson ];
platforms = platforms.linux;
};
}

@ -2364,8 +2364,8 @@ let
mktplcRef = {
name = "vspacecode";
publisher = "VSpaceCode";
version = "0.10.1";
sha256 = "sha256-H7SCC/ZhDswMQjLX+qpQa6A1N83MobJRPC4pyIbZ1kA=";
version = "0.10.9";
sha256 = "sha256-16oC2BghY7mB/W0niTDtKGMAC9pt6m0utSOJ0lgbpAU=";
};
meta = {
license = lib.licenses.mit;

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "19.0.0";
version = "19.0.2";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "aabf2addc3182996c76a01df16024b77ae16a489e52cedf87bcfb14891f72118";
sha256 = "46b4e7269628100ea3c083dee75308d9746780e46eac15d2c5495fdeece7e323";
};
nativeBuildInputs = [

@ -5,7 +5,6 @@
, cairo
, cmake
, fetchurl
, fetchpatch
, gettext
, ghostscript
, glib
@ -44,20 +43,25 @@
let
python3Env = python3.withPackages
(ps: with ps; [
appdirs
beautifulsoup4
cachecontrol
numpy
lxml
pillow
scour
pyserial
]);
requests
pygobject3
] ++ inkex.propagatedBuildInputs);
in
stdenv.mkDerivation rec {
pname = "inkscape";
version = "1.1.2";
version = "1.2";
src = fetchurl {
url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz";
sha256 = "sha256-P/5UoG0LJaTNi260JFNu8e0gW+E0Q6Oc1DfIx7ibltE=";
url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz";
sha256 = "jZsxFCVUlFZk7f7+LWtVkQpQmXZfcXanEQfDTx3N5q0=";
};
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
@ -73,20 +77,6 @@ stdenv.mkDerivation rec {
# e.g., those from the "Effects" menu.
python3 = "${python3Env}/bin/python";
})
# Fix build with poppler 22.03
# https://gitlab.com/inkscape/inkscape/-/merge_requests/4187
(fetchpatch {
url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch";
sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg=";
})
# Fix build with poppler 22.04
# https://gitlab.com/inkscape/inkscape/-/merge_requests/4266
(fetchpatch {
url = "https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b.patch";
sha256 = "2cJZdunbRgPIwhJgz1dQoQRw3ZYZ2Fp6c3hpVBV2PbE=";
})
];
postPatch = ''

@ -1,79 +1,21 @@
{ alsa-lib
, at-spi2-atk
, at-spi2-core
, atk
, autoPatchelfHook
, cairo
, cups
, dbus
, electron_9
, expat
{ autoPatchelfHook
, electron
, fetchurl
, gdk-pixbuf
, glib
, gtk3
, lib
, libappindicator-gtk3
, libdbusmenu-gtk3
, libuuid
, makeWrapper
, nspr
, nss
, pango
, squashfsTools
, stdenv
, systemd
, xorg
}:
let
# Currently only works with electron 9
electron = electron_9;
in
stdenv.mkDerivation rec {
pname = "authy";
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version'
version = "2.1.0";
rev = "9";
buildInputs = [
alsa-lib
at-spi2-atk
at-spi2-core
atk
cairo
cups
dbus
expat
gdk-pixbuf
glib
gtk3
libappindicator-gtk3
libdbusmenu-gtk3
libuuid
nspr
nss
pango
stdenv.cc.cc
systemd
xorg.libX11
xorg.libXScrnSaver
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libxcb
];
version = "2.2.0";
rev = "10";
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap";
sha256 = "sha256-RxjxOYrbneVctyTJTMvoN/UdREohaZWb1kTdEeI6mUU=";
sha256 = "sha256-sB9/fVV/qp+DfjxpvzIUHsLkeEu35i2rEv1/JYMytG8=";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ];
@ -95,25 +37,16 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/lib/
cp -r ./* $out/
rm -R ./*
mkdir -p $out/bin $out/share/applications $out/share/pixmaps/apps
# The snap package has the `ffmpeg.so` file which is copied over with other .so files
mv $out/*.so $out/lib/
# Copy only what is needed
cp -r resources* $out/
cp -r locales* $out/
cp meta/gui/authy.desktop $out/share/applications/
cp meta/gui/icon.png $out/share/pixmaps/authy.png
# Replace icon name in Desktop file
sed -i 's|''${SNAP}/meta/gui/icon.png|authy|g' "$out/meta/gui/authy.desktop"
# Move the desktop file, icon, binary to their appropriate locations
mkdir -p $out/bin $out/share/applications $out/share/pixmaps/apps
cp $out/meta/gui/authy.desktop $out/share/applications/
cp $out/meta/gui/icon.png $out/share/pixmaps/authy.png
cp $out/${pname} $out/bin/${pname}
# Cleanup
rm -r $out/{data-dir,gnome-platform,meta,scripts,usr,*.sh,*.so}
sed -i 's|''${SNAP}/meta/gui/icon.png|authy|g' "$out/share/applications/authy.desktop"
runHook postInstall
'';

@ -1,72 +0,0 @@
{ lib, stdenv, python27Packages, curaengine, makeDesktopItem, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "cura";
version = "15.06.03";
src = fetchFromGitHub {
owner = "daid";
repo = "Cura";
rev = version;
sha256 = "sha256-o1cAi4Wi19WOijlRB9iYwNEpSNnmywUj5Bth8rRhqFA=";
};
desktopItem = makeDesktopItem {
name = "Cura";
exec = "cura";
icon = "cura";
comment = "Cura";
desktopName = "Cura";
genericName = "3D printing host software";
categories = [ "GNOME" "GTK" "Utility" ];
};
python_deps = with python27Packages; [ pyopengl pyserial numpy wxPython30 power setuptools ];
pythonPath = python_deps;
propagatedBuildInputs = python_deps;
buildInputs = [ curaengine python27Packages.wrapPython ];
configurePhase = "";
buildPhase = "";
patches = [ ./numpy-cast.patch ];
installPhase = ''
# Install Python code.
site_packages=$out/lib/python2.7/site-packages
mkdir -p $site_packages
cp -r Cura $site_packages/
# Install resources.
resources=$out/share/cura
mkdir -p $resources
cp -r resources/* $resources/
sed -i 's|os.path.join(os.path.dirname(__file__), "../../resources")|"'$resources'"|g' $site_packages/Cura/util/resources.py
# Install executable.
mkdir -p $out/bin
cp Cura/cura.py $out/bin/cura
chmod +x $out/bin/cura
sed -i 's|#!/usr/bin/python|#!/usr/bin/env python|' $out/bin/cura
wrapPythonPrograms
# Make it find CuraEngine.
echo "def getEngineFilename(): return '${curaengine}/bin/CuraEngine'" >> $site_packages/Cura/util/sliceEngine.py
# Install desktop item.
mkdir -p "$out"/share/applications
cp "$desktopItem"/share/applications/* "$out"/share/applications/
mkdir -p "$out"/share/icons
ln -s "$resources/images/c.png" "$out"/share/icons/cura.png
'';
meta = with lib; {
description = "3D printing host software";
homepage = "https://github.com/daid/Cura";
license = licenses.agpl3;
platforms = platforms.linux;
};
}

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub, fetchpatch
, autoreconfHook, intltool
, gtk, pkg-config, flex }:
@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w";
};
patches = [
# Pul patch pending upstream inclusion for -fno-common toolchain support:
# https://github.com/galculator/galculator/pull/45
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/galculator/galculator/commit/501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6.patch";
sha256 = "08c9d2b49a1mizgk7v37dp8r96x389zc13mzv4dcy16x448lhp67";
})
];
nativeBuildInputs = [ autoreconfHook intltool pkg-config ];
buildInputs = [ gtk flex ];

@ -16,7 +16,7 @@
python3Packages.buildPythonApplication rec {
pname = "gnome-secrets";
version = "6.4";
version = "6.5";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
owner = "World";
repo = "secrets";
rev = version;
sha256 = "sha256-qO2DJ/Eb9+G1R3un2+n9Tf6oxpGrEuH3SBrajQ9tCPU=";
sha256 = "sha256-Hy2W7cvvzVcKtd/KzTn81awoolnfM3ST0Nm70YBLTYY=";
};
nativeBuildInputs = [

@ -16,7 +16,13 @@ let
};
});
# Use click 7
click = self.callPackage ../../../development/python2-modules/click/default.nix { };
click = super.click.overridePythonAttrs (old: rec {
version = "7.1.2";
src = old.src.override {
inherit version;
sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
};
});
};
};
in

@ -12,7 +12,7 @@
let
inherit (stdenv.hostPlatform) system;
pname = "obsidian";
version = "0.14.6";
version = "0.14.15";
appname = "Obsidian";
meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
@ -25,7 +25,7 @@ let
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
sha256 = if stdenv.isDarwin then "1zzccwlim3gi6f5czzyddqjzy1xsk6ayx1hljhw6bmnid72km3q2" else "sha256-KieAE13SIYHDoXTqzk1QY+TPjwF9LRzlfm1yFg9hsTc=";
sha256 = if stdenv.isDarwin then "10c5255nbgqiigcwq6kmhzcgafq91k25wnxj3jxabzc0hs7pn4m5" else "sha256-bSLt4EnlCtxZeKIahr618qMuK9ogUhxn+NKO2GPkjOQ=";
};
icon = fetchurl {

@ -2,30 +2,7 @@
qtbase, mkDerivationWith }:
{
stable = with python27Packages; buildPythonPackage rec {
pname = "plover";
version = "3.1.1";
meta = with lib; {
broken = stdenv.isDarwin;
description = "OpenSteno Plover stenography software";
maintainers = with maintainers; [ twey kovirobi ];
license = licenses.gpl2;
};
src = fetchFromGitHub {
owner = "openstenoproject";
repo = "plover";
rev = "v${version}";
sha256 = "sha256-LIhTwHMphg+xTR9NKvjAZ6p0mmqPNcZd9C4cgnenmYQ=";
};
nativeBuildInputs = [ setuptools-scm ];
buildInputs = [ pytest mock ];
propagatedBuildInputs = [
six setuptools pyserial appdirs hidapi wxPython xlib wmctrl dbus-python
];
};
stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05
dev = with python3Packages; mkDerivationWith buildPythonPackage rec {
pname = "plover";

@ -65,18 +65,30 @@ let
sha256 = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo=";
};
});
# Required by flask-babel
itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec {
version = "2.0.1";
version = "1.1.0";
src = old.src.override {
inherit version;
sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19";
};
});
flask = super.flask.overridePythonAttrs (old: rec {
version = "1.1.4";
src = old.src.override {
inherit version;
sha256 = "sha256-nnJNaPwikCoUNTUfhMP7hiPzA//8xWaky5Ut+MVyz/A=";
sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196";
};
});
flask = self.callPackage ../../../development/python2-modules/flask { };
sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: {
meta = meta // { broken = false; };
});
click = super.click.overridePythonAttrs (old: rec {
version = "7.1.2";
src = old.src.override {
inherit version;
sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
};
});
};
};
in

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.mrhedgehog ];
maintainers = [ maintainers.thehedgeh0g ];
mainProgram = "${pname}";
};
}

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ydict";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "ydict";
rev = "v${version}";
sha256 = "sha256-zhjsXZsRk0UNijjqjGjZh4TiPxAM5p+ic3JMx2wrPeY=";
sha256 = "sha256-qrGOrqI+PXsDNCmgcCPDNn6qUYu2emhYSkYsz4sj27M=";
};
vendorSha256 = "sha256-O6czDfKD18rGVMIZv6II09oQu1w0ijQRuZRGt2gj9Cs=";
vendorSha256 = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs=";
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.30.2";
sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl";
manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb";
version = "0.31.0";
sha256 = "073ij9mllxvw6rg8nm8pj6b8m5jzgbiihr9kknhhpp788wya155d";
manifestsSha256 = "0kp75h119l9051p2xcjfwcllk4hilmq25fcrx86bm0646krvk0pk";
manifests = fetchzip {
url =
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-POziJtCdD4klu23WuGmWdt72Ugr4KwCAjXRTCuzikSk=";
vendorSha256 = "sha256-XTtVSSqU2jWRZvudE6G5QaNaZxw3oESiMPnnQzDs/1w=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "roxctl";
version = "3.69.1";
version = "3.70.0";
src = fetchFromGitHub {
owner = "stackrox";
repo = "stackrox";
rev = version;
sha256 = "sha256-fB43C+gMtUOg/Ah1fOTnOWOUmS0TjXkNCzw/TKfMzj4=";
sha256 = "sha256-VnnMD2tRixCswO/9nrP3PgXmev6O8QUTbkwmFIpPUyE=";
};
vendorSha256 = "sha256-M+ZueycJEaDVzC2bFwQc5EulCrdz6lvzyD8YCoGyW1g=";
vendorSha256 = "sha256-xh2bgLSWjQHOjHrgDpQri78LvCL4CDbMteQYARyGLgg=";
nativeBuildInputs = [ installShellFiles ];

@ -518,6 +518,15 @@
"vendorSha256": "sha256-HrsjhaMlzs+uel5tBlxJD69Kkjl+4qVisWWREANBx40=",
"version": "5.0.2"
},
"hetznerdns": {
"owner": "timohirt",
"provider-source-address": "registry.terraform.io/timohirt/hetznerdns",
"repo": "terraform-provider-hetznerdns",
"rev": "v2.1.0",
"sha256": "sha256-QmD9UlQpyvEz4in1I960J0eC6xNtgk5z8tZUxaApOwE=",
"vendorSha256": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=",
"version": "2.1.0"
},
"htpasswd": {
"owner": "loafoe",
"provider-source-address": "registry.terraform.io/loafoe/htpasswd",

@ -196,7 +196,10 @@ rec {
sha256 = "sha256-LkRCumyNHVBSsXRp1ovNMGCeidK/jVCjh9H1HSE1Lm8=";
vendorSha256 = "sha256-CVgAmPM0nt0Wx+N0qs+IO5KwCWnbfif70EHjBi0bIsQ=";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
passthru = {
inherit plugins;
tests = { inherit terraform_plugins_test; };
};
};
# Tests that the plugins are being used. Terraform looks at the specific

@ -1,5 +1,5 @@
{ buildGoPackage, lib, fetchFromGitHub }:
buildGoPackage rec {
{ buildGoModule, lib, fetchFromGitHub }:
buildGoModule rec {
pname = "tgswitch";
version = "0.5.389";
@ -10,7 +10,14 @@ buildGoPackage rec {
sha256 = "sha256-6hErfI7LEJFgOoJR8IF9jTSBwqbQYeGiwdeJShqxVQ0=";
};
goPackagePath = "github.com/warrensbox/tgswitch";
vendorSha256 = null;
ldflags = [ "-s" "-w" ];
# There are many modifications need to be done to make tests run. For example:
# 1. Network access
# 2. Operation on `/var/empty` not permitted on macOS
doCheck= false;
meta = with lib; {
description = "A command line tool to switch between different versions of terragrunt";
@ -19,3 +26,4 @@ buildGoPackage rec {
maintainers = with maintainers; [ psibi ];
};
}

@ -18,17 +18,17 @@
let
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
version = "1.84.0";
version = "1.86.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
hash = "sha256-ZG3siulXVHTbdSd9tmenljFODZ3LWX+BXn6OJfrbEYA=";
hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${old.pname}-${version}";
hash = "sha256-vQ+A4dEWh5+BgWOdxd7GTPuHk6M6bHgGnZcWNwR/Urs=";
hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk=";
};
});
electronExec = if stdenv.isDarwin then
@ -46,13 +46,13 @@ let
});
in nodePackages.deltachat-desktop.override rec {
pname = "deltachat-desktop";
version = "1.30.0";
version = "1.30.1";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
rev = "v${version}";
hash = "sha256-vp6vqoQvkAe7QPy4210r/5c1GNaGWgYvG0LyLqtCAxw=";
hash = "sha256-gZjZbXiqhFVfThZOsvL/nKkf6MX+E3KB5ldEAIuzBYA=";
};
nativeBuildInputs = [
@ -122,6 +122,7 @@ in nodePackages.deltachat-desktop.override rec {
homepage = "https://github.com/deltachat/deltachat-desktop";
changelog = "https://github.com/deltachat/deltachat-desktop/blob/${src.rev}/CHANGELOG.md";
license = licenses.gpl3Plus;
mainProgram = "deltachat";
maintainers = with maintainers; [ dotlambda ];
};
}

@ -1,6 +1,6 @@
{
"name": "deltachat-desktop",
"version": "1.30.0",
"version": "1.30.1",
"dependencies": {
"@blueprintjs/core": "^4.1.2",
"@deltachat/message_parser_wasm": "^0.4.0",
@ -9,7 +9,7 @@
"application-config": "^1.0.1",
"classnames": "^2.3.1",
"debounce": "^1.2.0",
"deltachat-node": "1.84.0",
"deltachat-node": "1.86.0",
"emoji-js-clean": "^4.0.0",
"emoji-mart": "^3.0.1",
"emoji-regex": "^9.2.2",

@ -22,11 +22,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
version = "1.4.2";
version = "1.4.3";
src = fetchurl {
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
sha256 = "sha256:151lbz9092z8r2yva5039g867chcid3n804jk7hjawrd9vnw81az";
sha256 = "sha256:0n6v96pwgds8655877fjgsphq4rd4gb9mz7cbqp4nkd4m7kvr3xv";
};
buildInputs = [

@ -1,60 +0,0 @@
{ lib, stdenv, fetchurl, python27Packages, file }:
let
inherit (python27Packages) python;
requirements = (import ./requirements.nix {
inherit lib fetchurl;
pythonPackages = python27Packages;
});
in
stdenv.mkDerivation rec {
pname = "salut-a-toi";
version = "0.6.1";
src = fetchurl {
url = "ftp://ftp.goffi.org/sat/sat-${version}.tar.bz2";
sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
};
buildInputs = with python27Packages;
[
python twisted urwid wxPython pygobject2
dbus-python wrapPython setuptools file
pycrypto pyxdg
] ++ (with requirements; [
pyfeed
wokkel
]);
configurePhase = ''
sed -i "/use_setuptools/d" setup.py
sed -e "s@sys.prefix@'$out'@g" -i setup.py
sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh
sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh
echo 'import wokkel.muc' | python
'';
buildPhase = ''
${python.interpreter} setup.py build
'';
installPhase = ''
${python.interpreter} setup.py install --prefix="$out"
for i in "$out/bin"/*; do
head -n 1 "$i" | grep -E '[/ ]python( |$)' && {
wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}"
} || true
done
'';
meta = with lib; {
homepage = "http://sat.goffi.org/";
description = "A multi-frontend XMPP client";
platforms = platforms.linux;
maintainers = [ maintainers.raskin ];
license = licenses.gpl3Plus;
};
}

@ -1,67 +0,0 @@
{ fetchurl
, lib
, pythonPackages
}:
let
buildPythonPackage = pythonPackages.buildPythonPackage;
xe = buildPythonPackage rec {
url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz";
name = lib.nameFromURL url ".tar";
src = fetchurl {
inherit url;
sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42";
};
# error: invalid command 'test'
doCheck = false;
meta = {
homepage = "http://home.blarg.net/~steveha/xe.html";
description = "XML elements";
};
};
in {
pyfeed = (buildPythonPackage rec {
url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz";
name = lib.nameFromURL url ".tar";
src = fetchurl {
inherit url;
sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1";
};
propagatedBuildInputs = [ xe ];
# error: invalid command 'test'
doCheck = false;
meta = with lib; {
homepage = "http://home.blarg.net/~steveha/pyfeed.html";
description = "Tools for syndication feeds";
};
});
wokkel = buildPythonPackage (rec {
url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz";
name = lib.nameFromURL url ".tar";
src = fetchurl {
inherit url;
sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml";
};
propagatedBuildInputs = with pythonPackages; [twisted python-dateutil];
meta = with lib; {
description = "Some (mainly XMPP-related) additions to twisted";
homepage = "http://wokkel.ik.nu/";
license = licenses.mit;
};
});
}

@ -1,18 +1,16 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
# https://github.com/erroneousboat/slack-term
buildGoModule rec {
pname = "slack-term";
version = "0.5.0";
goPackagePath = "github.com/erroneousboat/slack-term";
src = fetchFromGitHub {
owner = "erroneousboat";
repo = "slack-term";
rev = "v${version}";
sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6";
};
vendorSha256 = null;
meta = with lib; {
description = "Slack client for your terminal";

@ -1,40 +0,0 @@
{ lib, stdenv, fetchFromGitHub, python2, unzip, tor }:
stdenv.mkDerivation rec {
pname = "torchat";
version = "0.9.9.553";
src = fetchFromGitHub {
owner = "prof7bit";
repo = "TorChat";
rev = version;
sha256 = "2LHG9qxZDo5rV6wsputdRo2Y1aHs+irMwt1ucFnXQE0=";
};
nativeBuildInputs = [ unzip ];
buildInputs = with python2.pkgs; [ python wxPython wrapPython ];
pythonPath = with python2.pkgs; [ wxPython ];
preConfigure = "cd torchat/src; rm portable.txt";
installPhase = ''
substituteInPlace "Tor/tor.sh" --replace "tor -f" "${tor}/bin/tor -f"
wrapPythonPrograms
mkdir -p $out/lib/torchat
cp -rf * $out/lib/torchat
makeWrapper ${python2}/bin/python $out/bin/torchat \
--set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \
--chdir "$out/lib/torchat" \
--add-flags "-O $out/lib/torchat/torchat.py"
'';
meta = with lib; {
homepage = "https://github.com/prof7bit/TorChat";
description = "Instant messaging application on top of the Tor network and it's location hidden services";
license = licenses.gpl3;
maintainers = [ ];
platforms = platforms.unix;
};
}

@ -8,23 +8,23 @@
rustPlatform.buildRustPackage rec {
pname = "mujmap";
version = "0.1.1";
version = "0.2.0";
src = fetchFromGitHub {
owner = "elizagamedev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-O5CbLgs+MkATPtess0gocgPB9kwD8FMR/urwm6jo2rA=";
sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E=";
};
cargoSha256 = "sha256-nOZ+HnzXhVp+tLrNMZO1NmZIhIqlWz0fRMbHVIQkOxI=";
cargoSha256 = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU=";
buildInputs = [
notmuch
] ++ lib.optional stdenv.isDarwin Security;
meta = with lib; {
description = "Bridge for synchronizing email and tags between JMAP and notmuch";
description = "JMAP integration for notmuch mail";
homepage = "https://github.com/elizagamedev/mujmap/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ elizagamedev ];

@ -11,7 +11,7 @@ assert withQt -> qt5 != null;
with lib;
let
version = "3.6.3";
version = "3.6.5";
variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@ -21,7 +21,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "sha256-tgNkpMAGihCBGrP9B1ymwesOddRGACcbiKIO2Tou9jE=";
sha256 = "sha256-otdB1g/zUWE31LnzjNwH7uVKVuw2BG9MOv7mv7T26qE=";
};
cmakeFlags = [

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "appflowy";
version = "0.0.3";
version = "0.0.4";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz";
sha256 = "sha256-m9vfgytSKnWLf6hwKjIGcU/7OCmIBiF4hJ/yIRBdSpQ=";
sha256 = "sha256-ke3cuRi+ZlBSWawg66cGrV928dOBp0EniNakitmgUso=";
};
nativeBuildInputs = [

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, intltool
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool
, gtk3, glib, curl, goocanvas2, gpsd
, hamlib, wrapGAppsHook
}:
@ -14,6 +14,16 @@ in stdenv.mkDerivation {
sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7";
};
patches = [
# Pull upstream fix for -fno-common toolchains:
# https://github.com/csete/gpredict/issues/195
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch";
sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a";
})
];
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ];

@ -49,6 +49,7 @@ let
"8.15.0".sha256 = "sha256:1ma76wfrpfsl72yh10w1ys2a0vi0mdc2jc79kdc8nrmxkhpw1nxx";
"8.15.1".sha256 = "sha256:1dsa04jzkx5pw69pmxn0l55q4w88lg6fvz7clbga0bazzsfnsgd6";
"8.15.2".sha256 = "sha256:0gn8dz69scxnxaq6ycb3x34bjfk9wlp1y2xn8w69kg9fm4b6gkc7";
"8.16+rc1".sha256 = "sha256-dU+E0Mz7MVntbQIeG9I59ANBaHaXXSrjCRdoqZ5TO60=";
};
releaseRev = v: "V${v}";
fetched = import ../../../../build-support/coq/meta-fetch/default.nix

@ -9,14 +9,14 @@
buildPythonApplication rec {
pname = "glances";
version = "3.2.4.2";
version = "3.2.5";
disabled = isPyPy;
src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "v${version}";
sha256 = "0gql61lrav3f7wbsvgc1d6vf8r0xi5xs9rz9d3sqw3wj5m90w0vq";
sha256 = "sha256-kTnUP7WvmEw4VazjLrGb0FhSdz+/OadzgwDXs1SA02o=";
};
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):

@ -1,15 +1,15 @@
{ mkDerivation, lib, fetchbzr, python3, rtmpdump }:
let
pythonEnv = python3.withPackages (ps: with ps; [ pyqt5_with_qtmultimedia ]);
pythonEnv = python3.withPackages (ps: with ps; [ m3u8 pyqt5_with_qtmultimedia ]);
in mkDerivation {
pname = "qarte";
version = "4.15.1";
version = "4.17.1";
src = fetchbzr {
url = "http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4";
rev = "67";
sha256 = "sha256:0ajvrvpyqyyxnq9nv69p3sr6c1kplphvrpph75k76yl0av94j2s3";
rev = "74";
sha256 = "sha256:18ky9qwfvbifd0xrbmnfm3cm2vyy5jgf9rrca2hby46sjf2745h4";
};
buildInputs = [ pythonEnv ];

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "containerd";
version = "1.6.5";
version = "1.6.6";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
sha256 = "sha256-WEHhx9xSxzBoViujGc4yNt9K2gSMfU6GFmsYk3WDfu8=";
sha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8=";
};
vendorSha256 = null;

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.24.0";
version = "1.24.1";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
sha256 = "sha256-LbLBG8nvEgSF5KAeAYnp7dM9cbqF078QpVai1iDx63U=";
sha256 = "sha256-/AoZKeUcYF1fyYtllXpB7GNWR/6SWEOy2ffDLYbTp9E=";
};
vendorSha256 = null;

@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
--replace "CFLAGSX =" "CFLAGSX = -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: plugin.o:(.bss+0x0): multiple definition of `stam'; panel.o:(.bss+0x20): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS="-lX11";
meta = with lib; {

@ -10,7 +10,6 @@ rec {
*
* Examples:
* runCommand "name" {envVariable = true;} ''echo hello > $out''
* runCommandNoCC "name" {envVariable = true;} ''echo hello > $out'' # equivalent to prior
* runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out'';
*
* The `*Local` variants force a derivation to be built locally,

@ -1,6 +1,6 @@
{
"commit": "1da63d5bfb88cd1e920fefd1b55650c78edc5539",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1da63d5bfb88cd1e920fefd1b55650c78edc5539.tar.gz",
"sha256": "1n8qv8ajfwrj73f81m2zj81jyjx1jxxhjljwp8gch2aq8piz74g6",
"msg": "Update from Hackage at 2022-05-29T17:05:02Z"
"commit": "a4be9679c308459b390768e6195f3f08ae5366db",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a4be9679c308459b390768e6195f3f08ae5366db.tar.gz",
"sha256": "09pr3ag0k1wjiih36p902gcpygxg8f7wqpr5g8j7ka851g0gckqa",
"msg": "Update from Hackage at 2022-06-04T09:01:11Z"
}

@ -49,6 +49,11 @@ in stdenv.mkDerivation rec {
# build fails otherwise
enableParallelBuilding = false;
# Workaround build failure on -fno-common toolchains:
# ld: raima/startup.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: multiple definition of
# `__SK__'; raima/alloc.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
makeFlags = [
"World"
"BOOTSTRAPCFLAGS=-I${xorgproto}/include/X11"

@ -40,7 +40,10 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "pic" "bindnow" ];
NIX_CFLAGS_COMPILE = "-fgnu89-inline";
# -fcommon: workaround build failure on -fno-common toolchains:
# ld: ./libgclp.a(user_match.o):(.bss+0x18): multiple definition of
# `tf'; ./libpre_gcl.a(main.o):(.bss+0x326d90): first defined here
NIX_CFLAGS_COMPILE = "-fgnu89-inline -fcommon";
meta = with lib; {
description = "GNU Common Lisp compiler working via GCC";

@ -0,0 +1,43 @@
{ lib
, pkgs
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "gmqcc";
version = "unstable-2021-07-09";
src = fetchFromGitHub {
owner = "graphitemaster";
repo = "gmqcc";
rev = "297eab9e5e2c9cc4f41201b68821593a5cf9a725";
sha256 = "1hl2qn7402ia03kjkblj4q4wfypxkil99sivsyk2vrnwwpdp4nzx";
};
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install -m755 gmqcc $out/bin
runHook postInstall
'';
meta = with lib; {
homepage = "https://graphitemaster.github.io/gmqcc/";
description = "A modern QuakeC compiler";
longDescription = ''
For an enduring period of time the options for a decent compiler for
the Quake C programming language were confined to a specific compiler
known as QCC. Attempts were made to extend and improve upon the design
of QCC, but many foreseen the consequences of building on a broken
foundation. The solution was obvious, a new compiler; one born from
the NIH realm of sarcastic wit.
We welcome you. You won't find a better Quake C compiler.
'';
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ necrophcodr ];
platforms = platforms.linux;
};
}

@ -8,6 +8,7 @@ with lib; mkCoqDerivation {
defaultVersion = if versions.isGe "8.6" coq.coq-version
then "${coq.coq-version}.0" else null;
release."8.16.0".sha256 = "sha256-DH3iWwatPlhhCVYVlgL2WLkvneSVzSXUiKo2e0+1zR4=";
release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns";
release."8.14.0".sha256 = "0jsgdvj0ddhkls32krprp34r64y1rb5mwxl34fgaxk2k4664yq06";
release."8.13.0".sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y";

@ -6,20 +6,21 @@ with builtins; with lib; let
{ case = "8.12"; out = { version = "1.12.0"; };}
{ case = "8.13"; out = { version = "1.13.7"; };}
{ case = "8.14"; out = { version = "1.13.7"; };}
{ case = "8.15"; out = { version = "1.14.1"; };}
] { version = "1.14.1"; } );
{ case = "8.15"; out = { version = "1.15.0"; };}
] {} );
in mkCoqDerivation {
pname = "elpi";
repo = "coq-elpi";
owner = "LPCIC";
inherit version;
defaultVersion = lib.switch coq.coq-version [
{ case = "8.15"; out = "1.13.0"; }
{ case = "8.15"; out = "1.14.0"; }
{ case = "8.14"; out = "1.11.2"; }
{ case = "8.13"; out = "1.11.1"; }
{ case = "8.12"; out = "1.8.3_8.12"; }
{ case = "8.11"; out = "1.6.3_8.11"; }
] null;
release."1.14.0".sha256 = "sha256:1v2p5dlpviwzky2i14cj7gcgf8cr0j54bdm9fl5iz1ckx60j6nvp";
release."1.13.0".sha256 = "1j7s7dlnjbw222gnbrsjgmjck1yrx7h6hwm8zikcyxi0zys17w7n";
release."1.12.1".sha256 = "sha256-4mO6/co7NcIQSGIQJyoO8lNWXr6dqz+bIYPO/G0cPkY=";
release."1.11.2".sha256 = "0qk5cfh15y2zrja7267629dybd3irvxk1raz7z8qfir25a81ckd4";

@ -41,9 +41,6 @@
, meta ? {}
# disabled
, runVend ? false
# Not needed with buildGoModule
, goPackagePath ? ""
@ -55,8 +52,6 @@
with builtins;
assert runVend != false -> throw "`runVend` has been replaced by `proxyVendor`";
assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`";
let

@ -2351,25 +2351,6 @@ self: super: {
# Invalid CPP in test suite: https://github.com/cdornan/memory-cd/issues/1
memory-cd = dontCheck super.memory-cd;
protolude = appendPatches [
# Intermediate Patch, so the next one applies
(fetchpatch {
name = "integer-gmp-only-symbols.patch";
url = "https://github.com/protolude/protolude/commit/84d228a3b5a2adfe5c8aec23176a0301012e54eb.patch";
sha256 = "0mk0gxcg8vp73wlz764y24gqmxdrhanp12dfam9xsb6cm34jkjdc";
})
# Compat with GHC 9.0 (not merged yet)
(fetchpatch {
name = "protolude-ghc-9.0.patch";
url = "https://github.com/protolude/protolude/pull/131/commits/1ca4b4564b4d868022d5bab5330e2c7d9cae11a0.patch";
sha256 = "0jrm6715kc8v7v4isi79b3w1i51rs332bkak25ik6zv3i5lgcg68";
includes = [
"protolude.cabal"
"src/**"
];
})
] super.protolude;
# https://github.com/haskell/fgl/pull/99
fgl = doJailbreak super.fgl;
fgl-arbitrary = doJailbreak super.fgl-arbitrary;
@ -2485,9 +2466,9 @@ self: super: {
ema = assert super.ema.version == "0.6.0.0";
super.ema.overrideScope (self: super: { relude = doJailbreak self.relude_0_7_0_0; });
# attoparsec bump is on v2 branch, but not released yet
irc-core = assert super.irc-core.version == "2.10"; doJailbreak super.irc-core;
glirc = assert super.irc-core.version == "2.10"; doJailbreak super.glirc;
glirc = super.glirc.override {
vty = self.vty_5_35_1;
};
# 2022-02-25: Unmaintained and to strict upper bounds
paths = doJailbreak super.paths;
@ -2568,6 +2549,10 @@ self: super: {
sha256 = "0wxpqazjnal9naibapg63nm7x6qz0lklcfw2m5mzjrh2q9x2cvnd";
}) super.debian;
# Test data missing from sdist
# https://github.com/ngless-toolkit/ngless/issues/152
NGLess = dontCheck super.NGLess;
# Raise version bounds for hspec
records-sop = appendPatch (fetchpatch {
url = "https://github.com/kosmikus/records-sop/pull/11/commits/d88831388ab3041190130fec3cdd679a4217b3c7.patch";

@ -206,9 +206,13 @@ self: super: {
regex-rure = doDistribute (markUnbroken super.regex-rure);
jacinda = doDistribute super.jacinda;
some = doJailbreak super.some;
# 2022-06-05: this is not the latest version of fourmolu because
# hls-fourmolu-plugin 1.0.3.0 doesn‘t support a newer one.
fourmolu = super.fourmolu_0_6_0_0;
# hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0
hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.3.0"; doJailbreak super.hls-fourmolu-plugin;
hls-ormolu-plugin = assert super.hls-ormolu-plugin.version == "1.0.2.1"; doJailbreak super.hls-ormolu-plugin;
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
# 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed

@ -571,6 +571,7 @@ broken-packages:
- call-alloy
- cal-layout
- call-haskell-from-anything
- call-plantuml
- camfort
- canon
- canonical-filepath
@ -648,6 +649,7 @@ broken-packages:
- checked
- Checked
- checkmate
- chez-grater
- chiasma
- Chitra
- choose
@ -3782,6 +3784,7 @@ broken-packages:
- pcf-font
- pcgen
- PCLT
- pcre2
- pcre-light-extra
- pdfname
- pdf-slave-template
@ -3943,6 +3946,7 @@ broken-packages:
- polysemy-check
- polysemy-keyed-state
- polysemy-kvstore-jsonfile
- polysemy-managed
- polysemy-mocks
- polysemy-readline
- polysemy-req
@ -5504,6 +5508,7 @@ broken-packages:
- wai-graceful
- wai-handler-devel
- wai-handler-fastcgi
- wai-handler-hal
- wai-handler-scgi
- wai-handler-webkit
- wai-hmac-auth
@ -5564,11 +5569,11 @@ broken-packages:
- webdriver
- webdriver-snoy
- web-encodings
- webkitgtk3
- WeberLogic
- webex-teams-pipes
- webfinger-client
- web-inv-route
- webkitgtk3
- webkit-javascriptcore
- webmention
- web-output

@ -87,10 +87,6 @@ default-package-overrides:
- dhall-nix < 1.1.24
# Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version
- distribution-nixpkgs < 1.7.0
# glirc 2.39 is broken: https://github.com/glguy/irc-core/issues/99
- glirc == 2.38
# glirc 2.38 requires hookup 0.6
- hookup == 0.6
extra-packages:
- aeson < 2 # required by pantry-0.5.2
@ -138,6 +134,7 @@ extra-packages:
- hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9
- fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0
package-maintainers:
abbradar:

@ -1,4 +1,4 @@
# Stackage LTS 19.8
# Stackage LTS 19.9
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -24,7 +24,7 @@ default-package-overrides:
- aeson-casing ==0.2.0.0
- aeson-commit ==1.4
- aeson-compat ==0.3.10
- aeson-diff ==1.1.0.12
- aeson-diff ==1.1.0.13
- aeson-extra ==0.5.1
- aeson-generic-compat ==0.0.1.3
- aeson-optics ==1.1.1
@ -368,7 +368,7 @@ default-package-overrides:
- colour ==2.3.6
- columnar ==1.0.0.0
- combinatorial ==0.1.0.1
- comfort-array ==0.5.1
- comfort-array ==0.5.1.1
- comfort-array-shape ==0.0
- comfort-fftw ==0.0
- comfort-graph ==0.0.3.2
@ -399,7 +399,7 @@ default-package-overrides:
- conduit-aeson ==0.1.0.1
- conduit-algorithms ==0.0.12.0
- conduit-combinators ==1.3.0
- conduit-concurrent-map ==0.1.1
- conduit-concurrent-map ==0.1.3
- conduit-connection ==0.1.0.5
- conduit-extra ==1.3.6
- conduit-parse ==0.2.1.1
@ -426,7 +426,7 @@ default-package-overrides:
- control-dsl ==0.2.1.3
- control-monad-free ==0.6.2
- control-monad-omega ==0.3.2
- convertible ==1.1.1.0
- convertible ==1.1.1.1
- cookie ==0.4.5
- copr-api ==0.1.0
- core-data ==0.3.2.2
@ -604,7 +604,7 @@ default-package-overrides:
- doctest-exitcode-stdio ==0.0
- doctest-extract ==0.1
- doctest-lib ==0.1
- doctest-parallel ==0.2.2
- doctest-parallel ==0.2.3
- doldol ==0.4.1.2
- do-list ==1.0.1
- domain ==0.1.1.3
@ -672,7 +672,7 @@ default-package-overrides:
- eq ==4.3
- equal-files ==0.0.5.3
- equational-reasoning ==0.7.0.1
- equivalence ==0.4
- equivalence ==0.4.0.1
- erf ==2.0.0.0
- errata ==0.4.0.0
- error ==0.3.0.0
@ -761,7 +761,7 @@ default-package-overrides:
- fixed-length ==0.2.3
- fixed-vector ==1.2.1.0
- fixed-vector-hetero ==0.6.1.1
- fix-whitespace ==0.0.7
- fix-whitespace ==0.0.8
- flac ==0.2.0
- flac-picture ==0.1.2
- flags-applicative ==0.1.0.3
@ -1328,7 +1328,7 @@ default-package-overrides:
- json-feed ==2.0.0.1
- jsonifier ==0.2.0.1
- jsonpath ==0.2.1.0
- json-stream ==0.4.3.0
- json-stream ==0.4.4.1
- JuicyPixels ==3.3.7
- JuicyPixels-blurhash ==0.1.0.3
- JuicyPixels-extra ==0.5.2
@ -1425,7 +1425,7 @@ default-package-overrides:
- linux-file-extents ==0.2.0.0
- linux-namespaces ==0.1.3.0
- List ==0.6.2
- ListLike ==4.7.6
- ListLike ==4.7.7
- list-predicate ==0.1.0.1
- listsafe ==0.1.0.1
- list-singleton ==2.0.0.0
@ -1611,7 +1611,7 @@ default-package-overrides:
- mwc-random-monad ==0.7.3.1
- mx-state-codes ==1.0.0.0
- mysql ==0.2.1
- mysql-simple ==0.4.7.2
- mysql-simple ==0.4.8
- n2o ==0.11.1
- n2o-nitro ==0.11.2
- nagios-check ==0.3.2
@ -1622,7 +1622,7 @@ default-package-overrides:
- nanospec ==0.2.2
- nanovg ==0.8.0.0
- nats ==1.1.2
- natural-arithmetic ==0.1.2.0
- natural-arithmetic ==0.1.3.0
- natural-induction ==0.2.0.0
- natural-sort ==0.1.2
- natural-transformation ==0.4
@ -1681,9 +1681,9 @@ default-package-overrides:
- numbers ==3000.2.0.2
- numeric-extras ==0.1
- numeric-limits ==0.1.0.0
- numeric-prelude ==0.4.3.3
- numeric-prelude ==0.4.4
- numeric-quest ==0.2.0.2
- numhask ==0.10.0.0
- numhask ==0.10.1.0
- numhask-array ==0.10.0
- numhask-space ==0.10.0.0
- NumInstances ==1.4
@ -2208,7 +2208,7 @@ default-package-overrides:
- shake ==0.19.6
- shake-language-c ==0.12.0
- shake-plus ==0.3.4.0
- shakespeare ==2.0.27
- shakespeare ==2.0.29
- shared-memory ==0.2.0.0
- ShellCheck ==0.8.0
- shell-conduit ==5.0.0
@ -2478,7 +2478,7 @@ default-package-overrides:
- text-regex-replace ==0.1.1.4
- text-rope ==0.1
- text-short ==0.1.5
- text-show ==3.9.6
- text-show ==3.9.7
- text-show-instances ==3.8.6
- text-zipper ==0.11
- tfp ==1.0.2
@ -2488,7 +2488,7 @@ default-package-overrides:
- th-compat ==0.1.3
- th-constraint-compat ==0.0.1.0
- th-desugar ==1.12
- th-env ==0.1.0.3
- th-env ==0.1.1
- these ==1.1.1.1
- these-lens ==1.0.1.2
- these-optics ==1.0.1.2
@ -2613,7 +2613,7 @@ default-package-overrides:
- unicode-show ==0.1.1.1
- unicode-transforms ==0.4.0.1
- unidecode ==0.1.0.4
- unification-fd ==0.11.1
- unification-fd ==0.11.2
- union ==0.1.2
- union-angle ==0.1.0.1
- union-find ==0.2
@ -2632,7 +2632,7 @@ default-package-overrides:
- universe-reverse-instances ==1.1.1
- universe-some ==1.2.1
- universum ==1.7.3
- unix-bytestring ==0.3.7.6
- unix-bytestring ==0.3.7.7
- unix-compat ==0.5.4
- unix-time ==0.4.7
- unliftio ==0.2.22.0
@ -2735,7 +2735,7 @@ default-package-overrides:
- wai-transformers ==0.1.0
- wai-websockets ==3.0.1.2
- wakame ==0.1.0.0
- warp ==3.3.20
- warp ==3.3.21
- warp-tls ==3.3.2
- warp-tls-uid ==0.2.0.6
- wave ==0.2.0

@ -878,6 +878,7 @@ dont-distribute-packages:
- cabal-query
- cabal-test
- cabal2arch
- cabal2json
- cabalmdvrpm
- cabalrpmdeps
- cabocha
@ -3087,6 +3088,8 @@ dont-distribute-packages:
- phonetic-languages-simplified-generalized-properties-array
- phonetic-languages-simplified-lists-examples
- phonetic-languages-simplified-properties-array
- phonetic-languages-simplified-properties-array-common
- phonetic-languages-simplified-properties-array-old
- phonetic-languages-simplified-properties-lists
- phonetic-languages-simplified-properties-lists-double
- phonetic-languages-ukrainian
@ -4200,6 +4203,7 @@ dont-distribute-packages:
- yesod-auth-fb
- yesod-auth-ldap
- yesod-auth-lti13
- yesod-auth-simple
- yesod-colonnade
- yesod-comments
- yesod-continuations

@ -924,6 +924,9 @@ self: super: builtins.intersectAttrs super {
&& buildPlatform.isx86;
} super.hashes;
# Tries to access network
aws-sns-verify = dontCheck super.aws-sns-verify;
# procex relies on close_range which has been introduced in Linux 5.9,
# the test suite seems to force the use of this feature (or the fallback
# mechanism is broken), so we can't run the test suite on machines with a
@ -941,6 +944,13 @@ self: super: builtins.intersectAttrs super {
'' + (drv.postConfigure or "");
}) super.procex;
# Test suite wants to run main executable
fourmolu_0_7_0_1 = overrideCabal (drv: {
preCheck = drv.preCheck or "" + ''
export PATH="$PWD/dist/build/fourmolu:$PATH"
'';
}) super.fourmolu_0_7_0_1;
# Apply a patch which hardcodes the store path of graphviz instead of using
# whatever graphviz is in PATH.
graphviz = overrideCabal (drv: {

File diff suppressed because it is too large Load Diff

@ -49,9 +49,12 @@ buildPackages.stdenv.mkDerivation {
# compiling databases takes less time than copying the results
# between machines.
preferLocalBuild = true;
# Plus, you need a complete database for each possible combination
# of dependencies, caching them does not make sense.
allowSubstitutes = false;
# we still allow substitutes because a database is relatively small and if it
# is already built downloading is probably faster. The substitution will only
# trigger for users who have already cached the database on a substituter and
# thus probably intend to substitute it.
allowSubstitutes = true;
inherit docPackages;

@ -79,13 +79,13 @@ let
++ (op opensslSupport openssl)
++ (op gdbmSupport gdbm)
++ (op yamlSupport libyaml)
++ (op jemallocSupport jemalloc)
# Looks like ruby fails to build on darwin without readline even if curses
# support is not enabled, so add readline to the build inputs if curses
# support is disabled (if it's enabled, we already have it) and we're
# running on darwin
++ op (!cursesSupport && stdenv.isDarwin) readline
++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ];
propagatedBuildInputs = op jemallocSupport jemalloc;
enableParallelBuilding = true;

@ -14,12 +14,12 @@
assert withGmp -> gmp != null;
stdenv.mkDerivation rec {
version = "4.65";
version = "5.0";
pname = "glpk";
src = fetchurl {
url = "mirror://gnu/glpk/${pname}-${version}.tar.gz";
sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2";
sha256 = "sha256-ShAT7rtQ9yj8YBvdgzsLKHAzPDs+WoFu66kh2VvsbxU=";
};
buildInputs =
@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
# https://trac.sagemath.org/ticket/20710#comment:18
(fetchpatch {
name = "error_recovery.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
sha256 = "0z99z9gd31apb6x5n5n26411qzx0ma3s6dnznc4x61x86bhq31qf";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=d3c1f607e32f964bf0cab877a63767c86fd00266";
sha256 = "sha256-2hNtUEoGTFt3JgUvLH3tPWnz+DZcXNhjXzS+/V89toA=";
})
];

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "hidapi";
version = "0.11.2";
version = "0.12.0";
src = fetchFromGitHub {
owner = "libusb";
repo = "hidapi";
rev = "${pname}-${version}";
sha256 = "sha256-zSAhnvnDI3+q8VwZ8fIx/YmvwTpL87PBJ2C1mTmD7Ko=";
sha256 = "sha256-SMhlcB7LcViC6UFVYACjunxsGkvSOKC3mbLBH4XQSzM=";
};
nativeBuildInputs = [ cmake pkg-config ];

@ -7,6 +7,12 @@ stdenv.mkDerivation {
sourceRoot = "agar-1.5.0/tests";
# Workaround build failure on -fno-common toolchains:
# ld: textdlg.o:(.bss+0x0): multiple definition of `someString';
# configsettings.o:(.bss+0x0): first defined here
# TODO: the workaround can be removed once nixpkgs updates to 1.6.0.
NIX_CFLAGS_COMPILE = "-fcommon";
preConfigure = ''
substituteInPlace configure.in \
--replace '_BSD_SOURCE' '_DEFAULT_SOURCE'

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.85.0";
version = "1.86.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
hash = "sha256-bgx1j2ESAv9cRe3Iv6nYOS7bUAQcXj3Ta4rAC800Nf8=";
hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0=";
};
patches = [
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-7ZdN/7CKFuFOIReM7BkMsO/E2lPyDnl4ssPhK5BPLh8=";
hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk=";
};
nativeBuildInputs = [

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libmediaart";
version = "1.9.5";
version = "1.9.6";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1mlw1qgj8nkd9ll6b6h54r1gfdy3zp8a8xqz7qfyfaj85jjgbph7";
sha256 = "w7xQJdfbOAWH+cjrgAxhH2taFta0t4/P+T9ih2pnfxc=";
};
nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];

@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-olLgD8WA3rIdoNqMCqA7jDHoRAuESMi5gUP6tHfTIwU=";
};
outputs = [ "out" "dev" "devdoc" ];
outputs = [ "out" "dev" ]
++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc";
nativeBuildInputs = [
pkg-config

@ -244,9 +244,9 @@ stdenv.mkDerivation {
echo '"(build info elided)"' > modules/core/version_string.inc
'';
buildInputs =
[ zlib pcre hdf5 boost gflags protobuf ]
buildInputs = [ zlib pcre boost gflags protobuf ]
++ lib.optional enablePython pythonPackages.python
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5
++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3
++ lib.optional enableVtk vtk

@ -53,6 +53,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS = [ "-Wno-return-type" ];
# Workaround build failure on -fno-common toolchains:
# ld: libpacklib.a(kedit.o):kuip/klink1.h:11: multiple definition of `klnkaddr';
# libzftplib.a(zftpcdf.o):zftp/zftpcdf.c:155: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
makeFlags = [
"FORTRANOPTIONS=$(FFLAGS)"
"CCOPTIONS=$(NIX_CFLAGS)"

File diff suppressed because it is too large Load Diff

@ -1,13 +1,18 @@
{ lib
, buildDunePackage, camlp5
, ocaml
, menhir, menhirLib
, stdlib-shims
, re, perl, ncurses
, ppxlib, ppx_deriving
, ppxlib_0_15, ppx_deriving_0_15
, coqPackages
, version ? "1.14.1"
, version ? if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1"
}:
with lib;
let fetched = coqPackages.metaFetch ({
release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s=";
release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar";
release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis=";
release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r";
release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka";
@ -23,11 +28,16 @@ buildDunePackage rec {
pname = "elpi";
inherit (fetched) version src;
minimumOCamlVersion = "4.04";
minimalOCamlVersion = "4.04";
buildInputs = [ perl ncurses ];
buildInputs = [ perl ncurses ]
++ optional (versionAtLeast version "1.15" || version == "dev") menhir;
propagatedBuildInputs = [ camlp5 re ]
propagatedBuildInputs = [ re stdlib-shims ]
++ (if versionAtLeast version "1.15" || version == "dev"
then [ menhirLib ]
else [ camlp5 ]
)
++ (if lib.versionAtLeast version "1.13" || version == "dev"
then [ ppxlib ppx_deriving ]
else [ ppxlib_0_15 ppx_deriving_0_15 ]
@ -43,6 +53,4 @@ buildDunePackage rec {
postPatch = ''
substituteInPlace elpi_REPL.ml --replace "tput cols" "${ncurses}/bin/tput cols"
'';
useDune2 = true;
}

@ -0,0 +1,16 @@
{ lib, buildDunePackage, posix-base, posix-types, unix-errno }:
buildDunePackage {
pname = "posix-time2";
inherit (posix-base) version src;
propagatedBuildInputs = [ posix-base posix-types unix-errno ];
doCheck = true;
meta = posix-base.meta // {
description = "posix-time2 provides the types and bindings for posix time APIs";
maintainers = with lib.maintainers; [ dandellion ];
};
}

@ -6,25 +6,22 @@
buildDunePackage rec {
pname = "srt";
version = "0.1.1";
version = "0.2.1";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-srt";
rev = "v${version}";
sha256 = "0xh89w4j7lljvpy2n08x6m9kw88f82snmzf23kp0gw637sjnrj6f";
sha256 = "sha256-rnM50IzeiKOrpFf79jTHp+fXn0tdx+vrLuD3kzqLh5g=";
};
useDune2 = true;
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ posix-socket srt ];
meta = {
meta = with lib; {
description = "OCaml bindings for the libsrt library";
license = lib.licenses.gpl2Only;
inherit (src.meta) homepage;
maintainers = [ lib.maintainers.vbgl ];
maintainers = with maintainers; [ vbgl dandellion ];
};
}

@ -0,0 +1,22 @@
{ lib, buildDunePackage, fetchurl, ctypes, integers, result }:
buildDunePackage rec {
pname = "unix-errno";
version = "0.6.1";
minimalOCamlVersion = "4.03.0"; # Specified to be 4.01.0, but it's actually 4.03
src = fetchurl {
url = "https://github.com/xapi-project/ocaml-unix-errno/releases/download/${version}/unix-errno-${version}.tbz";
sha256 = "sha256-jZqtHwUKTffjuOP2jdKKQRtEOBKyclhfeiPO96hEj4c=";
};
propagatedBuildInputs = [ ctypes integers result ];
meta = with lib; {
homepage = "https://github.com/xapi-project/ocaml-unix-errno"; # This is the repo used in the opam package
description = "Unix errno types, maps, and support for OCaml";
license = with licenses; [ isc lgpl21Only ]; # All the files indicate ISC, but there's an LGPL LICENSE file
maintainers = with maintainers; [ dandellion ];
};
}

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "adb-shell";
version = "0.4.2";
version = "0.4.3";
format = "setuptools";
disabled = !isPy3k;
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "JeffLIrion";
repo = "adb_shell";
rev = "v${version}";
hash = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY=";
hash = "sha256-+RU3nyJpHq0r/9erEbjUILpwIPWq14HdOX7LkSxySs4=";
};
propagatedBuildInputs = [

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioairzone";
version = "0.4.4";
version = "0.4.5";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-fYhYqBnwvnfu2GbWUlmMmW/Xon3OE3fh+gGlnQRsCyA=";
hash = "sha256-sNlqG5A8a8AIgKc9xDAEwxBeKJ/HaW847BZR4WdcsrQ=";
};
propagatedBuildInputs = [

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "asdf";
version = "2.11.1";
version = "2.12.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-1uDRoS9nyZCLPdbiAQBADoiwqaVBzj1NMpZXdJQYoxQ=";
hash = "sha256-WRSDTQd7o79ouar9xka58nzl5W4cJBFn1GHe5DsQI+k=";
};
nativeBuildInputs = [

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "atenpdu";
version = "0.3.2";
version = "0.3.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-hlbrjx6WKVJYaxrMT4fiRXlxKRcQU4AIQUVgA8mbWa8=";
sha256 = "sha256-/duY1hS+RU/UAdcQoHF1+c99XaN74jj/0Hj/86U0kmo=";
};
propagatedBuildInputs = [ pysnmp ];

@ -1,47 +1,107 @@
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python-dateutil, jsonref, jsonschema,
pyyaml, simplejson, six, pytz, msgpack, swagger-spec-validator, rfc3987,
strict-rfc3339, webcolors, mypy-extensions, jsonpointer, idna, pytest, mock,
pytest-benchmark, isPy27, enum34 }:
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, fqdn
, idna
, isoduration
, jsonpointer
, jsonref
, jsonschema
, mock
, msgpack
, mypy-extensions
, pytest-benchmark
, pytestCheckHook
, python-dateutil
, pythonOlder
, pytz
, pyyaml
, rfc3987
, rfc3339-validator
, simplejson
, six
, strict-rfc3339
, swagger-spec-validator
, uri-template
, webcolors
}:
buildPythonPackage rec {
pname = "bravado-core";
version = "5.17.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Yelp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE=";
hash = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE=";
};
checkInputs = [
mypy-extensions
pytest
mock
pytest-benchmark
];
checkPhase = "pytest --benchmark-skip";
propagatedBuildInputs = [
python-dateutil
jsonref
jsonschema
msgpack
python-dateutil
pytz
pyyaml
simplejson
six
pytz
msgpack
swagger-spec-validator
# the following 3 packages are included when jsonschema (3.2) is installed
# the following packages are included when jsonschema (3.2) is installed
# as jsonschema[format], which reflects what happens in setup.py
fqdn
idna
isoduration
jsonpointer
rfc3987
rfc3339-validator
strict-rfc3339
uri-template
webcolors
jsonpointer
idna
] ++ lib.optionals isPy27 [ enum34 ];
];
checkInputs = [
mypy-extensions
pytestCheckHook
mock
pytest-benchmark
];
pythonImportsCheck = [
"bravado_core"
];
pytestFlagsArray = [
"--benchmark-skip"
];
disabledTestPaths = [
# Tests are out-dated (not supporting later modules releases, e.g., jsonschema)
"tests/_decorators_test.py"
"tests/formatter"
"tests/marshal"
"tests/model"
"tests/operation"
"tests/param"
"tests/request"
"tests/resource"
"tests/response"
"tests/schema"
"tests/security_test.py"
"tests/spec"
"tests/swagger20_validator"
"tests/unmarshal"
"tests/validate"
];
disabledTests = [
"test_petstore_spec"
];
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "browser-cookie3";
version = "0.14.1";
version = "0.14.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-2cMWFyHK+7M99Z9O7PiKue37c5XVBe/n88AF5ax7A2s=";
hash = "sha256-YR5NcDmbLlnhxcDuyM6hjjuL/Ozw79ytbCF4/nmSZmQ=";
};
propagatedBuildInputs = [

@ -1,22 +1,27 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, plotly
, flask
, flask-compress
, celery
, dash-core-components
, dash-html-components
, dash-table
, pytest-mock
, diskcache
, fetchFromGitHub
, flask
, flask-compress
, mock
, pyyaml
, multiprocess
, plotly
, psutil
, pytest-mock
, pytestCheckHook
, pythonOlder
, pyyaml
, redis
}:
buildPythonPackage rec {
pname = "dash";
version = "2.4.1";
version = "2.5.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -25,7 +30,7 @@ buildPythonPackage rec {
owner = "plotly";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-7B1LEcEgUGJ/gDCDD4oURqli8I5YTJo9jl7l4E1aLVQ=";
hash = "sha256-Qh5oOkTxEbxXXDX+g9TDa5DiYBlMpnx0yKsn/XMfMF0=";
};
propagatedBuildInputs = [
@ -37,6 +42,18 @@ buildPythonPackage rec {
dash-table
];
passthru.optional-dependencies = {
celery = [
celery
redis
];
diskcache = [
diskcache
multiprocess
psutil
];
};
checkInputs = [
pytestCheckHook
pytest-mock
@ -50,12 +67,14 @@ buildPythonPackage rec {
"tests/integration"
];
pythonImportsCheck = [ "dash" ];
pythonImportsCheck = [
"dash"
];
meta = with lib; {
description = "Python framework for building analytical web applications";
homepage = "https://dash.plot.ly/";
license = licenses.mit;
maintainers = [ maintainers.antoinerg ];
maintainers = with maintainers; [ antoinerg ];
};
}

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "databricks-connect";
version = "9.1.16";
version = "9.1.17";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-agdky7AhRuObU9GT8IpdgB3SWdHDBRnuoaAtYAlCv/4=";
sha256 = "sha256-QBGeXZ8zvRRjmKGs0vyBWTvcug3PF/BFV2asYTqsScw=";
};
sourceRoot = ".";

@ -13,16 +13,16 @@
buildPythonPackage rec {
pname = "deezer-python";
version = "5.3.2";
version = "5.3.3";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "browniebroke";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-lOVHSYL57hwzvdC+pJFDkDGFuu29jdZ36BYscw82uDE=";
hash = "sha256-eiznL23Pt7bwBLxNG8V3ITSNMnwMBjFdiGgu0cSoSw0=";
};
nativeBuildInputs = [
@ -46,7 +46,9 @@ buildPythonPackage rec {
--replace " --cov=deezer" ""
'';
pythonImportsCheck = [ "deezer" ];
pythonImportsCheck = [
"deezer"
];
meta = with lib; {
description = "Python wrapper around the Deezer API";

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

Loading…
Cancel
Save