Merge branch 'staging-next' into staging

main
Shea Levy 2 years ago
commit 7456be85db
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
  1. 2
      lib/tests/modules.sh
  2. 61
      lib/tests/modules/functionTo/submodule-options.nix
  3. 4
      lib/types.nix
  4. 10
      nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
  5. 2
      nixos/doc/manual/release-notes/rl-2205.section.md
  6. 8
      nixos/lib/make-options-doc/options-to-docbook.xsl
  7. 2
      nixos/modules/misc/locate.nix
  8. 23
      nixos/modules/services/monitoring/prometheus/default.nix
  9. 2
      nixos/modules/services/networking/radicale.nix
  10. 27
      nixos/modules/services/web-apps/nextcloud.nix
  11. 9
      nixos/modules/services/x11/display-managers/gdm.nix
  12. 2
      pkgs/applications/audio/pulseeffects-legacy/default.nix
  13. 7
      pkgs/applications/blockchains/cgminer/default.nix
  14. 28
      pkgs/applications/blockchains/lightwalletd/default.nix
  15. 4
      pkgs/applications/blockchains/wasabiwallet/default.nix
  16. 4
      pkgs/applications/graphics/ImageMagick/7.0.nix
  17. 4
      pkgs/applications/misc/logseq/default.nix
  18. 10
      pkgs/applications/networking/browsers/firefox/common.nix
  19. 4
      pkgs/applications/networking/cluster/driftctl/default.nix
  20. 6
      pkgs/applications/networking/cluster/nerdctl/default.nix
  21. 25
      pkgs/applications/networking/cluster/terraform-inventory/default.nix
  22. 20
      pkgs/applications/networking/cluster/terraform-inventory/deps.nix
  23. 14
      pkgs/applications/networking/cluster/terraform-providers/providers.json
  24. 7
      pkgs/applications/networking/cluster/terraform-providers/update-provider
  25. 4
      pkgs/applications/networking/instant-messengers/cinny/default.nix
  26. 4
      pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
  27. 1
      pkgs/applications/networking/mailreaders/mutt/default.nix
  28. 6
      pkgs/applications/office/jameica/default.nix
  29. 6
      pkgs/applications/plasma-mobile/angelfish.nix
  30. 21
      pkgs/applications/plasma-mobile/audiotube.nix
  31. 2
      pkgs/applications/plasma-mobile/default.nix
  32. 2
      pkgs/applications/plasma-mobile/fetch.sh
  33. 8
      pkgs/applications/plasma-mobile/kasts.nix
  34. 2
      pkgs/applications/plasma-mobile/krecorder.nix
  35. 12
      pkgs/applications/plasma-mobile/neochat.nix
  36. 16
      pkgs/applications/plasma-mobile/plasma-dialer.nix
  37. 4
      pkgs/applications/plasma-mobile/plasma-settings.nix
  38. 41
      pkgs/applications/plasma-mobile/plasmatube.nix
  39. 9
      pkgs/applications/plasma-mobile/spacebar.nix
  40. 184
      pkgs/applications/plasma-mobile/srcs.nix
  41. 1
      pkgs/applications/science/biology/EZminc/default.nix
  42. 1
      pkgs/applications/science/misc/root/5.nix
  43. 4
      pkgs/applications/science/misc/snakemake/default.nix
  44. 50
      pkgs/applications/science/physics/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch
  45. 8
      pkgs/applications/science/physics/xfitter/default.nix
  46. 13
      pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
  47. 7
      pkgs/applications/version-management/git-and-tools/git-sync/default.nix
  48. 12
      pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix
  49. 15
      pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
  50. 14
      pkgs/desktops/pantheon/apps/elementary-photos/default.nix
  51. 4
      pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
  52. 34
      pkgs/development/compilers/vlang/default.nix
  53. 133
      pkgs/development/compilers/vlang/disable_vcreate_test.patch
  54. 4
      pkgs/development/coq-modules/interval/default.nix
  55. 20
      pkgs/development/go-modules/generic/default.nix
  56. 20
      pkgs/development/go-packages/generic/default.nix
  57. 105
      pkgs/development/interpreters/j/default.nix
  58. 4
      pkgs/development/libraries/console-bridge/default.nix
  59. 4
      pkgs/development/libraries/folly/default.nix
  60. 4
      pkgs/development/libraries/icu/59.nix
  61. 4
      pkgs/development/libraries/icu/65.nix
  62. 12
      pkgs/development/libraries/libfpx/default.nix
  63. 25
      pkgs/development/libraries/libnih/default.nix
  64. 4
      pkgs/development/libraries/libpcap/default.nix
  65. 14
      pkgs/development/libraries/openssl/default.nix
  66. 4
      pkgs/development/libraries/podofo/default.nix
  67. 7
      pkgs/development/libraries/prometheus-client-c/default.nix
  68. 40
      pkgs/development/libraries/qtmpris/default.nix
  69. 6
      pkgs/development/libraries/science/math/lrs/default.nix
  70. 19
      pkgs/development/libraries/xdg-dbus-proxy/default.nix
  71. 16
      pkgs/development/ocaml-modules/easy-format/default.nix
  72. 4
      pkgs/development/python-modules/ansible-compat/default.nix
  73. 4
      pkgs/development/python-modules/azure-core/default.nix
  74. 4
      pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
  75. 4
      pkgs/development/python-modules/azure-multiapi-storage/default.nix
  76. 4
      pkgs/development/python-modules/bc-python-hcl2/default.nix
  77. 4
      pkgs/development/python-modules/bugsnag/default.nix
  78. 11
      pkgs/development/python-modules/buildbot/default.nix
  79. 6
      pkgs/development/python-modules/cachelib/default.nix
  80. 1
      pkgs/development/python-modules/cheroot/default.nix
  81. 4
      pkgs/development/python-modules/cvxpy/default.nix
  82. 6
      pkgs/development/python-modules/django-anymail/default.nix
  83. 6
      pkgs/development/python-modules/dulwich/default.nix
  84. 4
      pkgs/development/python-modules/fastcore/default.nix
  85. 9
      pkgs/development/python-modules/fsspec/default.nix
  86. 4
      pkgs/development/python-modules/gcal-sync/default.nix
  87. 6
      pkgs/development/python-modules/graphtage/default.nix
  88. 4
      pkgs/development/python-modules/hatchling/default.nix
  89. 6
      pkgs/development/python-modules/herepy/default.nix
  90. 8
      pkgs/development/python-modules/ijson/default.nix
  91. 4
      pkgs/development/python-modules/ipympl/default.nix
  92. 4
      pkgs/development/python-modules/manuel/default.nix
  93. 4
      pkgs/development/python-modules/mt-940/default.nix
  94. 4
      pkgs/development/python-modules/numpy-stl/default.nix
  95. 4
      pkgs/development/python-modules/ocrmypdf/default.nix
  96. 10
      pkgs/development/python-modules/pandas/default.nix
  97. 4
      pkgs/development/python-modules/pg8000/default.nix
  98. 4
      pkgs/development/python-modules/pikepdf/default.nix
  99. 4
      pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
  100. 6
      pkgs/development/python-modules/pylsp-mypy/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

@ -290,6 +290,8 @@ checkConfigOutput '^"a b"$' config.result ./functionTo/merging-list.nix
checkConfigError 'A definition for option .fun.\[function body\]. is not of type .string.. Definition values:\n\s*- In .*wrong-type.nix' config.result ./functionTo/wrong-type.nix checkConfigError 'A definition for option .fun.\[function body\]. is not of type .string.. Definition values:\n\s*- In .*wrong-type.nix' config.result ./functionTo/wrong-type.nix
checkConfigOutput '^"b a"$' config.result ./functionTo/list-order.nix checkConfigOutput '^"b a"$' config.result ./functionTo/list-order.nix
checkConfigOutput '^"a c"$' config.result ./functionTo/merging-attrs.nix checkConfigOutput '^"a c"$' config.result ./functionTo/merging-attrs.nix
checkConfigOutput '^"a bee"$' config.result ./functionTo/submodule-options.nix
checkConfigOutput '^"fun.\[function body\].a fun.\[function body\].b"$' config.optionsResult ./functionTo/submodule-options.nix
# moduleType # moduleType
checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-variant.nix checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-variant.nix

@ -0,0 +1,61 @@
{ lib, config, options, ... }:
let
inherit (lib) types;
in
{
imports = [
# fun.<function-body>.a
({ ... }: {
options = {
fun = lib.mkOption {
type = types.functionTo (types.submodule {
options.a = lib.mkOption { default = "a"; };
});
};
};
})
# fun.<function-body>.b
({ ... }: {
options = {
fun = lib.mkOption {
type = types.functionTo (types.submodule {
options.b = lib.mkOption { default = "b"; };
});
};
};
})
];
options = {
result = lib.mkOption
{
type = types.str;
default = lib.concatStringsSep " " (lib.attrValues (config.fun (throw "shouldn't use input param")));
};
optionsResult = lib.mkOption
{
type = types.str;
default = lib.concatStringsSep " "
(lib.concatLists
(lib.mapAttrsToList
(k: v:
if k == "_module"
then [ ]
else [ (lib.showOption v.loc) ]
)
(
(options.fun.type.getSubOptions [ "fun" ])
)
)
);
};
};
config.fun = lib.mkMerge
[
(input: { b = "bee"; })
];
}

@ -526,9 +526,11 @@ rec {
check = isFunction; check = isFunction;
merge = loc: defs: merge = loc: defs:
fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue; fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue;
getSubOptions = elemType.getSubOptions; getSubOptions = prefix: elemType.getSubOptions (prefix ++ [ "[function body]" ]);
getSubModules = elemType.getSubModules; getSubModules = elemType.getSubModules;
substSubModules = m: functionTo (elemType.substSubModules m); substSubModules = m: functionTo (elemType.substSubModules m);
functor = (defaultFunctor "functionTo") // { wrapped = elemType; };
nestedTypes.elemType = elemType;
}; };
# A submodule (like typed attribute set). See NixOS manual. # A submodule (like typed attribute set). See NixOS manual.

@ -2519,6 +2519,16 @@ cp /var/lib/redis/dump.rdb &quot;/var/lib/redis-mastodon/dump.rdb&quot;
enabled. enabled.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The Nextcloud module now allows setting the value of the
<literal>max-age</literal> directive of the
<literal>Strict-Transport-Security</literal> HTTP header,
which is now controlled by the
<literal>services.nextcloud.https</literal> option, rather
than <literal>services.nginx.recommendedHttpHeaders</literal>.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
The <literal>spark3</literal> package has been updated from The <literal>spark3</literal> package has been updated from

@ -894,6 +894,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The Nextcloud module now supports to create a Mysql database automatically - The Nextcloud module now supports to create a Mysql database automatically
with `services.nextcloud.database.createLocally` enabled. with `services.nextcloud.database.createLocally` enabled.
- The Nextcloud module now allows setting the value of the `max-age` directive of the `Strict-Transport-Security` HTTP header, which is now controlled by the `services.nextcloud.https` option, rather than `services.nginx.recommendedHttpHeaders`.
- The `spark3` package has been updated from 3.1.2 to 3.2.1 ([#160075](https://github.com/NixOS/nixpkgs/pull/160075)): - The `spark3` package has been updated from 3.1.2 to 3.2.1 ([#160075](https://github.com/NixOS/nixpkgs/pull/160075)):
- Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`. - Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`.

@ -20,7 +20,13 @@
<title>Configuration Options</title> <title>Configuration Options</title>
<variablelist xml:id="configuration-variable-list"> <variablelist xml:id="configuration-variable-list">
<xsl:for-each select="attrs"> <xsl:for-each select="attrs">
<xsl:variable name="id" select="concat('opt-', str:replace(str:replace(str:replace(str:replace(attr[@name = 'name']/string/@value, '*', '_'), '&lt;', '_'), '>', '_'), ':', '_'))" /> <xsl:variable name="id" select="
concat('opt-',
translate(
attr[@name = 'name']/string/@value,
'*&lt; >[]:',
'_______'
))" />
<varlistentry> <varlistentry>
<term xlink:href="#{$id}"> <term xlink:href="#{$id}">
<xsl:attribute name="xml:id"><xsl:value-of select="$id"/></xsl:attribute> <xsl:attribute name="xml:id"><xsl:value-of select="$id"/></xsl:attribute>

@ -250,7 +250,7 @@ in
}; };
warnings = optional (isMorPLocate && cfg.localuser != null) warnings = optional (isMorPLocate && cfg.localuser != null)
"mlocate does not support the services.locate.localuser option; updatedb will run as root. (Silence with services.locate.localuser = null.)" "mlocate and plocate do not support the services.locate.localuser option. updatedb will run as root. Silence this warning by setting services.locate.localuser = null."
++ optional (isFindutils && cfg.pruneNames != [ ]) ++ optional (isFindutils && cfg.pruneNames != [ ])
"findutils locate does not support pruning by directory component" "findutils locate does not support pruning by directory component"
++ optional (isFindutils && cfg.pruneBindMounts) ++ optional (isFindutils && cfg.pruneBindMounts)

