Merge master into haskell-updates

main
github-actions[bot] 2 years ago committed by GitHub
commit 0e6e7745fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  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. 2
      nixos/modules/services/networking/wg-quick.nix
  11. 27
      nixos/modules/services/web-apps/nextcloud.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. 2
      pkgs/applications/finance/odoo/default.nix
  17. 4
      pkgs/applications/graphics/ImageMagick/7.0.nix
  18. 4
      pkgs/applications/misc/logseq/default.nix
  19. 2
      pkgs/applications/misc/plover/default.nix
  20. 2
      pkgs/applications/misc/safeeyes/default.nix
  21. 4
      pkgs/applications/networking/cluster/driftctl/default.nix
  22. 6
      pkgs/applications/networking/cluster/nerdctl/default.nix
  23. 25
      pkgs/applications/networking/cluster/terraform-inventory/default.nix
  24. 20
      pkgs/applications/networking/cluster/terraform-inventory/deps.nix
  25. 14
      pkgs/applications/networking/cluster/terraform-providers/providers.json
  26. 7
      pkgs/applications/networking/cluster/terraform-providers/update-provider
  27. 4
      pkgs/applications/networking/instant-messengers/cinny/default.nix
  28. 4
      pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
  29. 1
      pkgs/applications/networking/mailreaders/mutt/default.nix
  30. 2
      pkgs/applications/networking/opsdroid/default.nix
  31. 2
      pkgs/applications/office/fava/default.nix
  32. 6
      pkgs/applications/office/jameica/default.nix
  33. 6
      pkgs/applications/plasma-mobile/angelfish.nix
  34. 21
      pkgs/applications/plasma-mobile/audiotube.nix
  35. 2
      pkgs/applications/plasma-mobile/default.nix
  36. 2
      pkgs/applications/plasma-mobile/fetch.sh
  37. 8
      pkgs/applications/plasma-mobile/kasts.nix
  38. 2
      pkgs/applications/plasma-mobile/krecorder.nix
  39. 12
      pkgs/applications/plasma-mobile/neochat.nix
  40. 16
      pkgs/applications/plasma-mobile/plasma-dialer.nix
  41. 4
      pkgs/applications/plasma-mobile/plasma-settings.nix
  42. 41
      pkgs/applications/plasma-mobile/plasmatube.nix
  43. 9
      pkgs/applications/plasma-mobile/spacebar.nix
  44. 184
      pkgs/applications/plasma-mobile/srcs.nix
  45. 1
      pkgs/applications/science/biology/EZminc/default.nix
  46. 4
      pkgs/applications/science/misc/snakemake/default.nix
  47. 50
      pkgs/applications/science/physics/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch
  48. 8
      pkgs/applications/science/physics/xfitter/default.nix
  49. 13
      pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
  50. 7
      pkgs/applications/version-management/git-and-tools/git-sync/default.nix
  51. 2
      pkgs/applications/video/screenkey/default.nix
  52. 12
      pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix
  53. 15
      pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
  54. 5
      pkgs/development/compilers/go/1.17.nix
  55. 8
      pkgs/development/compilers/spirv-llvm-translator/default.nix
  56. 34
      pkgs/development/compilers/vlang/default.nix
  57. 133
      pkgs/development/compilers/vlang/disable_vcreate_test.patch
  58. 105
      pkgs/development/interpreters/j/default.nix
  59. 12
      pkgs/development/libraries/SDL2/default.nix
  60. 51
      pkgs/development/libraries/atk/default.nix
  61. 4
      pkgs/development/libraries/console-bridge/default.nix
  62. 34
      pkgs/development/libraries/dbus/default.nix
  63. 15
      pkgs/development/libraries/dbus/docs-reproducible-ids.patch
  64. 4
      pkgs/development/libraries/fribidi/default.nix
  65. 6
      pkgs/development/libraries/gettext/default.nix
  66. BIN
      pkgs/development/libraries/glibc/2.34-master.patch.gz
  67. 4
      pkgs/development/libraries/glibc/common.nix
  68. 13
      pkgs/development/libraries/gstreamer/base/default.nix
  69. 14
      pkgs/development/libraries/gstreamer/core/default.nix
  70. 1
      pkgs/development/libraries/http-parser/default.nix
  71. 4
      pkgs/development/libraries/icu/59.nix
  72. 4
      pkgs/development/libraries/icu/65.nix
  73. 4
      pkgs/development/libraries/kerberos/krb5.nix
  74. 4
      pkgs/development/libraries/libbsd/default.nix
  75. 12
      pkgs/development/libraries/libclc/default.nix
  76. 12
      pkgs/development/libraries/libical/default.nix
  77. 25
      pkgs/development/libraries/libnih/default.nix
  78. 4
      pkgs/development/libraries/libnotify/default.nix
  79. 14
      pkgs/development/libraries/openssl/default.nix
  80. 4
      pkgs/development/libraries/pango/default.nix
  81. 4
      pkgs/development/libraries/podofo/default.nix
  82. 7
      pkgs/development/libraries/prometheus-client-c/default.nix
  83. 40
      pkgs/development/libraries/qtmpris/default.nix
  84. 6
      pkgs/development/libraries/science/math/lrs/default.nix
  85. 4
      pkgs/development/libraries/sqlite/default.nix
  86. 4
      pkgs/development/libraries/sqlite/tools.nix
  87. 19
      pkgs/development/libraries/xdg-dbus-proxy/default.nix
  88. 16
      pkgs/development/ocaml-modules/easy-format/default.nix
  89. 24
      pkgs/development/python-modules/Babel/default.nix
  90. 4
      pkgs/development/python-modules/Mako/default.nix
  91. 4
      pkgs/development/python-modules/Nikola/default.nix
  92. 28
      pkgs/development/python-modules/Pygments/default.nix
  93. 4
      pkgs/development/python-modules/agate/default.nix
  94. 4
      pkgs/development/python-modules/ansible-compat/default.nix
  95. 2
      pkgs/development/python-modules/apache-airflow/default.nix
  96. 4
      pkgs/development/python-modules/apprise/default.nix
  97. 18
      pkgs/development/python-modules/azure-core/default.nix
  98. 4
      pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
  99. 4
      pkgs/development/python-modules/azure-multiapi-storage/default.nix
  100. 25
      pkgs/development/python-modules/babel/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
