Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-07-24 12:02:06 +00:00 committed by GitHub
commit 4a6e124c33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
128 changed files with 1316 additions and 1189 deletions

View file

@ -2649,6 +2649,12 @@
fingerprint = "8026 D24A A966 BF9C D3CD CB3C 08FB 2BFC 470E 75B4";
}];
};
Crafter = {
email = "crafter@crafter.rocks";
github = "Craftzman7";
githubId = 70068692;
name = "Crafter";
};
craigem = {
email = "craige@mcwhirter.io";
github = "craigem";

View file

@ -45,41 +45,17 @@ in
["lxqt" "lxqt-qtplugin"]
["libsForQt5" "plasma-integration"]
];
description = ''
Selects the platform theme to use for Qt5 applications.</para>
<para>The options are
<variablelist>
<varlistentry>
<term><literal>gtk</literal></term>
<listitem><para>Use GTK theme with
<link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link>
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>gnome</literal></term>
<listitem><para>Use GNOME theme with
<link xlink:href="https://github.com/FedoraQt/QGnomePlatform">qgnomeplatform</link>
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>lxqt</literal></term>
<listitem><para>Use LXQt style set using the
<link xlink:href="https://github.com/lxqt/lxqt-config">lxqt-config-appearance</link>
application.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>qt5ct</literal></term>
<listitem><para>Use Qt style set using the
<link xlink:href="https://sourceforge.net/projects/qt5ct/">qt5ct</link>
application.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>kde</literal></term>
<listitem><para>Use Qt settings from Plasma.</para></listitem>
</varlistentry>
</variablelist>
description = lib.mdDoc ''
Selects the platform theme to use for Qt5 applications.
The options are
- `gtk`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins)
- `gnome`: Use GNOME theme with [qgnomeplatform](https://github.com/FedoraQt/QGnomePlatform)
- `lxqt`: Use LXQt style set using the [lxqt-config-appearance](https://github.com/lxqt/lxqt-config)
application.
- `qt5ct`: Use Qt style set using the [qt5ct](https://sourceforge.net/projects/qt5ct/)
application.
- `kde`: Use Qt settings from Plasma.
'';
};
@ -97,27 +73,14 @@ in
"adwaita-qt"
["libsForQt5" "qtstyleplugins"]
];
description = ''
Selects the style to use for Qt5 applications.</para>
<para>The options are
<variablelist>
<varlistentry>
<term><literal>adwaita</literal></term>
<term><literal>adwaita-dark</literal></term>
<listitem><para>Use Adwaita Qt style with
<link xlink:href="https://github.com/FedoraQt/adwaita-qt">adwaita</link>
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>cleanlooks</literal></term>
<term><literal>gtk2</literal></term>
<term><literal>motif</literal></term>
<term><literal>plastique</literal></term>
<listitem><para>Use styles from
<link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link>
</para></listitem>
</varlistentry>
</variablelist>
description = lib.mdDoc ''
Selects the style to use for Qt5 applications.
The options are
- `adwaita`, `adwaita-dark`: Use Adwaita Qt style with
[adwaita](https://github.com/FedoraQt/adwaita-qt)
- `cleanlooks`, `gtk2`, `motif`, `plastique`: Use styles from
[qtstyleplugins](https://github.com/qt/qtstyleplugins)
'';
};
};

View file

@ -59,6 +59,14 @@ in
description = "If enabled, start the Murmur Mumble server.";
};
openFirewall = mkOption {
type = types.bool;
default = false;
description = ''
Open ports in the firewall for the Murmur Mumble server.
'';
};
autobanAttempts = mkOption {
type = types.int;
default = 10;
@ -291,6 +299,11 @@ in
gid = config.ids.gids.murmur;
};
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.port ];
allowedUDPPorts = [ cfg.port ];
};
systemd.services.murmur = {
description = "Murmur Chat Service";
wantedBy = [ "multi-user.target" ];

View file

@ -30,15 +30,22 @@ let
updateConfig = pkgs.writers.writeDash "merge-syncthing-config" ''
set -efu
# be careful not to leak secrets in the filesystem or in process listings
umask 0077
# get the api key by parsing the config.xml
while
! api_key=$(${pkgs.libxml2}/bin/xmllint \
! ${pkgs.libxml2}/bin/xmllint \
--xpath 'string(configuration/gui/apikey)' \
${cfg.configDir}/config.xml)
${cfg.configDir}/config.xml \
>"$RUNTIME_DIRECTORY/api_key"
do sleep 1; done
(printf "X-API-Key: "; cat "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers"
curl() {
${pkgs.curl}/bin/curl -sSLk -H "X-API-Key: $api_key" \
${pkgs.curl}/bin/curl -sSLk -H "@$RUNTIME_DIRECTORY/headers" \
--retry 1000 --retry-delay 1 --retry-all-errors \
"$@"
}
@ -576,6 +583,7 @@ in {
serviceConfig = {
User = cfg.user;
RemainAfterExit = true;
RuntimeDirectory = "syncthing-init";
Type = "oneshot";
ExecStart = updateConfig;
};

View file

@ -15,7 +15,7 @@ in
services.resolved.enable = mkOption {
default = false;
type = types.bool;
description = ''
description = lib.mdDoc ''
Whether to enable the systemd DNS resolver daemon.
'';
};
@ -24,7 +24,7 @@ in
default = [ ];
example = [ "8.8.8.8" "2001:4860:4860::8844" ];
type = types.listOf types.str;
description = ''
description = lib.mdDoc ''
A list of IPv4 and IPv6 addresses to use as the fallback DNS servers.
If this option is empty, a compiled-in list of DNS servers is used instead.
'';
@ -35,7 +35,7 @@ in
defaultText = literalExpression "config.networking.search";
example = [ "example.com" ];
type = types.listOf types.str;
description = ''
description = lib.mdDoc ''
A list of domains. These domains are used as search suffixes
when resolving single-label host names (domain names which
contain no dot), in order to qualify them into fully-qualified
@ -43,7 +43,7 @@ in
For compatibility reasons, if this setting is not specified,
the search domains listed in
<filename>/etc/resolv.conf</filename> are used instead, if
{file}`/etc/resolv.conf` are used instead, if
that file exists and any domains are configured in it.
'';
};
@ -52,32 +52,14 @@ in
default = "true";
example = "false";
type = types.enum [ "true" "resolve" "false" ];
description = ''
description = lib.mdDoc ''
Controls Link-Local Multicast Name Resolution support
(RFC 4795) on the local host.
If set to
<variablelist>
<varlistentry>
<term><literal>"true"</literal></term>
<listitem><para>
Enables full LLMNR responder and resolver support.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"false"</literal></term>
<listitem><para>
Disables both.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"resolve"</literal></term>
<listitem><para>
Only resolution support is enabled, but responding is disabled.
</para></listitem>
</varlistentry>
</variablelist>
- `"true"`: Enables full LLMNR responder and resolver support.
- `"false"`: Disables both.
- `"resolve"`: Only resolution support is enabled, but responding is disabled.
'';
};
@ -85,21 +67,14 @@ in
default = "allow-downgrade";
example = "true";
type = types.enum [ "true" "allow-downgrade" "false" ];
description = ''
description = lib.mdDoc ''
If set to
<variablelist>
<varlistentry>
<term><literal>"true"</literal></term>
<listitem><para>
- `"true"`:
all DNS lookups are DNSSEC-validated locally (excluding
LLMNR and Multicast DNS). Note that this mode requires a
DNS server that supports DNSSEC. If the DNS server does
not properly support DNSSEC all validations will fail.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"allow-downgrade"</literal></term>
<listitem><para>
- `"allow-downgrade"`:
DNSSEC validation is attempted, but if the server does not
support DNSSEC properly, DNSSEC mode is automatically
disabled. Note that this mode makes DNSSEC validation
@ -107,22 +82,14 @@ in
be able to trigger a downgrade to non-DNSSEC mode by
synthesizing a DNS response that suggests DNSSEC was not
supported.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"false"</literal></term>
<listitem><para>
DNS lookups are not DNSSEC validated.
</para></listitem>
</varlistentry>
</variablelist>
- `"false"`: DNS lookups are not DNSSEC validated.
'';
};
services.resolved.extraConfig = mkOption {
default = "";
type = types.lines;
description = ''
description = lib.mdDoc ''
Extra config to append to resolved.conf.
'';
};

View file