@ -5,6 +5,9 @@ with lib;
let let
json = pkgs.formats.json { }; json = pkgs.formats.json { };
cfg = config.services.prometheus; cfg = config.services.prometheus;
checkConfigEnabled =
(lib.isBool cfg.checkConfig && cfg.checkConfig)
|| cfg.checkConfig == "syntax-only";
workingDir = "/var/lib/" + cfg.stateDir; workingDir = "/var/lib/" + cfg.stateDir;
@ -27,7 +30,7 @@ let
# a wrapper that verifies that the configuration is valid # a wrapper that verifies that the configuration is valid
promtoolCheck = what: name: file: promtoolCheck = what: name: file:
if cfg.checkConfig then if checkConfigEnabled then
pkgs.runCommandLocal pkgs.runCommandLocal
"${name}-${replaceStrings [" "] [""] what}-checked" "${name}-${replaceStrings [" "] [""] what}-checked"
{ buildInputs = [ cfg.package ]; } '' { buildInputs = [ cfg.package ]; } ''
@ -58,7 +61,7 @@ let
pkgs.writeText "prometheus.yml" cfg.configText pkgs.writeText "prometheus.yml" cfg.configText
else generatedPrometheusYml; else generatedPrometheusYml;
in in
promtoolCheck "check config" "prometheus.yml" yml; promtoolCheck "check config ${lib.optionalString (cfg.checkConfig == "syntax-only") "--syntax-only"}" "prometheus.yml" yml;
cmdlineArgs = cfg.extraFlags ++ [ cmdlineArgs = cfg.extraFlags ++ [
"--storage.tsdb.path=${workingDir}/data/" "--storage.tsdb.path=${workingDir}/data/"
@ -1726,16 +1729,20 @@ in
}; };
checkConfig = mkOption { checkConfig = mkOption {
type = types.bool; type = with types; either bool (enum [ "syntax-only" ]);
default = true; default = true;
example = "syntax-only";
description = '' description = ''
Check configuration with <literal>promtool Check configuration with <literal>promtool
check</literal>. The call to <literal>promtool</literal> is check</literal>. The call to <literal>promtool</literal> is
subject to sandboxing by Nix. When credentials are stored in subject to sandboxing by Nix.
external files (<literal>password_file</literal>,
<literal>bearer_token_file</literal>, etc), they will not be If you use credentials stored in external files
visible to <literal>promtool</literal> and it will report (<literal>password_file</literal>, <literal>bearer_token_file</literal>, etc),
errors, despite a correct configuration. they will not be visible to <literal>promtool</literal>
and it will report errors, despite a correct configuration.
To resolve this, you may set this option to <literal>"syntax-only"</literal>
in order to only syntax check the Prometheus configuration.
''; '';
}; };

@ -164,7 +164,7 @@ in {
StateDirectoryMode = "0750"; StateDirectoryMode = "0750";
# Hardening # Hardening
CapabilityBoundingSet = [ "" ]; CapabilityBoundingSet = [ "" ];
DeviceAllow = [ "/dev/stdin" ]; DeviceAllow = [ "/dev/stdin" "/dev/urandom" ];
DevicePolicy = "strict"; DevicePolicy = "strict";
IPAddressAllow = mkIf bindLocalhost "localhost"; IPAddressAllow = mkIf bindLocalhost "localhost";
IPAddressDeny = mkIf bindLocalhost "any"; IPAddressDeny = mkIf bindLocalhost "any";

@ -546,10 +546,23 @@ in {
''; '';
}; };
nginx.recommendedHttpHeaders = mkOption { nginx = {
type = types.bool; recommendedHttpHeaders = mkOption {
default = true; type = types.bool;
description = "Enable additional recommended HTTP response headers"; default = true;
description = "Enable additional recommended HTTP response headers";
};
hstsMaxAge = mkOption {
type = types.ints.positive;
default = 15552000;
description = ''
Value for the <code>max-age</code> directive of the HTTP
<code>Strict-Transport-Security</code> header.
See section 6.1.1 of IETF RFC 6797 for detailed information on this
directive and header.
'';
};
}; };
}; };
@ -702,7 +715,7 @@ in {
'skeletondirectory' => '${cfg.skeletonDirectory}', 'skeletondirectory' => '${cfg.skeletonDirectory}',
${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"} ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"}
'log_type' => 'syslog', 'log_type' => 'syslog',
'log_level' => '${builtins.toString cfg.logLevel}', 'loglevel' => '${builtins.toString cfg.logLevel}',
${optionalString (c.overwriteProtocol != null) "'overwriteprotocol' => '${c.overwriteProtocol}',"} ${optionalString (c.overwriteProtocol != null) "'overwriteprotocol' => '${c.overwriteProtocol}',"}
${optionalString (c.dbname != null) "'dbname' => '${c.dbname}',"} ${optionalString (c.dbname != null) "'dbname' => '${c.dbname}',"}
${optionalString (c.dbhost != null) "'dbhost' => '${c.dbhost}',"} ${optionalString (c.dbhost != null) "'dbhost' => '${c.dbhost}',"}
@ -983,7 +996,9 @@ in {
add_header X-Permitted-Cross-Domain-Policies none; add_header X-Permitted-Cross-Domain-Policies none;
add_header X-Frame-Options sameorigin; add_header X-Frame-Options sameorigin;
add_header Referrer-Policy no-referrer; add_header Referrer-Policy no-referrer;
add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; ''}
${optionalString (cfg.https) ''
add_header Strict-Transport-Security "max-age=${toString cfg.nginx.hstsMaxAge}; includeSubDomains" always;
''} ''}
client_max_body_size ${cfg.maxUploadSize}; client_max_body_size ${cfg.maxUploadSize};
fastcgi_buffers 64 4K; fastcgi_buffers 64 4K;

@ -140,8 +140,13 @@ in
environment = { environment = {
GDM_X_SERVER_EXTRA_ARGS = toString GDM_X_SERVER_EXTRA_ARGS = toString
(filter (arg: arg != "-terminate") cfg.xserverArgs); (filter (arg: arg != "-terminate") cfg.xserverArgs);
# GDM is needed for gnome-login.session XDG_DATA_DIRS = lib.makeSearchPath "share" [
XDG_DATA_DIRS = "${gdm}/share:${cfg.sessionData.desktops}/share:${pkgs.gnome.gnome-control-center}/share"; gdm # for gnome-login.session
cfg.sessionData.desktops
pkgs.gnome.gnome-control-center # for accessibility icon
pkgs.gnome.adwaita-icon-theme
pkgs.hicolor-icon-theme # empty icon theme as a base
];
} // optionalAttrs (xSessionWrapper != null) { } // optionalAttrs (xSessionWrapper != null) {
# Make GDM use this wrapper before running the session, which runs the # Make GDM use this wrapper before running the session, which runs the
# configured setupCommands. This relies on a patched GDM which supports # configured setupCommands. This relies on a patched GDM which supports

@ -108,7 +108,7 @@ in stdenv.mkDerivation rec {
description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
homepage = "https://github.com/wwmm/pulseeffects"; homepage = "https://github.com/wwmm/pulseeffects";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ jtojnar ]; maintainers = with maintainers; [ ];
platforms = platforms.linux; platforms = platforms.linux;
badPlatforms = [ "aarch64-linux" ]; badPlatforms = [ "aarch64-linux" ];
}; };

@ -39,6 +39,13 @@ stdenv.mkDerivation rec {
"--enable-keccak" "--enable-keccak"
"--enable-bflsc"]; "--enable-bflsc"];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: cgminer-driver-modminer.o:/build/source/miner.h:285:
# multiple definition of `bitforce_drv'; cgminer-cgminer.o:/build/source/miner.h:285:
# first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
meta = with lib; { meta = with lib; {
description = "CPU/GPU miner in c for bitcoin"; description = "CPU/GPU miner in c for bitcoin";
homepage = "https://github.com/ckolivas/cgminer"; homepage = "https://github.com/ckolivas/cgminer";

@ -1,14 +1,14 @@
{ buildGoModule, fetchFromGitHub, lib }: { buildGoModule, fetchFromGitHub, lib, lightwalletd, testers }:
buildGoModule rec { buildGoModule rec {
pname = "lightwalletd"; pname = "lightwalletd";
version = "0.4.9"; version = "0.4.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zcash"; owner = "zcash";
repo = "lightwalletd"; repo = "lightwalletd";
rev = "v${version}"; rev = "68789356fb1a75f62735a529b38389ef08ea7582";
sha256 = "sha256-IksA06V+mP7ZAXXFYLKLacxrDXeMXHAk5w4t7pmobq4="; sha256 = "sha256-7gZhr6YMarGdgoGjg+oD4nZ/SAJ5cnhEDKmA4YMqJTo=";
}; };
vendorSha256 = null; vendorSha256 = null;
@ -16,22 +16,28 @@ buildGoModule rec {
ldflags = [ ldflags = [
"-s" "-w" "-s" "-w"
"-X github.com/zcash/lightwalletd/common.Version=v${version}" "-X github.com/zcash/lightwalletd/common.Version=v${version}"
"-X github.com/zcash/lightwalletd/common.GitCommit=v${version}" "-X github.com/zcash/lightwalletd/common.GitCommit=${src.rev}"
"-X github.com/zcash/lightwalletd/common.BuildDate=1970-01-01" "-X github.com/zcash/lightwalletd/common.BuildDate=1970-01-01"
"-X github.com/zcash/lightwalletd/common.BuildUser=nixbld" "-X github.com/zcash/lightwalletd/common.BuildUser=nixbld"
]; ];
postFixup = '' excludedPackages = [
shopt -s extglob "genblocks"
cd $out/bin "testclient"
rm !(lightwalletd) "zap"
''; ];
passthru.tests.version = testers.testVersion {
package = lightwalletd;
command = "lightwalletd version";
version = "v${lightwalletd.version}";
};
meta = with lib; { meta = with lib; {
description = "A backend service that provides a bandwidth-efficient interface to the Zcash blockchain"; description = "A backend service that provides a bandwidth-efficient interface to the Zcash blockchain";
homepage = "https://github.com/zcash/lightwalletd"; homepage = "https://github.com/zcash/lightwalletd";
maintainers = with maintainers; [ centromere ]; maintainers = with maintainers; [ centromere ];
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

@ -25,11 +25,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wasabiwallet"; pname = "wasabiwallet";
version = "1.1.12.9"; version = "1.1.13.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
sha256 = "sha256-DtoLQbRXyR4xGm+M0xg9uj8wcbh1dOBJUG430OS8AS4="; sha256 = "sha256-AtsNbUqEBQx0DPWR2LjNl7pdviYmvkv3bYKNBoeJHbw=";
}; };
dontBuild = true; dontBuild = true;

@ -45,13 +45,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imagemagick"; pname = "imagemagick";
version = "7.1.0-33"; version = "7.1.0-34";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ImageMagick"; owner = "ImageMagick";
repo = "ImageMagick"; repo = "ImageMagick";
rev = version; rev = version;
hash = "sha256-qiXTSQcc48IIzz7RUcyOH2w8JUOTdU1zg43gJhoELXo="; hash = "sha256-eASmIOTYupK5di3lggJ/8O5pkG88ZpFuvaYK23AWsq4=";
}; };
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "logseq"; pname = "logseq";
version = "0.6.8"; version = "0.6.9";
src = fetchurl { src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "QPbH7d2RC8DLze44Q3gCQ9IzHOgIq8IB+hZr9+8rTs0="; sha256 = "sha256-ubhGDx5T1AAJjU6Ka1Pqy5kL8HPa097QhhK5Sp3HWEo=";
name = "${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage";
}; };