checkConfigOutput '^"b a"$' config.result ./functionTo/list-order.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
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;
merge = loc: defs:
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;
substSubModules = m: functionTo (elemType.substSubModules m);
functor = (defaultFunctor "functionTo") // { wrapped = elemType; };
nestedTypes.elemType = elemType;
};
# A submodule (like typed attribute set). See NixOS manual.

@ -2514,6 +2514,16 @@ cp /var/lib/redis/dump.rdb &quot;/var/lib/redis-mastodon/dump.rdb&quot;
enabled.
</para>
</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>
<para>
The <literal>spark3</literal> package has been updated from

@ -892,6 +892,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
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)):
- Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`.

@ -20,7 +20,13 @@
<title>Configuration Options</title>
<variablelist xml:id="configuration-variable-list">
<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>
<term xlink:href="#{$id}">
<xsl:attribute name="xml:id"><xsl:value-of select="$id"/></xsl:attribute>

@ -250,7 +250,7 @@ in
};
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 != [ ])
"findutils locate does not support pruning by directory component"
++ optional (isFindutils && cfg.pruneBindMounts)

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

@ -211,7 +211,7 @@ let
postUp =
optional (values.privateKeyFile != null) "wg set ${name} private-key <(cat ${values.privateKeyFile})" ++
(concatMap (peer: optional (peer.presharedKeyFile != null) "wg set ${name} peer ${peer.publicKey} preshared-key <(cat ${peer.presharedKeyFile})") values.peers) ++
optional (values.postUp != null) values.postUp;
optional (values.postUp != "") values.postUp;
postUpFile = if postUp != [] then writeScriptFile "postUp.sh" (concatMapStringsSep "\n" (line: line) postUp) else null;
preDownFile = if values.preDown != "" then writeScriptFile "preDown.sh" values.preDown else null;
postDownFile = if values.postDown != "" then writeScriptFile "postDown.sh" values.postDown else null;

@ -546,10 +546,23 @@ in {
'';
};
nginx.recommendedHttpHeaders = mkOption {
type = types.bool;
default = true;
description = "Enable additional recommended HTTP response headers";
nginx = {
recommendedHttpHeaders = mkOption {
type = types.bool;
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}',
${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"}
'log_type' => 'syslog',
'log_level' => '${builtins.toString cfg.logLevel}',
'loglevel' => '${builtins.toString cfg.logLevel}',
${optionalString (c.overwriteProtocol != null) "'overwriteprotocol' => '${c.overwriteProtocol}',"}
${optionalString (c.dbname != null) "'dbname' => '${c.dbname}',"}
${optionalString (c.dbhost != null) "'dbhost' => '${c.dbhost}',"}
@ -983,7 +996,9 @@ in {
add_header X-Permitted-Cross-Domain-Policies none;
add_header X-Frame-Options sameorigin;
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};
fastcgi_buffers 64 4K;

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

@ -39,6 +39,13 @@ stdenv.mkDerivation rec {
"--enable-keccak"
"--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; {
description = "CPU/GPU miner in c for bitcoin";
homepage = "https://github.com/ckolivas/cgminer";

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

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

@ -93,7 +93,7 @@ in python.pkgs.buildPythonApplication rec {
makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" ];
propagatedBuildInputs = with python.pkgs; [
Babel
babel
chardet
decorator
docutils

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.6.8";
version = "0.6.9";
src = fetchurl {
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";
};

@ -48,7 +48,7 @@
postPatch = "sed -i /PyQt5/d setup.cfg";
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth setuptools ];
propagatedBuildInputs = [ babel pyqt5 xlib pyserial appdirs wcwidth setuptools ];
dontWrapQtApps = true;

@ -25,7 +25,7 @@ in buildPythonApplication rec {
];
propagatedBuildInputs = with python3Packages; [
Babel
babel
psutil
xlib
pygobject3

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

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

@ -1,22 +1,25 @@
{ lib, buildGoPackage, fetchFromGitHub}:
{ lib, buildGoModule, fetchFromGitHub, testers, terraform-inventory }:
buildGoPackage rec {
buildGoModule rec {
pname = "terraform-inventory";
version = "0.7-pre";
rev = "v${version}";
goPackagePath = "github.com/adammck/terraform-inventory";
subPackages = [ "./" ];
version = "0.10";
src = fetchFromGitHub {
inherit rev;
owner = "adammck";
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; {
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",
"provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github",
"rev": "v4.25.0-alpha",
"sha256": "sha256-9BE19VywtNIeDfjBKzle5nGFPmpS8lHV60w0h2xTztU=",
"rev": "v4.24.1",
"sha256": "sha256-1fwHMN2HIVl+8ZL7OtP1U5ORc41e7Tm3qEpMqIgWL20=",
"vendorSha256": null,
"version": "4.25.0-alpha"
"version": "4.24.1"
},
"gitlab": {
"owner": "gitlabhq",
@ -719,10 +719,10 @@
"owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/metal",
"repo": "terraform-provider-metal",
"rev": "v3.3.0-alpha.3",
"sha256": "sha256-wuZp0Be8a84y7JqpCGnBDPXgNG8JJcNWsIICP3ZjSVk=",
"vendorSha256": "sha256-Ln9EyycPduVuj+JefH9f+Q5KlNGvbcwcEDgaqH2M0So=",
"version": "3.3.0-alpha.3"
"rev": "v3.2.2",
"sha256": "193897farpyb3zxz6p79mfaf04ccin7xdirbkclqb3x3c56jy0xi",
"vendorSha256": null,
"version": "3.2.2"
},
"minio": {
"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
echo_provider "already at version ${version}"
exit
else
echo_provider "updating from ${old_version} to ${version}"
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}"
provider_source_url="$(jq -r '.source' <<<"${registry_response}")"

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

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

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

@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec {
doCheck = false;
propagatedBuildInputs = with python3Packages; [
click Babel opsdroid_get_image_size slackclient webexteamssdk bleach
click babel opsdroid_get_image_size slackclient webexteamssdk bleach
parse emoji puremagic yamale nbformat websockets pycron nbconvert
aiohttp matrix-api-async aioredis aiosqlite arrow pyyaml motor regex
mattermostdriver setuptools voluptuous ibm-watson tailer multidict

@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
propagatedBuildInputs = with python3.pkgs; [
Babel
babel
beancount
cheroot
click

@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }:
let
_version = "2.10.1";
_build = "482";
_version = "2.10.2";
_build = "484";
version = "${_version}-${_build}";
swtSystem = if stdenv.hostPlatform.system == "i686-linux" then "linux"
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
owner = "willuhn";
repo = "jameica";
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

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

@ -1,8 +1,8 @@
{ lib
, mkDerivation
, fetchpatch
, extra-cmake-modules
, gcc11
, kcoreaddons
, kcrash
@ -16,16 +16,9 @@
mkDerivation rec {
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 = [
extra-cmake-modules
gcc11 # doesn't build with GCC 9 from stdenv on aarch64
python3Packages.wrapPython
python3Packages.pybind11
];
@ -37,13 +30,11 @@ mkDerivation rec {
kirigami2
qtmultimedia
qtquickcontrols2
python3Packages.youtube-dl
python3Packages.ytmusicapi
];
] ++ pythonPath;
pythonPath = [
python3Packages.youtube-dl
python3Packages.ytmusicapi
pythonPath = with python3Packages; [
yt-dlp
ytmusicapi
];
preFixup = ''

@ -73,9 +73,11 @@ let
krecorder = callPackage ./krecorder.nix {};
ktrip = callPackage ./ktrip.nix {};
kweather = callPackage ./kweather.nix {};
neochat = callPackage ./neochat.nix {};
plasma-dialer = callPackage ./plasma-dialer.nix {};
plasma-phonebook = callPackage ./plasma-phonebook.nix {};
plasma-settings = callPackage ./plasma-settings.nix {};
plasmatube = callPackage ./plasmatube.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
, ki18n
, kirigami2
, networkmanager-qt
, qtkeychain
, qtmultimedia
, qtquickcontrols2
, syndication
, taglib
}:
let
@ -37,9 +40,12 @@ mkDerivation rec {
kcoreaddons
ki18n
kirigami2
qtquickcontrols2
networkmanager-qt
qtkeychain
qtmultimedia
qtquickcontrols2
syndication
taglib
];
preFixup = ''

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

@ -1,6 +1,5 @@
{ mkDerivation
, lib
, fetchFromGitLab
, pkg-config
, cmake
, cmark
@ -28,15 +27,6 @@
mkDerivation rec {
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 ];
@ -64,7 +54,7 @@ mkDerivation rec {
];
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";
license = licenses.gpl3Only;
maintainers = with maintainers; [ peterhoeg ];

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

@ -11,6 +11,8 @@
, kdbusaddons
, ki18n
, kitemmodels
, modemmanager-qt
, networkmanager-qt
, plasma-framework
}:
@ -29,6 +31,8 @@ mkDerivation rec {
kdbusaddons
ki18n
kitemmodels
modemmanager-qt
networkmanager-qt
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
, libphonenumber
, libqofono
, modemmanager-qt
, protobuf
, telepathy
, qcoro
, qtquickcontrols2
}:
mkDerivation rec {
@ -30,9 +32,10 @@ mkDerivation rec {
knotifications
kpeople
libphonenumber
libqofono
modemmanager-qt
protobuf # Needed by libphonenumber
telepathy
qcoro
qtquickcontrols2
];
meta = with lib; {

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

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

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "snakemake";
version = "7.6.2";
version = "7.7.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-mIl5c+HR2kqgJzbLVTQjJlf4Ca/+Icqg9G49yIUyipc=";
hash = "sha256-KAnilLq7hZy5IU8d95D9sHSGfqibAvUAW3bRH/JwGnw=";
};
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=";
};
preConfigure = ''
substituteInPlace CMakeLists.txt \
--replace "-fallow-argument-mismatch" ""
'';
patches = [
# Avoid need for -fallow-argument-mismatch
./0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch
];
nativeBuildInputs = [ cmake gfortran pkg-config ];
buildInputs =

@ -4,16 +4,16 @@ with rustPlatform;
buildRustPackage rec {
pname = "git-ignore";
version = "1.1.1";
version = "1.2.0";
src = fetchFromGitHub {
owner = "sondr3";
repo = pname;
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 ];
buildInputs = [ openssl ]
@ -21,9 +21,10 @@ buildRustPackage rec {
darwin.apple_sdk.frameworks.Security
];
outputs = [ "out" "man" ];
preFixup = ''
installManPage $releaseDir/build/git-ignore-*/out/git-ignore.1
postInstall = ''
installManPage assets/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; {

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

@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
];
propagatedBuildInputs = with python3.pkgs; [
Babel
babel
pycairo
pygobject3
];

@ -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 }:
stdenv.mkDerivation rec {
@ -10,12 +10,20 @@ stdenv.mkDerivation rec {
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
propagatedBuildInputs = [ hicolor-icon-theme ];
buildInputs = [ gdk-pixbuf librsvg ];
nativeBuildInputs = [ pkg-config intltool iconnamingutils gtk3 ];
nativeBuildInputs = [ pkg-config autoreconfHook intltool iconnamingutils gtk3 ];
dontDropIconThemeCache = true;

@ -4,19 +4,19 @@
, glib
, gettext
, sassc
, unstableGitUpdater
, gitUpdater
}:
stdenv.mkDerivation rec {
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.
src = fetchFromGitHub {
owner = "micheleg";
repo = "dash-to-dock";
rev = "6f717302747931de6bf35bc9839fb3bd946e2c2f";
sha256 = "1J8t0R43jBbqpXyH2uVyEK+OvhrCw18WWheflqwe100=";
rev = "extensions.gnome.org-v${version}";
sha256 = "Cds5Fc+rnvoy01GTZBS7qPh8UC9ekrNBOs+IEkDNkJw=";
};
nativeBuildInputs = [
@ -33,9 +33,10 @@ stdenv.mkDerivation rec {
extensionUuid = "dash-to-dock@micxgx.gmail.com";
extensionPortalSlug = "dash-to-dock";
updateScript = unstableGitUpdater {
stableVersion = true;
tagPrefix = "extensions.gnome.org-v";
updateScript = gitUpdater {
pname = "gnomeExtensions.dash-to-dock";
inherit version;
rev-prefix = "extensions.gnome.org-v";
};
};

@ -54,11 +54,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.17.9";
version = "1.17.10";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-djrUuvuAqSBEWMX6K45zJ/qXGu5FQlLA42LBEjYVaBM=";
sha256 = "sha256-KZ5VrzDxVpGwFdjc+OyuckEkElaeWy7OIDYXU6RW8vk=";
};
# perl is used for testing go vet
@ -167,7 +167,6 @@ stdenv.mkDerivation rec {
./remove-test-pie-1.15.patch
./creds-test.patch
./go-1.9-skip-flaky-19608.patch
./go-1.9-skip-flaky-20072.patch
./skip-chown-tests-1.16.patch
./skip-external-network-tests-1.16.patch
./skip-nohup-tests.patch

@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
checkInputs = [ lit ];
makeFlags = [ "llvm-spirv" ];
cmakeFlags = [
"-DLLVM_INCLUDE_TESTS=ON"
"-DLLVM_DIR=${llvm_11.dev}"
@ -37,6 +35,12 @@ stdenv.mkDerivation rec {
# FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist
doCheck = false;
makeFlags = [ "all" "llvm-spirv" ];
postInstall = ''
install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv
'';
meta = with lib; {
homepage = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator";
description = "A tool and a library for bi-directional translation between SPIR-V and LLVM IR";

@ -2,21 +2,21 @@
stdenv.mkDerivation rec {
pname = "vlang";
version = "weekly.2022.19";
version = "weekly.2022.20";
src = fetchFromGitHub {
owner = "vlang";
repo = "v";
rev = version;
sha256 = "1bl91j3ip3i84jq3wg03sflllxv38sv4dc072r302rl2g9f4dbg6";
sha256 = "1isbyfs98bdbm2qjf7q4bqbpsmdiqlavn3gznwr12bkvhnsf4j3x";
};
# Required for bootstrap.
vc = fetchFromGitHub {
owner = "vlang";
repo = "vc";
rev = "a298ad7069f6333ef8ab59a616654fc74e04c847";
sha256 = "168cgq6451hcgsxzyd8vq11g01642bs5kkwxqh6rz3rnc86ajic0";
rev = "167f262866090493650f58832d62d910999dd5a4";
sha256 = "1xax8355qkrccjcmx24gcab88xnrqj15mhqy0bgp3v2rb1hw1n3a";
};
# Required for vdoc.
@ -27,11 +27,6 @@ stdenv.mkDerivation rec {
sha256 = "0cawzizr3rjz81blpvxvxrcvcdai1adj66885ss390444qq1fnv7";
};
# vcreate_test.v requires git, so we must disable it.
patches = [
./disable_vcreate_test.patch
];
propagatedBuildInputs = [ glfw freetype openssl ]
++ lib.optional stdenv.hostPlatform.isUnix upx;
@ -42,9 +37,16 @@ stdenv.mkDerivation rec {
"VC=${vc}"
];
prePatch = ''
preBuild = ''
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 = ''
@ -64,12 +66,16 @@ stdenv.mkDerivation rec {
$out/lib/v -v $out/lib/cmd/tools/vast
$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
'';
# 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; {
homepage = "https://vlang.io/";
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')
}

@ -1,82 +1,107 @@
{ lib, stdenv, fetchFromGitHub, readline, libedit, bc
{ lib
, stdenv
, fetchFromGitHub
, bc
, libedit
, readline
, avxSupport ? stdenv.hostPlatform.avxSupport
}:
stdenv.mkDerivation rec {
pname = "j";
version = "902";
jtype = "release-b";
version = "904-beta-c";
src = fetchFromGitHub {
name = "${pname}-source";
owner = "jsoftware";
repo = "jsource";
rev = "j${version}-${jtype}";
sha256 = "0j67vgikqflwjqacsdicasvyv1k54s2c8vjgwmf0ix7l41p4xqz0";
name = "jsource";
rev = "j${version}";
hash = "sha256-MzEO/saHEBl1JwVlFC6P2UKm9RZnV7KVrNd9h4cPV/w=";
};
buildInputs = [ readline libedit bc ];
bits = if stdenv.is64bit then "64" else "32";
platform =
if (stdenv.isAarch32 || stdenv.isAarch64) then "raspberry" else
if stdenv.isLinux then "linux" else
if stdenv.isDarwin then "darwin" else
"unknown";
variant = if stdenv.isx86_64 && avxSupport then "avx" else "";
j64x="j${bits}${variant}";
doCheck = true;
# Causes build failure due to warning
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
# Causes build failure due to warning
# https://github.com/jsoftware/jsource/issues/16
NIX_CFLAGS_COMPILE = "-Wno-error=return-local-addr";
buildInputs = [
readline
libedit
bc
];
dontConfigure = true;
# emulating build_all.sh configuration variables
jplatform =
if stdenv.isDarwin then "darwin"
else if (stdenv.isAarch32 || stdenv.isAarch64) then "raspberry"
else if stdenv.isLinux then "linux"
else "unsupported";
j64x =
if stdenv.is32bit then "j32"
else if stdenv.isx86_64 then
if (stdenv.isLinux && avxSupport) then "j64avx" else "j64"
else if stdenv.isAarch64 then
if stdenv.isDarwin then "j64arm" else "j64"
else "unsupported";
buildPhase = ''
export SOURCE_DIR=$(pwd)
export HOME=$TMPDIR
export JLIB=$SOURCE_DIR/jlibrary
runHook preBuild
echo $OUT_DIR
export SRCDIR=$(pwd)
export HOME=$TMPDIR
export JLIB=$SRCDIR/jlibrary
export CC=cc
cd make2
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 = ''
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
cd $SOURCE_DIR/test
pushd $SRCDIR/test
for f in *.ijs
do
echo $f
echo -n "test $f: "
$JLIB/bin/jconsole < $f > /dev/null || echo FAIL && echo PASS
done
popd
runHook postCheck
'';
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/bin "$out"
runHook postInstall
'';
meta = with lib; {
homepage = "http://jsoftware.com/";
description = "J programming language, an ASCII-based APL successor";
maintainers = with maintainers; [ raskin synthetica ];
platforms = with platforms; linux ++ darwin;
longDescription = ''
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;
homepage = "http://jsoftware.com/";
maintainers = with maintainers; [ raskin synthetica AndersonTorres ];
platforms = with platforms; unix;
};
}

@ -22,6 +22,7 @@
, waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
, wayland
, wayland-protocols
, wayland-scanner
, drmSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
, libdrm
, mesa
@ -76,9 +77,18 @@ stdenv.mkDerivation rec {
./find-headers.patch
];
postPatch = ''
# Fix running wayland-scanner for the build platform when cross-compiling.
# See comment here: https://github.com/libsdl-org/SDL/issues/4860#issuecomment-1119003545
substituteInPlace configure \
--replace '$(WAYLAND_SCANNER)' 'wayland-scanner'
'';
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ];
nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland wayland-scanner ];
propagatedBuildInputs = dlopenPropagatedBuildInputs;

@ -1,36 +1,49 @@
{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
, fixDarwinDylibNames, gobject-introspection, gnome
{ stdenv
, lib
, fetchurl
, meson
, ninja
, gettext
, pkg-config
, glib
, fixDarwinDylibNames
, gobject-introspection
, gnome
}:
let
stdenv.mkDerivation rec {
pname = "atk";
version = "2.36.0";
in
version = "2.38.0";
stdenv.mkDerivation rec {
name = "${pname}-${version}";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "rE3ipO9L1WZQUpUv4WllfmXolcUFff+zwqgQ9hkaDDY=";
};
outputs = [ "out" "dev" ];
patches = [
# meson builds an incorrect .pc file
# glib should be Requires not Requires.private
./fix_pc.patch
];
nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
gobject-introspection
glib
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
fixDarwinDylibNames
];
propagatedBuildInputs = [
# Required by atk.pc
glib
];
patches = [
# meson builds an incorrect .pc file
# glib should be Requires not Requires.private
./fix_pc.patch
];
mesonFlags = [
"-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
];
@ -55,7 +68,7 @@ stdenv.mkDerivation rec {
control running applications.
'';
homepage = "http://library.gnome.org/devel/atk/";
homepage = "https://gitlab.gnome.org/GNOME/atk";
license = lib.licenses.lgpl2Plus;

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

@ -8,42 +8,26 @@
, systemd
, audit
, libapparmor
, libX11 ? null
, libICE ? null
, libSM ? null
, x11Support ? (stdenv.isLinux || stdenv.isDarwin)
, dbus
, docbook_xml_dtd_44
, docbook-xsl-nons
, xmlto
, autoreconfHook
, autoconf-archive
, x11Support ? (stdenv.isLinux || stdenv.isDarwin)
, xorg
}:
stdenv.mkDerivation rec {
pname = "dbus";
version = "1.12.20";
version = "1.14.0";
src = fetchurl {
url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp";
url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz";
sha256 = "sha256-zNfM43WW4KGVWP1mSNEnKrQ/AR2AyGNa6o/QutWK69Q=";
};
patches = [
# 'generate.consistent.ids=1' ensures reproducible docs, for further details see
# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
# Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189,
# expected in version 1.14
./docs-reproducible-ids.patch
# AC_PATH_XTRA doesn't seem to find X11 libs even though libX11 seems
# to provide valid pkg-config files. This replace AC_PATH_XTRA with
# PKG_CHECK_MODULES.
# MR merged cf https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/212/diffs?commit_id=23880a181e82ee7f
(fetchpatch {
url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/6bfaea0707ba1a7788c4b6d30c18fb094f3a1dd4.patch";
sha256 = "1d8ay55n2ksw5faqx3hsdpfni3xl3gq9hnjl65073xcfnx67x8d2";
})
# Fix dbus-daemon crashing when running tests due to long XDG_DATA_DIRS.
# https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/302
(fetchpatch {
@ -68,6 +52,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "lib" "doc" "man" ];
strictDeps = true;
nativeBuildInputs = [
autoreconfHook
autoconf-archive
@ -82,11 +67,11 @@ stdenv.mkDerivation rec {
];
buildInputs =
lib.optionals x11Support [
lib.optionals x11Support (with xorg; [
libX11
libICE
libSM
] ++ lib.optional enableSystemd systemd
]) ++ lib.optional enableSystemd systemd
++ lib.optionals stdenv.isLinux [ audit libapparmor ];
# ToDo: optional selinux?
@ -104,7 +89,8 @@ stdenv.mkDerivation rec {
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
] ++ lib.optional (!x11Support) "--without-x"
++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ];
++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ]
++ lib.optionals enableSystemd [ "SYSTEMCTL=${systemd}/bin/systemctl" ];
NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";

@ -1,15 +0,0 @@
diff --color -Naur dbus-1.12.20-original/doc/Makefile.in dbus-1.12.20-hacked2/doc/Makefile.in
--- dbus-1.12.20-original/doc/Makefile.in 2020-07-02 12:10:41.000000000 +0200
+++ dbus-1.12.20-hacked2/doc/Makefile.in 2020-11-07 09:57:15.297694773 +0100
@@ -870,8 +870,10 @@
.PRECIOUS: Makefile
+# 'generate.consistent.ids=1' ensures reproducible docs, for further details see
+# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
@DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) --stringparam generate.consistent.ids=1 html-nochunks $<
@DBUS_XML_DOCS_ENABLED_TRUE@%.1: %.1.xml
@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) man $<

@ -10,14 +10,14 @@
stdenv.mkDerivation rec {
pname = "fribidi";
version = "1.0.11";
version = "1.0.12";
outputs = [ "out" "devdoc" ];
# NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
src = fetchurl {
url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-MPk+nGPuYn0aLO3PWaw01FvzAkCYL5nkTG4BVGa05z0=";
sha256 = "sha256-DNIz+X/IxnuzrCfOhEDe9dP/rPUWdluRwsxlRJgpNJU=";
};
postPatch = ''

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz }:
{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz, bash }:
# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
@ -47,12 +47,14 @@ stdenv.mkDerivation rec {
sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
'';
strictDeps = true;
nativeBuildInputs = [
xz
xz.bin
];
buildInputs = [ bash ]
# HACK, see #10874 (and 14664)
buildInputs = lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv;
++ lib.optionals (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) [ libiconv ];
setupHooks = [
../../../build-support/setup-hooks/role.bash

@ -44,7 +44,7 @@
let
version = "2.34";
patchSuffix = "-115";
patchSuffix = "-210";
sha256 = "sha256-RNJqH+ILiFOkj0cOrQHkJ56GmsFJsZXdpORKGV2YGrI=";
in
@ -63,7 +63,7 @@ stdenv.mkDerivation ({
[
/* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
$ git fetch --all -p && git checkout origin/release/2.34/master && git describe
glibc-2.34-115-gd5d1c95aaf
glibc-2.34-210-ge123f08ad5
$ git show --minimal --reverse glibc-2.34.. | gzip -9n --rsyncable - > 2.34-master.patch.gz
To compare the archive contents zdiff can be used.

@ -5,7 +5,6 @@
, meson
, ninja
, gettext
, gobject-introspection
, python3
, gstreamer
, orc
@ -37,6 +36,8 @@
, enableCdparanoia ? (!stdenv.isDarwin)
, cdparanoia
, glib
, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
, gobject-introspection
}:
stdenv.mkDerivation rec {
@ -50,6 +51,7 @@ stdenv.mkDerivation rec {
sha256 = "0162ly7pscymq6bsf1d5fva2k9s16zvfwyi1q6z4yfd97d0sdn4n";
};
strictDeps = true;
nativeBuildInputs = [
meson
ninja
@ -58,10 +60,11 @@ stdenv.mkDerivation rec {
gettext
orc
glib
gobject-introspection
gstreamer
# docs
# TODO add hotdoc here
] ++ lib.optionals withIntrospection [
gobject-introspection
] ++ lib.optional enableWayland wayland;
buildInputs = [
@ -88,6 +91,8 @@ stdenv.mkDerivation rec {
] ++ lib.optionals enableWayland [
wayland
wayland-protocols
] ++ lib.optionals withIntrospection [
gobject-introspection
] ++ lib.optional enableCocoa Cocoa
++ lib.optional enableCdparanoia cdparanoia;
@ -101,8 +106,8 @@ stdenv.mkDerivation rec {
"-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing
# See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices
"-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}"
"-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-Dintrospection=disabled"
"-Dtests=disabled"
]
++ lib.optional (!enableX11) "-Dx11=disabled"

@ -4,7 +4,6 @@
, ninja
, pkg-config
, gettext
, gobject-introspection
, bison
, flex
, python3
@ -17,6 +16,8 @@
, bash-completion
, lib
, CoreServices
, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
, gobject-introspection
}:
stdenv.mkDerivation rec {
@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
sha256 = "0cghi6n4nhdbajz3wqcgbh5xm94myvnqgsi9g2bz9n1s9904l2fy";
};
strictDeps = true;
nativeBuildInputs = [
meson
ninja
@ -47,11 +49,14 @@ stdenv.mkDerivation rec {
python3
makeWrapper
glib
gobject-introspection
bash-completion
# documentation
# TODO add hotdoc here
] ++ lib.optionals stdenv.isLinux [
libcap # for setcap binary
] ++ lib.optionals withIntrospection [
gobject-introspection
];
buildInputs = [
@ -60,6 +65,8 @@ stdenv.mkDerivation rec {
libcap
libunwind
elfutils
] ++ lib.optionals withIntrospection [
gobject-introspection
] ++ lib.optionals stdenv.isDarwin [
CoreServices
];
@ -72,8 +79,7 @@ stdenv.mkDerivation rec {
"-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-Dintrospection=disabled"
"-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
] ++ lib.optionals stdenv.isDarwin [
# darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it.
"-Dlibunwind=disabled"

@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error";
patches = [
./build-shared.patch
] ++ lib.optionals stdenv.isAarch32 [
# https://github.com/nodejs/http-parser/pull/510
(fetchpatch {
url = "https://github.com/nodejs/http-parser/commit/4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878.patch";

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

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

@ -19,11 +19,11 @@ in
with lib;
stdenv.mkDerivation rec {
pname = "${type}krb5";
version = "1.19.2";
version = "1.19.3";
src = fetchurl {
url = "https://kerberos.org/dist/krb5/${versions.majorMinor version}/krb5-${version}.tar.gz";
sha256 = "0snz1jm2w4dkk65zcz953jmmv9mqa30fanch2bk8r3rs9vp3yi8h";
sha256 = "1l6wp58zav37g03n2ig5qr0pslz38gh5cxgigbmxkjfxrxilil2n";
};
outputs = [ "out" "dev" ];

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libbsd";
version = "0.11.5";
version = "0.11.6";
src = fetchurl {
url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz";
sha256 = "sha256-GpyVJSVjXBu2dwyyLpabk42Oap15EjYrmO6DcFmbDv0=";
sha256 = "sha256-GbOPMXLq9pPm4caHFGNhkMfkiFHkUiTXILO1vASZtd8=";
};
outputs = [ "out" "dev" "man" ];

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages }:
{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages, spirv-llvm-translator }:
let
llvm = llvmPackages.llvm;
@ -7,13 +7,13 @@ in
stdenv.mkDerivation rec {
pname = "libclc";
version = "11.0.1";
version = "12.0.1";
src = fetchFromGitHub {
owner = "llvm";
repo = "llvm-project";
rev = "llvmorg-${version}";
sha256 = "0bxh43hp1vl4axl3s9n2nb2ii8x1cbq98xz9c996f8rl5jy84ags";
sha256 = "08s5w2db9imb2yaqsvxs6pg21csi1cf6wa35rf8x6q07mam7j8qv";
};
sourceRoot = "source/libclc";
@ -21,10 +21,12 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \
'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )'
'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )' \
--replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \
'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )'
'';
nativeBuildInputs = [ cmake ninja python3 ];
nativeBuildInputs = [ cmake ninja python3 spirv-llvm-translator ];
buildInputs = [ llvm clang-unwrapped ];
strictDeps = true;
cmakeFlags = [

@ -13,7 +13,7 @@
, python3
, tzdata
, fixDarwinDylibNames
, introspectionSupport ? stdenv.buildPlatform == stdenv.hostPlatform
, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
, gobject-introspection
, vala
}:
@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-gZ6IBjG5pNKJ+hWcTzXMP7yxL4he4LTklZGoC9vXra8=";
};
strictDeps = true;
nativeBuildInputs = [
cmake
ninja
@ -43,7 +44,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# provides ical-glib-src-generator that runs during build
libical
] ++ lib.optionals introspectionSupport [
] ++ lib.optionals withIntrospection [
gobject-introspection
vala
] ++ lib.optionals stdenv.isDarwin [
@ -60,13 +61,14 @@ stdenv.mkDerivation rec {
glib
libxml2
icu
] ++ lib.optionals withIntrospection [
gobject-introspection
];
cmakeFlags = [
"-DENABLE_GTK_DOC=False"
] ++ lib.optionals introspectionSupport [
"-DGOBJECT_INTROSPECTION=True"
"-DICAL_GLIB_VAPI=True"
"-DGOBJECT_INTROSPECTION=${if withIntrospection then "True" else "False"}"
"-DICAL_GLIB_VAPI=${if withIntrospection then "True" else "False"}"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake"
];

@ -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;
};
}

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "libnotify";
version = "0.7.11";
version = "0.7.12";
outputs = [ "out" "man" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "3VaC7GgiAznhHFFZt+ASIEoxjdGzaDoJxILKQhqwc3U=";
sha256 = "dEsrN1CBNfgmG3Vanevm4JrdQhrcdb3pMPbhmLcKtG4=";
};
mesonFlags = [

@ -7,6 +7,7 @@
# This will cause c_rehash to refer to perl via the environment, but otherwise
# will produce a perfectly functional openssl binary and library.
, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform
, removeReferencesTo
}:
# Note: this package is used for bootstrapping fetchurl, and thus
@ -112,7 +113,11 @@ let
# OpenSSL needs a specific `no-shared` configure flag.
# See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_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 = [
"MANDIR=$(man)/share/man"
@ -126,13 +131,16 @@ let
enableParallelBuilding = true;
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
# libraries.
if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
rm "$out/lib/"*.a
fi
'' + lib.optionalString (!stdenv.hostPlatform.isWindows)
'') + lib.optionalString (!stdenv.hostPlatform.isWindows)
# Fix bin/c_rehash's perl interpreter line
#
# - openssl 1_0_2: embeds a reference to buildPackages.perl

@ -24,14 +24,14 @@
stdenv.mkDerivation rec {
pname = "pango";
version = "1.50.6";
version = "1.50.7";
outputs = [ "bin" "out" "dev" ]
++ lib.optionals withDocs [ "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "qZi882iBw6wgSV1AvOswT06qkXW9KWfIVlZDTL2v6Go=";
sha256 = "BHfzaaPUxpXfcpmmmJ3ABHVqf03ifuysQFxnkLfjrTM=";
};
strictDeps = !withIntrospection;

@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
version = "0.9.7";
version = "0.9.8";
pname = "podofo";
src = fetchurl {
url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz";
sha256 = "1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw";
sha256 = "sha256-XeYH4V8ZK4rZBzgwB1nYjeoPXM3OO/AASKDJMrxkUVQ=";
};
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 = ''
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 {
pname = "lrs";
version = "7.0";
version = "7.2";
src = fetchurl {
url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-070.tar.gz";
sha256 = "1zjdmkjracz695k73c2pvipc0skpyn1wzagkhilsvcw9pqljpwg9";
url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-072.tar.gz";
sha256 = "1w1jsnfgny8cihndr5gfm99pvwp48qsvxkqfsi2q87gd3m57aj7w";
};
buildInputs = [ gmp ];

@ -12,13 +12,13 @@ in
stdenv.mkDerivation rec {
pname = "sqlite${optionalString interactive "-interactive"}";
version = "3.38.3";
version = "3.38.5";
# nixpkgs-update: no auto update
# NB! Make sure to update ./tools.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz";
sha256 = "sha256-YfLdk6LjjDNGi3EllnwyGL+fTdg2Xe9gJeMU+QXclC4=";
sha256 = "sha256-WvB96YK6ZY/ZGgMXDJRfmclx9pVbx53zJmVENz45hpw=";
};
outputs = [ "bin" "dev" "out" ];

@ -4,12 +4,12 @@ let
archiveVersion = import ./archive-version.nix lib;
mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec {
inherit pname;
version = "3.38.3";
version = "3.38.5";
# nixpkgs-update: no auto update
src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip";
sha256 = "sha256-oQTUk+CEAGvXT/H/esLrKzh8fAo7Y7pv6i+vtBGDE68=";
sha256 = "sha256-ZQO7WeOeyGYwg2lpQOyBjNVVUZbmylQ9QClEDMp7ANk=";
};
nativeBuildInputs = [ unzip ];

@ -1,8 +1,11 @@
{ lib, stdenv
{ stdenv
, lib
, fetchurl
, meson
, ninja
, pkg-config
, libxslt
, docbook_xsl
, docbook-xsl-nons
, docbook_xml_dtd_43
, dbus
, glib
@ -10,17 +13,19 @@
stdenv.mkDerivation rec {
pname = "xdg-dbus-proxy";
version = "0.1.3";
version = "0.1.4";
src = fetchurl {
url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-A7XSjKh5JT3bvOMQmJCb7MoUleqBGmN3pJLijxbAm5s=";
sha256 = "sha256-HsDqtT0eSZZtciNSvP1RrEAtzlGQuu3HSahUHnYWcKs=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
libxslt
docbook_xsl
docbook-xsl-nons
docbook_xml_dtd_43
];
@ -32,10 +37,6 @@ stdenv.mkDerivation rec {
dbus
];
configureFlags = [
"--enable-man"
];
# dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory
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 {
pname = "easy-format";
version = "1.3.2";
inherit (params) version;
src = fetchurl {
url = "https://github.com/ocaml-community/easy-format/releases/download/${version}/easy-format-${version}.tbz";
sha256 = "sha256:09hrikx310pac2sb6jzaa7k6fmiznnmhdsqij1gawdymhawc4h1l";
inherit (params) sha256;
};
doCheck = true;

@ -1,24 +0,0 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, pytz, pytestCheckHook, freezegun }:
buildPythonPackage rec {
pname = "Babel";
version = "2.9.1";
src = fetchPypi {
inherit pname version;
sha256 = "bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0";
};
propagatedBuildInputs = [ pytz ];
checkInputs = [ pytestCheckHook freezegun ];
doCheck = !stdenv.isDarwin;
meta = with lib; {
homepage = "http://babel.edgewall.org";
description = "A collection of tools for internationalizing Python applications";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
}

@ -8,7 +8,7 @@
, markupsafe
# extras: Babel
, Babel
, babel
# tests
, mock
@ -32,7 +32,7 @@ buildPythonPackage rec {
passthru.extras-require = {
babel = [
Babel
babel
];
};

@ -1,6 +1,6 @@
{ lib
, aiohttp
, Babel
, babel
, blinker
, buildPythonPackage
, python-dateutil
@ -51,7 +51,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
Babel
babel
blinker
python-dateutil
docutils

@ -1,28 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, docutils
}:
buildPythonPackage rec {
pname = "Pygments";
version = "2.11.2";
src = fetchPypi {
inherit pname version;
sha256 = "4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a";
};
propagatedBuildInputs = [ docutils ];
# Circular dependency with sphinx
doCheck = false;
pythonImportsCheck = [ "pygments" ];
meta = {
homepage = "https://pygments.org/";
description = "A generic syntax highlighter";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ ];
};
}

@ -1,5 +1,5 @@
{ lib
, Babel
, babel
, buildPythonPackage
, cssselect
, fetchFromGitHub
@ -32,7 +32,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
Babel
babel
isodate
leather
parsedatetime

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

@ -243,5 +243,7 @@ buildPythonPackage rec {
homepage = "https://airflow.apache.org/";
license = licenses.asl20;
maintainers = with maintainers; [ bhipple costrouc ingenieroariel ];
# requires extremely outdated versions of multiple dependencies
broken = true;
};
}

@ -1,5 +1,5 @@
{ lib
, Babel
, babel
, buildPythonPackage
, click
, cryptography
@ -31,7 +31,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
Babel
babel
installShellFiles
];

@ -1,4 +1,4 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
{ lib, stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder
, aiodns
, aiohttp
, flask
@ -15,16 +15,26 @@
}:
buildPythonPackage rec {
version = "1.23.1";
version = "1.24.0";
pname = "azure-core";
disabled = isPy27;
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-KKAd+68KaBLE4qgtFkLqMJVqlznyW8d8myO5H06mjw8=";
sha256 = "sha256-NFsbBB+q19AgWyDVaX8dDfNEMC56qoUBkFWA/4e9C+U=";
};
patches = [
# FIXME: fixes tests with new versions of flask/werkzeug
# upstream PR: https://github.com/Azure/azure-sdk-for-python/pull/24450
(fetchpatch {
url = "https://github.com/Azure/azure-sdk-for-python/commit/fb20b0b985f614bb7bcd84f3f5f6f3105de25fd9.patch";
stripLen = 3;
sha256 = "sha256-Gt5T/UkQT1yml8bqYbeUpimfOPlmzpN1KKKUnbU9xJw=";
})
];
propagatedBuildInputs = [
requests
six

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

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

@ -0,0 +1,25 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, pytz, pytestCheckHook, freezegun }:
buildPythonPackage rec {
pname = "babel";
version = "2.10.1";
src = fetchPypi {
pname = "Babel";
inherit version;
sha256 = "sha256-mK6soIYTPvs+HiqtA5aYdJDIQlkp3bz+BVAYT9xUzRM=";
};
propagatedBuildInputs = [ pytz ];
checkInputs = [ pytestCheckHook freezegun ];
doCheck = !stdenv.isDarwin;
meta = with lib; {
homepage = "https://babel.pocoo.org/";
description = "Collection of internationalizing tools";
license = licenses.bsd3;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

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

Loading…
Cancel
Save