@ -14,18 +14,18 @@ let
image = mkOption {
type = with types; str;
description = "OCI image to run.";
description = lib.mdDoc "OCI image to run.";
example = "library/hello-world";
};
imageFile = mkOption {
type = with types; nullOr package;
default = null;
description = ''
description = lib.mdDoc ''
Path to an image file to load before running the image. This can
be used to bypass pulling the image from the registry.
The <literal>image</literal> attribute must match the name and
The `image` attribute must match the name and
tag of the image contained in this file, as they will be used to
run the container with that image. If they do not match, the
image will be pulled from the registry as usual.
@ -38,20 +38,20 @@ let
username = mkOption {
type = with types; nullOr str;
default = null;
description = "Username for login.";
description = lib.mdDoc "Username for login.";
};
passwordFile = mkOption {
type = with types; nullOr str;
default = null;
description = "Path to file containing password.";
description = lib.mdDoc "Path to file containing password.";
example = "/etc/nixos/dockerhub-password.txt";
};
registry = mkOption {
type = with types; nullOr str;
default = null;
description = "Registry where to login to.";
description = lib.mdDoc "Registry where to login to.";
example = "https://docker.pkg.github.com";
};
@ -60,7 +60,7 @@ let
cmd = mkOption {
type = with types; listOf str;
default = [];
description = "Commandline arguments to pass to the image's entrypoint.";
description = lib.mdDoc "Commandline arguments to pass to the image's entrypoint.";
example = literalExpression ''
["--port=9000"]
'';
@ -68,7 +68,7 @@ let
entrypoint = mkOption {
type = with types; nullOr str;
description = "Override the default entrypoint of the image.";
description = lib.mdDoc "Override the default entrypoint of the image.";
default = null;
example = "/bin/my-app";
};
@ -76,7 +76,7 @@ let
environment = mkOption {
type = with types; attrsOf str;
default = {};
description = "Environment variables to set for this container.";
description = lib.mdDoc "Environment variables to set for this container.";
example = literalExpression ''
{
DATABASE_HOST = "db.example.com";
@ -88,7 +88,7 @@ let
environmentFiles = mkOption {
type = with types; listOf path;
default = [];
description = "Environment files for this container.";
description = lib.mdDoc "Environment files for this container.";
example = literalExpression ''
[
/path/to/.env
@ -100,15 +100,15 @@ let
log-driver = mkOption {
type = types.str;
default = "journald";
description = ''
description = lib.mdDoc ''
Logging driver for the container. The default of
<literal>"journald"</literal> means that the container's logs will be
`"journald"` means that the container's logs will be
handled as part of the systemd unit.
For more details and a full list of logging drivers, refer to respective backends documentation.
For Docker:
<link xlink:href="https://docs.docker.com/engine/reference/run/#logging-drivers---log-driver">Docker engine documentation</link>
[Docker engine documentation](https://docs.docker.com/engine/reference/run/#logging-drivers---log-driver)
For Podman:
Refer to the docker-run(1) man page.
@ -118,49 +118,27 @@ let
ports = mkOption {
type = with types; listOf str;
default = [];
description = ''
description = lib.mdDoc ''
Network ports to publish from the container to the outer host.
Valid formats:
- `<ip>:<hostPort>:<containerPort>`
- `<ip>::<containerPort>`
- `<hostPort>:<containerPort>`
- `<containerPort>`
<itemizedlist>
<listitem>
<para>
<literal>&lt;ip&gt;:&lt;hostPort&gt;:&lt;containerPort&gt;</literal>
</para>
</listitem>
<listitem>
<para>
<literal>&lt;ip&gt;::&lt;containerPort&gt;</literal>
</para>
</listitem>
<listitem>
<para>
<literal>&lt;hostPort&gt;:&lt;containerPort&gt;</literal>
</para>
</listitem>
<listitem>
<para>
<literal>&lt;containerPort&gt;</literal>
</para>
</listitem>
</itemizedlist>
Both <literal>hostPort</literal> and
<literal>containerPort</literal> can be specified as a range of
Both `hostPort` and `containerPort` can be specified as a range of
ports. When specifying ranges for both, the number of container
ports in the range must match the number of host ports in the
range. Example: <literal>1234-1236:1234-1236/tcp</literal>
range. Example: `1234-1236:1234-1236/tcp`
When specifying a range for <literal>hostPort</literal> only, the
<literal>containerPort</literal> must <emphasis>not</emphasis> be a
range. In this case, the container port is published somewhere
within the specified <literal>hostPort</literal> range. Example:
<literal>1234-1236:1234/tcp</literal>
When specifying a range for `hostPort` only, the `containerPort`
must *not* be a range. In this case, the container port is published
somewhere within the specified `hostPort` range.
Example: `1234-1236:1234/tcp`
Refer to the
<link xlink:href="https://docs.docker.com/engine/reference/run/#expose-incoming-ports">
Docker engine documentation</link> for full details.
[Docker engine documentation](https://docs.docker.com/engine/reference/run/#expose-incoming-ports) for full details.
'';
example = literalExpression ''
[
@ -172,7 +150,7 @@ let
user = mkOption {
type = with types; nullOr str;
default = null;
description = ''
description = lib.mdDoc ''
Override the username or UID (and optionally groupname or GID) used
in the container.
'';
@ -182,16 +160,15 @@ let
volumes = mkOption {
type = with types; listOf str;
default = [];
description = ''
description = lib.mdDoc ''
List of volumes to attach to this container.
Note that this is a list of <literal>"src:dst"</literal> strings to
allow for <literal>src</literal> to refer to
<literal>/nix/store</literal> paths, which would be difficult with an
attribute set. There are also a variety of mount options available
as a third field; please refer to the
<link xlink:href="https://docs.docker.com/engine/reference/run/#volume-shared-filesystems">
docker engine documentation</link> for details.
Note that this is a list of `"src:dst"` strings to
allow for `src` to refer to `/nix/store` paths, which
would be difficult with an attribute set. There are
also a variety of mount options available as a third
field; please refer to the
[docker engine documentation](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems) for details.
'';
example = literalExpression ''
[
@ -204,17 +181,17 @@ let
workdir = mkOption {
type = with types; nullOr str;
default = null;
description = "Override the default working directory for the container.";
description = lib.mdDoc "Override the default working directory for the container.";
example = "/var/lib/hello_world";
};
dependsOn = mkOption {
type = with types; listOf str;
default = [];
description = ''
description = lib.mdDoc ''
Define which other containers this one depends on. They will be added to both After and Requires for the unit.
Use the same name as the attribute under <literal>virtualisation.oci-containers.containers</literal>.
Use the same name as the attribute under `virtualisation.oci-containers.containers`.
'';
example = literalExpression ''
virtualisation.oci-containers.containers = {
@ -229,7 +206,7 @@ let
extraOptions = mkOption {
type = with types; listOf str;
default = [];
description = "Extra options for <command>${defaultBackend} run</command>.";
description = lib.mdDoc "Extra options for {command}`${defaultBackend} run`.";
example = literalExpression ''
["--network=host"]
'';
@ -238,7 +215,7 @@ let
autoStart = mkOption {
type = types.bool;
default = true;
description = ''
description = lib.mdDoc ''
When enabled, the container is automatically started on boot.
If this option is set to false, the container has to be started on-demand via its service.
'';
@ -339,13 +316,13 @@ in {
backend = mkOption {
type = types.enum [ "podman" "docker" ];
default = if versionAtLeast config.system.stateVersion "22.05" then "podman" else "docker";
description = "The underlying Docker implementation to use.";
description = lib.mdDoc "The underlying Docker implementation to use.";
};
containers = mkOption {
default = {};
type = types.attrsOf (types.submodule containerOptions);
description = "OCI (Docker) containers to run as systemd services.";
description = lib.mdDoc "OCI (Docker) containers to run as systemd services.";
};
};

View file

@ -22,11 +22,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
start_all()
default.wait_for_unit("podgrab")
default.wait_for_open_port(defaultPort)
default.wait_for_open_port(${toString defaultPort})
default.succeed("curl --fail http://localhost:${toString defaultPort}")
customized.wait_for_unit("podgrab")
customized.wait_for_open_port(customPort)
customized.wait_for_open_port(${toString customPort})
customized.succeed("curl --fail http://localhost:${toString customPort}")
'';

View file

@ -60,7 +60,7 @@ in {
)
# Only SQLCipher should be able to read the encrypted DB:
machine.fail(
"su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .databases'"
"su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'"
)
print(machine.succeed(
"su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'"

View file

@ -12,14 +12,14 @@
mkDerivation rec {
pname = "bambootracker";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "BambooTracker";
repo = "BambooTracker";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "1mpbvhsmrn0wdmxfp3n5dwv4474qlhy47r3vwc2jwdslq6vgl1fa";
sha256 = "sha256-AEELUJYiapF/sBWRXXuBXUHwnKp0szdIOCNVMYufv94=";
};
nativeBuildInputs = [ qmake qttools pkg-config ];

View file

@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null;
stdenv.mkDerivation rec {
pname = "carla";
version = "2.4.3";
version = "2.5.0";
src = fetchFromGitHub {
owner = "falkTX";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FAQTIM5NpcOhLNMf62qiKaxg6QtK5uIJF/XT6KJVnUc=";
sha256 = "sha256-KcwEuiy58wjTr+RWPmpMaPgM0olzxiWp9MMYiKwmIcI=";
};
nativeBuildInputs = [

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ft2-clone";
version = "1.55";
version = "1.56";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${version}";
sha256 = "sha256-qk6SHL9K4+9Em1jjrPOm14msOoqRiAahlRoiRiAMLC0=";
sha256 = "sha256-kSnsep6abE07Q1EpGEeX8e/2APc60TxR2MhLZxqW9WY=";
};
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "pt2-clone";
version = "1.49";
version = "1.50";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
sha256 = "sha256-mE7mcaQCJlMzFTec9/faTyIZ7aoA4ygn60wS5QgVF7k=";
sha256 = "sha256-IZakhYVtVXmcKwUMl/v1w6Huu5XWQfaBCatTN4hQAbM=";
};
nativeBuildInputs = [ cmake ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost
{ lib, stdenv, fetchFromGitLab, pkg-config, autoreconfHook, openssl, db48, boost
, zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3
, withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null
, Foundation, ApplicationServices, AppKit }:
@ -7,13 +7,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "bitcoin" + optionalString (!withGui) "d" + "-unlimited";
version = "1.9.2.0";
version = "1.10.0.0";
src = fetchFromGitHub {
src = fetchFromGitLab {
owner = "bitcoinunlimited";
repo = "bitcoinunlimited";
repo = "BCHUnlimited";
rev = "BCHunlimited${version}";
sha256 = "sha256-qUf/GWZHpI57ATTlvRhjDtAjRa8a4uvUb0G9Xcf0j7w=";
sha256 = "sha256-d+giTXq/6HpysRAPT7yOl/B1x4zie9irs4O7cJsBqHg=";
};
nativeBuildInputs = [ pkg-config autoreconfHook python3 ]

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
version = "4.0.30";
version = "4.0.34";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
sha256 = "sha256-Jeufmt2Dso13Z/TQnSA8IPNxTfha+wcklKZb+BF/dNE=";
sha256 = "sha256-VFzjoa9TdFMSdWtYvpW1ZfECEmuj25yCXIV99/lzZwI=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }:
stdenv.mkDerivation rec {
pname = "exodus";
version = "22.6.17";
version = "22.7.15";
src = fetchurl {
url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
sha256 = "1gllmrmc1gylw54yrgy1ggpn3kvkyxf7ydjvd5n5kvd8d9xh78ng";
sha256 = "sha256-tQwxzhy+d2hA7VvZB9qSF7uaYIffAyX9ovZYQ8HDEB8=";
};
sourceRoot = ".";

View file

@ -783,8 +783,8 @@ let
mktplcRef = {
name = "gitlens";
publisher = "eamodio";
version = "12.1.1";
sha256 = "0i1wxgc61rrf11zff0481dg9s2lmv1ngpwx8nb2ygf6lh0axr7cj";
version = "12.1.2";
sha256 = "0wpmfrfpi6wl9v3dknx2qr2m74azpcw8bvhac21v67w6jxnl3jd9";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
@ -1379,8 +1379,8 @@ let
mktplcRef = {
name = "svg";
publisher = "jock";
version = "1.4.17";
sha256 = "sha256-CDxh/YRyDGocxG4qOcyLXA0zHCg0YJ7XUu3OjFFjleI=";
version = "1.4.19";
sha256 = "1yl5pxsayplkdqv5jipii7pyj85j2lc4zmibyr69470b6li264rq";
};
meta = with lib; {
license = licenses.mit;
@ -1648,8 +1648,8 @@ let
mktplcRef = {
name = "vscode-docker";
publisher = "ms-azuretools";
version = "1.22.0";
sha256 = "sha256-+cY9uLQ4oIk7V/4uCNc6BdIAQCXvPPGeqd0apbDjDos=";
version = "1.22.1";
sha256 = "1ix363fjxi9g450rs3ghx44z3hppvasf0xpzgha93m90djd7ai52";
};
meta = {
license = lib.licenses.mit;
@ -1857,8 +1857,8 @@ let
mktplcRef = {
name = "vscode-yaml";
publisher = "redhat";
version = "1.7.0";
sha256 = "1bbjpaypp0mq5akww5f0pkpq01j0xhhvkfr44f4lb2rdhr5nmnvc";
version = "1.9.1";
sha256 = "10m70sahl7vf8y82gqz9yk6bk4k4b923xn5rk7fax1nqw0pkln2w";
};
meta = {
license = lib.licenses.mit;
@ -1913,8 +1913,8 @@ let
mktplcRef = {
name = "material-icon-theme";
publisher = "PKief";
version = "4.16.0";
sha256 = "sha256-AOHvWoVB26caNgEEnKBhw5Z/tRtaTSeVLkO6Rlc/kqo=";
version = "4.19.0";
sha256 = "1azkkp4bnd7n8v0m4325hfrr6p6ikid88xbxaanypji25pnyq5a4";
};
meta = {
license = lib.licenses.mit;
@ -1953,8 +1953,8 @@ let
mktplcRef = {
name = "prisma";
publisher = "Prisma";
version = "3.14.0";
sha256 = "09dlm2awd2h0xmx1vcx95kdvz3xf4f5pd7zcdg3mb0g2az4nfld7";
version = "4.1.0";
sha256 = "sha256-YpdxRoeIesx4R2RIpJ8YmmHEmR3lezdN1efhhg14MzI=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
@ -2246,8 +2246,8 @@ let
mktplcRef = {
name = "code-spell-checker";
publisher = "streetsidesoftware";
version = "2.2.5";
sha256 = "0ayhlzh3b2mcdx6mdj00y4qxvv6mirfpnp8q5zvidm6sv3vwlcj0";
version = "2.3.1";
sha256 = "0pm9i3zw4aa4qrcqnzb9bz166rl7p6nwb81m9rqzisdc85mx4s3x";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
@ -2538,8 +2538,8 @@ let
mktplcRef = {
name = "vscode-import-cost";
publisher = "wix";
version = "2.15.0";
sha256 = "0d3b6654cdck1syn74vmmd1jmgkrw5v4c4cyrhdxbhggkip732bc";
version = "3.3.0";
sha256 = "0wl8vl8n0avd6nbfmis0lnlqlyh4yp3cca6kvjzgw5xxdc5bl38r";
};
meta = with lib; {
license = licenses.mit;

View file

@ -145,6 +145,7 @@ let
kio-extras = callPackage ./kio-extras.nix {};
kio-gdrive = callPackage ./kio-gdrive.nix {};
kipi-plugins = callPackage ./kipi-plugins.nix {};
kirigami-gallery = callPackage ./kirigami-gallery.nix {};
kitinerary = callPackage ./kitinerary.nix {};
kldap = callPackage ./kldap.nix {};
kleopatra = callPackage ./kleopatra.nix {};

View file

@ -0,0 +1,31 @@
{ mkDerivation
, lib
, kirigami2
, extra-cmake-modules
, kitemmodels
, qtgraphicaleffects
, qtquickcontrols2
, qttools
, qtbase
}:
mkDerivation rec {
pname = "kirigami-gallery";
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [
qtgraphicaleffects
qtquickcontrols2
kirigami2
kitemmodels
];
meta = with lib; {
homepage = "https://apps.kde.org/kirigami2.gallery/";
description = "View examples of Kirigami components";
license = licenses.lgpl2;
maintainers = with maintainers; [ shadowrz ];
broken = versionOlder qtbase.version "5.15";
};
}

View file

@ -12,12 +12,12 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
version = "2.5.1";
version = "2.6.0";
sources = rec {
aarch64-linux = fetch "linux_arm64" "sha256-HZ6AVheJrw9ZR9HGWbB6/kCzbrfYcwApa2z18tDBo1k=" "zip";
i686-linux = fetch "linux_386" "sha256-aG6oW0epF+P9pSWMlTStSbBynBDkGX1B+0NHUnwLRhs=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-7GkBVcvXM/WZiXEiIbYh9lS0f4BS4Hc4RCVjr8FoW8A=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-XebD33fX15RsFUdbV+DvMRIi1MSyMfIRC3JOwcmi8kk=" "pkg";
aarch64-linux = fetch "linux_arm64" "sha256-2V3/F7/HEOvk2T1dv4rnS0xu6Z5EqGSV/9erED7ZS1w=" "zip";
i686-linux = fetch "linux_386" "sha256-z4pKZY5DQ2oDHHuet1S/p7GM+rXS8/8xmTrN+rqCUBo=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-1/DgwHMkUenj+2ZyADeBK1HJ3M/b2PoAey36eAqAUSQ=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-YPidRXNzNNuDoM2Gd5dEsCDxwosBJFKSzjoP0SPkQZs=" "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;

View file

@ -9,17 +9,17 @@
rustPlatform.buildRustPackage {
pname = "faircamp";
version = "unstable-2022-03-20";
version = "unstable-2022-07-22";
# TODO when switching to a stable release, use fetchFromGitea and add a
# version test. Meanwhile, fetchgit is used to make unstableGitUpdater work.
src = fetchgit {
url = "https://codeberg.org/simonrepp/faircamp.git";
rev = "863cecb468a58a774bd2d1d93f99f3c8ecd8205c";
sha256 = "sha256-JodIo601BYesbiHarnBk4/GuFR/bpCswxQbaysRP+CI=";
rev = "4803b6e0b59c1fc9922d1e498743a0171d7f324d";
sha256 = "sha256-VliBGYZPoX65JURlBaVMCMB5DuE/gqr27KcEzAVRFxc=";
};
cargoHash = "sha256-XqsUUc+s01t4KHtktbNhm52r0NeLbcBg5DVw3Xn0oZk=";
cargoHash = "sha256-fs7CXw6CS+TtMxLtDaQiYY6fiBFl4RCttymQJDAm6dg=";
nativeBuildInputs = [
makeWrapper

View file

@ -19,13 +19,13 @@
mkDerivation rec {
pname = "organicmaps";
version = "2022.06.18-2";
version = "2022.06.29-3";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = "${version}-android";
sha256 = "sha256-FlytRGiqGr9L5ZwL1slbPjagJKsleOXM8+loPmtfccI=";
sha256 = "sha256-/K3bxnb6y+9nEuGvoIpPl218xmNqjOWgpV8hQ/W12ZA=";
fetchSubmodules = true;
};

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.10.2";
version = "2.11.1";
src = fetchFromGitHub {
owner = "spicetify";
repo = pname;
rev = "v${version}";
sha256 = "sha256-chaCz4+RXPUP/MZymxA0h1ATuWYRgru3JMELiWPEBcE=";
sha256 = "sha256-NX3qbnnbV2mLxBQCjfl7xNicyir6usi2uYGw6Yij/ho=";
};
vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng=";

View file

@ -1,60 +1,45 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }:
{ lib, buildGoModule, fetchurl, fetchFromGitHub }:
let
version = "1.6.4";
version = "1.8.0";
# TODO: must build the extension instead of downloading it. But since it's
# literally an asset that is indifferent regardless of the platform, this
# might be just enough.
webext = fetchurl {
url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi";
sha256 = "1shf1s9s525wns5vrsc4ns21zjxm1si43lx6v0q8ma6vd5x5445l";
url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}.xpi";
sha256 = "sha256-12xWbf4ngYHWLKV9yyxyi0Ny/zHSj2o7Icats+Ef+pA=";
};
in buildGoPackage rec {
in
buildGoModule rec {
inherit version;
pname = "browsh";
goPackagePath = "browsh";
sourceRoot = "source/interfacer";
# further go package dependencies are defined in deps.nix, see line below.
src = fetchFromGitHub {
owner = "browsh-org";
repo = "browsh";
rev = "v${version}";
sha256 = "0gvf5k1gm81xxg7ha309kgfkgl5357dli0fbc4z01rmfgbl0rfa0";
sha256 = "sha256-/tH1w6qi+rimsqtk8Y8AYljU3X4vbmoDtV07piWSBdw=";
};
nativeBuildInputs = [ go-bindata ];
vendorSha256 = "sha256-eCvV3UuM/JtCgMqvwvqWF3bpOmPSos5Pfhu6ETaS58c=";
# embed the web extension in a go file and place it where it's supposed to
# be. See
# https://github.com/browsh-org/browsh/blob/v1.5.0/interfacer/contrib/xpi2bin.sh
preBuild = ''
xpiprefix="$(mktemp -d)"
cp "${webext}" "$xpiprefix/browsh.xpi"
go-bindata \
-prefix "$xpiprefix" \
-pkg browsh \
-o "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/webextension.go" \
"$xpiprefix/browsh.xpi"
sed \
-e 's:Asset("/browsh.xpi"):Asset("browsh.xpi"):g' \
-i "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/firefox.go"
cp "${webext}" src/browsh/browsh.xpi
'';
postBuild = ''
mv "$NIX_BUILD_TOP/go/bin/src" "$NIX_BUILD_TOP/go/bin/browsh"
'';
goDeps = ./deps.nix;
# Tests require network access
doCheck = false;
meta = with lib; {
description = "A fully-modern text-based browser, rendering to TTY and browsers";
homepage = "https://www.brow.sh/";
maintainers = [ maintainers.kalbasit ];
maintainers = with maintainers; [ kalbasit siraben ];
license = lib.licenses.lgpl21;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};

View file

@ -1,264 +0,0 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "github.com/NYTimes/gziphandler";
fetch = {
type = "git";
url = "https://github.com/NYTimes/gziphandler";
rev = "dd0439581c7657cb652dfe5c71d7d48baf39541d";
sha256 = "0rhrjlw220hnymzfccm0yir3pc9dpj7h3gwzhzq2cbsb3hhsqvyy";
};
}
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
type = "git";
url = "https://github.com/fsnotify/fsnotify";
rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "github.com/gdamore/encoding";
fetch = {
type = "git";
url = "https://github.com/gdamore/encoding";
rev = "6289cdc94c00ac4aa177771c5fce7af2f96b626d";
sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9";
};
}
{
goPackagePath = "github.com/gdamore/tcell";
fetch = {
type = "git";
url = "https://github.com/gdamore/tcell";
rev = "b5d0c1ac570211e469f43ff88c0c6aa4b56cc99a";
sha256 = "0g2zfbgyk3djlk0qpmrgcyy0ba9ad932yswpaacswi21qyf9gwag";
};
}
{
goPackagePath = "github.com/go-errors/errors";
fetch = {
type = "git";
url = "https://github.com/go-errors/errors";
rev = "a6af135bd4e28680facf08a3d206b454abc877a4";
sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
};
}
{
goPackagePath = "github.com/gorilla/websocket";
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
rev = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d";
sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
};
}
{
goPackagePath = "github.com/hashicorp/hcl";
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
rev = "8cb6e5b959231cc1119e43259c4a608f9c51a241";
sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
};
}
{
goPackagePath = "github.com/hpcloud/tail";
fetch = {
type = "git";
url = "https://github.com/hpcloud/tail";
rev = "a30252cb686a21eb2d0b98132633053ec2f7f1e5";
sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
};
}
{
goPackagePath = "github.com/lucasb-eyer/go-colorful";
fetch = {
type = "git";
url = "https://github.com/lucasb-eyer/go-colorful";
rev = "30298f24079860c4dee452fdef6519b362a4a026";
sha256 = "0fig06880bvk1l92j4127v4x9sar4ds7ga8959gxxghb2w70b7l2";
};
}
{
goPackagePath = "github.com/magiconair/properties";
fetch = {
type = "git";
url = "https://github.com/magiconair/properties";
rev = "de8848e004dd33dc07a2947b3d76f618a7fc7ef1";
sha256 = "19zqw1x0w0crh8zc84yy82nkcc5yjz72gviaf2xjgfm5a8np7nyb";
};
}
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "3ee7d812e62a0804a7d0a324e0249ca2db3476d3";
sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
};
}
{
goPackagePath = "github.com/mitchellh/mapstructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe";
sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
};
}
{
goPackagePath = "github.com/onsi/ginkgo";
fetch = {
type = "git";
url = "https://github.com/onsi/ginkgo";
rev = "eea6ad008b96acdaa524f5b409513bf062b500ad";
sha256 = "1326s5fxgasdpz1qqwrw4n5p3k0vz44msnyz14knrhlw5l97lx33";
};
}
{
goPackagePath = "github.com/onsi/gomega";
fetch = {
type = "git";
url = "https://github.com/onsi/gomega";
rev = "90e289841c1ed79b7a598a7cd9959750cb5e89e2";
sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9";
};
}
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
rev = "728039f679cbcd4f6a54e080d2219a4c4928c546";
sha256 = "1v76s3vds0i9dxaha4ikd6xjm7vqqfk6sy9l6jc2lsvmj99d5sy6";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4";
sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
goPackagePath = "github.com/shibukawa/configdir";
fetch = {
type = "git";
url = "https://github.com/shibukawa/configdir";
rev = "e180dbdc8da04c4fa04272e875ce64949f38bd3e";
sha256 = "0vbma9jkwh0ifz8dk2ssgmy7aiaify63lpa0lah7i4dkkxr94c9z";
};
}
{
goPackagePath = "github.com/spf13/afero";
fetch = {
type = "git";
url = "https://github.com/spf13/afero";
rev = "588a75ec4f32903aa5e39a2619ba6a4631e28424";
sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9";
};
}
{
goPackagePath = "github.com/spf13/cast";
fetch = {
type = "git";
url = "https://github.com/spf13/cast";
rev = "8c9545af88b134710ab1cd196795e7f2388358d7";
sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
};
}
{
goPackagePath = "github.com/spf13/jwalterweatherman";
fetch = {
type = "git";
url = "https://github.com/spf13/jwalterweatherman";
rev = "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1";
sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b";
};
}
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "298182f68c66c05229eb03ac171abe6e309ee79a";
sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
};
}
{
goPackagePath = "github.com/spf13/viper";
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
rev = "b5bf975e5823809fb22c7644d008757f78a4259e";
sha256 = "1zpzxvn13wpvbblbbn73svaq39zgxfjqhci9d68g3qf309pcfy19";
};
}
{
goPackagePath = "github.com/ulule/limiter";
fetch = {
type = "git";
url = "https://github.com/ulule/limiter";
rev = "38b2a440be905c8be884fd5e114dc893a64e5d81";
sha256 = "0sbbfz9k3m2hf45cx7y7xshsr3rac495lks9ciwmnrzsnxfdh3l5";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "461777fb6f67e8cb9d70cda16573678d085a74cf";
sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "93c9922d18aeb82498a065f07aec7ad7fa60dfb7";
sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475";
sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
};
}
{
goPackagePath = "gopkg.in/fsnotify.v1";
fetch = {
type = "git";
url = "https://github.com/fsnotify/fsnotify";
rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "gopkg.in/tomb.v1";
fetch = {
type = "git";
url = "https://github.com/go-tomb/tomb";
rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8";
sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://github.com/go-yaml/yaml";
rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
]

View file

@ -3,10 +3,10 @@
"owner": "CiscoDevNet",
"provider-source-address": "registry.terraform.io/CiscoDevNet/aci",
"repo": "terraform-provider-aci",
"rev": "v2.3.0",
"sha256": "sha256-V4LvMVWuKsGMVo/P8r79ICy3SrsVmCOMl75yRIixqAQ=",
"rev": "v2.4.0",
"sha256": "sha256-jP9C2RF0lTzQ2HB21WPAZ1aONcQijiYxfi7miltT7W0=",
"vendorSha256": null,
"version": "2.3.0"
"version": "2.4.0"
},
"acme": {
"owner": "vancluever",
@ -49,10 +49,10 @@
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
"rev": "v1.176.0",
"sha256": "sha256-YMcB1CdnXdYHBUdghFP/4BHCtWfOSzPXMD+VZp49VY0=",
"vendorSha256": "sha256-6FiVXy/q3WImYDbwvj9e3ns9gilaL6GBW5qCpaUNCW0=",
"version": "1.176.0"
"rev": "v1.177.0",
"sha256": "sha256-Fm0ECJ/pszClIlzqRcW8jKwU+PfejL8D8ln/5GxWHH8=",
"vendorSha256": "sha256-pia256CKguRY+Acedq6QJmgBpiIGwxgn6tchFB6qjwQ=",
"version": "1.177.0"
},
"ansible": {
"owner": "nbering",
@ -76,37 +76,37 @@
"owner": "auth0",
"provider-source-address": "registry.terraform.io/auth0/auth0",
"repo": "terraform-provider-auth0",
"rev": "v0.33.0",
"sha256": "sha256-yAt2uBrkHS6TalHArSikRxTo8s0g/PoNoPBS/d/iWzY=",
"vendorSha256": "sha256-HJtG2sCQpY9rTSwHj2PjSiF8236VLufF9B9TyubGD/Q=",
"version": "0.33.0"
"rev": "v0.34.0",
"sha256": "sha256-wjqJf3MgLL5NAXp0Nf9VWg8D8jEKvyXoLCMq9yyyFGM=",
"vendorSha256": "sha256-5OIMhuzM/jTXNeZpMG3BOOUTmJyoLrbOjR2O7ixDDlM=",
"version": "0.34.0"
},
"avi": {
"owner": "vmware",
"provider-source-address": "registry.terraform.io/vmware/avi",
"repo": "terraform-provider-avi",
"rev": "v21.1.4",
"sha256": "sha256-6H56TRA3I0CQ9/d8JdP5JNL0u3lpS8YhCvdSM5bxYp8=",
"vendorSha256": "sha256-b0MwGmgugZdmVk7ZVBSCivDQ4n+tLABymH/igo/S1Wc=",
"version": "21.1.4"
"rev": "v22.1.1",
"sha256": "sha256-BQ4M1e7wWDCq2HEJIoAAqSUmq9hV66auvH47p3j2M8I=",
"vendorSha256": "sha256-otOArethLfanpp3KjQCutrlOxkcpr+6YHn5xWl31feE=",
"version": "22.1.1"
},
"aviatrix": {
"owner": "AviatrixSystems",
"provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix",
"repo": "terraform-provider-aviatrix",
"rev": "v2.22.1",
"sha256": "sha256-jvk6j/JZvRSq1ywlkJdCXGFrJccjViCVAIe+z4SjiUk=",
"rev": "v2.22.2",
"sha256": "sha256-3IzIeixm63r42s/Bs8EMemxK0u0TSCWgTuPw3FoBSws=",
"vendorSha256": null,
"version": "2.22.1"
"version": "2.22.2"
},
"aws": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
"rev": "v4.22.0",
"sha256": "sha256-F+YzXIKkF/eGUY3l8MjeP+8GqS37e1N9b+fmNCkdeMM=",
"vendorSha256": "sha256-kz0bPsfLCekRj/ZGCBT+eFRMRkV+Dc69RkyBbFaztd0=",
"version": "4.22.0"
"rev": "v4.23.0",
"sha256": "sha256-cl58lC2oAT+8kISm59E1zRq9pZk+xaQxVxnDge/9jFk=",
"vendorSha256": "sha256-ew6s5QbGOibhCyhbhEjCCVA6d7BrhH7UPovizv/U85Y=",
"version": "4.23.0"
},
"azuread": {
"owner": "hashicorp",
@ -121,10 +121,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
"repo": "terraform-provider-azurerm",
"rev": "v3.14.0",
"sha256": "sha256-/lE+PuljWG57d3tSiNo0ED4Cj2fJbyDsWNqdYcl1vS4=",
"rev": "v3.15.0",
"sha256": "sha256-U6AVVbX1IuYIASuC7W9ZLpXjT/aOBrg+H7mbVwJfZMc=",
"vendorSha256": null,
"version": "3.14.0"
"version": "3.15.0"
},
"azurestack": {
"owner": "hashicorp",
@ -377,10 +377,10 @@
"owner": "exoscale",
"provider-source-address": "registry.terraform.io/exoscale/exoscale",
"repo": "terraform-provider-exoscale",
"rev": "v0.38.0",
"sha256": "sha256-TVJlfce5bF5Z64FOPKqb0ac+NtjzeHsid+Q7vWIINuk=",
"rev": "v0.39.1",
"sha256": "sha256-dsTKh/Fx0PEka/vOy/AJ3CAcE2lpY7x62ms0sTIPwOw=",
"vendorSha256": null,
"version": "0.38.0"
"version": "0.39.1"
},
"external": {
"owner": "hashicorp",
@ -395,19 +395,19 @@
"owner": "fastly",
"provider-source-address": "registry.terraform.io/fastly/fastly",
"repo": "terraform-provider-fastly",
"rev": "v2.2.0",
"sha256": "sha256-x5Rl4JW59kuAoX0pSpCpto3dcvyEhvZlocg8fv2R6Jw=",
"rev": "v2.2.1",
"sha256": "sha256-Ls5yTkwnvBjvGyJZ9Hr+BE6jFuwoTfl/iFVf3WsduF8=",
"vendorSha256": null,
"version": "2.2.0"
"version": "2.2.1"
},
"flexibleengine": {
"owner": "FlexibleEngineCloud",
"provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine",
"repo": "terraform-provider-flexibleengine",
"rev": "v1.31.0",
"sha256": "sha256-Vu6XRRtN+04Hg1OhZ42QaqFiVbov0Zg5v6Rbyeyz410=",
"rev": "v1.31.1",
"sha256": "sha256-QB3O9Ez+hFgBE1yYi1kqtC3WW//Ueg/Ij4p2WbQz/AE=",
"vendorSha256": "sha256-P2/yK6aLNdmC8g5dMKK0hpAdj76KtewzVVHQsVgr3J4=",
"version": "1.31.0"
"version": "1.31.1"
},
"fortios": {
"owner": "fortinetdev",
@ -431,10 +431,10 @@
"owner": "integrations",
"provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github",
"rev": "v4.27.0",
"sha256": "sha256-cQMkBhXvD5sO9obHGH64GcDg6v5X5qs9QHwjyBNkRww=",
"rev": "v4.27.1",
"sha256": "sha256-Pu8I+tAcrEN8ZtBv/gH1VguO1GVk3tnqeJ50cLh7/HQ=",
"vendorSha256": null,
"version": "4.27.0"
"version": "4.27.1"
},
"gitlab": {
"owner": "gitlabhq",
@ -450,20 +450,20 @@
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.28.0",
"sha256": "sha256-Dy0T5/G8vzaE688o/lb4H3ccE0mGnTRDQHIxcvs1C9k=",
"vendorSha256": "sha256-c836amEF3krq1ERNZGTUgQ6nzPUKg8GiJ2RkDmcVPNk=",
"version": "4.28.0"
"rev": "v4.29.0",
"sha256": "sha256-4qWqL/A/Q9tOokhQc8HMgqNVnLjfLkMKM8JfSZSMuj8=",
"vendorSha256": "sha256-slZpug9kyO3BNARwBUgZLRj0QWkUAKzb9eSVhth9zhY=",
"version": "4.29.0"
},
"google-beta": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.28.0",
"sha256": "sha256-faYPwFcusDVM1TM5I9sgpUBER8TB2ltaTryyDvLQz9g=",
"vendorSha256": "sha256-c836amEF3krq1ERNZGTUgQ6nzPUKg8GiJ2RkDmcVPNk=",
"version": "4.28.0"
"rev": "v4.29.0",
"sha256": "sha256-bBpJ+iG/wTXUQCVIPyEyyZG41Qeot8unGF0qQj2Pco8=",
"vendorSha256": "sha256-slZpug9kyO3BNARwBUgZLRj0QWkUAKzb9eSVhth9zhY=",
"version": "4.29.0"
},
"googleworkspace": {
"owner": "hashicorp",
@ -487,19 +487,19 @@
"owner": "gridscale",
"provider-source-address": "registry.terraform.io/gridscale/gridscale",
"repo": "terraform-provider-gridscale",
"rev": "v1.14.3",
"sha256": "sha256-OGVIZ6q8qq4XkkWxjX5BQCJE9qubJ5Xnt2DrD23JGB8=",
"rev": "v1.15.0",
"sha256": "sha256-vbFrwAZBazZok4LwXTTa4QIZpHxIPKv3x6vUyVt2S2I=",
"vendorSha256": null,
"version": "1.14.3"
"version": "1.15.0"
},
"hcloud": {
"owner": "hetznercloud",
"provider-source-address": "registry.terraform.io/hetznercloud/hcloud",
"repo": "terraform-provider-hcloud",
"rev": "v1.34.3",
"sha256": "sha256-3p7pdpBxrbKZx6di39GQb2DOS2ZtN4uVmIb2OU0Zs+c=",
"rev": "v1.35.0",
"sha256": "sha256-64WfmC0QZRYP3L9Lf3bT5Cy5qOAlCpNt6ME/xe8U6MA=",
"vendorSha256": "sha256-3JFdsuJlDW6xTgSgn7hkIWfH9Iqr35t8op4yVXYIFpg=",
"version": "1.34.3"
"version": "1.35.0"
},
"helm": {
"owner": "hashicorp",
@ -514,10 +514,10 @@
"owner": "heroku",
"provider-source-address": "registry.terraform.io/heroku/heroku",
"repo": "terraform-provider-heroku",
"rev": "v5.1.0",
"sha256": "sha256-MMX8zaM3J2GxMXUX0YNX03V8uQzb67cIUF432tjm3Mw=",
"rev": "v5.1.1",
"sha256": "sha256-lXMxIxXgjW2hD4wJQBnc19WFym4zJSKq3dUeUbIqiOQ=",
"vendorSha256": null,
"version": "5.1.0"
"version": "5.1.1"
},
"hetznerdns": {
"owner": "timohirt",
@ -676,10 +676,10 @@
"owner": "linode",
"provider-source-address": "registry.terraform.io/linode/linode",
"repo": "terraform-provider-linode",
"rev": "v1.28.0",
"sha256": "sha256-FkfyyG+DcfsTQY319zmg5iiCgAW8Eu2PxWF35vd51Ng=",
"vendorSha256": "sha256-fWD1Qf6vFe/MH2K2yFufCFBcVuos7FD31ShOA9GvsWw=",
"version": "1.28.0"
"rev": "v1.28.1",
"sha256": "sha256-w7PvzcgyzrkxQ+I8Bjw5C3MqMmiJS5neuGipC+H+mEM=",
"vendorSha256": "sha256-c0NtM3TkkSjrwQ9fj0XiH0BYnSsE8uzirkTv2QHzPOg=",
"version": "1.28.1"
},
"linuxbox": {
"owner": "numtide",
@ -794,10 +794,10 @@
"owner": "newrelic",
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v2.48.2",
"sha256": "sha256-iLgc9nkeQIElVvu7+Pw5yZyzsx3VovCKOoJMIPigBGo=",
"vendorSha256": "sha256-ch+xeSTIu1zkbPN/zq3BKywNLt6ip1HxYCvSmU+0+mI=",
"version": "2.48.2"
"rev": "v2.49.1",
"sha256": "sha256-+jjMdBj8yEJBA9etiRo3qu+/KfpOe3Gb2DqCR8YPzPI=",
"vendorSha256": "sha256-iIArzW/r57OCtq/lNaFCvQrrGJ8WPHo4md+JrHdMyGs=",
"version": "2.49.1"
},
"nomad": {
"owner": "hashicorp",
@ -849,10 +849,10 @@
"owner": "oracle",
"provider-source-address": "registry.terraform.io/oracle/oci",
"repo": "terraform-provider-oci",
"rev": "v4.84.0",
"sha256": "sha256-fLWA7SPoCzO2TZkxnUw5K07OCAQYd+X5BMnHeIdAEdA=",
"rev": "v4.85.0",
"sha256": "sha256-Idqd8l2vxgWyV7uze66mP2/+KKaPQug8FXfyDb8d1Vg=",
"vendorSha256": null,
"version": "4.84.0"
"version": "4.85.0"
},
"okta": {
"owner": "okta",
@ -894,19 +894,19 @@
"owner": "opentelekomcloud",
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.30.0",
"sha256": "sha256-goXQlsOw/nE4d+9VXfqr1yhf/DEOtlVdIS2QJ2s4+8M=",
"rev": "v1.30.1",
"sha256": "sha256-FIxW/bxs/w4j/YyYIYLQHH3Nh4TUWNb2pGqC6zjBiww=",
"vendorSha256": "sha256-0QKYpjA9iv8dSOZ5mIqJ/hpQxlgd+5Y/txBDa0Gsqqc=",
"version": "1.30.0"
"version": "1.30.1"
},
"opsgenie": {
"owner": "opsgenie",
"provider-source-address": "registry.terraform.io/opsgenie/opsgenie",
"repo": "terraform-provider-opsgenie",
"rev": "v0.6.10",
"sha256": "sha256-nA3AXwvVFBnyVK8qeUN0AUzISpAYzVdLtyBQNbUxuM8=",
"rev": "v0.6.11",
"sha256": "sha256-R+IKAI86DhQ2E74VpswqG75p7PRzSV77at2+dAyI5RI=",
"vendorSha256": null,
"version": "0.6.10"
"version": "0.6.11"
},
"ovh": {
"owner": "ovh",
@ -1011,10 +1011,10 @@
"owner": "scaleway",
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.2.2",
"sha256": "sha256-uSJga2M+9unC8eJkUjhuCQbTTGXEYGky4MJyVL0ZfiQ=",
"vendorSha256": "sha256-DOL38q5463aOMijP6AbBuE7jI7hvLYLm8yCBxrr6DoA=",
"version": "2.2.2"
"rev": "v2.2.3",
"sha256": "sha256-XiGc6MU0TrpaZL0SRKez2IUFM7MZIu8tGMFIUQJzbv4=",
"vendorSha256": "sha256-pDDk4cGCZEotOfL1OLEVJVQ35lI/fdNh2NNjAkIHTZ0=",
"version": "2.2.3"
},
"secret": {
"owner": "numtide",
@ -1038,10 +1038,10 @@
"owner": "jianyuan",
"provider-source-address": "registry.terraform.io/jianyuan/sentry",
"repo": "terraform-provider-sentry",
"rev": "v0.9.2",
"sha256": "sha256-/Am4v+s7l3hDCbvIV34aG9C+dMEtPS6qB97FywcZcho=",
"vendorSha256": "sha256-A8VxxoMYd8Z4DRFmBLh/uSzjWxIyLQGtV4kGbuDfv8I=",
"version": "0.9.2"
"rev": "v0.9.3",
"sha256": "sha256-FTwJ0H5k5zeglgjur3O6b4GybWAmVF4K7QmNMlvHnlY=",
"vendorSha256": "sha256-lmnZLgCTpKGhk+rUWwL2GQoBAXlU006Sk1GZrcEvhD4=",
"version": "0.9.3"
},
"shell": {
"owner": "scottwinkler",
@ -1056,10 +1056,10 @@
"owner": "splunk-terraform",
"provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",
"repo": "terraform-provider-signalfx",
"rev": "v6.13.1",
"sha256": "sha256-OtWJgLObTaWCGOjxN8nlkmfW+D6EMS0esht/OkJaioM=",
"vendorSha256": "sha256-yWqUsObvABwmA6V9ecz8SFtk1Bhdq2/dUpnNLKQtuNM=",
"version": "6.13.1"
"rev": "v6.14.0",
"sha256": "sha256-29yN8n/m/1kSl9xRlf5dae9KOL16FvfZJuM1fLqWPd4=",
"vendorSha256": "sha256-I9fWw6wJiytEuiT8gQVSTKuQggXCMENn4RBxPsenZOY=",
"version": "6.14.0"
},
"skytap": {
"owner": "skytap",
@ -1074,10 +1074,10 @@
"owner": "Snowflake-Labs",
"provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake",
"repo": "terraform-provider-snowflake",
"rev": "v0.39.0",
"sha256": "sha256-I15vLcZtVPs/37vRuJk5qiiWxNXY561gpWkOLw4ZN6w=",
"rev": "v0.40.0",
"sha256": "sha256-xouzlgI7MkFfela0ZgaX318YhgBLN5/qN+yqZ7rxVGQ=",
"vendorSha256": "sha256-I0d7Nm8h7vBHxvcyTousg7Uc+QuYu8FCPabPNMw8rGM=",
"version": "0.39.0"
"version": "0.40.0"
},
"sops": {
"owner": "carlpett",
@ -1128,10 +1128,10 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.76.0",
"sha256": "sha256-Qfe2j6y2qn1GVtsv9+Sy7r9tmPMuAkkNNsOqno2nCx8=",
"rev": "v1.76.2",
"sha256": "sha256-dtymdUggjQk3v8FWWBktMe2kPoeEn3FBsXSZ12JneRw=",
"vendorSha256": null,
"version": "1.76.0"
"version": "1.76.2"
},
"tfe": {
"owner": "hashicorp",
@ -1164,10 +1164,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/tls",
"repo": "terraform-provider-tls",
"rev": "v3.4.0",
"sha256": "sha256-14sKHnmUfDbXceH+bfSPuA1TKo6Q6kkazYwHC15D4vY=",
"vendorSha256": "sha256-o7QvF6Z/HCyb/EBr0m90B63AVKqxteQEBXe+OuovnYg=",
"version": "3.4.0"
"rev": "v4.0.0",
"sha256": "sha256-owOYnn4tIvdCxCZLaAhq9UwcgDIwyrISVTxWjC6oRM8=",
"vendorSha256": "sha256-Uk20wDu2qIs9Ez/H6NyHMS7i34Il0ReuDzC3MnKdHSk=",
"version": "4.0.0"
},
"triton": {
"deleteVendor": true,
@ -1201,10 +1201,10 @@
"owner": "cloudposse",
"provider-source-address": "registry.terraform.io/cloudposse/utils",
"repo": "terraform-provider-utils",
"rev": "0.17.27",
"sha256": "sha256-FE2G0EOjI4D9HzH05eiwTHc4ZN+5NfcJXYoMUZN+OWM=",
"vendorSha256": "sha256-/ZxmvsKTteAvl9NoCyxSQk4llDsGZmZTZxEIPlqXvY0=",
"version": "0.17.27"
"rev": "0.17.28",
"sha256": "sha256-8Ep4eYpFSJtIA7twOpUI5ns4/lqSnM07MflQJLnC8eU=",
"vendorSha256": "sha256-6ELd3Cxc460TY+XY1AcDQamYg76hWad6bO9BzTEWleU=",
"version": "0.17.28"
},
"vault": {
"owner": "hashicorp",

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "waypoint";
version = "0.8.2";
version = "0.9.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Pq1gGXROPHHMaOoQwx6cObvMF+SoilOROR4bwI0Y/GM=";
sha256 = "sha256-R+X0fp4AdC3u+/rX2Vb0P3MTBRi94wfT9YvW2pxwr5Y=";
};
vendorSha256 = "sha256-Q8ookgQwecRuSrnQiIREBMDxK9NAWfHu+sIQeMO/T4w=";
vendorSha256 = "sha256-bDsmou4zmRz8DyENdteJ3MzhTpCgri4ISIgxi7fhQdc=";
nativeBuildInputs = [ go-bindata installShellFiles ];

View file

@ -5,21 +5,22 @@
, installShellFiles
, btrfs-progs
, glibc
, gitUpdater
, testers
, werf
}:
buildGoModule rec {
pname = "werf";
version = "1.2.128";
version = "1.2.138";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
sha256 = "sha256-H1GzIxj6ZrlcNM4Y0oKYoVBsMFj4wYP9XYicAmIpaik=";
sha256 = "sha256-gRMPTw/PzAE/kij4dq9ph/1Iz/a+fEsT5HSogC5EDFE=";
};
vendorSha256 = "sha256-78V+cw0A3Q3Gagl4KrserFXvV17MSqhpaFG38VKwhKg=";
vendorSha256 = "sha256-6/XiTgAQ3M3ge/b7uEFD0K+3kd7I2yqZJjgPVXP+uQ0=";
proxyVendor = true;
@ -58,10 +59,10 @@ buildGoModule rec {
--zsh <($out/bin/werf completion --shell=zsh)
'';
passthru.updateScript = gitUpdater {
inherit pname version;
ignoredVersions = "1\.[3-9].*";
rev-prefix = "v";
passthru.tests.version = testers.testVersion {
package = werf;
command = "werf version";
version = "v${version}";
};
meta = with lib; {

View file

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

View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "irssi";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "irssi";
repo = "irssi";
rev = version;
hash = "sha256-HLcIhAZoJfCHoSNQCpoytBR0zmiZd919FcKWCl35G0A=";
hash = "sha256-dQZ/CeBfcfWGjKPF3fR62JDqyEXGv5hd9VT4OEbgJhQ=";
};
nativeBuildInputs = [

View file

@ -1,34 +1,28 @@
{ lib, stdenv, fetchFromGitHub, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }:
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, openssl, irssi }:
stdenv.mkDerivation rec {
pname = "fish-irssi";
version = "unstable-2013-04-13";
version = "unstable-2021-04-16";
src = fetchFromGitHub {
owner = "falsovsky";
repo = "FiSH-irssi";
rev = "e98156bebd8c150bf100b3a0356e7103bb5c20e6";
sha256 = "0mqq7q3rnkzx4j352g1l8sv3g687d76ikjl9c7g6xw96y91kqvdp";
rev = "fcc484f09ce6941ba2e499605270593ddd13b81a";
hash = "sha256-KIPnz17a0CFfoPO2dZz90j+wG/dR4pv5d0iZMRf7Vkc=";
};
preConfigure = ''
cp -a "${irssi.src}" "./${irssi.name}"
configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}"
patches = [ ./irssi-include-dir.patch ];
./regen.sh
'';
nativeBuildInputs = [ cmake pkg-config ];
installPhase = ''
mkdir -p $out/lib/irssi/modules
cp src/.libs/libfish.so $out/lib/irssi/modules
'';
buildInputs = [ glib openssl ];
nativeBuildInputs = [ pkg-config autoconf automake ];
buildInputs = [ gmp libtool openssl glib ];
cmakeFlags = [ "-DIRSSI_INCLUDE_PATH:PATH=${irssi}/include" ];
meta = {
meta = with lib; {
homepage = "https://github.com/falsovsky/FiSH-irssi";
license = lib.licenses.unfree; # I can't find any mention of license
maintainers = with lib.maintainers; [viric];
license = licenses.mit;
maintainers = with maintainers; [ viric ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,33 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 601b92b..b440f83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,27 +36,10 @@ if(OPENSSL_FOUND)
MESSAGE(STATUS "Using OpenSSL ${OPENSSL_VERSION}")
ENDIF()
-# Sets a variable that the user can set with
-# cmake -DIRSSI_INCLUDE_DIR:PATH=/path/to/irssi/includes .
-SET(IRSSI_INCLUDE_DIR "" CACHE PATH "Path to irssi include files")
-
-# Tries to find the irssi include files in the most common places,
-# and in the user defined directory
-FIND_PATH(IRSSI_INCLUDE_PATH
- NAMES irssi-config.h src/common.h
- PATHS /usr/include/irssi /usr/local/include/irssi ${IRSSI_INCLUDE_DIR}
-)
-
-# Bail out if the required irssi files werent found
-IF(NOT IRSSI_INCLUDE_PATH)
- MESSAGE(SEND_ERROR "Could not detect the irssi include files. Please run:\n# cmake -DIRSSI_INCLUDE_DIR:PATH=/path/to/irssi/includes .")
- RETURN()
-ENDIF()
-
MESSAGE(STATUS "irssi includes were found on ${IRSSI_INCLUDE_PATH}")
# Add the weirdo irssi includes directories
-INCLUDE_DIRECTORIES(${IRSSI_INCLUDE_PATH} ${IRSSI_INCLUDE_PATH}/src ${IRSSI_INCLUDE_PATH}/src/fe-common/core ${IRSSI_INCLUDE_PATH}/src/core)
+INCLUDE_DIRECTORIES(${IRSSI_INCLUDE_PATH} ${IRSSI_INCLUDE_PATH}/irssi ${IRSSI_INCLUDE_PATH}/irssi/src ${IRSSI_INCLUDE_PATH}/irssi/src/fe-common/core ${IRSSI_INCLUDE_PATH}/irssi/src/core)
MESSAGE(STATUS "The module will be installed by default to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/irssi/modules")
MESSAGE(STATUS "You can change it with 'cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .'")

View file

@ -1,26 +1,15 @@
{ lib, python3, fetchpatch }:
{ lib, python3 }:
python3.pkgs.buildPythonApplication rec {
pname = "fava";
version = "1.21";
version = "1.22.1";
format = "pyproject";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "sha256-0aFCKEjmXn6yddgNMi9t4rzqHcN7VBLoz3LEg9apmNY=";
sha256 = "sha256-gte1N43b9AokmEqONdvEcaGXDPIeGflsk+wuxDtTeR4=";
};
patches = [
(fetchpatch {
# Update werkzeug compatibility
url = "https://github.com/beancount/fava/commit/5a99417a42e1d739b1e57fae2d01ff1d146dcbc2.patch";
hash = "sha256-Y6IcxZAcFJEYgT8/xBIABdkP+pUdQX1EgSS5uNdSJUE=";
excludes = [
".pre-commit-config.yaml"
];
})
];
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
propagatedBuildInputs = with python3.pkgs; [

View file

@ -12,13 +12,13 @@
buildPythonApplication rec {
pname = "git-machete";
version = "3.11.2";
version = "3.11.3";
src = fetchFromGitHub {
owner = "virtuslab";
repo = pname;
rev = "v${version}";
sha256 = "sha256-alSok5/qcAOBUTNlGjeVSEbT4xW+HzPWj59njfXpG6w=";
sha256 = "sha256-3DIRHvl6r/NhTEQiGqgY59xSI4Y67xRcETgyVv1DIVA=";
};
nativeBuildInputs = [ installShellFiles ];

View file

@ -3,6 +3,7 @@
, fetchFromGitHub
, cmake
, pkg-config
, libexif
, lxqt
, qtbase
, qttools
@ -32,6 +33,7 @@ mkDerivation rec {
];
buildInputs = [
libexif
qtbase
qttools
qtx11extras

View file

@ -1,9 +1,7 @@
{ pkgs, newScope }:
{ pkgs, lib }:
let
callPackage = newScope self;
self = rec {
packages = self: with self; {
# Update script tailored to mate packages from git repository
mateUpdateScript = { pname, version, odd-unstable ? true, rev-prefix ? "v", url ? null }:
@ -101,4 +99,4 @@ let
};
in self
in lib.makeScope pkgs.newScope packages

View file

@ -17,6 +17,13 @@ rec {
extraPrefix = "src/";
excludes = [ "src/testes/*" ];
})
(fetchpatch {
name = "CVE-2022-33099.patch";
url = "https://github.com/lua/lua/commit/42d40581dd919fb134c07027ca1ce0844c670daf.patch";
sha256 = "sha256-qj1Dq1ojVoknALSa67jhgH3G3Kk4GtJP6ROFElVF+D0=";
stripLen = 1;
extraPrefix = "src/";
})
];
};

View file

@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
version = "22.4.3";
version = "22.5.0";
outputs = [ "out" "dev" ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
sha256 = "sha256-NcbtgJjDAHRv7Qs6fPRwScMBPLXci6e2oLxm8DC2nnw=";
sha256 = "sha256-8E3MN4a+k8YA+uuUPApYFvT82bgJHE1cnPyuAO6R1tA=";
};
patches = [

View file

@ -8,13 +8,13 @@
nv-codec-headers = nv-codec-headers-11;
}).overrideAttrs (old: rec {
pname = "jellyfin-ffmpeg";
version = "5.0.1-7";
version = "5.0.1-8";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-ffmpeg";
rev = "v${version}";
sha256 = "sha256-jMd7tEEfiHqTp4q8c6EvbjL0KyJ6ucj4ZNrKOJLJ1Mc=";
sha256 = "sha256-zr1WuTkOBAVk7JkpDT52rfGGOaXEqiPFIGmJUDPhI/w=";
};
postPatch = ''

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config
, zlib, lzma, bzip2, zchunk, zstd
, zlib, xz, bzip2, zchunk, zstd
, expat, rpm, db }:
stdenv.mkDerivation rec {
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake ninja pkg-config ];
buildInputs = [ zlib lzma bzip2 zchunk zstd expat rpm db ];
buildInputs = [ zlib xz bzip2 zchunk zstd expat rpm db ];
meta = with lib; {
description = "A free package dependency solver";

View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mtxclient";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "Nheko-Reborn";
repo = "mtxclient";
rev = "v${version}";
sha256 = "sha256-iGw+qdw7heL5q7G0dwtl4PX2UA0Kka0FUmH610dM/00=";
sha256 = "sha256-SQoPeUdDNQU4qYDd8udQnIJ6PrZFtEOmf9uqnw1+fz4=";
};
postPatch = ''

View file

@ -11,18 +11,17 @@
stdenv.mkDerivation rec {
pname = "ncnn";
version = "20220216";
version = "20220721";
src = fetchFromGitHub {
owner = "Tencent";
repo = pname;
rev = version;
sha256 = "sha256-QHLD5NQZA7WR4mRQ0NIaXuAu59IV4SjXHOOlar5aOew=";
sha256 = "sha256-35OwvYYZtfugvujWl6bL8p8HU+z1kQsvnJ+aQOgO8V8=";
};
patches = [
./cmakelists.patch
./gpu-include.patch
];
cmakeFlags = [

View file

@ -1,13 +0,0 @@
diff --git a/src/gpu.cpp b/src/gpu.cpp
index 51cd7f95..bf7ed828 100644
--- a/src/gpu.cpp
+++ b/src/gpu.cpp
@@ -21,7 +21,7 @@
#include <vulkan/vulkan.h>
#include "glslang/SPIRV/GlslangToSpv.h"
-#include "glslang/glslang/Public/ShaderLang.h"
+#include "glslang/Public/ShaderLang.h"
#include "command.h"
#include "layer.h"

View file

@ -36,6 +36,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/oneapi-src/oneTBB/pull/833/commits/c18342ba667d1f33f5e9a773aa86b091a9694b97.patch";
sha256 = "ZUExE3nsW80Z5GPWZnDNuDiHHaD1EF7qNl/G5M+Wcxg=";
})
# Fixes build for aarch64-darwin
(fetchurl {
name = "aarch64-darwin.patch";
url = "https://github.com/oneapi-src/oneTBB/pull/258/commits/86f6dcdc17a8f5ef2382faaef860cfa5243984fe.patch";
sha256 = "sha256-JXqrFPCb3q1vfxk752tQu7HhApCB4YH2LoVnGRwmspk=";
})
];
nativeBuildInputs = lib.optionals stdenv.isDarwin [

View file

@ -3,7 +3,7 @@
buildDunePackage {
pname = "qcheck-alcotest";
inherit (qcheck-core) version useDune2 src;
inherit (qcheck-core) version src;
propagatedBuildInputs = [ qcheck-core alcotest ];

View file

@ -2,9 +2,7 @@
buildDunePackage rec {
pname = "qcheck-core";
version = "0.18";
useDune2 = true;
version = "0.19.1";
minimalOCamlVersion = "4.08";
@ -12,7 +10,7 @@ buildDunePackage rec {
owner = "c-cube";
repo = "qcheck";
rev = "v${version}";
sha256 = "1s652hrj2sxqj30dfl300zjvvqk3r62a1bnzqw1hqyf6pi88qn8x";
sha256 = "sha256-AZ1Ww6CWt3X1bXXcofMe14rTlMTC9hmohcKdZLUKEvE=";
};
meta = {

View file

@ -3,7 +3,7 @@
buildDunePackage {
pname = "qcheck";
inherit (qcheck-ounit) version useDune2 src;
inherit (qcheck-ounit) version src;
propagatedBuildInputs = [ qcheck-ounit ];

View file

@ -3,7 +3,7 @@
buildDunePackage {
pname = "qcheck-ounit";
inherit (qcheck-core) version useDune2 src;
inherit (qcheck-core) version src;
propagatedBuildInputs = [ qcheck-core ounit ];

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.25.0";
version = "3.26.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-8K8OKHxuPG5bibb49Epgv9lMuZ7Ipk9753sI22e6j24=";
hash = "sha256-lkzTJfjJNKsMmLet9VXv5Ao8+Dks4P0+0nRpWHHs3G0=";
};
nativeBuildInputs = [

View file

@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = version;
rev = "refs/tags/${version}";
hash = "sha256-BUKuZza9Jer334LUmU5zmfjg1ISuxg7HETEbUMB80KY=";
};

View file

@ -37,8 +37,8 @@
, sqlalchemy
, tenacity
, typing-extensions
, scikit-learn
}:
, testcontainers
, scikit-learn }:
buildPythonPackage rec {
pname = "apache-beam";
@ -107,6 +107,7 @@ buildPythonPackage rec {
scikit-learn
sqlalchemy
tenacity
testcontainers
];
# Make sure we're running the tests for the actually installed
@ -122,8 +123,6 @@ buildPythonPackage rec {
# container_init: Callable[[], Union[PostgresContainer, MySqlContainer]],
# E NameError: name 'MySqlContainer' is not defined
#
# Test relies on the testcontainers package, which is not currently (as of
# 2022-04-08) available in nixpkgs.
"apache_beam/io/external/xlang_jdbcio_it_test.py"
# These tests depend on the availability of specific servers backends.

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "asf-search";
version = "5.0.1";
version = "5.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "asfadmin";
repo = "Discovery-asf_search";
rev = "refs/tags/v${version}";
hash = "sha256-v8++qPeAPc/0nYEYK4GltDflF/unPbX0EvKkjZFuOQY=";
hash = "sha256-Jynks+c8OV0t1GoKAk4vP9jYQ0PclJHl3x8q78au5gk=";
};
propagatedBuildInputs = [

View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "cyclonedx-python-lib";
version = "2.6.0";
version = "2.7.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "CycloneDX";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-UM5z8FEu+Pua/LToraGh8N6V3ujUnu4F6lJec+4cUg4=";
hash = "sha256-Imn9wl5I7dzkUnVBzK2vhWOrf89FycVW4GvEYFeSujU=";
};
nativeBuildInputs = [

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "dvc-objects";
version = "0.1.1";
version = "0.1.4";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-s399GZ/ZuGQcV03NMJMUczEI00m8/xuuFJfzcjuV7T0=";
hash = "sha256-fFpRrFRa1VcVdc/uIJZ+DR74ivttRKkXgibXV3q72qY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "fastprogress";
version = "1.0.2";
version = "1.0.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-lga6RCUFo6RFgdY97dzlv/HfF6y9w3JS98PxvlLB0kM=";
sha256 = "sha256-ehfStDiJD4OMBI7vzjLE3tRxl+zI6gQs7MM9PeuAIvU=";
};
propagatedBuildInputs = [ numpy ];

View file

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "glfw";
version = "2.5.3";
version = "2.5.4";
src = fetchFromGitHub {
owner = "FlorianRhiem";
repo = "pyGLFW";
rev = "refs/tags/v${version}";
sha256 = "sha256-LaK/lYCUN7PDy8QsaGCnQPM1nvQNeBRTdEEkKtaMUHA=";
sha256 = "sha256-4Ym3Vmkf+HwORbhR72Ws/cqLkNMPCY8FL35O2hSalGQ=";
};
# Patch path to GLFW shared object

View file

@ -1,5 +1,6 @@
{ lib, stdenv
, buildPythonPackage
, fetchpatch
, grpc
, six
, protobuf
@ -17,6 +18,15 @@ buildPythonPackage rec {
inherit (grpc) src version;
pname = "grpcio";
patches = [
# Fix build on armv6l
# https://github.com/grpc/grpc/pull/30401
(fetchpatch {
url = "https://github.com/grpc/grpc/commit/65dc9f3edeee4c2d0e9b30d5a3ee63175437bea3.patch";
hash = "sha256-pS4FsCcSjmjSs3J5Y96UonkxqPwfpkyhrEM0t6HaMd0=";
})
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cython pkg-config ];

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2022.7.11";
version = "2022.7.12";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-BR92UGcmNWwQWZFK40rnkYvNbRoL2AYod4oozYXLSuM=";
sha256 = "sha256-9ErXsJUFM0Us9ChkYvpa2bNEy3CBJwfYAz4vnk2wu4Q=";
};
propagatedBuildInputs = [

View file

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "homematicip";
version = "1.0.5";
version = "1.0.6";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "hahn-th";
repo = "homematicip-rest-api";
rev = "refs/tags/${version}";
hash = "sha256-pfVjnRO6iKEgLDQz4JMARzab21XLbbUDUMyMWatGlJ8=";
hash = "sha256-z27VGApm5VsDm6VG0DaDOmhFrvRhLLINHtSM/cIiXyY=";
};
propagatedBuildInputs = [

View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "icecream";
version = "2.1.2";
version = "2.1.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-CTALLRxnhxJBDL1HyVGY6xtYD2bzEaVUzNa551js4O4=";
sha256 = "sha256-CqSnwzdOw2FTodCPgeMIDoPYrB7v2X0vT+lUTo+bSd4=";
};
propagatedBuildInputs = [ asttokens colorama executing pygments ];

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.20.2";
version = "1.20.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZhDk6JxgRASSezRkQ5KnRHKhQBykeZUpGCLW5zzLBSM=";
sha256 = "sha256-1HrXPqUeWtMkPD+wr5nKO9HLZQIqzCzs5j2pp/WNFGc=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];

View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "mailchecker";
version = "4.1.17";
version = "4.1.18";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-NfgLI490/9YoHIXTVD890RTe+qP9rrwAFv8Xkc1IY5s=";
hash = "sha256-zBikruHBTXKK4Yk7euTp0lTcdCG5AQ/kMZrECAvQ7Zw=";
};
# Module has no tests

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "motionblinds";
version = "0.6.10";
version = "0.6.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "motion-blinds";
rev = "refs/tags/${version}";
sha256 = "sha256-WCwj/2iUXOhmww4hiI5KPA7VyoVEYDeEMmnZM+DGHmc=";
sha256 = "sha256-LHZp5IXZqPYNwPlOQySwxon3uZX15caZvMeMY6QQIqk=";
};
propagatedBuildInputs = [

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pip-api";
version = "0.0.29";
version = "0.0.30";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9wFYTrHD4BAhyEb4nWKauTc7ZiTwYmdXd0rVT8TClXE=";
hash = "sha256-oF3yx6qbcVc3S89Cc1RCAaDHuuYKnGW8+E85We84lvM=";
};
propagatedBuildInputs = [

View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "plaid-python";
version = "9.7.0";
version = "9.8.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-yNjrWjlTF7cfEpFbPP6b/L6foNuhNa6JFNv6ImbAZ5k=";
hash = "sha256-iILDOpajLdTi+yPBNIr2+Sb1qBl0KCoSow2XBmDpFSI=";
};
propagatedBuildInputs = [

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "plexapi";
version = "4.11.2";
version = "4.12.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,8 +17,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
sha256 = "sha256-N4ic1DDMAHnHYYoD59ZHFqlgLlvFZV8Nn7V47NDXE5U=";
rev = "refs/tags/${version}";
sha256 = "sha256-GtFAHNqneoWPCUegFDIpmeyuCsjwAx9o6t0ptGNLBeQ=";
};
propagatedBuildInputs = [

View file

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.20.1";
version = "0.21.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
sha256 = "sha256-Sk7L0JPwn7IXVl5GeERxrG/vrHXeNwUjW1mgm4g40Ng=";
sha256 = "sha256-pw1apxqjKKv05Qw2VFN0cKit/3fas7PUb1wS/XsJruY=";
};
propagatedBuildInputs = [

View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pydal";
version = "20220720.1";
version = "20220721.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-cKw3thTqQWsTRqJQD9SyaBVBLM9YIqE/y/gIh4FL1bc=";
sha256 = "sha256-dOSTpK9HZFZL5/QWK/HTzPAgpsCSyj9r5a57cQpmlhY=";
};
postPatch = ''

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyinsteon";
version = "1.1.3";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-CYXsYOqh41qRob2DRxTB6zcc/jcdT9/vWJTRk2LJgWo=";
hash = "sha256-PMjvic+K/m7beavlZvGhJcizSNCzLPZYLm3P2V9EPLs=";
};
propagatedBuildInputs = [

View file

@ -11,15 +11,15 @@
buildPythonPackage rec {
pname = "pylink-square";
version = "0.13.0";
version = "0.14.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "square";
repo = "pylink";
rev = "v${version}";
hash = "sha256-SH2oxOlsX5dE8wMXpWPA/rEVrJwxJzizsOiYbwaGjLw=";
rev = "refs/tags/v${version}";
hash = "sha256-eCVNDPXtZAuzGb4ZOnjEmE1pKPOl52xRfZy+ppfxS3g=";
};
propagatedBuildInputs = [ psutil six future ];

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pysigma-backend-splunk";
version = "0.3.4";
version = "0.3.5";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "SigmaHQ";
repo = "pySigma-backend-splunk";
rev = "v${version}";
hash = "sha256-zsX2lycqJKRASXio8s3Cvkt1yfnBm5cwQOFAFA891GI=";
rev = "refs/tags/v${version}";
hash = "sha256-W6wnxQPrtMDG5jctB7CMXr4kPIhZievFTBJCeSeDCWw=";
};
nativeBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma";
version = "0.6.6";
version = "0.6.8";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma";
rev = "refs/tags/v${version}";
hash = "sha256-9t582CuDq7JeCcaPqWZGMUVLx8e78PygfNPp/s7rMA8=";
hash = "sha256-Jq37/9w1GHr+GZ8Fvftmfz2XkL3zUpTjbDlokrUoLtw=";
};
nativeBuildInputs = [

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.14.1";
version = "0.15.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = "refs/tags/${version}";
hash = "sha256-/p5rmoxSl4Y3X1N3E3BSwPUGV8MCxI0sxv1i9w3fJiY=";
hash = "sha256-x1uRUr9mU510X2rSGBYBheB9rqsGBFr3SLnWcXiIBfk=";
};
propagatedBuildInputs = [

View file

@ -46,7 +46,7 @@
buildPythonPackage rec {
pname = "sentry-sdk";
version = "1.7.2";
version = "1.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = "getsentry";
repo = "sentry-python";
rev = version;
hash = "sha256-0VQ1P3xWC1keoXaPfIzh+uGXvRAK3nOrc6fLKIhfiHk=";
hash = "sha256-PtGQJUZ6/u2exmg6P5VV2RoBKyuV3G2YuAWgA06oQKo=";
};
propagatedBuildInputs = [

View file

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "srsly";
version = "2.4.3";
version = "2.4.4";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-2+kfbdSuqegZSTYoNW3HFb2cYGSGKXu3yldI5uADhBw=";
hash = "sha256-6KBlgWJ7ZxLxnGAkG3wUwrspzobvBPeRN5p58bJJoSg=";
};
nativeBuildInputs = [ cython ];

View file

@ -5,7 +5,7 @@
buildPythonPackage rec {
pname = "tatsu";
version = "5.8.1";
version = "5.8.2";
# upstream only supports 3.10+
disabled = pythonOlder "3.10";
@ -13,7 +13,7 @@ buildPythonPackage rec {
owner = "neogeny";
repo = "TatSu";
rev = "refs/tags/v${version}";
sha256 = "sha256-2zEpP1WATqzAo0HsBGdjjk/RoliyIim1OltPoJTlxIU=";
sha256 = "sha256-eJJ438zjXRZ7dk36RPkFvhcIA5RYo5MsjptZIpjCrVI=";
};
nativeBuildInputs = [ pytest-runner ];

View file

@ -3,8 +3,7 @@
, buildPythonPackage
, deprecation
, docker
, wrapt
}:
, wrapt }:
buildPythonPackage rec {
pname = "testcontainers";
@ -31,7 +30,9 @@ buildPythonPackage rec {
];
meta = with lib; {
description = "Allows using docker containers for functional and integration testing";
description = ''
Allows using docker containers for functional and integration testing
'';
homepage = "https://github.com/testcontainers/testcontainers-python";
license = licenses.asl20;
maintainers = with maintainers; [ onny ];

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "twilio";
version = "7.11.0";
version = "7.12.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
hash = "sha256-JeguDPbsG3aeXDqqojfJHGpDVniY+IvWMD2GCgCUvuQ=";
hash = "sha256-/ni7QwBJTLc9hZPFg6wPskwuqmyKS4MHr+r7d/i87Mc=";
};
propagatedBuildInputs = [

View file

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-pytz";
version = "2022.1.1";
version = "2022.1.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-TnrdcIhtwu5u51NcgYSibusKyduvrpliy4gtdLn2czA=";
sha256 = "sha256-GoslwiXF5r2EaKqetF3dOzN/ZxbUByrQqk7x5BR47rw=";
};
# Modules doesn't have tests

View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.28.2";
version = "2.28.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-OY+IzZMCx5bLY9ECGvKh+3rlB3QaPVCO344HRtjBagQ=";
sha256 = "sha256-+56mkxF2aWf56RhhIR7HRJ9khAJbdm6nCWicDbsp17o=";
};
propagatedBuildInputs = [

View file

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
version = "63.2.0";
version = "63.2.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-/JpsR3ajmND1eyWcqJN0g0IXTFKjXVk9CLVvUqqZwaQ=";
sha256 = "sha256-KVekCt38pccSX9jThqnv2lN5CYxuZqCOAiV/0c6kITE=";
};
# Module doesn't have tests

View file

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "zcs";
version = "0.1.17";
version = "0.1.18";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ZoQgAaJy3kKHLljyKA0Oo/D1kefE8X9FlsGDSNt1nPw=";
sha256 = "sha256-cIg0LFQFVo91Ywvulxtx0/PPyQnRflJFnIi0gaUGGq4=";
};
patches = [

View file

@ -321,8 +321,12 @@ in
substituteInPlace Makefile \
--replace '-Wno-invalid-source-encoding' ""
'' + lib.optionalString stdenv.isDarwin ''
# For < v1.48.0
substituteInPlace src/ruby/ext/grpc/extconf.rb \
--replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" ""
# For >= v1.48.0
substituteInPlace src/ruby/ext/grpc/extconf.rb \
--replace 'apple_toolchain = ' 'apple_toolchain = false && '
'';
};

View file

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "bear";
version = "3.0.19";
version = "3.0.20";
src = fetchFromGitHub {
owner = "rizsotto";
repo = pname;
rev = version;
sha256 = "sha256-Jj38dmzr8NDDMercfWyJrMFxGBSExCGPeG2IVEtnSxY=";
sha256 = "sha256-8hA0Y/AGczFwggxkTG7PQKOVnr2Oizx4OH38nS5jCU0=";
};
nativeBuildInputs = [ cmake pkg-config ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fly";
version = "7.8.1";
version = "7.8.2";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${version}";
sha256 = "sha256-A37XTLL6BcltKofriqai8RX+VQ4jcFRHriP4sUZ5g2c=";
sha256 = "sha256-Lgsn5k3ITJnRnOXXZjfjlEEG+OvTZjFq+LB3Us3DH8k=";
};
vendorSha256 = "sha256-aYu5K6pK6Q0Fmagr91i6nc3t55nUjn5vasIO+kUXWrs=";
vendorSha256 = "sha256-91N6AOxXFOI6AM28avlInseAeZkqE9IfybJAX31tPDg=";
subPackages = [ "fly" ];

View file

@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec {
owner = "azdavis";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+4lMRd4pzbkRDct5kz17MB9drN6sEtYLk29d6TlubLk=";
sha256 = "sha256-nFFgVvctkGCU0BOh8JWftw2pt0KP5bYh+uhm/LhdspQ=";
};
cargoSha256 = "sha256-MoXKNUgNeg2AG7G78wnZvLXADhCsK/WB5WiT5lTSmIQ=";

View file

@ -1,21 +1,53 @@
{ fetchurl, lib, stdenv, python3, ncurses, ocamlPackages, pkg-config }:
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, ocamlPackages
, pkg-config
, autoreconfHook
}:
stdenv.mkDerivation rec {
pname = "coccinelle";
version = "1.1.0";
version = "1.1.1";
src = fetchurl {
url = "https://coccinelle.gitlabpages.inria.fr/website/distrib/${pname}-${version}.tar.gz";
sha256 = "0k0x4qnxzj8fymkp6y9irggcah070hj7hxq8l6ddj8ccpmjbhnsb";
src = fetchFromGitHub {
repo = pname;
rev = version;
owner = "coccinelle";
hash = "sha256-rS9Ktp/YcXF0xUtT4XZtH5F9huvde0vRztY7vGtyuqY=";
};
buildInputs = with ocamlPackages; [
ocaml findlib menhir
ocaml_pcre parmap stdcompat
python3 ncurses pkg-config
patches = [
# Fix data path lookup.
# https://github.com/coccinelle/coccinelle/pull/270
(fetchpatch {
url = "https://github.com/coccinelle/coccinelle/commit/540888ff426e0b1f7907b63ce26e712d1fc172cc.patch";
sha256 = "sha256-W8RNIWDAC3lQ5bG+gD50r7x919JIcZRpt3QSOSMWpW4=";
})
];
doCheck = false;
nativeBuildInputs = with ocamlPackages; [
autoreconfHook
pkg-config
ocaml
findlib
menhir
];
buildInputs = with ocamlPackages; [
ocaml_pcre
parmap
pyml
stdcompat
];
strictDeps = true;
postPatch = ''
# Ensure dependencies from Nixpkgs are picked up.
rm -rf bundles/
'';
meta = {
description = "Program to apply semantic patches to C code";
@ -33,8 +65,8 @@ stdenv.mkDerivation rec {
and others) for finding and fixing bugs in systems code.
'';
homepage = "http://coccinelle.lip6.fr/";
license = lib.licenses.gpl2;
homepage = "https://coccinelle.gitlabpages.inria.fr/website/";
license = lib.licenses.gpl2Only;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.thoughtpolice ];
};

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terracognita";
version = "0.7.4";
version = "0.7.6";
src = fetchFromGitHub {
owner = "cycloidio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QaJoHnuzSQXxEuGpui9lyKAjT2wdz4XmMAh5cAOKvBg=";
sha256 = "sha256-9t3W/mHXXl8Sw/2iQ5D3U66LiO+/mQ56K+ihJCO4au4=";
};
vendorSha256 = "sha256-HcUH3cnaeyB2XnfcRLulsRcHaCwdLkiIb518Ucl2tv8=";
vendorSha256 = "sha256-JkgkBxeUUQBb+VQzhovH5MnVwdxplKMVCGs4CX/fZlY=";
doCheck = false;

View file

@ -0,0 +1,28 @@
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "railway";
version = "1.8.3";
src = fetchFromGitHub {
owner = "railwayapp";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-PAKg/8Ljcrz92M4sdKXZBe9Qa0NYwWnghzjxsCO8nhU=";
};
ldflags = [ "-s" "-w" ];
vendorSha256 = "sha256-nLuomuAScodgLUKzMTiygtFBnNHrqAojOySZgKLVGJY=";
postInstall = ''
mv $out/bin/cli $out/bin/railway
'';
meta = with lib; {
description = "Railway CLI";
homepage = "https://railway.app";
license = licenses.mit;
maintainers = with maintainers; [ Crafter ];
};
}

View file

@ -1,4 +1,11 @@
{ stdenv, rustPlatform, fetchFromGitHub, lib, ruby, which}:
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, fetchpatch
, ruby
, which
}:
rustPlatform.buildRustPackage rec {
pname = "rbspy";
version = "0.12.1";
@ -13,6 +20,15 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "98vmUoWSehX/9rMlHNSvKHJvJxW99pOhS08FI3OeLGo=";
doCheck = true;
patches = [
# Backport rust 1.62 support. Should be removed in the next rbspy release.
(fetchpatch {
name = "rust-1.62.patch";
url = "https://github.com/rbspy/rbspy/commit/f5a8eecfbf2ad0b3ff9105115988478fb760d54d.patch";
sha256 = "sha256-+04rvEXU7/lx5IQkk3Bhe+KLN8PwxZ0j4nH5ySnS154=";
})
];
# Tests in initialize.rs rely on specific PIDs being queried and attaching
# tracing to forked processes, which don't work well with the isolated build.
preCheck = ''

View file

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
description = "Roswell is a Lisp implementation installer/manager, launcher, and much more";
license = licenses.mit;
maintainers = with maintainers; [ hiro98 ];
platforms = platforms.linux;
platforms = platforms.unix;
homepage = "https://github.com/roswell/roswell";
mainProgram = "ros";
};

View file

@ -13,11 +13,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.35.13";
version = "0.35.15";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-rkE/GLFZP1C5C4s6ghbfsJY92Wu3ku27VRorU/ZGelA=";
sha256 = "sha256-fHW3ypi/BlfDybhnHOmPoBlyMdf3ZK7pOnH35cvhhRU=";
};
nativeBuildInputs = [ pkg-config ];
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
cargoSha256 = "sha256-GSHbs8GUHqFrBN1Op6Uh4fPzXEjSkX+a6beBQxS19K8=";
cargoSha256 = "sha256-Az7A0VMlWv34uUeM0TH7tT5FPja/j0x6aoF7qDw8JCs=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.

File diff suppressed because it is too large Load diff

View file

@ -11,17 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "uniffi-bindgen";
version = "0.17.0";
version = "0.19.3";
src = fetchFromGitHub {
owner = "mozilla";
repo = "uniffi-rs";
rev = "v${version}";
hash = "sha256-EGyJrW0U/dnKT7OWgd8LehCyvj6mxud3QWbBVyhoK4Y=";
hash = "sha256-A6Zd1jfhoR4yW2lT5qYE3vJTpiJc94pK/XQmfE2QLFc=";
};
cargoLock.lockFileContents = builtins.readFile ./Cargo.lock;
cargoHash = "sha256-Fw+yCAI32NdFKJGPuNU6t0FiEfohoVD3VQfInNJuooI=";
cargoLock.lockFile = ./Cargo.lock;
cargoBuildFlags = [ "-p uniffi_bindgen" ];
cargoTestFlags = [ "-p uniffi_bindgen" ];
@ -36,6 +35,8 @@ rustPlatform.buildRustPackage rec {
--suffix PATH : ${lib.strings.makeBinPath [ rustfmt ktlint yapf rubocop ] }
'';
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Toolkit for building cross-platform software components in Rust";
homepage = "https://mozilla.github.io/uniffi-rs/";

View file

@ -0,0 +1,35 @@
#!/usr/bin/env nix-shell
#! nix-shell -p nix cargo rsync nix-update
#! nix-shell -i bash
set -euo pipefail
if [[ -z "${UPDATE_NIX_ATTR_PATH+x}" ]]; then
echo "Error: run the following command from nixpkgs root:" >&2
echo " nix-shell maintainers/scripts/update.nix --argstr package uniffi-bindgen" >&2
exit 1
fi
targetLockfile="$(dirname "$0")/Cargo.lock"
# Update version and hash
nix-update "$UPDATE_NIX_ATTR_PATH"
# Update lockfile through `cargo update`
src=$(nix-build -A "${UPDATE_NIX_ATTR_PATH}.src" --no-out-link)
tmp=$(mktemp -d)
cleanup() {
echo "Removing $tmp" >&2
rm -rf "$tmp"
}
trap cleanup EXIT
rsync -a --chmod=ugo=rwX "$src/" "$tmp"
pushd "$tmp"
cargo update
cp "Cargo.lock" "$targetLockfile"
popd

View file

@ -11,11 +11,11 @@ let
in
stdenv.mkDerivation rec {
pname = "grails";
version = "5.1.7";
version = "5.1.9";
src = fetchurl {
url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
sha256 = "sha256-Sk+VvuEyzZ9sSeI9fOuHgmgSu89WjriiK/6UU/eWqag=";
sha256 = "sha256-gOC1jwFoasxTAhXoX/Mbl5uL1p6NjXcjpz7td8DZUlk=";
};
nativeBuildInputs = [ unzip ];
@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://grails.org/";
license = licenses.asl20;
sourceProvenance = with sourceTypes; [ binaryBytecode ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};

View file

@ -3,22 +3,22 @@
let
pname = "anki-bin";
# Update hashes for both Linux and Darwin!
version = "2.1.52";
version = "2.1.54";
sources = {
linux = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst";
sha256 = "sha256-+eRflNMxutoSY9yQfnhIjfLg9b9CNv+7UuYyg4jgfK4=";
sha256 = "sha256-NFhgVd4ctEsh7iaSZ9v0OMszd81H41eq+y+FRIhcCtE=";
};
# For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version
darwin-x86_64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg";
sha256 = "sha256-keQxaf0KOQjCb22dQD/1VytW2fk35OPUJyJ42kaoAr8=";
sha256 = "sha256-kus59Z9Oe4sbAlF4szeg751hlSEUR0ijKz4rjfHEWgA=";
};
darwin-aarch64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg";
sha256 = "sha256-mYPSOjXh18nWpZjXLAjEodoxopr6rxadESMAf/t9SlI=";
sha256 = "sha256-ROIpGB3W21ttWj+cRkf0rpLFrO4LR6+ZyGRsalz5J+E=";
};
};

View file

@ -16,21 +16,22 @@
, openal
, msaClientID ? ""
, jdks ? [ jdk jdk8 ]
, extra-cmake-modules
}:
stdenv.mkDerivation rec {
pname = "polymc";
version = "1.3.2";
version = "1.4.0";
src = fetchFromGitHub {
owner = "PolyMC";
repo = "PolyMC";
rev = version;
sha256 = "sha256-hqsyS82UzgCUZ9HjoPKjOLE49fwLntRAh3mVrTsmi3o=";
sha256 = "sha256-gaPqCAC/tE6nUONgWSrVm3oBzSnOhZ5xiAJ+QyX+8rA=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake file jdk wrapQtAppsHook ];
nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ];
buildInputs = [ qtbase zlib quazip ];
cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];

View file

@ -0,0 +1,23 @@
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "autotiling-rs";
version = "0.1.3";
src = fetchFromGitHub {
owner = "ammgws";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LQbmF2M6pWa0QEbKF770x8TFLMGrJeq5HnXHvLrDDPA=";
};
cargoHash = "sha256-wot5GKBA2TBrA/jnWD0eypPRqUodmk/TJlYJMl3/gm4=";
meta = with lib; {
description = "Autotiling for sway (and possibly i3)";
homepage = "https://github.com/ammgws/autotiling-rs";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ dit7ya ];
};
}

View file

@ -24,6 +24,7 @@ stdenv.mkDerivation {
nativeBuildInputs = kernel.moduleBuildDependencies;
meta = with lib; {
broken = kernel.kernelAtLeast "5.16";
description = "Kernel module for ISO-TP (ISO 15765-2)";
homepage = "https://github.com/hartkopp/can-isotp";
license = licenses.gpl2;

View file

@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
'';
meta = {
broken = kernel.kernelAtLeast "5.16";
homepage = "http://www.magewell.com/";
description = "Linux driver for the Magewell Pro Capture family";
license = licenses.unfreeRedistributable;

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