@ -177,8 +177,8 @@ buildStdenv.mkDerivation ({
outputs = [ outputs = [
"out" "out"
"symbols" ]
]; ++ lib.optionals crashreporterSupport [ "symbols" ];
# Add another configure-build-profiling run before the final configure phase if we build with pgo # Add another configure-build-profiling run before the final configure phase if we build with pgo
preConfigurePhases = lib.optionals pgoSupport [ preConfigurePhases = lib.optionals pgoSupport [
@ -212,7 +212,6 @@ buildStdenv.mkDerivation ({
nativeBuildInputs = [ nativeBuildInputs = [
autoconf autoconf
cargo cargo
dump_syms
gnum4 gnum4
llvmPackagesBuildBuild.bintools llvmPackagesBuildBuild.bintools
makeWrapper makeWrapper
@ -227,6 +226,7 @@ buildStdenv.mkDerivation ({
which which
wrapGAppsHook wrapGAppsHook
] ]
++ lib.optionals crashreporterSupport [ dump_syms ]
++ lib.optionals pgoSupport [ xvfb-run ] ++ lib.optionals pgoSupport [ xvfb-run ]
++ extraNativeBuildInputs; ++ extraNativeBuildInputs;
@ -437,11 +437,11 @@ buildStdenv.mkDerivation ({
# Generate build symbols once after the final build # Generate build symbols once after the final build
# https://firefox-source-docs.mozilla.org/crash-reporting/uploading_symbol.html # https://firefox-source-docs.mozilla.org/crash-reporting/uploading_symbol.html
preInstall = '' preInstall = lib.optionalString crashreporterSupport ''
./mach buildsymbols ./mach buildsymbols
mkdir -p $symbols/ mkdir -p $symbols/
cp mozobj/dist/*.crashreporter-symbols.zip $symbols/ cp mozobj/dist/*.crashreporter-symbols.zip $symbols/
'' + ''
cd mozobj cd mozobj
''; '';

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "driftctl"; pname = "driftctl";
version = "0.29.0"; version = "0.30.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "snyk"; owner = "snyk";
repo = "driftctl"; repo = "driftctl";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-cn0PhumDaOhTm1vZCj0h9XehnQCDc+mXtne7QQNSbBk="; sha256 = "sha256-kjXqkaBF3rAaGnDDVmAoFmvH4t8/seC+KF7K78eKZco=";
}; };
vendorSha256 = "sha256-bsIPEjD/kCUvkRKP85CjW3JJf1Hyx9b2pMY9S4HlKrA="; vendorSha256 = "sha256-bsIPEjD/kCUvkRKP85CjW3JJf1Hyx9b2pMY9S4HlKrA=";

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "nerdctl"; pname = "nerdctl";
version = "0.19.0"; version = "0.20.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containerd"; owner = "containerd";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-FuWfHd4LfFHX5oRopDIDTi90cARi8cYjJBK0BgeCD/U="; sha256 = "sha256-5bigfsig2LkZoLUlA6764ttG85CNi6rmOgQck+/zc5c=";
}; };
vendorSha256 = "sha256-mHitGjOfSRlqORWFtB16buSSJrCf7Li9+oHX4rcO4ek="; vendorSha256 = "sha256-Ei4L35/RN2en7gOUzvGflBivTlBy2YnUvTHqcCe5HN4=";
nativeBuildInputs = [ makeWrapper installShellFiles ]; nativeBuildInputs = [ makeWrapper installShellFiles ];

@ -1,22 +1,25 @@
{ lib, buildGoPackage, fetchFromGitHub}: { lib, buildGoModule, fetchFromGitHub, testers, terraform-inventory }:
buildGoPackage rec { buildGoModule rec {
pname = "terraform-inventory"; pname = "terraform-inventory";
version = "0.7-pre"; version = "0.10";
rev = "v${version}";
goPackagePath = "github.com/adammck/terraform-inventory";
subPackages = [ "./" ];
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev;
owner = "adammck"; owner = "adammck";
repo = "terraform-inventory"; repo = "terraform-inventory";
sha256 = "0wwyi2nfyn3wfpmvj8aabn0cjba0lpr5nw3rgd6qdywy7sc3rmb1"; rev = "v${version}";
sha256 = "sha256-gkSDxcBoYmCBzkO8y1WKcRtZdfl8w5qVix0zbyb4Myo=";
}; };
goDeps = ./deps.nix; vendorSha256 = "sha256-pj9XLzaGU1PuNnpTL/7XaKJZUymX+i8hFMroZtHIqTc=";
ldflags = [ "-s" "-w" "-X main.build_version=${version}" ];
doCheck = false;
passthru.tests.version = testers.testVersion {
package = terraform-inventory;
};
meta = with lib; { meta = with lib; {
homepage = "https://github.com/adammck/terraform-inventory"; homepage = "https://github.com/adammck/terraform-inventory";

@ -1,20 +0,0 @@
[
{
goPackagePath = "github.com/adammck/venv";
fetch = {
type = "git";
url = "https://github.com/adammck/venv";
rev = "8a9c907a37d36a8f34fa1c5b81aaf80c2554a306";
sha256 = "1fzk3j4q59kpd2ks2aw8rmic6b123p5mh981cjh0kzs716grc6y8";
};
}
{
goPackagePath = "github.com/blang/vfs";
fetch = {
type = "git";
url = "https://github.com/blang/vfs";
rev = "c14afcac17253ce7418da751ec6b1988790cdc8f";
sha256 = "00q5qzxpn9n59nrmrljz4w9lljxvrr8i5j8i8b4iw86j0alcx53b";
};
}
]

@ -420,10 +420,10 @@
"owner": "integrations", "owner": "integrations",
"provider-source-address": "registry.terraform.io/integrations/github", "provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github", "repo": "terraform-provider-github",
"rev": "v4.25.0-alpha", "rev": "v4.24.1",
"sha256": "sha256-9BE19VywtNIeDfjBKzle5nGFPmpS8lHV60w0h2xTztU=", "sha256": "sha256-1fwHMN2HIVl+8ZL7OtP1U5ORc41e7Tm3qEpMqIgWL20=",
"vendorSha256": null, "vendorSha256": null,
"version": "4.25.0-alpha" "version": "4.24.1"
}, },
"gitlab": { "gitlab": {
"owner": "gitlabhq", "owner": "gitlabhq",
@ -719,10 +719,10 @@
"owner": "equinix", "owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/metal", "provider-source-address": "registry.terraform.io/equinix/metal",
"repo": "terraform-provider-metal", "repo": "terraform-provider-metal",
"rev": "v3.3.0-alpha.3", "rev": "v3.2.2",
"sha256": "sha256-wuZp0Be8a84y7JqpCGnBDPXgNG8JJcNWsIICP3ZjSVk=", "sha256": "193897farpyb3zxz6p79mfaf04ccin7xdirbkclqb3x3c56jy0xi",
"vendorSha256": "sha256-Ln9EyycPduVuj+JefH9f+Q5KlNGvbcwcEDgaqH2M0So=", "vendorSha256": null,
"version": "3.3.0-alpha.3" "version": "3.2.2"
}, },
"minio": { "minio": {
"owner": "aminueza", "owner": "aminueza",

@ -128,9 +128,12 @@ version="$(jq -r '.version' <<<"${registry_response}")"
if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorSha256} && ${old_vendor_sha256} != "${vendorSha256}" ]]; then if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorSha256} && ${old_vendor_sha256} != "${vendorSha256}" ]]; then
echo_provider "already at version ${version}" echo_provider "already at version ${version}"
exit exit
else
echo_provider "updating from ${old_version} to ${version}"
fi fi
if [[ ${version} =~ (alpha|beta|pre) && ${force} != 1 ]]; then
echo_provider "not updating to unstable version ${version}"
exit
fi
echo_provider "updating from ${old_version} to ${version}"
update_attr version "${version}" update_attr version "${version}"
provider_source_url="$(jq -r '.source' <<<"${registry_response}")" provider_source_url="$(jq -r '.source' <<<"${registry_response}")"

@ -4,11 +4,11 @@ let
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "cinny"; pname = "cinny";
version = "2.0.2"; version = "2.0.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
sha256 = "sha256-qVnNVJK/Y76cZTh8QNeSNHDxHA/Ekbt7X6mKYkYAPNU="; sha256 = "13jg28dypp7x6wgsc6vikbqnagp1grqsdmmwhll8qz9ih9rq9fxd";
}; };
installPhase = '' installPhase = ''

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "signalbackup-tools"; pname = "signalbackup-tools";
version = "20220430"; version = "20220517";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bepaald"; owner = "bepaald";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-clG0B7PgtlpsSnZgglkv7y7SOtMTBvwJMnvMrcTWXdI="; sha256 = "sha256-6jKsdilgWm6oDAuzE1aToMg9oV9BmTgQrOvvlwPA5gc=";
}; };
# Remove when Apple SDK is >= 10.13 # Remove when Apple SDK is >= 10.13

@ -28,6 +28,7 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mutt"; pname = "mutt";
version = "2.2.4"; version = "2.2.4";
outputs = [ "out" "doc" "info" ];
src = fetchurl { src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";

@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: { lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }:
let let
_version = "2.10.1"; _version = "2.10.2";
_build = "482"; _build = "484";
version = "${_version}-${_build}"; version = "${_version}-${_build}";
swtSystem = if stdenv.hostPlatform.system == "i686-linux" then "linux" swtSystem = if stdenv.hostPlatform.system == "i686-linux" then "linux"
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
owner = "willuhn"; owner = "willuhn";
repo = "jameica"; repo = "jameica";
rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}";
sha256 = "0pzcfqsf7flzipwivpinpkfb2xisand1sfjm00wif4pyj3f4qfh1"; sha256 = "1x9sybknzsfxp9z0pvw9dx80732ynyap57y03p7xwwjbcrnjla57";
}; };
# there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries

@ -4,6 +4,7 @@
, cmake , cmake
, corrosion , corrosion
, extra-cmake-modules , extra-cmake-modules
, gcc11
, kconfig , kconfig
, kcoreaddons , kcoreaddons
, kdbusaddons , kdbusaddons
@ -19,8 +20,8 @@
, srcs , srcs
# These must be updated in tandem with package updates. # These must be updated in tandem with package updates.
, cargoShaForVersion ? "21.08" , cargoShaForVersion ? "22.04"
, cargoSha256 ? "1pbvw9hdzn3i97mahdy9y6jnjsmwmjs3lxfz7q6r9r10i8swbkak" , cargoSha256 ? "RtdZMBKixC3mdHeFXY9u0pHyDv93Z8p4EVY+lz1aISM="
}: }:
# Guard against incomplete updates. # Guard against incomplete updates.
@ -45,6 +46,7 @@ mkDerivation rec {
cmake cmake
corrosion corrosion
extra-cmake-modules extra-cmake-modules
gcc11 # doesn't build with GCC 9 from stdenv on aarch64
] ++ (with rustPlatform; [ ] ++ (with rustPlatform; [
cargoSetupHook cargoSetupHook
rust.cargo rust.cargo

@ -1,8 +1,8 @@
{ lib { lib
, mkDerivation , mkDerivation
, fetchpatch
, extra-cmake-modules , extra-cmake-modules
, gcc11
, kcoreaddons , kcoreaddons
, kcrash , kcrash
@ -16,16 +16,9 @@
mkDerivation rec { mkDerivation rec {
pname = "audiotube"; pname = "audiotube";
patches = [
# Fix compatibility with ytmusicapi 0.19.1
(fetchpatch {
url = "https://invent.kde.org/plasma-mobile/audiotube/-/commit/734caa02805988200f923b88d1590b3f7dac8ac2.patch";
sha256 = "0zq4f0w84dv0630bpvmqkfmhxbvibr2fxhzy6d2mnf098028gzyd";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules
gcc11 # doesn't build with GCC 9 from stdenv on aarch64
python3Packages.wrapPython python3Packages.wrapPython
python3Packages.pybind11 python3Packages.pybind11
]; ];
@ -37,13 +30,11 @@ mkDerivation rec {
kirigami2 kirigami2
qtmultimedia qtmultimedia
qtquickcontrols2 qtquickcontrols2
python3Packages.youtube-dl ] ++ pythonPath;
python3Packages.ytmusicapi
];
pythonPath = [ pythonPath = with python3Packages; [
python3Packages.youtube-dl yt-dlp
python3Packages.ytmusicapi ytmusicapi
]; ];
preFixup = '' preFixup = ''

@ -73,9 +73,11 @@ let
krecorder = callPackage ./krecorder.nix {}; krecorder = callPackage ./krecorder.nix {};
ktrip = callPackage ./ktrip.nix {}; ktrip = callPackage ./ktrip.nix {};
kweather = callPackage ./kweather.nix {}; kweather = callPackage ./kweather.nix {};
neochat = callPackage ./neochat.nix {};
plasma-dialer = callPackage ./plasma-dialer.nix {}; plasma-dialer = callPackage ./plasma-dialer.nix {};
plasma-phonebook = callPackage ./plasma-phonebook.nix {}; plasma-phonebook = callPackage ./plasma-phonebook.nix {};
plasma-settings = callPackage ./plasma-settings.nix {}; plasma-settings = callPackage ./plasma-settings.nix {};
plasmatube = callPackage ./plasmatube.nix {};
spacebar = callPackage ./spacebar.nix {}; spacebar = callPackage ./spacebar.nix {};
}; };

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/21.08/ -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.04/ -A '*.tar.xz' )

@ -10,9 +10,12 @@
, kcoreaddons , kcoreaddons
, ki18n , ki18n
, kirigami2 , kirigami2
, networkmanager-qt
, qtkeychain
, qtmultimedia , qtmultimedia
, qtquickcontrols2 , qtquickcontrols2
, syndication , syndication
, taglib
}: }:
let let
@ -37,9 +40,12 @@ mkDerivation rec {
kcoreaddons kcoreaddons
ki18n ki18n
kirigami2 kirigami2
qtquickcontrols2 networkmanager-qt
qtkeychain
qtmultimedia qtmultimedia
qtquickcontrols2
syndication syndication
taglib
]; ];
preFixup = '' preFixup = ''

@ -5,6 +5,7 @@
, extra-cmake-modules , extra-cmake-modules
, kconfig , kconfig
, kcoreaddons
, ki18n , ki18n
, kirigami2 , kirigami2
, qtmultimedia , qtmultimedia
@ -21,6 +22,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
kconfig kconfig
kcoreaddons
ki18n ki18n
kirigami2 kirigami2
qtmultimedia qtmultimedia

@ -1,6 +1,5 @@
{ mkDerivation { mkDerivation
, lib , lib
, fetchFromGitLab
, pkg-config , pkg-config
, cmake , cmake
, cmark , cmark
@ -28,15 +27,6 @@
mkDerivation rec { mkDerivation rec {
pname = "neochat"; pname = "neochat";
version = "22.02";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "network";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7EBnHuwpyJ/bGrCldZHWOwcnJWDIDaNWZXHkCYkOTjs=";
};
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
@ -64,7 +54,7 @@ mkDerivation rec {
]; ];
meta = with lib; { meta = with lib; {
description = "A client for matrix, the decentralized communication protocol."; description = "A client for matrix, the decentralized communication protocol";
homepage = "https://apps.kde.org/en/neochat"; homepage = "https://apps.kde.org/en/neochat";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];

@ -4,6 +4,7 @@
, cmake , cmake
, extra-cmake-modules , extra-cmake-modules
, callaudiod
, kcontacts , kcontacts
, kcoreaddons , kcoreaddons
, kdbusaddons , kdbusaddons
@ -12,12 +13,11 @@
, knotifications , knotifications
, kpeople , kpeople
, libphonenumber , libphonenumber
, libpulseaudio , modemmanager-qt
, libqofono
, protobuf , protobuf
, pulseaudio-qt , qtfeedback
, qtmpris
, qtquickcontrols2 , qtquickcontrols2
, telepathy
}: }:
mkDerivation rec { mkDerivation rec {
@ -29,6 +29,7 @@ mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
callaudiod
kcontacts kcontacts
kcoreaddons kcoreaddons
kdbusaddons kdbusaddons
@ -37,12 +38,11 @@ mkDerivation rec {
knotifications knotifications
kpeople kpeople
libphonenumber libphonenumber
libpulseaudio modemmanager-qt
libqofono
protobuf # Needed by libphonenumber protobuf # Needed by libphonenumber
pulseaudio-qt qtfeedback
qtmpris
qtquickcontrols2 qtquickcontrols2
telepathy
]; ];
meta = with lib; { meta = with lib; {

@ -11,6 +11,8 @@
, kdbusaddons , kdbusaddons
, ki18n , ki18n
, kitemmodels , kitemmodels
, modemmanager-qt
, networkmanager-qt
, plasma-framework , plasma-framework
}: }:
@ -29,6 +31,8 @@ mkDerivation rec {
kdbusaddons kdbusaddons
ki18n ki18n
kitemmodels kitemmodels
modemmanager-qt
networkmanager-qt
plasma-framework plasma-framework
]; ];

@ -0,0 +1,41 @@
{ lib
, mkDerivation
, cmake
, extra-cmake-modules
, gst_all_1
, kcoreaddons
, kdeclarative
, ki18n
, kirigami2
, qtmultimedia
, qtquickcontrols2
}:
mkDerivation {
pname = "plasmatube";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
kcoreaddons
kdeclarative
ki18n
kirigami2
qtmultimedia
qtquickcontrols2
] ++ (with gst_all_1; [
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gstreamer
]);
meta = {
description = "Youtube player powered by an invidious server";
homepage = "https://invent.kde.org/plasma-mobile/plasmatube";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

@ -11,8 +11,10 @@
, kpeople , kpeople
, libphonenumber , libphonenumber
, libqofono , libqofono
, modemmanager-qt
, protobuf , protobuf
, telepathy , qcoro
, qtquickcontrols2
}: }:
mkDerivation rec { mkDerivation rec {
@ -30,9 +32,10 @@ mkDerivation rec {
knotifications knotifications
kpeople kpeople
libphonenumber libphonenumber
libqofono modemmanager-qt
protobuf # Needed by libphonenumber protobuf # Needed by libphonenumber
telepathy qcoro
qtquickcontrols2
]; ];
meta = with lib; { meta = with lib; {

@ -4,155 +4,187 @@
{ {
alligator = { alligator = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/alligator-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/alligator-22.04.tar.xz";
sha256 = "1dhwfwd1v5wmx3sldpygb79kz87j13wd0arhlkm94z1whsixan0q"; sha256 = "1f2s0ay4qr7ylqnx8d1fawwi4h15gza2d4dsvrww1gm8ar1miqwc";
name = "alligator-21.08.tar.xz"; name = "alligator-22.04.tar.xz";
}; };
}; };
angelfish = { angelfish = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/angelfish-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/angelfish-22.04.tar.xz";
sha256 = "1gzvlha159bw767mj8lisn89592j4j4dazzfws3v4anddjh60xnh"; sha256 = "169bhkymfxcs93injzp86cvcdhv78pl4dfsscjahlh9c1g5lsbqa";
name = "angelfish-21.08.tar.xz"; name = "angelfish-22.04.tar.xz";
}; };
}; };
audiotube = { audiotube = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/audiotube-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/audiotube-22.04.tar.xz";
sha256 = "14h4xna9v70lmp7cfpvdnz0f5a4gwgj0q3byccmawm38xsv15v8c"; sha256 = "0x9xmlfz39ac15c4rbg33sl1bbjmglxgz39flmrvrrw9h2m62s2x";
name = "audiotube-21.08.tar.xz"; name = "audiotube-22.04.tar.xz";
}; };
}; };
calindori = { calindori = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/calindori-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/calindori-22.04.tar.xz";
sha256 = "08s16a8skh02n8ygqwryxpzczj5aqr5k58aijaz2gzx45m7ym31b"; sha256 = "1zinhlflrx230yymlfxvm98dvvq1yig3r49bq61fmyrzq6fdfv60";
name = "calindori-21.08.tar.xz"; name = "calindori-22.04.tar.xz";
}; };
}; };
kalk = { kalk = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/kalk-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/kalk-22.04.tar.xz";
sha256 = "0xzrahpz47yajalsfmpzmavxjwmr4bgljwyz2dhxdg40ryjxdy23"; sha256 = "0aaqcb7jkkqypawfkzjnqglzyni17064d0mhch8g7q0qm5izvap8";
name = "kalk-21.08.tar.xz"; name = "kalk-22.04.tar.xz";
}; };
}; };
kasts = { kasts = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/kasts-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/kasts-22.04.tar.xz";
sha256 = "10v6icxwv46nihzbdi0n2w71bsg7l166z7jf9rb7vf2mjh1gqavn"; sha256 = "0c60wp0i6l7ji13ap69lh21vpdq09h2nmqpzjlrwlbjqbhhx7lsh";
name = "kasts-21.08.tar.xz"; name = "kasts-22.04.tar.xz";
}; };
}; };
kclock = { kclock = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/kclock-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/kclock-22.04.tar.xz";
sha256 = "1zq0fxlwd7l3b6dgfqsmv1x4wvhmrjz5r0a38hbd7j7pzgyix47d"; sha256 = "1ycln85ydd3qmzfadgg80zf7jlwx5yijxs1mbfmx7f1rr427qdk6";
name = "kclock-21.08.tar.xz"; name = "kclock-22.04.tar.xz";
}; };
}; };
keysmith = { keysmith = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/keysmith-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/keysmith-22.04.tar.xz";
sha256 = "0fa8inli7cwmb75af0mr2cflng0r6k3pd6ckih6ph7szqbpg2x90"; sha256 = "0cx14r820mnlh75l3blc0ywxwmlinn2wakdnwl75w6i8l46k48li";
name = "keysmith-21.08.tar.xz"; name = "keysmith-22.04.tar.xz";
};
};
khealthcertificate = {
version = "22.04";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/khealthcertificate-22.04.tar.xz";
sha256 = "0sr90ki42m3cbjy63rl2ay02wm089wyka0lc4ik7jaic6wb47y5d";
name = "khealthcertificate-22.04.tar.xz";
}; };
}; };
koko = { koko = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/koko-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/koko-22.04.tar.xz";
sha256 = "1sqlcl871m6dlrnkkhqa3xfwix01d74d7jf94r1a3p32hqljv76p"; sha256 = "0i4h2brc5dqwdmj2bs7nywrz7cgqcf7nmm6yl03047vj9aah01cw";
name = "koko-21.08.tar.xz"; name = "koko-22.04.tar.xz";
}; };
}; };
kongress = { kongress = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/kongress-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/kongress-22.04.tar.xz";
sha256 = "099ds4bv4ngx21f28hxcvc17wd2nk786kydwf2h5n3mdd2mgz3ka"; sha256 = "07yb8hddxl7m1wl0z7rcwdls3k9q89zl1d271n15j1rwrsbwiyxd";
name = "kongress-21.08.tar.xz"; name = "kongress-22.04.tar.xz";
}; };
}; };
krecorder = { krecorder = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/krecorder-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/krecorder-22.04.tar.xz";
sha256 = "1381x889h37saf6k875iqhwz5vbixrp7650smxp31r56ycrqq26i"; sha256 = "0d7nvq87avw4gj6whjrlmxs361r9cvzfmfsrca5f536jlazp95pg";
name = "krecorder-21.08.tar.xz"; name = "krecorder-22.04.tar.xz";
}; };
}; };
ktrip = { ktrip = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/ktrip-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/ktrip-22.04.tar.xz";
sha256 = "0ipxi3pqd7mznq3qjf9j9w3wyck85lxnr81ay6b3ricfb08ry68x"; sha256 = "1ijy19axc492l4naayr3d8qdjznc286105qnki8vmcaw93p48n9x";
name = "ktrip-21.08.tar.xz"; name = "ktrip-22.04.tar.xz";
}; };
}; };
kweather = { kweather = {
version = "21.08"; version = "22.04";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/kweather-22.04.tar.xz";
sha256 = "0080l00dya34d35sf6z2j3ra6lls0nafr045a9jmxv09763ydb5d";
name = "kweather-22.04.tar.xz";
};
};
neochat = {
version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/kweather-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/neochat-22.04.tar.xz";
sha256 = "0b1zjwsakwsnh6827zjhypvb04c78gwwygr7k1cy2x3finrp5if5"; sha256 = "04i1kn52w9jjaaw8x53mksw2vzrpsq1xrq13h158c1s3q1g9jdm8";
name = "kweather-21.08.tar.xz"; name = "neochat-22.04.tar.xz";
}; };
}; };
plasma-dialer = { plasma-dialer = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/plasma-dialer-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/plasma-dialer-22.04.tar.xz";
sha256 = "14vgjg0nihhm446cfrrld1l43r50dlah5xs2ypdnm68618bdc7p1"; sha256 = "0hnxasj6psplwykahhisipyvy67hfr820azixw5p820fzy11x2g4";
name = "plasma-dialer-21.08.tar.xz"; name = "plasma-dialer-22.04.tar.xz";
}; };
}; };
plasma-phonebook = { plasma-phonebook = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/plasma-phonebook-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/plasma-phonebook-22.04.tar.xz";
sha256 = "09gr5mkwhayx6k6bhm29bmcvdlqqw8jj7gydh5fz40g9z98c84km"; sha256 = "14nd2yx9cf6gabb10kcaqkdn7kb96n2209qrib7daq2ldva8c9i9";
name = "plasma-phonebook-21.08.tar.xz"; name = "plasma-phonebook-22.04.tar.xz";
}; };
}; };
plasma-settings = { plasma-settings = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/plasma-settings-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/plasma-settings-22.04.tar.xz";
sha256 = "005v1gyrzl9b0k875p2wipja3l8l4awp8nl2d1jx7c28lqaspz2j"; sha256 = "1k40mviikpij1srar1hkg732qg14ld0176g1mpza0ysr3yr21vny";
name = "plasma-settings-21.08.tar.xz"; name = "plasma-settings-22.04.tar.xz";
};
};
plasmatube = {
version = "22.04";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/plasmatube-22.04.tar.xz";
sha256 = "01bmxdh0aclm184j5s0kddjc7a14225bdnbkr8jlk21g9wlw8cyx";
name = "plasmatube-22.04.tar.xz";
}; };
}; };
qmlkonsole = { qmlkonsole = {
version = "21.08"; version = "22.04.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/qmlkonsole-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/qmlkonsole-22.04.1.tar.xz";
sha256 = "1p3ysf6sgiji86400523hm67rvw3znj3a7k6g6s83dxynxdh2faq"; sha256 = "06zfrqaag9sgihs5k93nssgm4smrs2ymh7q0fx35z7fcphngjpaw";
name = "qmlkonsole-21.08.tar.xz"; name = "qmlkonsole-22.04.1.tar.xz";
}; };
}; };
spacebar = { spacebar = {
version = "21.08"; version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/spacebar-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/spacebar-22.04.tar.xz";
sha256 = "1cg36iys4x7p97ywilnp2lzz1ry5a1m7jz38yh2yiw6m8wvzfqff"; sha256 = "0ga3symavdrq5aim924bd889b9cmv09dyplz9gcspk46w49vx3s5";
name = "spacebar-21.08.tar.xz"; name = "spacebar-22.04.tar.xz";
}; };
}; };
tokodon = { tokodon = {
version = "21.08"; version = "22.04";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/tokodon-22.04.tar.xz";
sha256 = "0c9q2ax0h047xm3g5r5cn6sxfyv2lb93dahd5z3nw67bfrzwvnw2";
name = "tokodon-22.04.tar.xz";
};
};
vakzination = {
version = "22.04";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/tokodon-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/22.04/vakzination-22.04.tar.xz";
sha256 = "0j9zfcdss1872hv8xxrmy0jjmcz3y5kdz8gdrd6qmig5scrzjvnf"; sha256 = "0zadygzw4xzpwbdnb6dwjjjls1h915gp9xaf59kbfbmzwb6m4mf8";
name = "tokodon-21.08.tar.xz"; name = "vakzination-22.04.tar.xz";
}; };
}; };
} }

@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ bcdarwin ]; maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.free; license = licenses.free;
broken = true; # ITK5 compatibility issue (https://github.com/BIC-MNI/EZminc/issues/15)
}; };
} }

@ -104,6 +104,7 @@ stdenv.mkDerivation rec {
"-Drpath=ON" "-Drpath=ON"
"-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-Dalien=OFF" "-Dalien=OFF"
"-Dbonjour=OFF" "-Dbonjour=OFF"
"-Dcastor=OFF" "-Dcastor=OFF"

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

@ -0,0 +1,50 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,21 +54,7 @@ endif()
endif()
#Use c preprocessor with fortran
-
-if(UNIX AND NOT APPLE)
- set(CMAKE_Fortran_FLAGS "-cpp -Wno-argument-mismatch")
-endif()
-
-if(APPLE)
- set(CMAKE_Fortran_FLAGS "-cpp -fallow-argument-mismatch")
-endif()
-
-
-if (CMAKE_MAJOR_VERSION VERSION_GREATER_EQUAL "3")
-if(CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL "10")
- set(CMAKE_Fortran_FLAGS "-cpp -fallow-argument-mismatch")
-endif()
-endif()
+set(CMAKE_Fortran_FLAGS "-cpp")
#For Fortran
diff --git a/src/GetChisquare.f b/src/GetChisquare.f
index b21413fe..28391bcb 100644
--- a/src/GetChisquare.f
+++ b/src/GetChisquare.f
@@ -2418,8 +2418,8 @@ C> @Brief Interface to lapack, to dynamically allocate work arrays
integer NCovar, NDimCovar
double precision Covar(NDimCovar,NDimCovar), EigenValues(NCovar)
integer IFail
- double precision Work
- integer IWork
+ double precision Work(1)
+ integer IWork(1)
Character*80 msg
C---------------------------------------------------------------
C Determine optimal size of the work array:
@@ -2432,7 +2432,7 @@ C Determine optimal size of the work array:
$ int(work)+1, iwork
call HF_ERRLOG(14121701,msg)
call MyDSYEVD2(NCovar,Covar,NDimCovar, EigenValues,
- $ int(work)+1,iwork,ifail)
+ $ int(work(1))+1,iwork(1),ifail)
end

@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ZHIQ5hOY+k0/wmpE0o4Po+RZ4MkVMk+bK1Rc6eqwwH0="; sha256 = "sha256-ZHIQ5hOY+k0/wmpE0o4Po+RZ4MkVMk+bK1Rc6eqwwH0=";
}; };
preConfigure = '' patches = [
substituteInPlace CMakeLists.txt \ # Avoid need for -fallow-argument-mismatch
--replace "-fallow-argument-mismatch" "" ./0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch
''; ];
nativeBuildInputs = [ cmake gfortran pkg-config ]; nativeBuildInputs = [ cmake gfortran pkg-config ];
buildInputs = buildInputs =

@ -4,16 +4,16 @@ with rustPlatform;
buildRustPackage rec { buildRustPackage rec {
pname = "git-ignore"; pname = "git-ignore";
version = "1.1.1"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sondr3"; owner = "sondr3";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-bKIBPqGKiS3ey8vH2F4EoleV1H2PTOp+71d/YW3jkT0="; sha256 = "sha256-Bfr+4zDi6QqirlqccW1jU95eb4q82ZFG9LtT2mCPYLc=";
}; };
cargoSha256 = "sha256-7jPNVBf5DYtE8nsh7LIywMCjU7ODZ3qFsmBie2mZ3h8="; cargoSha256 = "sha256-ehEUI4M2IxqS6QhyqOncwP+w6IGbIlSFNIP/FEVH/JI=";
nativeBuildInputs = [ pkg-config installShellFiles ]; nativeBuildInputs = [ pkg-config installShellFiles ];
buildInputs = [ openssl ] buildInputs = [ openssl ]
@ -21,9 +21,10 @@ buildRustPackage rec {
darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Security
]; ];
outputs = [ "out" "man" ]; postInstall = ''
preFixup = '' installManPage assets/git-ignore.1
installManPage $releaseDir/build/git-ignore-*/out/git-ignore.1 # There's also .elv and .ps1 completion files but I don't know where to install those
installShellCompletion assets/git-ignore.{bash,fish} --zsh assets/_git-ignore
''; '';
meta = with lib; { meta = with lib; {

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "git-sync"; pname = "git-sync";
version = "unstable-2021-07-14"; version = "unstable-2022-03-20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simonthum"; owner = "simonthum";
repo = "git-sync"; repo = "git-sync";
rev = "7d3d34bf3ee2483fba00948f5b97f964b849a590"; rev = "8466b77a38b3d5e8b4ed9e3cb1b635e475eeb415";
sha256 = "sha256-PuYREW5NBkYF1tlcLTbOI8570nvHn5ifN8OIInfNNxI="; sha256 = "sha256-8rCwpmHV6wgFCLzPJOKzwN5mG8uD5KIlGFwcgQD+SK4=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp -a git-* $out/bin/ cp -a git-* $out/bin/
cp -a contrib/git-* $out/bin/
''; '';
wrapperPath = with lib; makeBinPath [ wrapperPath = with lib; makeBinPath [

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, gnome { lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, intltool, gnome
, iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,12 +10,20 @@ stdenv.mkDerivation rec {
sha256 = "XoW1rcje5maQD8rycbpxf33LnQoD2W2uCPnL0n4YseA="; sha256 = "XoW1rcje5maQD8rycbpxf33LnQoD2W2uCPnL0n4YseA=";
}; };
patches = [
(fetchpatch {
name = "reduce-build-parallelism.patch";
url = "https://gitlab.gnome.org/vcunat/adwaita-icon-theme/-/commit/27edeca7927eb2247d7385fccb3f0fd7787471e6.patch";
sha256 = "vDWuvz5yRhtn9obTtHRp6J7gJpXDZz1cajyquPGw53I=";
})
];
# For convenience, we can specify adwaita-icon-theme only in packages # For convenience, we can specify adwaita-icon-theme only in packages
propagatedBuildInputs = [ hicolor-icon-theme ]; propagatedBuildInputs = [ hicolor-icon-theme ];
buildInputs = [ gdk-pixbuf librsvg ]; buildInputs = [ gdk-pixbuf librsvg ];
nativeBuildInputs = [ pkg-config intltool iconnamingutils gtk3 ]; nativeBuildInputs = [ pkg-config autoreconfHook intltool iconnamingutils gtk3 ];
dontDropIconThemeCache = true; dontDropIconThemeCache = true;

@ -4,19 +4,19 @@
, glib , glib
, gettext , gettext
, sassc , sassc
, unstableGitUpdater , gitUpdater
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extension-dash-to-dock"; pname = "gnome-shell-extension-dash-to-dock";
version = "71+date=2022-02-23"; version = "72";
# Temporarily switched to commit hash because stable version is buggy. # Temporarily switched to commit hash because stable version is buggy.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "micheleg"; owner = "micheleg";
repo = "dash-to-dock"; repo = "dash-to-dock";
rev = "6f717302747931de6bf35bc9839fb3bd946e2c2f"; rev = "extensions.gnome.org-v${version}";
sha256 = "1J8t0R43jBbqpXyH2uVyEK+OvhrCw18WWheflqwe100="; sha256 = "Cds5Fc+rnvoy01GTZBS7qPh8UC9ekrNBOs+IEkDNkJw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -33,9 +33,10 @@ stdenv.mkDerivation rec {
extensionUuid = "dash-to-dock@micxgx.gmail.com"; extensionUuid = "dash-to-dock@micxgx.gmail.com";
extensionPortalSlug = "dash-to-dock"; extensionPortalSlug = "dash-to-dock";
updateScript = unstableGitUpdater { updateScript = gitUpdater {
stableVersion = true; pname = "gnomeExtensions.dash-to-dock";
tagPrefix = "extensions.gnome.org-v"; inherit version;
rev-prefix = "extensions.gnome.org-v";
}; };
}; };

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, nix-update-script , nix-update-script
, meson , meson
, ninja , ninja
@ -32,24 +31,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elementary-photos"; pname = "elementary-photos";
version = "2.7.4"; version = "2.7.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = "photos"; repo = "photos";
rev = version; rev = version;
sha256 = "sha256-NhF/WgS6IOwgALSCNyFNxz8ROVTb+mUX+lBtnWEyhEI="; sha256 = "sha256-zM32+bva+QD1Z/0vUD7K0/tnSzo+7GGLjJ1ytr64c0I=";
}; };
patches = [
# Fix build with vala 0.56
# https://github.com/elementary/photos/pull/711
(fetchpatch {
url = "https://github.com/elementary/photos/commit/6594f1323726fb0d38519a7bdafe16f9170353cb.patch";
sha256 = "sha256-Ie9ULC8Xw4KLQJANPXh4LDywMjWfniPX/P76eHW8LHc=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
appstream appstream
desktop-file-utils desktop-file-utils

@ -18,13 +18,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "switchboard-plug-onlineaccounts"; pname = "switchboard-plug-onlineaccounts";
version = "6.4.0"; version = "6.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-Fppl/IvdlW8lZ6YKEHaHNticv3FFFKEKTPPVnz4u9b4="; sha256 = "sha256-Q/vvXKyeedn5o7HnL9F5ixSjJS3OWrvvHbzvx2fW2qY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

@ -2,21 +2,21 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vlang"; pname = "vlang";
version = "weekly.2022.19"; version = "weekly.2022.20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vlang"; owner = "vlang";
repo = "v"; repo = "v";
rev = version; rev = version;
sha256 = "1bl91j3ip3i84jq3wg03sflllxv38sv4dc072r302rl2g9f4dbg6"; sha256 = "1isbyfs98bdbm2qjf7q4bqbpsmdiqlavn3gznwr12bkvhnsf4j3x";
}; };
# Required for bootstrap. # Required for bootstrap.
vc = fetchFromGitHub { vc = fetchFromGitHub {
owner = "vlang"; owner = "vlang";
repo = "vc"; repo = "vc";
rev = "a298ad7069f6333ef8ab59a616654fc74e04c847"; rev = "167f262866090493650f58832d62d910999dd5a4";
sha256 = "168cgq6451hcgsxzyd8vq11g01642bs5kkwxqh6rz3rnc86ajic0"; sha256 = "1xax8355qkrccjcmx24gcab88xnrqj15mhqy0bgp3v2rb1hw1n3a";
}; };
# Required for vdoc. # Required for vdoc.
@ -27,11 +27,6 @@ stdenv.mkDerivation rec {
sha256 = "0cawzizr3rjz81blpvxvxrcvcdai1adj66885ss390444qq1fnv7"; sha256 = "0cawzizr3rjz81blpvxvxrcvcdai1adj66885ss390444qq1fnv7";
}; };
# vcreate_test.v requires git, so we must disable it.
patches = [
./disable_vcreate_test.patch
];
propagatedBuildInputs = [ glfw freetype openssl ] propagatedBuildInputs = [ glfw freetype openssl ]
++ lib.optional stdenv.hostPlatform.isUnix upx; ++ lib.optional stdenv.hostPlatform.isUnix upx;
@ -42,9 +37,16 @@ stdenv.mkDerivation rec {
"VC=${vc}" "VC=${vc}"
]; ];
prePatch = '' preBuild = ''
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
cp cmd/tools/vcreate_test.v $HOME/vcreate_test.v '';
# vcreate_test.v requires git, so we must remove it when building the tools.
# vtest.v fails on Darwin, so let's just disable it for now.
preInstall = ''
mv cmd/tools/vcreate_test.v $HOME/vcreate_test.v
'' + lib.optionalString stdenv.isDarwin ''
mv cmd/tools/vtest.v $HOME/vtest.v
''; '';
installPhase = '' installPhase = ''
@ -64,12 +66,16 @@ stdenv.mkDerivation rec {
$out/lib/v -v $out/lib/cmd/tools/vast $out/lib/v -v $out/lib/cmd/tools/vast
$out/lib/v -v $out/lib/cmd/tools/vvet $out/lib/v -v $out/lib/cmd/tools/vvet
# Return the pre-patch vcreate_test.v now that we no longer need the alteration.
cp $HOME/vcreate_test.v $out/lib/cmd/tools/vcreate_test.v
runHook postInstall runHook postInstall
''; '';
# Return vcreate_test.v and vtest.v, so the user can use it.
postInstall = ''
cp $HOME/vcreate_test.v $out/lib/cmd/tools/vcreate_test.v
'' + lib.optionalString stdenv.isDarwin ''
cp $HOME/vtest.v $out/lib/cmd/tools/vtest.v
'';
meta = with lib; { meta = with lib; {
homepage = "https://vlang.io/"; homepage = "https://vlang.io/";
description = "Simple, fast, safe, compiled language for developing maintainable software"; description = "Simple, fast, safe, compiled language for developing maintainable software";

@ -1,133 +0,0 @@
diff --git a/cmd/tools/vcreate_test.v b/cmd/tools/vcreate_test.v
index 3d07f4773..de8a202df 100644
--- a/cmd/tools/vcreate_test.v
+++ b/cmd/tools/vcreate_test.v
@@ -2,127 +2,6 @@ import os
const test_path = 'vcreate_test'
-fn init_and_check() ? {
- os.execute_or_exit('${os.quoted_path(@VEXE)} init')
-
- assert os.read_file('vcreate_test.v') ? == [
- 'module main\n',
- 'fn main() {',
- " println('Hello World!')",
- '}',
- '',
- ].join_lines()
-
- assert os.read_file('v.mod') ? == [
- 'Module {',
- " name: 'vcreate_test'",
- " description: ''",
- " version: ''",
- " license: ''",
- ' dependencies: []',
- '}',
- '',
- ].join_lines()
-
- assert os.read_file('.gitignore') ? == [
- '# Binaries for programs and plugins',
- 'main',
- 'vcreate_test',
- '*.exe',
- '*.exe~',
- '*.so',
- '*.dylib',
- '*.dll',
- 'vls.log',
- '',
- ].join_lines()
-
- assert os.read_file('.gitattributes') ? == [
- '*.v linguist-language=V text=auto eol=lf',
- '*.vv linguist-language=V text=auto eol=lf',
- '*.vsh linguist-language=V text=auto eol=lf',
- '**/v.mod linguist-language=V text=auto eol=lf',
- '',
- ].join_lines()
-
- assert os.read_file('.editorconfig') ? == [
- '[*]',
- 'charset = utf-8',
- 'end_of_line = lf',
- 'insert_final_newline = true',
- 'trim_trailing_whitespace = true',
- '',
- '[*.v]',
- 'indent_style = tab',
- 'indent_size = 4',
- '',
- ].join_lines()
-}
-
fn test_v_init() ? {
- dir := os.join_path(os.temp_dir(), test_path)
- os.rmdir_all(dir) or {}
- os.mkdir(dir) or {}
- defer {
- os.rmdir_all(dir) or {}
- }
- os.chdir(dir) ?
-
- init_and_check() ?
-}
-
-fn test_v_init_in_git_dir() ? {
- dir := os.join_path(os.temp_dir(), test_path)
- os.rmdir_all(dir) or {}
- os.mkdir(dir) or {}
- defer {
- os.rmdir_all(dir) or {}
- }
- os.chdir(dir) ?
- os.execute_or_exit('git init .')
- init_and_check() ?
-}
-
-fn test_v_init_no_overwrite_gitignore() ? {
- dir := os.join_path(os.temp_dir(), test_path)
- os.rmdir_all(dir) or {}
- os.mkdir(dir) or {}
- os.write_file('$dir/.gitignore', 'blah') ?
- defer {
- os.rmdir_all(dir) or {}
- }
- os.chdir(dir) ?
-
- os.execute_or_exit('${os.quoted_path(@VEXE)} init')
-
- assert os.read_file('.gitignore') ? == 'blah'
-}
-
-fn test_v_init_no_overwrite_gitattributes_and_editorconfig() ? {
- git_attributes_content := '*.v linguist-language=V text=auto eol=lf'
- editor_config_content := '[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.v]
-indent_style = tab
-indent_size = 4
-'
-
- dir := os.join_path(os.temp_dir(), test_path)
- os.rmdir_all(dir) or {}
- os.mkdir(dir) or {}
- os.write_file('$dir/.gitattributes', git_attributes_content) ?
- os.write_file('$dir/.editorconfig', editor_config_content) ?
- defer {
- os.rmdir_all(dir) or {}
- }
- os.chdir(dir) ?
-
- os.execute_or_exit('${os.quoted_path(@VEXE)} init')
-
- assert os.read_file('.gitattributes') ? == git_attributes_content
- assert os.read_file('.editorconfig') ? == editor_config_content
+ println('vcreate_test disabled')
}

@ -6,12 +6,12 @@ mkCoqDerivation rec {
domain = "gitlab.inria.fr"; domain = "gitlab.inria.fr";
inherit version; inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [ defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = isGe "8.8"; out = "4.4.0"; } { case = isGe "8.8"; out = "4.5.1"; }
{ case = range "8.8" "8.12"; out = "4.0.0"; } { case = range "8.8" "8.12"; out = "4.0.0"; }
{ case = range "8.7" "8.11"; out = "3.4.2"; } { case = range "8.7" "8.11"; out = "3.4.2"; }
{ case = range "8.5" "8.6"; out = "3.3.0"; } { case = range "8.5" "8.6"; out = "3.3.0"; }
] null; ] null;
release."4.4.0".sha256 = "sha256-0+9AatTIEsjul0RXoOw6zWGEbGDVmuy7XuyrZNBZ8Kk="; release."4.5.1".sha256 = "sha256-5OxbSPdw/1FFENubulKSk6fEIEYSPCxfvMMgtgN6j6s=";
release."4.3.0".sha256 = "sha256-k8DLC4HYYpHeEEgXUafS8jkaECqlM+/CoYaInmUTYko="; release."4.3.0".sha256 = "sha256-k8DLC4HYYpHeEEgXUafS8jkaECqlM+/CoYaInmUTYko=";
release."4.2.0".sha256 = "sha256-SD5thgpirs3wmZBICjXGpoefg9AAXyExb5t8tz3iZhE="; release."4.2.0".sha256 = "sha256-SD5thgpirs3wmZBICjXGpoefg9AAXyExb5t8tz3iZhE=";
release."4.1.1".sha256 = "sha256-h2NJ6sZt1C/88v7W2xyuftEDoyRt3H6kqm5g2hc1aoU="; release."4.1.1".sha256 = "sha256-h2NJ6sZt1C/88v7W2xyuftEDoyRt3H6kqm5g2hc1aoU=";

@ -180,22 +180,12 @@ let
exclude+='\)' exclude+='\)'
buildGoDir() { buildGoDir() {
local cmd="$1" dir="$2" local d; local cmd;
cmd="$1"
d="$2"
. $TMPDIR/buildFlagsArray . $TMPDIR/buildFlagsArray
declare -a flags
flags+=($buildFlags "''${buildFlagsArray[@]}")
flags+=(''${tags:+-tags=${lib.concatStringsSep "," tags}})
flags+=(''${ldflags:+-ldflags="$ldflags"})
flags+=("-v" "-p" "$NIX_BUILD_CORES")
if [ "$cmd" = "test" ]; then
flags+=($checkFlags)
fi
local OUT local OUT
if ! OUT="$(go $cmd "''${flags[@]}" $dir 2>&1)"; then if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then
if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
echo "$OUT" >&2 echo "$OUT" >&2
return 1 return 1
@ -253,7 +243,7 @@ let
runHook preCheck runHook preCheck
for pkg in $(getGoDirs test); do for pkg in $(getGoDirs test); do
buildGoDir test "$pkg" buildGoDir test $checkFlags "$pkg"
done done
runHook postCheck runHook postCheck

@ -160,22 +160,12 @@ let
exclude+='\)' exclude+='\)'
buildGoDir() { buildGoDir() {
local cmd="$1" dir="$2" local d; local cmd;
cmd="$1"
d="$2"
. $TMPDIR/buildFlagsArray . $TMPDIR/buildFlagsArray
declare -a flags
flags+=($buildFlags "''${buildFlagsArray[@]}")
flags+=(''${tags:+-tags=${lib.concatStringsSep "," tags}})
flags+=(''${ldflags:+-ldflags="$ldflags"})
flags+=("-v" "-p" "$NIX_BUILD_CORES")
if [ "$cmd" = "test" ]; then
flags+=($checkFlags)
fi
local OUT local OUT
if ! OUT="$(go $cmd "''${flags[@]}" $dir 2>&1)"; then if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then
if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
echo "$OUT" >&2 echo "$OUT" >&2
return 1 return 1
@ -235,7 +225,7 @@ let
runHook preCheck runHook preCheck
for pkg in $(getGoDirs test); do for pkg in $(getGoDirs test); do
buildGoDir test "$pkg" buildGoDir test $checkFlags "$pkg"
done done
runHook postCheck runHook postCheck

@ -1,82 +1,107 @@
{ lib, stdenv, fetchFromGitHub, readline, libedit, bc { lib
, stdenv
, fetchFromGitHub
, bc
, libedit
, readline
, avxSupport ? stdenv.hostPlatform.avxSupport , avxSupport ? stdenv.hostPlatform.avxSupport
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "j"; pname = "j";
version = "902"; version = "904-beta-c";
jtype = "release-b";
src = fetchFromGitHub { src = fetchFromGitHub {
name = "${pname}-source";
owner = "jsoftware"; owner = "jsoftware";
repo = "jsource"; repo = "jsource";
rev = "j${version}-${jtype}"; rev = "j${version}";
sha256 = "0j67vgikqflwjqacsdicasvyv1k54s2c8vjgwmf0ix7l41p4xqz0"; hash = "sha256-MzEO/saHEBl1JwVlFC6P2UKm9RZnV7KVrNd9h4cPV/w=";
name = "jsource";
}; };
buildInputs = [ readline libedit bc ]; buildInputs = [
bits = if stdenv.is64bit then "64" else "32"; readline
platform = libedit
if (stdenv.isAarch32 || stdenv.isAarch64) then "raspberry" else bc
if stdenv.isLinux then "linux" else ];
if stdenv.isDarwin then "darwin" else
"unknown"; dontConfigure = true;
variant = if stdenv.isx86_64 && avxSupport then "avx" else "";
# emulating build_all.sh configuration variables
j64x="j${bits}${variant}"; jplatform =
if stdenv.isDarwin then "darwin"
doCheck = true; else if (stdenv.isAarch32 || stdenv.isAarch64) then "raspberry"
else if stdenv.isLinux then "linux"
# Causes build failure due to warning else "unsupported";
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
j64x =
# Causes build failure due to warning if stdenv.is32bit then "j32"
# https://github.com/jsoftware/jsource/issues/16 else if stdenv.isx86_64 then
NIX_CFLAGS_COMPILE = "-Wno-error=return-local-addr"; if (stdenv.isLinux && avxSupport) then "j64avx" else "j64"
else if stdenv.isAarch64 then
if stdenv.isDarwin then "j64arm" else "j64"
else "unsupported";
buildPhase = '' buildPhase = ''
export SOURCE_DIR=$(pwd) runHook preBuild
export HOME=$TMPDIR
export JLIB=$SOURCE_DIR/jlibrary
echo $OUT_DIR export SRCDIR=$(pwd)
export HOME=$TMPDIR
export JLIB=$SRCDIR/jlibrary
export CC=cc
cd make2 cd make2
patchShebangs . patchShebangs .
sed -i $JLIB/bin/profile.ijs -e "s@'/usr/share/j/.*'@'$out/share/j'@;"
j64x="${j64x}" ./build_all.sh j64x="${j64x}" jplatform="${jplatform}" ./build_all.sh
cp $SOURCE_DIR/bin/${platform}/j${bits}*/* "$JLIB/bin" cp -v $SRCDIR/bin/${jplatform}/${j64x}/* "$JLIB/bin"
runHook postBuild
''; '';
doCheck = true;
checkPhase = '' checkPhase = ''
runHook preCheck
echo 'i. 5' | $JLIB/bin/jconsole | fgrep "0 1 2 3 4" echo "Smoke test"
echo 'i. 10' | $JLIB/bin/jconsole | fgrep "0 1 2 3 4 5 6 7 8 9"
# Now run the real tests # Now run the real tests
cd $SOURCE_DIR/test pushd $SRCDIR/test
for f in *.ijs for f in *.ijs
do do
echo $f echo -n "test $f: "
$JLIB/bin/jconsole < $f > /dev/null || echo FAIL && echo PASS $JLIB/bin/jconsole < $f > /dev/null || echo FAIL && echo PASS
done done
popd
runHook postCheck
''; '';
installPhase = '' installPhase = ''
mkdir -p "$out" runHook preInstall
mkdir -p "$out/share/j" mkdir -p "$out/share/j/"
cp -r $JLIB/{addons,system} "$out/share/j" cp -r $JLIB/{addons,system} "$out/share/j"
cp -r $JLIB/bin "$out" cp -r $JLIB/bin "$out"
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {
homepage = "http://jsoftware.com/";
description = "J programming language, an ASCII-based APL successor"; description = "J programming language, an ASCII-based APL successor";
maintainers = with maintainers; [ raskin synthetica ]; longDescription = ''
platforms = with platforms; linux ++ darwin; J is a high-level, general-purpose programming language that is
particularly suited to the mathematical, statistical, and logical analysis
of data. It is a powerful tool for developing algorithms and exploring
problems that are not already well understood.
'';
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
homepage = "http://jsoftware.com/"; maintainers = with maintainers; [ raskin synthetica AndersonTorres ];
platforms = with platforms; unix;
}; };
} }

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "console-bridge"; pname = "console-bridge";
version = "1.0.1"; version = "1.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ros"; owner = "ros";
repo = "console_bridge"; repo = "console_bridge";
rev = version; rev = version;
sha256 = "18qycrjnf7v8n5bipij91jsv7ap98z5dsp93w2gz9rah4lfjb80q"; sha256 = "sha256-M3GocT0hodw3Sc2NHcFDiPVZ1XN7BqIUuYLW8OaXMqM=";
}; };
nativeBuildInputs = [ cmake validatePkgConfig ]; nativeBuildInputs = [ cmake validatePkgConfig ];

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
zstd zstd
]; ];
NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" ]; NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
meta = with lib; { meta = with lib; {
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/facebook/folly"; homepage = "https://github.com/facebook/folly";
license = licenses.asl20; license = licenses.asl20;
# 32bit is not supported: https://github.com/facebook/folly/issues/103 # 32bit is not supported: https://github.com/facebook/folly/issues/103
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ];
maintainers = with maintainers; [ abbradar pierreis ]; maintainers = with maintainers; [ abbradar pierreis ];
}; };
} }

@ -1,4 +0,0 @@
import ./base.nix {
version = "59.1";
sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki";
}

@ -1,4 +0,0 @@
import ./base.nix {
version = "65.1";
sha256 = "0j6r6qqnhfr5iqkx53k63ifkm93kv1kkb7h2mlgd1mnnndk79qsk";
}

@ -17,13 +17,15 @@ stdenv.mkDerivation rec {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01"; url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01";
sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p"; sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p";
}) })
# Pull upstream fix for -fno-common:
# https://github.com/ImageMagick/libfpx/pull/1
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch";
sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9";
})
]; ];
# This dead code causes a duplicate symbol error in Clang so just remove it
postPatch = if stdenv.cc.isClang then ''
substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" ""
'' else null;
meta = with lib; { meta = with lib; {
homepage = "http://www.imagemagick.org"; homepage = "http://www.imagemagick.org";
description = "A library for manipulating FlashPIX images"; description = "A library for manipulating FlashPIX images";

@ -1,25 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, dbus, expat }:
let version = "1.0.3"; in
stdenv.mkDerivation {
pname = "libnih";
inherit version;
src = fetchurl {
url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dbus expat ];
doCheck = false; # fails 1 of 17 test
meta = {
description = "A small library for C application development";
homepage = "https://launchpad.net/libnih";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}

@ -6,8 +6,6 @@ stdenv.mkDerivation rec {
pname = "libpcap"; pname = "libpcap";
version = "1.10.1"; version = "1.10.1";
outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz"; url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz";
sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ="; sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ=";
@ -29,8 +27,6 @@ stdenv.mkDerivation rec {
if [ "$dontDisableStatic" -ne "1" ]; then if [ "$dontDisableStatic" -ne "1" ]; then
rm -f $out/lib/libpcap.a rm -f $out/lib/libpcap.a
fi fi
moveToOutput "bin/pcap-config" "$dev"
''; '';
meta = { meta = {

@ -7,6 +7,7 @@
# This will cause c_rehash to refer to perl via the environment, but otherwise # This will cause c_rehash to refer to perl via the environment, but otherwise
# will produce a perfectly functional openssl binary and library. # will produce a perfectly functional openssl binary and library.
, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform , withPerl ? stdenv.hostPlatform == stdenv.buildPlatform
, removeReferencesTo
}: }:
# Note: this package is used for bootstrapping fetchurl, and thus # Note: this package is used for bootstrapping fetchurl, and thus
@ -112,7 +113,11 @@ let
# OpenSSL needs a specific `no-shared` configure flag. # OpenSSL needs a specific `no-shared` configure flag.
# See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
# for a comprehensive list of configuration options. # for a comprehensive list of configuration options.
++ lib.optional (lib.versionAtLeast version "1.1.0" && static) "no-shared"; ++ lib.optional (lib.versionAtLeast version "1.1.0" && static) "no-shared"
# This introduces a reference to the CTLOG_FILE which is undesired when
# trying to build binaries statically.
++ lib.optional static "no-ct"
;
makeFlags = [ makeFlags = [
"MANDIR=$(man)/share/man" "MANDIR=$(man)/share/man"
@ -126,13 +131,16 @@ let
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = postInstall =
lib.optionalString (!static) '' (if static then ''
# OPENSSLDIR has a reference to self
${removeReferencesTo}/bin/remove-references-to -t $out $out/lib/*.a
'' else ''
# If we're building dynamic libraries, then don't install static # If we're building dynamic libraries, then don't install static
# libraries. # libraries.
if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
rm "$out/lib/"*.a rm "$out/lib/"*.a
fi fi
'' + lib.optionalString (!stdenv.hostPlatform.isWindows) '') + lib.optionalString (!stdenv.hostPlatform.isWindows)
# Fix bin/c_rehash's perl interpreter line # Fix bin/c_rehash's perl interpreter line
# #
# - openssl 1_0_2: embeds a reference to buildPackages.perl # - openssl 1_0_2: embeds a reference to buildPackages.perl

@ -3,12 +3,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.7"; version = "0.9.8";
pname = "podofo"; pname = "podofo";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz";
sha256 = "1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw"; sha256 = "sha256-XeYH4V8ZK4rZBzgwB1nYjeoPXM3OO/AASKDJMrxkUVQ=";
}; };
outputs = [ "out" "dev" "lib" ]; outputs = [ "out" "dev" "lib" ];

@ -43,6 +43,13 @@ let
) )
]; ];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: CMakeFiles/prom.dir/src/prom_process_stat.c.o:(.bss+0x0): multiple definition of
# `prom_process_start_time_seconds'; CMakeFiles/prom.dir/src/prom_collector.c.o:(.bss+0x0): first defined here
# Should be fixed in 1.2.0 and later: https://github.com/digitalocean/prometheus-client-c/pull/25
NIX_CFLAGS_COMPILE = "-fcommon";
preConfigure = '' preConfigure = ''
cd ${subdir} cd ${subdir}
''; '';

@ -0,0 +1,40 @@
{ lib
, mkDerivation
, fetchFromGitHub
, qmake
, qtbase
}:
mkDerivation rec {
pname = "qtmpris";
version = "1.0.6";
src = fetchFromGitHub {
owner = "sailfishos";
repo = "qtmpris";
rev = version;
hash = "sha256-kuM8hUdsa7N+eLDbwYw3ay+PWxg35zcTBOvGow1NlzI=";
};
postPatch = ''
substituteInPlace src/src.pro \
--replace '$$[QT_INSTALL_LIBS]' "$out/lib" \
--replace '$$[QT_INSTALL_HEADERS]' "$out/include" \
--replace '$$[QMAKE_MKSPECS]' "$out/mkspecs"
'';
nativeBuildInputs = [
qmake
];
buildInputs = [
qtbase
];
meta = {
description = "Qt and QML MPRIS interface and adaptor";
homepage = "https://github.com/sailfishos/qtmpris";
license = lib.licenses.lgpl21Plus;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lrs"; pname = "lrs";
version = "7.0"; version = "7.2";
src = fetchurl { src = fetchurl {
url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-070.tar.gz"; url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-072.tar.gz";
sha256 = "1zjdmkjracz695k73c2pvipc0skpyn1wzagkhilsvcw9pqljpwg9"; sha256 = "1w1jsnfgny8cihndr5gfm99pvwp48qsvxkqfsi2q87gd3m57aj7w";
}; };
buildInputs = [ gmp ]; buildInputs = [ gmp ];

@ -1,8 +1,11 @@
{ lib, stdenv { stdenv
, lib
, fetchurl , fetchurl
, meson
, ninja
, pkg-config , pkg-config
, libxslt , libxslt
, docbook_xsl , docbook-xsl-nons
, docbook_xml_dtd_43 , docbook_xml_dtd_43
, dbus , dbus
, glib , glib
@ -10,17 +13,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xdg-dbus-proxy"; pname = "xdg-dbus-proxy";
version = "0.1.3"; version = "0.1.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz"; url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-A7XSjKh5JT3bvOMQmJCb7MoUleqBGmN3pJLijxbAm5s="; sha256 = "sha256-HsDqtT0eSZZtciNSvP1RrEAtzlGQuu3HSahUHnYWcKs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
meson
ninja
pkg-config pkg-config
libxslt libxslt
docbook_xsl docbook-xsl-nons
docbook_xml_dtd_43 docbook_xml_dtd_43
]; ];
@ -32,10 +37,6 @@ stdenv.mkDerivation rec {
dbus dbus
]; ];
configureFlags = [
"--enable-man"
];
# dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory
doCheck = false; doCheck = false;

@ -1,12 +1,22 @@
{ lib, fetchurl, buildDunePackage }: { lib, fetchurl, ocaml, buildDunePackage }:
let params =
if lib.versionAtLeast ocaml.version "4.08" then {
version = "1.3.3";
sha256 = "sha256:05n4mm1yz33h9gw811ivjw7x4m26lpmf7kns9lza4v6227lwmz7a";
} else {
version = "1.3.2";
sha256 = "sha256:09hrikx310pac2sb6jzaa7k6fmiznnmhdsqij1gawdymhawc4h1l";
};
in
buildDunePackage rec { buildDunePackage rec {
pname = "easy-format"; pname = "easy-format";
version = "1.3.2"; inherit (params) version;
src = fetchurl { src = fetchurl {
url = "https://github.com/ocaml-community/easy-format/releases/download/${version}/easy-format-${version}.tbz"; url = "https://github.com/ocaml-community/easy-format/releases/download/${version}/easy-format-${version}.tbz";
sha256 = "sha256:09hrikx310pac2sb6jzaa7k6fmiznnmhdsqij1gawdymhawc4h1l"; inherit (params) sha256;
}; };
doCheck = true; doCheck = true;

@ -12,12 +12,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ansible-compat"; pname = "ansible-compat";
version = "2.0.3"; version = "2.0.4";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-oRV+QFneQYefP2XV7WK/ND/lvUUoYQHi0pcf/lfjqKU="; sha256 = "sha256-PV+yHB/waehKxfwX9sjSJhwqeymZhr6BDTOd/HfBKKk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

@ -1,4 +1,4 @@
{ lib, stdenv, buildPythonPackage, fetchpatch, fetchPypi, isPy27 { lib, stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder
, aiodns , aiodns
, aiohttp , aiohttp
, flask , flask
@ -17,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
version = "1.24.0"; version = "1.24.0";
pname = "azure-core"; pname = "azure-core";
disabled = isPy27; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-recoveryservicesbackup"; pname = "azure-mgmt-recoveryservicesbackup";
version = "4.2.0"; version = "5.0.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
hash = "sha256-At0BP9mWJneG65FDZuQXTnikaNcEWe+GtTr9ZPri89M="; hash = "sha256-BciA3sFyja5xo9yS3WVglC73y8gTfw8UejdEzbD4HYE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -7,13 +7,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.8.0"; version = "0.9.0";
pname = "azure-multiapi-storage"; pname = "azure-multiapi-storage";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-ZRiqnxPRdSOqyRMwuvxqKiZcxMbhVEYJ09CIlepc/B4="; sha256 = "sha256-7uq8uRZ3MXI1Gy+DmMkRVNV7uZPw6j8r9KfhS8d+tCY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bc-python-hcl2"; pname = "bc-python-hcl2";
version = "0.3.39"; version = "0.3.40";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-JMQ2sLgAnMJ1/0nR8LgKbpPB43gVKtCtrZKr/T4p0O8="; hash = "sha256-4we2Txk7kJ1SrCa82eQJ9OsqyTkFzocNi+GG7cV+OAc=";
}; };
# Nose is required during build process, so can not use `checkInputs`. # Nose is required during build process, so can not use `checkInputs`.

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bugsnag"; pname = "bugsnag";
version = "4.2.0"; version = "4.2.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-NnTn4m9we40Ww2abP7mbz1CtdypZyN2GYBvj8zxhOpI="; hash = "sha256-PT6XaKz3QFAEhCmS7jXKK7xxscNlpbhGpCKQIRuSt6U=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -1,8 +1,9 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
, python, twisted, jinja2, zope_interface, sqlalchemy, alembic, python-dateutil , python, twisted, jinja2, msgpack, zope_interface, sqlalchemy, alembic
, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, txrequests, pypugjs, boto3 , python-dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pypugjs
, moto, mock, lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker , boto3, moto, mock, lz4, setuptoolsTrial, isort, pylint, flake8
, buildbot-pkg, buildbot-plugins, parameterized, git, openssh, glibcLocales , buildbot-worker, buildbot-pkg, buildbot-plugins, parameterized, git, openssh
, glibcLocales
, nixosTests , nixosTests
}: }:
@ -42,6 +43,7 @@ let
# core # core
twisted twisted
jinja2 jinja2
msgpack
zope_interface zope_interface
sqlalchemy sqlalchemy
alembic alembic
@ -50,7 +52,6 @@ let
autobahn autobahn
pyjwt pyjwt
pyyaml pyyaml
unidiff
] ]
# tls # tls
++ twisted.extras-require.tls; ++ twisted.extras-require.tls;

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cachelib"; pname = "cachelib";
version = "0.6.0"; version = "0.7.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pallets"; owner = "pallets";
repo = pname; repo = pname;
rev = version; rev = "refs/tags/${version}";
sha256 = "sha256-1msDiNYxaETJfVBTaMuNJbSxhOpyRdHkb5CQ+1+ZbbQ="; sha256 = "sha256-/378xNkBZHoTJ9Qs8RTYi+QosLs7GBgMOkIDYOaSH1Y=";
}; };
checkInputs = [ checkInputs = [

@ -72,6 +72,7 @@ buildPythonPackage rec {
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
"http_over_https_error" "http_over_https_error"
"bind_addr_unix" "bind_addr_unix"
"test_ssl_env"
]; ];
disabledTestPaths = [ disabledTestPaths = [

@ -16,14 +16,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cvxpy"; pname = "cvxpy";
version = "1.2.0"; version = "1.2.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-QURm/ehJovqr/ZRE7ILKLnvxQsAdcjdSTPlzCt60IBw="; sha256 = "sha256-bWdkJkPR3bLyr1m0Zrh9QsSi42eDGte0PDO1nu+ltQ4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -12,13 +12,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-anymail"; pname = "django-anymail";
version = "8.5"; version = "8.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anymail"; owner = "anymail";
repo = pname; repo = pname;
rev = "v${version}"; rev = "refs/tags/v${version}";
sha256 = "1p2c7hf9baxr8khk8h7y8d38imw4zm920dgd9nbda18vlh7gpbcf"; sha256 = "sha256-hLNILUV7qzqHfh7l3SJAoFveUIRSCHTjEQ3ZC3PhZUY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -12,11 +12,12 @@
, mock , mock
, pkgs , pkgs
, urllib3 , urllib3
, paramiko
, pythonOlder , pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.20.35"; version = "0.20.36";
pname = "dulwich"; pname = "dulwich";
format = "setuptools"; format = "setuptools";
@ -24,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-lT9jAanfigkfqI1V7tOUqIv5mIzei+NBd1NUkQkYwZY="; hash = "sha256-2s7xVJwSdffS1v7NLyz6O6ozB9AJpRTAwjIDP2uqXSE=";
}; };
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
@ -43,6 +44,7 @@ buildPythonPackage rec {
gpgme gpgme
pkgs.gnupg pkgs.gnupg
mock mock
paramiko
]; ];
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fastcore"; pname = "fastcore";
version = "1.4.2"; version = "1.4.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "fastai"; owner = "fastai";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-0q+qFrfMsXkwgu08igt2kHZ9c3/aqz/inCpJXkPZsdg="; sha256 = "sha256-3l5bELb5f/cvh4gF2kJZEX6kAK9achTerIIplMuesTk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -7,6 +7,8 @@
, numpy , numpy
, aiohttp , aiohttp
, pytest-vcr , pytest-vcr
, pytest-mock
, pytest-asyncio
, requests , requests
, paramiko , paramiko
, smbprotocol , smbprotocol
@ -14,14 +16,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fsspec"; pname = "fsspec";
version = "2022.01.0"; version = "2022.3.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intake"; owner = "intake";
repo = "filesystem_spec"; repo = "filesystem_spec";
rev = version; rev = version;
sha256 = "sha256-iPe2q9hY3ZRIKQGpxrHda3t9G0AtbtohVcWdnAzlzCo="; sha256 = "sha256-jTF8R0kaHMsCYg+7YFi21Homn63K+ulp9NDZC/jkIXM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -34,6 +36,8 @@ buildPythonPackage rec {
checkInputs = [ checkInputs = [
numpy numpy
pytest-vcr pytest-vcr
pytest-mock
pytest-asyncio
pytestCheckHook pytestCheckHook
]; ];
@ -59,6 +63,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/intake/filesystem_spec"; homepage = "https://github.com/intake/filesystem_spec";
description = "A specification that Python filesystems should adhere to"; description = "A specification that Python filesystems should adhere to";
changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.costrouc ]; maintainers = [ maintainers.costrouc ];
}; };

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "gcal-sync"; pname = "gcal-sync";
version = "0.7.1"; version = "0.8.0";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "allenporter"; owner = "allenporter";
repo = "gcal_sync"; repo = "gcal_sync";
rev = version; rev = version;
hash = "sha256-NOB74P+5i63FEeHJsPXRdRgY6iyIUEn7BogbVKm8P5M="; hash = "sha256-Qk4WlMVyzOK2uyrUlJw9Q8ENtNT3PZ7FKTlCtPsm2v0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -15,14 +15,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "graphtage"; pname = "graphtage";
version = "0.2.5"; version = "0.2.6";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trailofbits"; owner = "trailofbits";
repo = pname; repo = pname;
rev = "v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-cFOTbPv7CnRdet7bx5LVq5xp9LG4yNm0oxlW5aSEeZs="; sha256 = "sha256-ZazqtrrCsoeJK7acj7Unpl+ZI2JL/khMN2aOSHdCHl0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -21,7 +21,7 @@
let let
pname = "hatchling"; pname = "hatchling";
version = "0.24.0"; version = "0.25.0";
in in
buildPythonPackage { buildPythonPackage {
inherit pname version; inherit pname version;
@ -29,7 +29,7 @@ buildPythonPackage {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-zmdl9bW688tX0vgBlsUOIB43KMrNlTU/XJtPA9/fTrk="; hash = "sha256-k/bjZvGaOjZshVr6w3Jb7XaC1dAOlIaraFQKCth2ZII=";
}; };
# listed in backend/src/hatchling/ouroboros.py # listed in backend/src/hatchling/ouroboros.py

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "herepy"; pname = "herepy";
version = "3.5.7"; version = "3.5.8";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
@ -17,8 +17,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "abdullahselek"; owner = "abdullahselek";
repo = "HerePy"; repo = "HerePy";
rev = version; rev = "refs/tags/${version}";
hash = "sha256-iPFFEFGH3csqzDtBtLkVkUezObwiMHNbiD/mTgIrdpo="; hash = "sha256-BwuH3GxEXiIFFM0na8Jhgp7J5TPW41/u89LWf+EprG4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi }: { lib, buildPythonPackage, fetchPypi, yajl, cffi, pytestCheckHook }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "ijson"; pname = "ijson";
@ -9,7 +9,11 @@ buildPythonPackage rec {
sha256 = "1d1003ae3c6115ec9b587d29dd136860a81a23c7626b682e2b5b12c9fd30e4ea"; sha256 = "1d1003ae3c6115ec9b587d29dd136860a81a23c7626b682e2b5b12c9fd30e4ea";
}; };
doCheck = false; # something about yajl buildInputs = [ yajl ];
propagatedBuildInputs = [ cffi ];
checkInputs = [ pytestCheckHook ];
doCheck = true;
meta = with lib; { meta = with lib; {
description = "Iterative JSON parser with a standard Python iterator interface"; description = "Iterative JSON parser with a standard Python iterator interface";

@ -8,12 +8,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ipympl"; pname = "ipympl";
version = "0.9.0"; version = "0.9.1";
format = "wheel"; format = "wheel";
src = fetchPypi { src = fetchPypi {
inherit pname version format; inherit pname version format;
sha256 = "sha256-HpO3T/zRbimxd1+nUkbSmclj7nPsMYuSUK0VJItZQs4="; sha256 = "sha256-NQW0ctQSF4/RFeJVdk0efnYy1sgunebWKyVDijU3RoA=";
}; };

@ -8,12 +8,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "manuel"; pname = "manuel";
version = "1.10.1"; version = "1.11.2";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1bdzay7j70fly5fy6wbdi8fbrxjrrlxnxnw226rwry1c8a351rpy"; sha256 = "sha256-nJt3WMQ66oa3VlW5InJCzOea96Wf7WwxSbBp9WIfzqc=";
}; };
propagatedBuildInputs = [ six ]; propagatedBuildInputs = [ six ];

@ -3,12 +3,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "4.23.0"; version = "4.26.0";
pname = "mt-940"; pname = "mt-940";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9274bc8298b2d4b69cb3936bdcda315b50e45975789f519a237bdec58346b8d7"; sha256 = "sha256-HL56TXZNkjVnap0XIhBT/xDA2N80NLCLpvuXkxXu6zE=";
}; };
propagatedBuildInputs = lib.optional (!isPy3k) enum34; propagatedBuildInputs = lib.optional (!isPy3k) enum34;

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "numpy-stl"; pname = "numpy-stl";
version = "2.16.3"; version = "2.17.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "95890627001efb2cb8d17418730cdc1bdd64b8dbb9862b01a8e0359d79fe863e"; sha256 = "sha256-G42ak4w4OAbE2RTe3STN03A43/rZqJBbB8rBm0TlOWU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -27,7 +27,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ocrmypdf"; pname = "ocrmypdf";
version = "13.4.3"; version = "13.4.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jbarlow83"; owner = "jbarlow83";
@ -39,7 +39,7 @@ buildPythonPackage rec {
extraPostFetch = '' extraPostFetch = ''
rm "$out/.git_archival.txt" rm "$out/.git_archival.txt"
''; '';
hash = "sha256-kriT3NV9Lj44WjOeK6+pILjfRMt9QMcKU57si394xxI="; hash = "sha256-uFKnohUxh17h6u0vwVB7EaTEh5NRowP8a6za63Ehodk=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;

@ -59,16 +59,6 @@ buildPythonPackage rec {
# https://github.com/NixOS/nixpkgs/issues/39687 # https://github.com/NixOS/nixpkgs/issues/39687
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
# For OSX, we need to add a dependency on libcxx, which provides
# `complex.h` and other libraries that pandas depends on to build.
postPatch = lib.optionalString stdenv.isDarwin ''
cpp_sdk="${lib.getDev libcxx}/include/c++/v1";
echo "Adding $cpp_sdk to the setup.py common_include variable"
substituteInPlace setup.py \
--replace "['pandas/src/klib', 'pandas/src']" \
"['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
'';
doCheck = !stdenv.isAarch32 && !stdenv.isAarch64; # upstream doesn't test this architecture doCheck = !stdenv.isAarch32 && !stdenv.isAarch64; # upstream doesn't test this architecture
# don't max out build cores, it breaks tests # don't max out build cores, it breaks tests

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pg8000"; pname = "pg8000";
version = "1.26.1"; version = "1.28.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-zNK2/hkK3ddMCTpivgcwuemfPqA6oO96uV7Rt/9p0lc="; sha256 = "sha256-Q1E949TjeOc6xEKpOQa6qdNWJFqmeqf2FgXFbjmn9ZE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -25,7 +25,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pikepdf"; pname = "pikepdf";
version = "5.1.2"; version = "5.1.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -40,7 +40,7 @@ buildPythonPackage rec {
extraPostFetch = '' extraPostFetch = ''
rm "$out/.git_archival.txt" rm "$out/.git_archival.txt"
''; '';
hash = "sha256-VR2/+XCQb62FdkGZBxP2XTqatdFYZO1ngb8gvoJEvzs="; hash = "sha256-jkAwc1bQ1jRDf/qY+xAjiLXXO98qKjyX+J7Lu4tYWoI=";
}; };
patches = [ patches = [

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "poetry-dynamic-versioning"; pname = "poetry-dynamic-versioning";
version = "0.16.0"; version = "0.17.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "mtkennerly"; owner = "mtkennerly";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-dLtZSm10OYWLRK4eRo83RczW0zBVAUF0HQXLQbeDJCk="; hash = "sha256-u4rqkwy5C1+OrHJUsc/9Sy3YyxWlsTv8cbB1bBKh2K4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

@ -10,14 +10,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pylsp-mypy"; pname = "pylsp-mypy";
version = "0.5.7"; version = "0.5.8";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Richardk2n"; owner = "Richardk2n";
repo = "pylsp-mypy"; repo = "pylsp-mypy";
rev = version; rev = "refs/tags/${version}";
sha256 = "0am16z9kmj57r5pi32jhzlbdngzmvzzaiqjm7cba1izh7w5m6dvc"; sha256 = "sha256-Yu1e/8gYFYEZ/IoFo8WnyRNYkCZ9i7NgjEjYBbagWMA=";
}; };
disabledTests = [ disabledTests = [

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

Loading…
Cancel
Save