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

This commit is contained in:
Martin Weinelt 2023-01-11 03:51:33 +01:00
commit c1e6c6af69
291 changed files with 4851 additions and 1651 deletions

13
.github/labeler.yml vendored
View File

@ -19,6 +19,11 @@
- pkgs/build-support/emacs/**/*
- pkgs/top-level/emacs-packages.nix
"6.topic: Enlightenment DE":
- nixos/modules/services/x11/desktop-managers/enlightenment.nix
- pkgs/desktops/enlightenment/**/*
- pkgs/development/python-modules/python-efl/*
"6.topic: erlang":
- doc/languages-frameworks/beam.section.md
- pkgs/development/beam-modules/**/*
@ -65,6 +70,14 @@
- pkgs/development/lua-modules/**/*
- pkgs/top-level/lua-packages.nix
"6.topic: Lumina DE":
- nixos/modules/services/x11/desktop-managers/lumina.nix
- pkgs/desktops/lumina/**/*
"6.topic: LXQt":
- nixos/modules/services/x11/desktop-managers/lxqt.nix
- pkgs/desktops/lxqt/**/*
"6.topic: mate":
- nixos/modules/services/x11/desktop-managers/mate.nix
- nixos/tests/mate.nix

View File

@ -24,7 +24,7 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Create backport PRs
uses: korthout/backport-action@v1.0.0
uses: korthout/backport-action@v1.0.1
with:
# Config README: https://github.com/korthout/backport-action#backport-action
pull_description: |-

View File

@ -24,8 +24,8 @@ Packages, including the Nix packages collection, are distributed through
[channels](https://nixos.org/nix/manual/#sec-channels). The collection is
distributed for users of Nix on non-NixOS distributions through the channel
`nixpkgs`. Users of NixOS generally use one of the `nixos-*` channels, e.g.
`nixos-19.09`, which includes all packages and modules for the stable NixOS
19.09. Stable NixOS releases are generally only given
`nixos-22.11`, which includes all packages and modules for the stable NixOS
22.11. Stable NixOS releases are generally only given
security updates. More up to date packages and modules are available via the
`nixos-unstable` channel.
@ -43,4 +43,4 @@ The binaries are made available via a [binary cache](https://cache.nixos.org).
The current Nix expressions of the channels are available in the
[`nixpkgs`](https://github.com/NixOS/nixpkgs) repository in branches
that correspond to the channel names (e.g. `nixos-19.09-small`).
that correspond to the channel names (e.g. `nixos-22.11-small`).

View File

@ -837,6 +837,10 @@ The distribution phase is intended to produce a source distribution of the packa
#### Variables controlling the distribution phase {#variables-controlling-the-distribution-phase}
##### `doDist` {#var-stdenv-doDist}
If set, the distribution phase is executed.
##### `distTarget` {#var-stdenv-distTarget}
The make target that produces the distribution. Defaults to `dist`.

View File

@ -55,7 +55,7 @@ fi
declare -a strings=()
mkdir -p "$tmp/strings"
while IFS= read -r -d $'\0' str; do
echo -n "$str" > "$tmp/strings/${#strings[@]}"
printf "%s" "$str" > "$tmp/strings/${#strings[@]}"
strings+=("$str")
done < <(awk \
-f "$SCRIPT_DIR"/generate.awk \

View File

@ -91,10 +91,14 @@ rec {
microblaze = { bits = 32; significantByte = bigEndian; family = "microblaze"; };
microblazeel = { bits = 32; significantByte = littleEndian; family = "microblaze"; };
mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; };
mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; };
mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };
mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; };
mipsisa32r6 = { bits = 32; significantByte = bigEndian; family = "mips"; };
mipsisa32r6el = { bits = 32; significantByte = littleEndian; family = "mips"; };
mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; };
mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };
mipsisa64r6 = { bits = 64; significantByte = bigEndian; family = "mips"; };
mipsisa64r6el = { bits = 64; significantByte = littleEndian; family = "mips"; };
mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; };

View File

@ -3475,6 +3475,13 @@
githubId = 10042482;
name = "Louis Pearson";
};
Dettorer = {
name = "Paul Hervot";
email = "paul.hervot@dettorer.net";
matrix = "@dettorer:matrix.org";
github = "Dettorer";
githubId = 2761682;
};
devhell = {
email = ''"^"@regexmail.net'';
github = "devhell";
@ -7868,6 +7875,15 @@
}];
name = "Yaroslav Bolyukin";
};
lafrenierejm = {
email = "joseph@lafreniere.xyz";
github = "lafrenierejm";
githubId = 11155300;
keys = [{
fingerprint = "0375 DD9A EDD1 68A3 ADA3 9EBA EE23 6AA0 141E FCA3";
}];
name = "Joseph LaFreniere";
};
laikq = {
email = "gwen@quasebarth.de";
github = "laikq";
@ -8013,6 +8029,15 @@
fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451";
}];
};
leifhelm = {
email = "jakob.leifhelm@gmail.com";
github = "leifhelm";
githubId = 31693262;
name = "Jakob Leifhelm";
keys =[{
fingerprint = "4A82 F68D AC07 9FFD 8BF0 89C4 6817 AA02 3810 0822";
}];
};
leixb = {
email = "abone9999+nixpkgs@gmail.com";
matrix = "@leix_b:matrix.org";
@ -12727,6 +12752,15 @@
githubId = 893474;
name = "Stefan Wiehler";
};
sephi = {
name = "Sylvain Fankhauser";
email = "sephi@fhtagn.top";
github = "sephii";
githubId = 754333;
keys = [{
fingerprint = "2A9D 8E76 5EE2 237D 7B6B A2A5 4228 AB9E C061 2ADA";
}];
};
sepi = {
email = "raffael@mancini.lu";
github = "sepi";

View File

@ -199,9 +199,9 @@ GTK themes can be installed either to user profile or system-wide (via
GTK ones, you can use the following configuration:
```nix
qt5.enable = true;
qt5.platformTheme = "gtk2";
qt5.style = "gtk2";
qt.enable = true;
qt.platformTheme = "gtk2";
qt.style = "gtk2";
```
## Custom XKB layouts {#custom-xkb-layouts .unnumbered}

View File

@ -223,9 +223,9 @@ services.xserver.libinput.touchpad.tapping = false;
configuration:
</para>
<programlisting language="nix">
qt5.enable = true;
qt5.platformTheme = &quot;gtk2&quot;;
qt5.style = &quot;gtk2&quot;;
qt.enable = true;
qt.platformTheme = &quot;gtk2&quot;;
qt.style = &quot;gtk2&quot;;
</programlisting>
</section>
<section xml:id="custom-xkb-layouts">

View File

@ -60,6 +60,14 @@
<link linkend="opt-programs.fzf.fuzzyCompletion">programs.fzf</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/StevenBlack/hosts">stevenblack-blocklist</link>,
A unified hosts file with base extensions for blocking
unwanted websites. Available as
<link xlink:href="options.html#opt-networking.stevenblack.enable">networking.stevenblack</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/ellie/atuin">atuin</link>,

View File

@ -24,6 +24,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion).
- [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable).
- [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable).
- [mmsd](https://gitlab.com/kop316/mmsd), a lower level daemon that transmits and recieves MMSes. Available as [services.mmsd](#opt-services.mmsd.enable).

View File

@ -4,7 +4,7 @@ with lib;
let
cfg = config.qt5;
cfg = config.qt;
isQGnome = cfg.platformTheme == "gnome" && builtins.elem cfg.style ["adwaita" "adwaita-dark"];
isQtStyle = cfg.platformTheme == "gtk2" && !(builtins.elem cfg.style ["adwaita" "adwaita-dark"]);
@ -12,22 +12,34 @@ let
isLxqt = cfg.platformTheme == "lxqt";
isKde = cfg.platformTheme == "kde";
packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ]
packages =
if isQGnome then [
pkgs.qgnomeplatform
pkgs.adwaita-qt
pkgs.qgnomeplatform-qt6
pkgs.adwaita-qt6
]
else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ]
else if isQt5ct then [ pkgs.libsForQt5.qt5ct ]
else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ]
else if isKde then [ pkgs.libsForQt5.plasma-integration pkgs.libsForQt5.systemsettings ]
else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible.";
else throw "`qt.platformTheme` ${cfg.platformTheme} and `qt.style` ${cfg.style} are not compatible.";
in
{
meta.maintainers = [ maintainers.romildo ];
options = {
qt5 = {
imports = [
(mkRenamedOptionModule ["qt5" "enable" ] ["qt" "enable" ])
(mkRenamedOptionModule ["qt5" "platformTheme" ] ["qt" "platformTheme" ])
(mkRenamedOptionModule ["qt5" "style" ] ["qt" "style" ])
];
enable = mkEnableOption (lib.mdDoc "Qt5 theming configuration");
options = {
qt = {
enable = mkEnableOption (lib.mdDoc "Qt theming configuration");
platformTheme = mkOption {
type = types.enum [
@ -40,13 +52,14 @@ in
example = "gnome";
relatedPackages = [
"qgnomeplatform"
"qgnomeplatform-qt6"
["libsForQt5" "qtstyleplugins"]
["libsForQt5" "qt5ct"]
["lxqt" "lxqt-qtplugin"]
["libsForQt5" "plasma-integration"]
];
description = lib.mdDoc ''
Selects the platform theme to use for Qt5 applications.
Selects the platform theme to use for Qt applications.
The options are
- `gtk`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins)
@ -71,10 +84,11 @@ in
example = "adwaita";
relatedPackages = [
"adwaita-qt"
"adwaita-qt6"
["libsForQt5" "qtstyleplugins"]
];
description = lib.mdDoc ''
Selects the style to use for Qt5 applications.
Selects the style to use for Qt applications.
The options are
- `adwaita`, `adwaita-dark`: Use Adwaita Qt style with

View File

@ -0,0 +1,34 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) optionals mkOption mkEnableOption types mkIf elem concatStringsSep maintainers mdDoc;
cfg = config.networking.stevenblack;
# needs to be in a specific order
activatedHosts = with cfg; [ ]
++ optionals (elem "fakenews" block) [ "fakenews" ]
++ optionals (elem "gambling" block) [ "gambling" ]
++ optionals (elem "porn" block) [ "porn" ]
++ optionals (elem "social" block) [ "social" ];
hostsPath = "${pkgs.stevenblack-blocklist}/alternates/" + concatStringsSep "-" activatedHosts + "/hosts";
in
{
options.networking.stevenblack = {
enable = mkEnableOption (mdDoc "Enable the stevenblack hosts file blocklist.");
block = mkOption {
type = types.listOf (types.enum [ "fakenews" "gambling" "porn" "social" ]);
default = [ ];
description = mdDoc "Additional blocklist extensions.";
};
};
config = mkIf cfg.enable {
networking.hostFiles = [ ]
++ optionals (activatedHosts != [ ]) [ hostsPath ]
++ optionals (activatedHosts == [ ]) [ "${pkgs.stevenblack-blocklist}/hosts" ];
};
meta.maintainers = [ maintainers.fortuneteller2k maintainers.artturin ];
}

View File

@ -31,7 +31,7 @@
};
# Theme calamares with GNOME theme
qt5 = {
qt = {
enable = true;
platformTheme = "gnome";
};

View File

@ -20,9 +20,10 @@
./config/nsswitch.nix
./config/power-management.nix
./config/pulseaudio.nix
./config/qt5.nix
./config/qt.nix
./config/resolvconf.nix
./config/shells-environment.nix
./config/stevenblack.nix
./config/swap.nix
./config/sysctl.nix
./config/system-environment.nix
@ -1141,6 +1142,7 @@
./services/web-apps/isso.nix
./services/web-apps/jirafeau.nix
./services/web-apps/jitsi-meet.nix
./services/web-apps/kasmweb/default.nix
./services/web-apps/keycloak.nix
./services/web-apps/komga.nix
./services/web-apps/lemmy.nix

View File

@ -12,14 +12,14 @@ in {
type = types.package;
default = pkgs.steam.override {
extraLibraries = pkgs: with config.hardware.opengl;
if pkgs.hostPlatform.is64bit
if pkgs.stdenv.hostPlatform.is64bit
then [ package ] ++ extraPackages
else [ package32 ] ++ extraPackages32;
};
defaultText = literalExpression ''
pkgs.steam.override {
extraLibraries = pkgs: with config.hardware.opengl;
if pkgs.hostPlatform.is64bit
if pkgs.stdenv.hostPlatform.is64bit
then [ package ] ++ extraPackages
else [ package32 ] ++ extraPackages32;
}

View File

@ -819,10 +819,10 @@ in
system-features = mkDefault (
[ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++
optionals (pkgs.hostPlatform ? gcc.arch) (
optionals (pkgs.stdenv.hostPlatform ? gcc.arch) (
# a builder can run code for `gcc.arch` and inferior architectures
[ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++
map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} or [])
[ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ] ++
map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or [])
)
);
}

View File

@ -214,7 +214,7 @@ in
};
})
];
podman.defaultNetwork.dnsname.enable = true;
podman.defaultNetwork.settings.dns_enabled = true;
};
};
}

View File

@ -0,0 +1,275 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.kasmweb;
in
{
options.services.kasmweb = {
enable = lib.mkEnableOption (lib.mdDoc "kasmweb");
networkSubnet = lib.mkOption {
default = "172.20.0.0/16";
type = lib.types.str;
description = lib.mdDoc ''
The network subnet to use for the containers.
'';
};
postgres = {
user = lib.mkOption {
default = "kasmweb";
type = lib.types.str;
description = lib.mdDoc ''
Username to use for the postgres database.
'';
};
password = lib.mkOption {
default = "kasmweb";
type = lib.types.str;
description = lib.mdDoc ''
password to use for the postgres database.
'';
};
};
redisPassword = lib.mkOption {
default = "kasmweb";
type = lib.types.str;
description = lib.mdDoc ''
password to use for the redis cache.
'';
};
defaultAdminPassword = lib.mkOption {
default = "kasmweb";
type = lib.types.str;
description = lib.mdDoc ''
default admin password to use.
'';
};
defaultUserPassword = lib.mkOption {
default = "kasmweb";
type = lib.types.str;
description = lib.mdDoc ''
default user password to use.
'';
};
defaultManagerToken = lib.mkOption {
default = "kasmweb";
type = lib.types.str;
description = lib.mdDoc ''
default manager token to use.
'';
};
defaultGuacToken = lib.mkOption {
default = "kasmweb";
type = lib.types.str;
description = lib.mdDoc ''
default guac token to use.
'';
};
defaultRegistrationToken = lib.mkOption {
default = "kasmweb";
type = lib.types.str;
description = lib.mdDoc ''
default registration token to use.
'';
};
datastorePath = lib.mkOption {
type = lib.types.str;
default = "/var/lib/kasmweb";
description = lib.mdDoc ''
The directory used to store all data for kasmweb.
'';
};
listenAddress = lib.mkOption {
type = lib.types.str;
default = "0.0.0.0";
description = lib.mdDoc ''
The address on which kasmweb should listen.
'';
};
listenPort = lib.mkOption {
type = lib.types.int;
default = 443;
description = lib.mdDoc ''
The port on which kasmweb should listen.
'';
};
sslCertificate = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
description = lib.mdDoc ''
The SSL certificate to be used for kasmweb.
'';
};
sslCertificateKey = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
description = lib.mdDoc ''
The SSL certificate's key to be used for kasmweb. Make sure to specify
this as a string and not a literal path, so that it is not accidentally
included in your nixstore.
'';
};
};
config = lib.mkIf cfg.enable {
systemd.services = {
"init-kasmweb" = {
wantedBy = [
"docker-kasm_db.service"
];
before = [
"docker-kasm_db.service"
"docker-kasm_redis.service"
"docker-kasm_db_init.service"
"docker-kasm_api.service"
"docker-kasm_agent.service"
"docker-kasm_manager.service"
"docker-kasm_share.service"
"docker-kasm_guac.service"
"docker-kasm_proxy.service"
];
serviceConfig = {
Type = "oneshot";
ExecStart = pkgs.substituteAll {
src = ./initialize_kasmweb.sh;
isExecutable = true;
binPath = lib.makeBinPath [ pkgs.docker pkgs.openssl pkgs.gnused ];
runtimeShell = pkgs.runtimeShell;
kasmweb = pkgs.kasmweb;
postgresUser = cfg.postgres.user;
postgresPassword = cfg.postgres.password;
inherit (cfg)
datastorePath
sslCertificate
sslCertificateKey
redisPassword
defaultUserPassword
defaultAdminPassword
defaultManagerToken
defaultRegistrationToken
defaultGuacToken;
};
};
};
};
virtualisation = {
oci-containers.containers = {
kasm_db = {
image = "postgres:12-alpine";
environment = {
POSTGRES_PASSWORD = cfg.postgres.password;
POSTGRES_USER = cfg.postgres.user;
POSTGRES_DB = "kasm";
};
volumes = [
"${cfg.datastorePath}/conf/database/data.sql:/docker-entrypoint-initdb.d/data.sql"
"${cfg.datastorePath}/conf/database/:/tmp/"
"kasmweb_db:/var/lib/postgresql/data"
];
extraOptions = [ "--network=kasm_default_network" ];
};
kasm_db_init = {
image = "kasmweb/api:${pkgs.kasmweb.version}";
user = "root:root";
volumes = [
"${cfg.datastorePath}/:/opt/kasm/current/"
"kasmweb_api_data:/tmp"
];
dependsOn = [ "kasm_db" ];
entrypoint = "/bin/bash";
cmd = [ "/opt/kasm/current/init_seeds.sh" ];
extraOptions = [ "--network=kasm_default_network" "--userns=host" ];
};
kasm_redis = {
image = "redis:5-alpine";
entrypoint = "/bin/sh";
cmd = [
"-c"
"redis-server --requirepass ${cfg.redisPassword}"
];
extraOptions = [ "--network=kasm_default_network" "--userns=host" ];
};
kasm_api = {
image = "kasmweb/api:${pkgs.kasmweb.version}";
user = "root:root";
volumes = [
"${cfg.datastorePath}/:/opt/kasm/current/"
"kasmweb_api_data:/tmp"
];
dependsOn = [ "kasm_db_init" ];
extraOptions = [ "--network=kasm_default_network" "--userns=host" ];
};
kasm_manager = {
image = "kasmweb/manager:${pkgs.kasmweb.version}";
user = "root:root";
volumes = [
"${cfg.datastorePath}/:/opt/kasm/current/"
];
dependsOn = [ "kasm_db" "kasm_api" ];
extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only"];
};
kasm_agent = {
image = "kasmweb/agent:${pkgs.kasmweb.version}";
user = "root:root";
volumes = [
"${cfg.datastorePath}/:/opt/kasm/current/"
"/var/run/docker.sock:/var/run/docker.sock"
"${pkgs.docker}/bin/docker:/usr/bin/docker"
"${cfg.datastorePath}/conf/nginx:/etc/nginx/conf.d"
];
dependsOn = [ "kasm_manager" ];
extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ];
};
kasm_share = {
image = "kasmweb/share:${pkgs.kasmweb.version}";
user = "root:root";
volumes = [
"${cfg.datastorePath}/:/opt/kasm/current/"
];
dependsOn = [ "kasm_db" "kasm_redis" ];
extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ];
};
kasm_guac = {
image = "kasmweb/kasm-guac:${pkgs.kasmweb.version}";
user = "root:root";
volumes = [
"${cfg.datastorePath}/:/opt/kasm/current/"
];
dependsOn = [ "kasm_db" "kasm_redis" ];
extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ];
};
kasm_proxy = {
image = "kasmweb/nginx:latest";
ports = [ "${cfg.listenAddress}:${toString cfg.listenPort}:443" ];
user = "root:root";
volumes = [
"${cfg.datastorePath}/conf/nginx:/etc/nginx/conf.d:ro"
"${cfg.datastorePath}/certs/kasm_nginx.key:/etc/ssl/private/kasm_nginx.key"
"${cfg.datastorePath}/certs/kasm_nginx.crt:/etc/ssl/certs/kasm_nginx.crt"
"${cfg.datastorePath}/www:/srv/www:ro"
"${cfg.datastorePath}/log/nginx:/var/log/external/nginx"
"${cfg.datastorePath}/log/logrotate:/var/log/external/logrotate"
];
dependsOn = [ "kasm_manager" "kasm_api" "kasm_agent" "kasm_share"
"kasm_guac" ];
extraOptions = [ "--network=kasm_default_network" "--userns=host"
"--network-alias=proxy"];
};
};
};
};
}

View File

@ -0,0 +1,114 @@
#! @runtimeShell@
export PATH=@binPath@:$PATH
mkdir -p @datastorePath@/log
chmod -R a+rw @datastorePath@
ln -sf @kasmweb@/bin @datastorePath@
rm -r @datastorePath@/conf
cp -r @kasmweb@/conf @datastorePath@
mkdir -p @datastorePath@/conf/nginx/containers.d
chmod -R a+rw @datastorePath@/conf
ln -sf @kasmweb@/www @datastorePath@
docker network inspect kasm_default_network >/dev/null || docker network create kasm_default_network --subnet @networkSubnet@
if docker volume inspect kasmweb_db >/dev/null; then
source @datastorePath@/ids.env
echo 'echo "skipping database init"' > @datastorePath@/init_seeds.sh
echo 'while true; do sleep 10 ; done' >> @datastorePath@/init_seeds.sh
else
API_SERVER_ID=$(cat /proc/sys/kernel/random/uuid)
MANAGER_ID=$(cat /proc/sys/kernel/random/uuid)
SHARE_ID=$(cat /proc/sys/kernel/random/uuid)
SERVER_ID=$(cat /proc/sys/kernel/random/uuid)
echo "export API_SERVER_ID=$API_SERVER_ID" > @datastorePath@/ids.env
echo "export MANAGER_ID=$MANAGER_ID" >> @datastorePath@/ids.env
echo "export SHARE_ID=$SHARE_ID" >> @datastorePath@/ids.env
echo "export SERVER_ID=$SERVER_ID" >> @datastorePath@/ids.env
mkdir -p @datastorePath@/certs
openssl req -x509 -nodes -days 1825 -newkey rsa:2048 -keyout @datastorePath@/certs/kasm_nginx.key -out @datastorePath@/certs/kasm_nginx.crt -subj "/C=US/ST=VA/L=None/O=None/OU=DoFu/CN=$(hostname)/emailAddress=none@none.none" 2> /dev/null
docker volume create kasmweb_db
rm @datastorePath@/.done_initing_data
cat >@datastorePath@/init_seeds.sh <<EOF
#!/bin/bash
if [ ! -e /opt/kasm/current/.done_initing_data ]; then
sleep 4
/usr/bin/kasm_server.so --initialize-database --cfg \
/opt/kasm/current/conf/app/api.app.config.yaml \
--populate-production \
--seed-file \
/opt/kasm/current/conf/database/seed_data/default_properties.yaml \
2>&1 | grep -v UserWarning
/usr/bin/kasm_server.so --cfg \
/opt/kasm/current/conf/app/api.app.config.yaml \
--populate-production \
--seed-file \
/opt/kasm/current/conf/database/seed_data/default_agents.yaml \
2>&1 | grep -v UserWarning
/usr/bin/kasm_server.so --cfg \
/opt/kasm/current/conf/app/api.app.config.yaml \
--populate-production \
--seed-file \
/opt/kasm/current/conf/database/seed_data/default_connection_proxies.yaml \
2>&1 | grep -v UserWarning
/usr/bin/kasm_server.so --cfg \
/opt/kasm/current/conf/app/api.app.config.yaml \
--populate-production \
--seed-file \
/opt/kasm/current/conf/database/seed_data/default_images_amd64.yaml \
2>&1 | grep -v UserWarning
touch /opt/kasm/current/.done_initing_data
while true; do sleep 10 ; done
else
echo "skipping database init"
while true; do sleep 10 ; done
fi
EOF
fi
chmod +x @datastorePath@/init_seeds.sh
chmod a+w @datastorePath@/init_seeds.sh
if [ -e @sslCertificate@ ]; then
cp @sslCertificate@ @datastorePath@/certs/kasm_nginx.crt
cp @sslCertificateKey@ @datastorePath@/certs/kasm_nginx.key
fi
sed -i -e "s/username.*/username: @postgresUser@/g" \
-e "s/password.*/password: @postgresPassword@/g" \
-e "s/host.*db/host: kasm_db/g" \
-e "s/ssl: true/ssl: false/g" \
-e "s/redisPassword.*/redisPassword: @redisPassword@/g" \
-e "s/server_hostname.*/server_hostname: kasm_api/g" \
-e "s/server_id.*/server_id: $API_SERVER_ID/g" \
-e "s/manager_id.*/manager_id: $MANAGER_ID/g" \
-e "s/share_id.*/share_id: $SHARE_ID/g" \
@datastorePath@/conf/app/api.app.config.yaml
sed -i -e "s/ token:.*/ token: \"@defaultManagerToken@\"/g" \
-e "s/hostnames: \['proxy.*/hostnames: \['kasm_proxy'\]/g" \
-e "s/server_id.*/server_id: $SERVER_ID/g" \
@datastorePath@/conf/app/agent.app.config.yaml
sed -i -e "s/password: admin.*/password: \"@defaultAdminPassword@\"/g" \
-e "s/password: user.*/password: \"@defaultUserPassword@\"/g" \
-e "s/default-manager-token/@defaultManagerToken@/g" \
-e "s/default-registration-token/@defaultRegistrationToken@/g" \
-e "s/upstream_auth_address:.*/upstream_auth_address: 'proxy'/g" \
@datastorePath@/conf/database/seed_data/default_properties.yaml
sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \
-e "s/APIHOSTNAME/proxy/g" \
@datastorePath@/conf/app/kasmguac.app.config.yaml
sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \
-e "s/APIHOSTNAME/proxy/g" \
@datastorePath@/conf/database/seed_data/default_connection_proxies.yaml
sed -i "s/00000000-0000-0000-0000-000000000000/$SERVER_ID/g" \
@datastorePath@/conf/database/seed_data/default_agents.yaml

View File

@ -95,7 +95,6 @@ let
) env))));
mastodonTootctl = pkgs.writeShellScriptBin "mastodon-tootctl" ''
#! ${pkgs.runtimeShell}
set -a
export RAILS_ROOT="${cfg.package}"
source "${envFile}"

View File

@ -198,10 +198,10 @@ in
programs.bash.vteIntegration = mkDefault true;
programs.zsh.vteIntegration = mkDefault true;
# Harmonize Qt5 applications under Cinnamon
qt5.enable = true;
qt5.platformTheme = "gnome";
qt5.style = "adwaita";
# Harmonize Qt applications under Cinnamon
qt.enable = true;
qt.platformTheme = "gnome";
qt.style = "adwaita";
# Default Fonts
fonts.fonts = with pkgs; [

View File

@ -352,8 +352,8 @@ in
})
];
# Harmonize Qt5 application style and also make them use the portal for file chooser dialog.
qt5 = {
# Harmonize Qt application style and also make them use the portal for file chooser dialog.
qt = {
enable = mkDefault true;
platformTheme = mkDefault "gnome";
style = mkDefault "adwaita";

View File

@ -250,10 +250,10 @@ in
programs.bash.vteIntegration = mkDefault true;
programs.zsh.vteIntegration = mkDefault true;
# Harmonize Qt5 applications under Pantheon
qt5.enable = true;
qt5.platformTheme = "gnome";
qt5.style = "adwaita";
# Harmonize Qt applications under Pantheon
qt.enable = true;
qt.platformTheme = "gnome";
qt.style = "adwaita";
# Default Fonts
fonts.fonts = with pkgs; [

View File

@ -73,8 +73,45 @@ in
boot.kernelPatches = mkOption {
type = types.listOf types.attrs;
default = [];
example = literalExpression "[ pkgs.kernelPatches.ubuntu_fan_4_4 ]";
description = lib.mdDoc "A list of additional patches to apply to the kernel.";
example = literalExpression ''
[
{
name = "foo";
patch = ./foo.patch;
structuredExtraConfig.FOO = lib.kernel.yes;
features.foo = true;
}
]
'';
description = lib.mdDoc ''
A list of additional patches to apply to the kernel.
Every item should be an attribute set with the following attributes:
```nix
{
name = "foo"; # descriptive name, required
patch = ./foo.patch; # path or derivation that contains the patch source
# (required, but can be null if only config changes
# are needed)
structuredExtraConfig = { # attrset of extra configuration parameters
FOO = lib.kernel.yes; # (without the CONFIG_ prefix, optional)
}; # values should generally be lib.kernel.yes or lib.kernel.no
features = { # attrset of extra "features" the kernel is considered to have
foo = true; # (may be checked by other NixOS modules, optional)
};
extraConfig = "CONFIG_FOO y"; # extra configuration options in string form
# (deprecated, use structuredExtraConfig instead, optional)
}
```
There's a small set of existing kernel patches in Nixpkgs, available as `pkgs.kernelPatches`,
that follow this format and can be used directly.
'';
};
boot.kernel.randstructSeed = mkOption {

View File

@ -1,17 +0,0 @@
--- a/waagent 2016-03-12 09:58:15.728088851 +0200
+++ a/waagent 2016-03-12 09:58:43.572680025 +0200
@@ -6173,10 +6173,10 @@
Log("MAC address: " + ":".join(["%02X" % Ord(a) for a in mac]))
# Consume Entropy in ACPI table provided by Hyper-V
- try:
- SetFileContents("/dev/random", GetFileContents("/sys/firmware/acpi/tables/OEM0"))
- except:
- pass
+ #try:
+ # SetFileContents("/dev/random", GetFileContents("/sys/firmware/acpi/tables/OEM0"))
+ #except:
+ # pass
Log("Probing for Azure environment.")
self.Endpoint = self.DoDhcpWork()

View File

@ -1,51 +1,10 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.virtualisation.azure.agent;
waagent = with pkgs; stdenv.mkDerivation rec {
name = "waagent-2.0";
src = pkgs.fetchFromGitHub {
owner = "Azure";
repo = "WALinuxAgent";
rev = "1b3a8407a95344d9d12a2a377f64140975f1e8e4";
sha256 = "10byzvmpgrmr4d5mdn2kq04aapqb3sgr1admk13wjmy5cd6bwd2x";
};
patches = [ ./azure-agent-entropy.patch ];
nativeBuildInputs = [ makeWrapper python pythonPackages.wrapPython ];
runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh
nettools # for hostname
procps # for pidof
shadow # for useradd, usermod
util-linux # for (u)mount, fdisk, sfdisk, mkswap
parted
];
pythonPath = [ pythonPackages.pyasn1 ];
configurePhase = false;
buildPhase = false;
installPhase = ''
substituteInPlace config/99-azure-product-uuid.rules \
--replace /bin/chmod "${coreutils}/bin/chmod"
mkdir -p $out/lib/udev/rules.d
cp config/*.rules $out/lib/udev/rules.d
mkdir -p $out/bin
cp waagent $out/bin/
chmod +x $out/bin/waagent
wrapProgram "$out/bin/waagent" \
--prefix PYTHONPATH : $PYTHONPATH \
--prefix PATH : "${makeBinPath runtimeDeps}"
'';
};
provisionedHook = pkgs.writeScript "provisioned-hook" ''
#!${pkgs.runtimeShell}
/run/current-system/systemd/bin/systemctl start provisioned.target
@ -74,14 +33,15 @@ in
###### implementation
config = mkIf cfg.enable {
assertions = [ {
config = lib.mkIf cfg.enable {
assertions = [{
assertion = pkgs.stdenv.hostPlatform.isx86;
message = "Azure not currently supported on ${pkgs.stdenv.hostPlatform.system}";
} {
assertion = config.networking.networkmanager.enable == false;
message = "Windows Azure Linux Agent is not compatible with NetworkManager";
} ];
}
{
assertion = config.networking.networkmanager.enable == false;
message = "Windows Azure Linux Agent is not compatible with NetworkManager";
}];
boot.initrd.kernelModules = [ "ata_piix" ];
networking.firewall.allowedUDPPorts = [ 68 ];
@ -89,13 +49,19 @@ in
environment.etc."waagent.conf".text = ''
#
# Windows Azure Linux Agent Configuration
# Microsoft Azure Linux Agent Configuration
#
Role.StateConsumer=${provisionedHook}
# Enable extension handling. Do not disable this unless you do not need password reset,
# backup, monitoring, or any extension handling whatsoever.
Extensions.Enabled=y
# Enable instance creation
Provisioning.Enabled=y
# How often (in seconds) to poll for new goal states
Extensions.GoalStatePeriod=6
# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
# "cloud-init", or "disabled".
Provisioning.Agent=disabled
# Password authentication for root account will be unavailable.
Provisioning.DeleteRootPassword=n
@ -103,18 +69,31 @@ in
# Generate fresh host key pair.
Provisioning.RegenerateSshHostKeyPair=n
# Supported values are "rsa", "dsa" and "ecdsa".
# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
Provisioning.SshHostKeyPairType=ed25519
# Monitor host name changes and publish changes via DHCP requests.
Provisioning.MonitorHostName=y
# How often (in seconds) to monitor host name changes.
Provisioning.MonitorHostNamePeriod=30
# Decode CustomData from Base64.
Provisioning.DecodeCustomData=n
# Execute CustomData after provisioning.
Provisioning.ExecuteCustomData=n
# Algorithm used by crypt when generating password hash.
#Provisioning.PasswordCryptId=6
# Length of random salt used when generating password hash.
#Provisioning.PasswordCryptSaltLength=10
# Allow reset password of sys user
Provisioning.AllowResetSysUser=n
# Format if unformatted. If 'n', resource disk will not be mounted.
ResourceDisk.Format=${if cfg.mountResourceDisk then "y" else "n"}
@ -125,22 +104,103 @@ in
# Mount point for the resource disk
ResourceDisk.MountPoint=/mnt/resource
# Respond to load balancer probes if requested by Windows Azure.
LBProbeResponder=y
# Create and use swapfile on resource disk.
ResourceDisk.EnableSwap=n
# Enable logging to serial console (y|n)
# When stdout is not enough...
# 'y' if not set
Logs.Console=y
# Size of the swapfile.
ResourceDisk.SwapSizeMB=0
# Comma-separated list of mount options. See mount(8) for valid options.
ResourceDisk.MountOptions=None
# Enable verbose logging (y|n)
Logs.Verbose=${if cfg.verboseLogging then "y" else "n"}
# Enable Console logging, default is y
# Logs.Console=y
# Enable periodic log collection, default is n
Logs.Collect=n
# How frequently to collect logs, default is each hour
Logs.CollectPeriod=3600
# Is FIPS enabled
OS.EnableFIPS=n
# Root device timeout in seconds.
OS.RootDeviceScsiTimeout=300
# How often (in seconds) to set the root device timeout.
OS.RootDeviceScsiTimeoutPeriod=30
# If "None", the system default version is used.
OS.OpensslPath=${pkgs.openssl_3.bin}/bin/openssl
# Set the SSH ClientAliveInterval
# OS.SshClientAliveInterval=180
# Set the path to SSH keys and configuration files
OS.SshDir=/etc/ssh
# If set, agent will use proxy server to access internet
#HttpProxy.Host=None
#HttpProxy.Port=None
# Detect Scvmm environment, default is n
# DetectScvmmEnv=n
#
# Lib.Dir=/var/lib/waagent
#
# DVD.MountPoint=/mnt/cdrom/secure
#
# Pid.File=/var/run/waagent.pid
#
# Extension.LogDir=/var/log/azure
#
# Home.Dir=/home
# Enable RDMA management and set up, should only be used in HPC images
OS.EnableRDMA=n
# Enable checking RDMA driver version and update
# OS.CheckRdmaDriver=y
# Enable or disable goal state processing auto-update, default is enabled
AutoUpdate.Enabled=n
# Determine the update family, this should not be changed
# AutoUpdate.GAFamily=Prod
# Determine if the overprovisioning feature is enabled. If yes, hold extension
# handling until inVMArtifactsProfile.OnHold is false.
# Default is enabled
EnableOverProvisioning=n
# Allow fallback to HTTP if HTTPS is unavailable
# Note: Allowing HTTP (vs. HTTPS) may cause security risks
# OS.AllowHTTP=n
# Add firewall rules to protect access to Azure host node services
OS.EnableFirewall=n
# How often (in seconds) to check the firewall rules
OS.EnableFirewallPeriod=30
# How often (in seconds) to remove the udev rules for persistent network interface
# names (75-persistent-net-generator.rules and /etc/udev/rules.d/70-persistent-net.rules)
OS.RemovePersistentNetRulesPeriod=30
# How often (in seconds) to monitor for DHCP client restarts
OS.MonitorDhcpClientRestartPeriod=30
'';
services.udev.packages = [ waagent ];
services.udev.packages = [ pkgs.waagent ];
networking.dhcpcd.persistent = true;
@ -157,23 +217,24 @@ in
description = "Services Requiring Azure VM provisioning to have finished";
};
systemd.services.consume-hypervisor-entropy =
{ description = "Consume entropy in ACPI table provided by Hyper-V";
systemd.services.consume-hypervisor-entropy =
{
description = "Consume entropy in ACPI table provided by Hyper-V";
wantedBy = [ "sshd.service" "waagent.service" ];
before = [ "sshd.service" "waagent.service" ];
wantedBy = [ "sshd.service" "waagent.service" ];
before = [ "sshd.service" "waagent.service" ];
path = [ pkgs.coreutils ];
script =
''
echo "Fetching entropy..."
cat /sys/firmware/acpi/tables/OEM0 > /dev/random
'';
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
serviceConfig.StandardError = "journal+console";
serviceConfig.StandardOutput = "journal+console";
};
path = [ pkgs.coreutils ];
script =
''
echo "Fetching entropy..."
cat /sys/firmware/acpi/tables/OEM0 > /dev/random
'';
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
serviceConfig.StandardError = "journal+console";
serviceConfig.StandardOutput = "journal+console";
};
systemd.services.waagent = {
wantedBy = [ "multi-user.target" ];
@ -184,11 +245,10 @@ in
description = "Windows Azure Agent Service";
unitConfig.ConditionPathExists = "/etc/waagent.conf";
serviceConfig = {
ExecStart = "${waagent}/bin/waagent -daemon";
ExecStart = "${pkgs.waagent}/bin/waagent -daemon";
Type = "simple";
};
};
};
}

View File

@ -17,7 +17,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
services.xserver.enable = true;
# Regression test for https://github.com/NixOS/nixpkgs/issues/163482
qt5 = {
qt = {
enable = true;
platformTheme = "gnome";
style = "adwaita-dark";

View File

@ -21,7 +21,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
};
testScript = let
nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.hostPlatform.system};
nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.stdenv.hostPlatform.system};
virshShutdownCmd = if pkgs.stdenv.isx86_64 then "shutdown" else "destroy";
in ''
start_all()

View File

@ -42,13 +42,13 @@ let
in
stdenv.mkDerivation rec {
pname = "strawberry";
version = "1.0.11";
version = "1.0.12";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
hash = "sha256-w2KOZwxPpe/yQw2RBeTEYueeq7m5ZCQXlUH/f52GiyI=";
hash = "sha256-XJCU9cGhmwJ6f79y3tAW1qfJKO7YESVpHY/1FmPQ/Mo=";
};
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead

View File

@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
version = "1.7.2";
version = "1.7.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-EZ8gfpTBmTB/lGtexZYbD9x1F7rFXIEaEhhwS6gOEV4=";
sha256 = "sha256-wjtiircPPQgWg1GGQsesEEeOF+h1+tc591YI0l/JlwQ=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";

View File

@ -8,15 +8,15 @@
(fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; })
(fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; })
(fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.12"; sha256 = "1n7yv6q8fbk02d334a19zyicvlammjhfrg9rf18jyb3szj8g36k7"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.16"; sha256 = "050wh5gw3hgql8191z0yv7sj06wg5da6kvkbcg9hq3ildj0fdj67"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.19"; sha256 = "1jx9233apry0kb54df7k0p7vrsp3hp27f5d0j2802gry04sihrl7"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.14"; sha256 = "1k5m6jc585hnkkl019diz2gycfnsv2kx4g4cfs4awlpr42k8s3ph"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.18"; sha256 = "0zpqi8dpk91sqg7njxbs64m9598fmmalcc1w97v60xlhp9afjmdb"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.21"; sha256 = "0qq6ppr5vw4k8hjnz5xp29fc82z32vh6bc389dnr439gw7hmwkp9"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.17"; sha256 = "1bb8q57lnqnp3wijw41vvbwgz8rgg4g9pw8qhd4iiqi1w94q1bkz"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.16"; sha256 = "1q109kmzj99axk35l68z3gi29ww1xd62zaxj1f39myvlcv9ncb41"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.18"; sha256 = "166v6mhmy47fgny55c4mzqb2x7anqyxnd0g409vfgyg5fq4gc15v"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.9"; sha256 = "0ya365w3i3sjv7wafm6wmasf9mpfsh0fcbhawsv5br7m7lpppwhh"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.12"; sha256 = "1gb61a5mdmyigy7ps2c8n4iig6i32rdsif9kwn35yxx25zbnmbk2"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.19"; sha256 = "046vvlxlg8div4a2v6pnxz4iwji93s688jgnvav3hl6c22b9lvs0"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.18"; sha256 = "04lp90rr61p7n39bfmia6jamgr0jjfns9987py64iazi236dl74g"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.20"; sha256 = "1kwyh71zzfij07r6nvcf7k2gdpjdhh90imwh6s255ws13m1fj3sn"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.11"; sha256 = "0zm0b45npacknir6b6a6v717kp3yz8hxv1qy2v65g2zp3ad2wij4"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.14"; sha256 = "1hhznv07bd1f3rn9d1rpg61ln68vqfjg7ypxif9lx4l3vfcj5j04"; })
(fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; })
(fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; })
(fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; })
@ -125,7 +125,6 @@
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.10"; sha256 = "1571q9iznbsmd7p87w420parmpdgi8zfjcs4kynmwv344dwdismz"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.5"; sha256 = "0lr22hlf52csrna9ly2lbz3y1agfgdlg7rvsqjg7ik488dhkmhji"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; })
@ -158,7 +157,7 @@
(fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; })
(fetchNuGet { pname = "NBitcoin"; version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; })
(fetchNuGet { pname = "NBitcoin"; version = "7.0.18"; sha256 = "02kkgymdb80cidibrs6qpy1zjwcfbkwv9zqz9s0swf5zp7qvcakn"; })
(fetchNuGet { pname = "NBitcoin"; version = "7.0.20"; sha256 = "0gl39v1mvnhdrqn8dmmslsyj4w4yc4l447zp62bfnwm5ppcwda9z"; })
(fetchNuGet { pname = "NBitcoin"; version = "7.0.23"; sha256 = "10dy58gq644561svc67pm37rlb44mymbnlfz409dhclmfhmqmd5s"; })
(fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.17"; sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; })
(fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; })
(fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.2"; sha256 = "0a8zy9iasgmr7mqhjrbxa2shnygpp97pbg5qnk7ix50y01k9blyw"; })

View File

@ -8,5 +8,4 @@ echo "Updating nbxplorer"
../nbxplorer/update.sh
echo
echo "Updating btcpayserver"
# Include Razor SDK packages in deps.nix
../nbxplorer/util/update-common.sh btcpayserver deps.nix '"/p:Configuration="Altcoins-Release" /p:RazorCompileOnBuild=false'
../nbxplorer/util/update-common.sh btcpayserver deps.nix

View File

@ -3,4 +3,4 @@ set -euo pipefail
scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix ''
getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix

View File

@ -1,46 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p dotnet-sdk_6
set -euo pipefail
# Writes deps for dotnet package in $pkgSrc to $depsFile.
# Expects $pkgSrc to contain a single .sln file.
pkgSrc=$1
depsFile=$(realpath "$2")
customFlags=$3
sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1)
[[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; }
tmpdir=$(mktemp -d /tmp/$pkgName-src.XXX)
echo "Using tmp dir: $tmpdir"
cp -rT "$pkgSrc" "$tmpdir"
chmod -R +w "$tmpdir"
pushd "$tmpdir" > /dev/null
mkdir home
echo "Running dotnet restore for $sln"
HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \
dotnet restore $customFlags -v normal --no-cache "$sln" > restore_log
echo "{ fetchNuGet }: [" > "$depsFile"
while read pkgSpec; do
{ read pname; read version; } < <(
# Ignore build version part: 1.0.0-beta2+77df2220 -> 1.0.0-beta2
sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkgSpec"
)
sha256=$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkgSpec")"/*.nupkg)
cat >> "$depsFile" <<EOF
(fetchNuGet {
pname = "$pname";
version = "$version";
sha256 = "$sha256";
})
EOF
done < <(find home/.nuget/packages -name '*.nuspec' | LC_ALL=C sort)
echo "]" >> "$depsFile"
echo "Created $depsFile"
popd > /dev/null
rm -r $tmpdir

View File

@ -10,7 +10,6 @@ trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR
pkgName=$1
depsFile=$2
customFlags=$3
: ${getVersionFromTags:=}
: ${refetch:=}
@ -75,5 +74,4 @@ fi
echo
# Create deps file
storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)"
. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" "$customFlags"
$(nix-build "$nixpkgs" -A $pkgName.fetch-deps --no-out-link) "$depsFile"

View File

@ -1,5 +1,5 @@
{ autoreconfHook, boost180, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub
, hexdump, hostPlatform, lib, libevent, libsodium, makeWrapper, rust, rustPlatform
, hexdump, lib, libevent, libsodium, makeWrapper, rust, rustPlatform
, pkg-config, Security, stdenv, testers, utf8cpp, util-linux, zcash, zeromq
}:
@ -82,6 +82,6 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
license = licenses.mit;
# https://github.com/zcash/zcash/issues/4405
broken = hostPlatform.isAarch64 && hostPlatform.isDarwin;
broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin;
};
}

View File

@ -13,7 +13,7 @@
, alsa-lib, cairo, acl, gpm, m17n_lib, libotf
, sigtool, jansson, harfbuzz, sqlite, nixosTests
, recurseIntoAttrs, emacsPackagesFor
, libgccjit, targetPlatform, makeWrapper # native-comp params
, libgccjit, makeWrapper # native-comp params
, fetchFromSavannah, fetchFromBitbucket
# macOS dependencies for NS and macPort

View File

@ -5,13 +5,13 @@
buildPythonApplication rec {
pname = "rednotebook";
version = "2.26";
version = "2.29";
src = fetchFromGitHub {
owner = "jendrikseipp";
repo = "rednotebook";
rev = "refs/tags/v${version}";
sha256 = "sha256-QKK0bHy6pe+elPhnQlYAwmFP93LwCGxqRtBy10vj4i4=";
sha256 = "sha256-gRmSxWAVF61svlZ0/IMTrWCmwin+uPONLBlcJOYcp2w=";
};
# We have not packaged tests.

View File

@ -29,12 +29,12 @@ final: prev:
ChatGPT-nvim = buildVimPluginFrom2Nix {
pname = "ChatGPT.nvim";
version = "2022-12-28";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "jackMort";
repo = "ChatGPT.nvim";
rev = "6c7e326add8fbb8c6662d92dd6bd9e1eb15f7c5a";
sha256 = "1lfq402h6z9y371yi11k2q19kii72xvfl540h2931w0hwdq6w5vj";
rev = "c33babb015005cda6042f908ac587e4bc498d041";
sha256 = "1hi5g82xr7vvlzwlwa2l1a4ji9ic7y3jzp76fqahsksmc9c9qqxh";
};
meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
};
@ -353,12 +353,12 @@ final: prev:
SpaceVim = buildVimPluginFrom2Nix {
pname = "SpaceVim";
version = "2022-12-28";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "SpaceVim";
repo = "SpaceVim";
rev = "9e80d9bbfad057cd8c056523ac18571083461ef0";
sha256 = "0488ps030wvjpx99dxnw53867cd86pb073c5f5aynhyc5l0rlgwj";
rev = "14d66bdb96c610f40d7a4265aadecd6f584fc76b";
sha256 = "0vfxd29c0a0yqbhpplppbp511hy2xidss29zcd5kqii0s43cbc04";
};
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
};
@ -449,12 +449,12 @@ final: prev:
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
version = "2023-01-03";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
rev = "6cc453397564164b7cdb341cd73f55a3aaf465c4";
sha256 = "0kxzhywk4zksyvkx73vhzjazyd7dfymryzaxm8g97xxr0xd2970m";
rev = "7620d87fe1a1632c620921cb0989d358638fb324";
sha256 = "19kmfq9kaxlpcznb65nh726axica9b8177ax863n6nbg0z52dvvr";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@ -835,12 +835,12 @@ final: prev:
barbecue-nvim = buildVimPluginFrom2Nix {
pname = "barbecue.nvim";
version = "2023-01-07";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "utilyre";
repo = "barbecue.nvim";
rev = "fc72ed04e87df12efbdcea25e6f0dce9d5229b6b";
sha256 = "0cfa2cqvscaai26yfjmxnv740p351v1dgqdg1v3snrmhj3m5i7bw";
rev = "51e6be4c0836b5fa9a9e6f679589f0e3cf90ec93";
sha256 = "09yl34b4qiv87rl88daa258443rgcxb6kx9yrhkc6ssalkh1a3gp";
};
meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
};
@ -895,12 +895,12 @@ final: prev:
better-escape-nvim = buildVimPluginFrom2Nix {
pname = "better-escape.nvim";
version = "2022-03-28";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "max397574";
repo = "better-escape.nvim";
rev = "d5ee0cef56a7e41a86048c14f25e964876ac20c1";
sha256 = "04hi2zmaz02fiyvjs94lqn7imp20fn2vpwww37sg7gim18b1mpl4";
rev = "6fed33809cde3b416087fc540ad9eb17ec470193";
sha256 = "1wqps75qkr7rqdvrsn6f8m02nkqap9g6cca1jqf53y9476jsbml7";
};
meta.homepage = "https://github.com/max397574/better-escape.nvim/";
};
@ -967,12 +967,12 @@ final: prev:
bufexplorer = buildVimPluginFrom2Nix {
pname = "bufexplorer";
version = "2022-09-20";
version = "2023-01-07";
src = fetchFromGitHub {
owner = "jlanzarotta";
repo = "bufexplorer";
rev = "e782dab0fe9523ac65d9fe4f726f2efe924e3f43";
sha256 = "1zbaqs96rimwawcf6nhxi3l02gs1yzdr4qk5aqh2ka0g6mx8mldn";
rev = "5a830d5d2d7417bf02339ec279c90e98dde822f8";
sha256 = "1vcfz4ngk5jsh66l74na9r0z2d3y6annb518kv0lgv76z99g5vy8";
};
meta.homepage = "https://github.com/jlanzarotta/bufexplorer/";
};
@ -1351,12 +1351,12 @@ final: prev:
cmp-git = buildVimPluginFrom2Nix {
pname = "cmp-git";
version = "2022-08-08";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "petertriho";
repo = "cmp-git";
rev = "fae6cdb407ad6c63a0b1928670bad1a67a55b887";
sha256 = "1iz6jkwk6fpn8vpqn8nvxrn35bbx6q2ssgycsrpny5293dkyiwgx";
rev = "6bcb61c0a5ec2e0d522ece7c8fb3e009f1c79261";
sha256 = "0n00apdpm920hjddmyhzynqxzdqz1scmqays9p4c4b6dq06jblbr";
};
meta.homepage = "https://github.com/petertriho/cmp-git/";
};
@ -2047,12 +2047,12 @@ final: prev:
copilot-cmp = buildVimPluginFrom2Nix {
pname = "copilot-cmp";
version = "2022-10-12";
version = "2023-01-07";
src = fetchFromGitHub {
owner = "zbirenbaum";
repo = "copilot-cmp";
rev = "84d5a0e8e4d1638e7554899cb7b642fa24cf463f";
sha256 = "180y6d89bldlpilhfz7dakyaml6mfhspnxjn4jliwql4k45xckbi";
rev = "b732a58ac8b7287b981cd9f0d9c0f61e5e9d5760";
sha256 = "0l05mrkc5v04nmrnazlqsb8p5ibv6p8lzy4ywvfrask14ajlfmz3";
};
meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/";
};
@ -2083,24 +2083,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
version = "2022-12-25";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
rev = "9d90bbff10171fcd9c6c4598e2cc7de1e6101463";
sha256 = "1pchn21aq8chrlk16qkwxc8q63bccysqk2lnz5gc5j3gnnlx3asm";
rev = "53cac5a2cc6f64765b658114efb50d62d7497ff4";
sha256 = "16z4g42h4mi3bvm7aj3c0jxv0r4vyb8a6z2fh1wlrbsgihk34nfw";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
version = "2022-12-25";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
rev = "48c0b049999549c18365fc4d7bb23ecbae58b47d";
sha256 = "0y4rwr4vfacvmj5bnia3s4h51fk73cay4kmwaajp1r1gbsxxiynq";
rev = "af94c7ad7ca379a68db0fef12622f8066248f2d3";
sha256 = "1msc60984zfwpvv3wx279bkjk4xy9hnf0mamaq1nvn6zh7dnsk5f";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@ -2119,12 +2119,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2022-12-25";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "6ca864153bab793b5d75c8af1b8e2195145dba80";
sha256 = "1mqciqyd4fjdrssf07mi3wk4qgvf48khpzgqzbsbv6c0g1k4pmn4";
rev = "8fe777d9ce4eb8519bef208f92e0843ddf2b2a1a";
sha256 = "1n7dlp712k92sh74c53g71d461vjll8pr4hdy15ksskh8j4i337s";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@ -2637,24 +2637,24 @@ final: prev:
dial-nvim = buildVimPluginFrom2Nix {
pname = "dial.nvim";
version = "2022-12-20";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "monaqa";
repo = "dial.nvim";
rev = "61afb28f61ba090a67a88186f7bc8a94212e509a";
sha256 = "0zzmgyl0j9ajmmyiwbpyp5js0ssz8gnlll6kbyk421jybjy17l6n";
rev = "1bf15b96126711424918cc66ccbbd53c4c1cec19";
sha256 = "1i97b2n2xyvj4a4abnnf3l98q341v7knalpibhl2byfwps7q2igc";
};
meta.homepage = "https://github.com/monaqa/dial.nvim/";
};
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
version = "2023-01-03";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "e3e15d8f1d727056185fc1696be1554837dec897";
sha256 = "134dxj758afq42kfhkd94scb70x6a8m4rb6f39cj1c2xyzfkrsa4";
rev = "18d88c86a1d7b5256f96694bd41aaee7037a6cc1";
sha256 = "048iwz14sf69y65lwwgbhmvg70g69rjg6mfjn42n6055lwz0djh9";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -2673,12 +2673,12 @@ final: prev:
doki-theme-vim = buildVimPluginFrom2Nix {
pname = "doki-theme-vim";
version = "2022-12-06";
version = "2023-01-07";
src = fetchFromGitHub {
owner = "doki-theme";
repo = "doki-theme-vim";
rev = "a83452264666eeb966b7fd5f48ddf15b8ca05450";
sha256 = "1v84dz04xbwwhh61fvpmfvydpvj5wkqskml908rgjzmk6y3hp8wq";
rev = "407c75de0049a184d6eb09ad415d2ccbc22ba612";
sha256 = "1f38pgfwfa114f768f77fdy733nbn12ch33q7gskji28mwmdp8yy";
};
meta.homepage = "https://github.com/doki-theme/doki-theme-vim/";
};
@ -2939,12 +2939,12 @@ final: prev:
firenvim = buildVimPluginFrom2Nix {
pname = "firenvim";
version = "2023-01-05";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "glacambre";
repo = "firenvim";
rev = "d1909c7abbc1857cc8b67e0234d7932ad7825644";
sha256 = "1z43p3whs5hfmdda7ck36n1s34w3k20k093m9asgdd6cv5bj7p96";
rev = "b6be2e074b8f62815a45e31eb0966b4dd5e57810";
sha256 = "0jhb91wfkz3jr1hxhigb551gg4c0gv8hdj9avyd5kj5lqwmy1j4q";
};
meta.homepage = "https://github.com/glacambre/firenvim/";
};
@ -3156,24 +3156,24 @@ final: prev:
fzf-lua = buildVimPluginFrom2Nix {
pname = "fzf-lua";
version = "2023-01-06";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "fzf-lua";
rev = "a5cf6e1debc9805f25443fab9cb0684c2507341e";
sha256 = "1x8bb2pkp4dcr3jvhkbcblgxg7h2siv63iqv2hzdk5klrgmajqh9";
rev = "632dbf6407b95cfa7995765f44d16c8d1663a04c";
sha256 = "0j4p73mcqllbr7rivcqlcc1zk7x67z04dkyww60ibbnzfzins4gr";
};
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
};
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf.vim";
version = "2022-12-31";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
rev = "0f03107bc94b31a9c7adcee6da8e5de7492e4b0b";
sha256 = "1fql2wcmc7c6lh2vsbb199q4isjz8ghd5a5fhcyiay5fl9rwgzw9";
rev = "9c37e6801b432a4046511b14414f488487b61973";
sha256 = "0f6c632k49xs0c8gbrd0bddrlbjyaw75vgjxszwd3x1cbl2mbk7c";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
@ -3312,12 +3312,12 @@ final: prev:
gitsigns-nvim = buildNeovimPluginFrom2Nix {
pname = "gitsigns.nvim";
version = "2023-01-04";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "d4f8c01280413919349f5df7daccd0c172143d7c";
sha256 = "114c7yjgi6d9mhr1c94n73msr3204idvcbh6y7i8y0853aan0jiz";
rev = "114362a85e51918ab2965181ffa31932c181f32f";
sha256 = "047gb4m4xzf34lsbax3fvb77gklig1p5k1srq5kxp1xn5vyl2w74";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -3563,12 +3563,12 @@ final: prev:
haskell-tools-nvim = buildVimPluginFrom2Nix {
pname = "haskell-tools.nvim";
version = "2023-01-06";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "haskell-tools.nvim";
rev = "cc6e727b7e605ddd63fd4f482755e8d8198289fa";
sha256 = "0pml2n16zrw4fmkd455fjmh9vxbwsqdwzip69gxlcgck0rraqirh";
rev = "7104fbe396f479db9d644c990669ed8b21024d70";
sha256 = "088mzb5y79afrn5in8g3wkii6izy86z1n66w94mrcl59dffcgzn3";
};
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
};
@ -4103,12 +4103,12 @@ final: prev:
lazy-nvim = buildVimPluginFrom2Nix {
pname = "lazy.nvim";
version = "2023-01-07";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "folke";
repo = "lazy.nvim";
rev = "8798ccc95031225e3b2241bd8b2d26c2452b06c4";
sha256 = "0n5ga8nfh5qc0abd6zwj4bibk72wpjkqx76qx5aw9r69w70mjqnq";
rev = "e6ee0fa6103e9514e85a96fc16902ad7f777b53f";
sha256 = "1463an1sdccsnxk8hlcxl3zb6bmwwd2mgqmdbixn5v33ijncjsr4";
};
meta.homepage = "https://github.com/folke/lazy.nvim/";
};
@ -4355,12 +4355,12 @@ final: prev:
lir-nvim = buildVimPluginFrom2Nix {
pname = "lir.nvim";
version = "2022-12-24";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "tamago324";
repo = "lir.nvim";
rev = "84af01547e51e15fc97e878330414385eeb825e8";
sha256 = "1idk82wyzwr1qk4waj8hik5jcv2zgbyc7zbb2bxl2vj0pdij8knw";
rev = "1fb0c78906677ec67493ffc3b4b6f7d584d25498";
sha256 = "0pf5ik5yma1j2w32gx4kb6s3p0hh0rhh0w9hkks7670jwib9sg3g";
};
meta.homepage = "https://github.com/tamago324/lir.nvim/";
};
@ -4511,12 +4511,12 @@ final: prev:
lsp-zero-nvim = buildVimPluginFrom2Nix {
pname = "lsp-zero.nvim";
version = "2023-01-07";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "VonHeikemen";
repo = "lsp-zero.nvim";
rev = "6224e879acc5ec25e2baae2a1c3d3cfe804e2486";
sha256 = "177gkyd7dyw24yrv3mfb6aip63nrxqf45vlrksl67bbq0q6kkak9";
rev = "b3d60f170a23ba52cfd56fd6f8ce70a38e853330";
sha256 = "1xhdqc16qyhkp9gp2lgqx3y7ayssnwcmy48m0s4phw7hkmjf4g6r";
};
meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
};
@ -4618,12 +4618,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2022-12-20";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "5570fd797eae0790affb54ea669a150cad76db5d";
sha256 = "0052rkqyhniz6djz7gkblmdlndllwv9jhcl6kh973qq23pdb00n4";
rev = "5d57303efde86fcb0959c52b1a6d40f923940f34";
sha256 = "16ajdq0m3msn1y7j8iqi9r9i297g9vvidff63xzk8jkw2h8frizn";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@ -4679,24 +4679,24 @@ final: prev:
marks-nvim = buildVimPluginFrom2Nix {
pname = "marks.nvim";
version = "2022-11-24";
version = "2023-01-07";
src = fetchFromGitHub {
owner = "chentoast";
repo = "marks.nvim";
rev = "a69253e4b471a2421f9411bc5bba127eef878dc0";
sha256 = "1df3c2apc4gsgrysdya99294c5h5lxibr9xifnv26rgbcqqk7njh";
rev = "c3b18b97912720a6586fb537c5c0dfc9e06a68f1";
sha256 = "1qgzvqzlnnb6axlcnyzw8lmafx8absv7dprqxkbgk5fkrdlcd9mm";
};
meta.homepage = "https://github.com/chentoast/marks.nvim/";
};
mason-lspconfig-nvim = buildVimPluginFrom2Nix {
pname = "mason-lspconfig.nvim";
version = "2023-01-06";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason-lspconfig.nvim";
rev = "33a198bc5ee0215ae8ab3f61781b29103cf4ca5a";
sha256 = "0rv8vy9gswqq76857xbanlw0l2mvls39qgsd2whnwz118gf92jh2";
rev = "3751eb5c56c67b51e68a1f4a0da28ae74ab771c1";
sha256 = "077pgksadar290n6zhgna6c42cvqj966sb3lb7l05xfd4m88ajn0";
};
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
};
@ -4715,12 +4715,12 @@ final: prev:
mason-nvim = buildVimPluginFrom2Nix {
pname = "mason.nvim";
version = "2023-01-07";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason.nvim";
rev = "369d520350b4c1af40630f90c3703444c40c065a";
sha256 = "1335n3jplxirwg1dyn52lzsni0dw7viv9sm3bqa8ib7fn051f4fx";
rev = "a4ebe1f14ba31242cd09f9e0709d5b1f9d2bcecb";
sha256 = "0jwqfmd89dghfrmfp7srcahxz5c7rkafyzd056s7qiwpciqi7hbn";
};
meta.homepage = "https://github.com/williamboman/mason.nvim/";
};
@ -5147,12 +5147,12 @@ final: prev:
neoconf-nvim = buildVimPluginFrom2Nix {
pname = "neoconf.nvim";
version = "2023-01-07";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "folke";
repo = "neoconf.nvim";
rev = "2b873a75159ec0c8d160da029392b1c4e31e1927";
sha256 = "0mvgwysgb78hxa80zik7nxfbagvhm6gwkclaq62vr7iyjsy4ranx";
rev = "4b4e539325db1d939be5a1d7a4b2d5644c59eda2";
sha256 = "1gdpiakgwn7f8lfx2hfvr4vaxnczni6i6yxfkc7hzf0r6h64q4h0";
};
meta.homepage = "https://github.com/folke/neoconf.nvim/";
};
@ -5195,12 +5195,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2023-01-05";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "84cf7efba6e4daed11a1185ea09fa553a3ca3d4f";
sha256 = "17ywbfg0shi8mjpfscrsqgm644nvayaycggza5sm0r4224rcvdjc";
rev = "a364c3da583a78f707aac761f5927967a0165143";
sha256 = "1y9vn5a35kq9imvp57gdal2pi2vhrv27l2vc5xzsa8clvcd05jxy";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -5327,12 +5327,12 @@ final: prev:
neotest-haskell = buildVimPluginFrom2Nix {
pname = "neotest-haskell";
version = "2023-01-06";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "neotest-haskell";
rev = "b8310d053c8859a159828054f930be8fdb18eb2d";
sha256 = "1hbrbxvs990a6fg3qr3mis8d9wpg9az675wx9yj0dlaisb0sq7kf";
rev = "132615d26f21dc3390a6c1f9f693dcad4be0c2b7";
sha256 = "0pgbh9jzva3bvzav33xz39fr4x4jqgqnyha44ff2hhdda3ba0b6m";
};
meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
};
@ -5481,14 +5481,26 @@ final: prev:
meta.homepage = "https://github.com/zah/nim.vim/";
};
nix-develop-nvim = buildVimPluginFrom2Nix {
pname = "nix-develop.nvim";
version = "2023-01-10";
src = fetchFromGitHub {
owner = "figsoda";
repo = "nix-develop.nvim";
rev = "456f0b202cc179390bc9ed84fbd589832849e983";
sha256 = "0yk7661336sjlvmsk7p7v6ssr5242r6xy5cm4d22pvk9zz5yzxwc";
};
meta.homepage = "https://github.com/figsoda/nix-develop.nvim/";
};
nlsp-settings-nvim = buildVimPluginFrom2Nix {
pname = "nlsp-settings.nvim";
version = "2023-01-07";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "tamago324";
repo = "nlsp-settings.nvim";
rev = "47a3e92a9b3a2f7604d4a9eefd1d55518554a89d";
sha256 = "1b7a5al09bnq1a3315gmg5dwxsw560dksqg3kqrphbx80g6v3f74";
rev = "ce9c4b5869e6ff2714812ada81553e9aa063e3ef";
sha256 = "1k0cjkvlfk5x92v5gcrcla3kj6r6kb5ygbm02jpr8ypraasy57nm";
};
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
@ -5639,12 +5651,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2022-12-24";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "03580d758231956d33c8dd91e2be195106a79fa4";
sha256 = "1qc7i1q4mkxqqmmcn22aig3sagg8g3qn6iw7xy56lv8dxk8yml9d";
rev = "f00eb3b766c370cb34fdabc29c760338ba9e4c6c";
sha256 = "147s9mq3vlvsf4wzm0x5aiwr374zhi3d6d2b9y52iwndwjvjkh0b";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@ -5663,12 +5675,12 @@ final: prev:
nvim-biscuits = buildVimPluginFrom2Nix {
pname = "nvim-biscuits";
version = "2022-12-26";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "code-biscuits";
repo = "nvim-biscuits";
rev = "e58b47d7ff6bded07f30f51ca1fa4855a1a6dfb1";
sha256 = "1as4c9ahmdvfnrsa3ih3dzz2pk8y00fyss1m61cs1q1l9j0cnc7j";
rev = "25a880605fa4533b7075c54a0fdb5f0a25bc4f84";
sha256 = "12lij0yv3n596yp2jbrdh17awrgvsm8gfyrafgvdzj4jibn16c68";
};
meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/";
};
@ -5819,12 +5831,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2023-01-05";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "1077a86c83f75a6eec36c91f91d6b728e2b02130";
sha256 = "17l45nyd7285w20l22s4m09hjck5nwmdjkbmc1cr7lrv8yiv5j1i";
rev = "700a3c7d6fbe5b07bee74e9952b456120d355c47";
sha256 = "16hrqqa6577lq51hcx048j8rwa6aqdb6dz9b94rv1ki0jy52cx00";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -6047,12 +6059,12 @@ final: prev:
nvim-lint = buildVimPluginFrom2Nix {
pname = "nvim-lint";
version = "2023-01-05";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-lint";
rev = "9c9490f63428f667fd3fcc7025947323653e17cc";
sha256 = "1igqy3dharnypk4wxdgkkjy99rs8rlilkzwk7hx4x5bc50h20n7q";
rev = "28af70fe2d410cb202a8a6a0c014184f2b12da61";
sha256 = "0as30f6f2whgzj911ac8gdrd2i7y0w9r4j0vq3j027wf6sx6i6zg";
};
meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
};
@ -6071,12 +6083,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2023-01-07";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "41dc4e017395d73af0333705447e858b7db1f75e";
sha256 = "1vpxgnid3a66b1bh6zk3l2h014bbykvpzz9s9d55cb6591kmbsa1";
rev = "7b98aadc6e85db4fc3af6c1ec22c4774d965506e";
sha256 = "1b0ygz9jyaj0i993qnjvfnr6yxf65sa8vkfjg2qh2gh1dphsvhfp";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -6311,24 +6323,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
version = "2023-01-07";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-tree.lua";
rev = "f2ee30998eb4e191ed9931719a4e3b28be35494b";
sha256 = "0881z195zzqm5lp9q1vas5dzi54qxrhd91gd9fz06w77c3ki5spa";
rev = "87961d38a7b6cd799ebe193946e86a1037ba66e8";
sha256 = "0ch5df2x39knvjs0j5vkbxlkl8md218ghdhms1gykj57074jsc2x";
};
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-01-07";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "ef0cd56e482bf82be82afd6afc69268fc6037475";
sha256 = "1pwydn801jvvahy491zhisfkmyk7n96lxvyj5msch3jjfg14whqw";
rev = "5fb315df12a3091f241b0326aed0ec70381adbd8";
sha256 = "00cpr1qalmgp6qbs0nhyj082dpndyir0ck2i3p09qqah2bfb1sy8";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -6419,11 +6431,11 @@ final: prev:
nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow2";
version = "2023-01-06";
version = "2023-01-08";
src = fetchgit {
url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
rev = "8b027039f2e3e735b8d7b8d22c5e04b56832e972";
sha256 = "1l6q16jjn88x0kv56lrp5x1ik7kmbd0zcgkdg34wkmcnky8jq6ms";
rev = "09dcb851701747b3f4c5c1088befc88e1601942d";
sha256 = "0a905qsy01wyyxsgcy354mfn7039dy3ib82yzixacdbwzmng1kcz";
};
meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
};
@ -6574,12 +6586,12 @@ final: prev:
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
version = "2023-01-04";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
rev = "335166c57b37e81989c0e3826e9f03759d64f39c";
sha256 = "1gc40qdxa012zbr1f94wwwss9bszngp4yd4hm0k4jg02gi8k16wg";
rev = "61b4f4509a59247118ff93f1707f41d4674a5ac2";
sha256 = "154r8gibyjzb8cp34xpz00l71f1drixvcsvsrw8lp1hqaak3hywd";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@ -6598,12 +6610,12 @@ final: prev:
onenord-nvim = buildVimPluginFrom2Nix {
pname = "onenord.nvim";
version = "2023-01-03";
version = "2023-01-07";
src = fetchFromGitHub {
owner = "rmehri01";
repo = "onenord.nvim";
rev = "fadf6d43c0c9014443e62857284169567a879bbf";
sha256 = "1b6fhlkl9i73vq744b8r1l815lj57mz41n2qd21sgx6mfc427mh4";
rev = "b05d57d04445836e6b9235e1937bf0a3ba42506b";
sha256 = "1n92ajibyz9w1iyyndkjzk6vzk3vz0wam1h39990c7fl4jj74is1";
};
meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
};
@ -7188,12 +7200,12 @@ final: prev:
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools.nvim";
version = "2022-11-06";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
rev = "99fd1238c6068d0637df30b6cee9a264334015e9";
sha256 = "0y95kj77p4zjskn6j7bp04scrlgg5l8827zc3m6f18cgcy1qnngf";
rev = "df584e84393ef255f5b8cbd709677d6a3a5bf42f";
sha256 = "1h2p6xdv4bxphn98iwjzk9fh54lh1ff41smp2n0j84inqpl0mygv";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
@ -9030,12 +9042,12 @@ final: prev:
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2023-01-02";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "0913c0a3b6fc256e6de8dff00dfd1c9388cad9a6";
sha256 = "0bvyr49shcqbdmcp0q06nfbay5cff11r80nhis3p3gdccik74zv7";
rev = "4f5b641710bc8cffddb28c6821b2ee7abaafefe6";
sha256 = "1pbg094i8s314f4ffa3ppcdycp1ylzd6z29xhvcsf4q83ji212r4";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@ -9174,12 +9186,12 @@ final: prev:
vim-autoformat = buildVimPluginFrom2Nix {
pname = "vim-autoformat";
version = "2022-09-10";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "vim-autoformat";
repo = "vim-autoformat";
rev = "63866f84095888d69af4e03d04ee6384fb93ef9b";
sha256 = "0501jskp4yxva9h12awmkk50hj8l8yxkqrbm362hgji7gh5n3za8";
rev = "d529e3e09a378695367969bf01735b9b997014ec";
sha256 = "06p0246rw4cra2c9zr6bml9ylflyb4kcx4h5nfcriz0rsqgph0ha";
};
meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";
};
@ -9426,12 +9438,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2023-01-06";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "ea2bebd2aa8c6fd677537fe0ef54b8c29a337e89";
sha256 = "0yww0igh798aqs8rfbrvsvc1yigaf1gl1ib0gi8gs4qv269dbsdj";
rev = "d388abc011762b01a0b31cb07a37e4da7f594eeb";
sha256 = "03ik7icaal6i6w3pdizkip0l7cjgz9hfm6y6dhlrgq1szf5mnq6c";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -11457,12 +11469,12 @@ final: prev:
vim-nixhash = buildVimPluginFrom2Nix {
pname = "vim-nixhash";
version = "2022-09-01";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "symphorien";
repo = "vim-nixhash";
rev = "e03af8d0c1bae3c015ffdb45ce79556c0561e59d";
sha256 = "1kdg84666gf1d3qiwwqmk7nwshspr2kpb8hjyh2m0nx0zmjji2ij";
rev = "71676294bcb22c52d372bd8850b1bd3d7173bfac";
sha256 = "14chq3c5dhkvllkmrrnpd8lbmlbm8ji1gqxn686bnh0d1w2r9hyk";
};
meta.homepage = "https://github.com/symphorien/vim-nixhash/";
};
@ -12838,12 +12850,12 @@ final: prev:
vim-tmux-navigator = buildVimPluginFrom2Nix {
pname = "vim-tmux-navigator";
version = "2023-01-07";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "christoomey";
repo = "vim-tmux-navigator";
rev = "7073840ab137c9f09d3d1a835d765e40faf715e3";
sha256 = "1bz37lxnx97l2zdvjm0dgjs0rdlyw9hbaxwzf1cxzwsv4x46rx9n";
rev = "9337b6d5d417e8006c09f1faadb5069296c8da02";
sha256 = "14wj5jqhyjpsdnlvx34fvk7zax6w2appi6rg7mc91z2z7gmrzf8q";
};
meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/";
};
@ -13511,12 +13523,12 @@ final: prev:
which-key-nvim = buildVimPluginFrom2Nix {
pname = "which-key.nvim";
version = "2023-01-07";
version = "2023-01-09";
src = fetchFromGitHub {
owner = "folke";
repo = "which-key.nvim";
rev = "802219ba26409f325a5575e3b684b6cb054e2cc5";
sha256 = "0flj4bq58s57wdf2x81lqsdpzm3h263s6v6xi76kisj7k3ykwiw0";
rev = "85f69b07afce4ea77c58ae9a3aeb4e6c918b4d34";
sha256 = "11ffalyyl29jk9h29vmg5vj9jil4brpjxa8rsys6n6zc1gydis8n";
};
meta.homepage = "https://github.com/folke/which-key.nvim/";
};
@ -13812,12 +13824,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2022-12-25";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "0deeed4aef43b249650cf4fc57722d5a4905703f";
sha256 = "1b98v4jzinf2hwdfhijl4qh12gvg3pr86w3j27wazlhb86wqlmi5";
rev = "6bdd731301e546e133c7c3e52bf31e7594394e27";
sha256 = "17lws3h29mkirsvq8v6ydc6isqkkg0zaw4p6g7hwpndf9pv8mb12";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};

View File

@ -115,23 +115,23 @@
};
c_sharp = buildGrammar {
language = "c_sharp";
version = "1bd772f";
version = "f076a8e";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c-sharp";
rev = "1bd772f69b0db577122533514a239b184650adf2";
hash = "sha256-ySgSavQflqFXHY25DjX16aP4KgK2HFdsQ6HeYaerxNI=";
rev = "f076a8efe30a0b8c249eeb61383f6d914376114c";
hash = "sha256-CFqVngYaGe+ZFwpMaQI5HKAioJPmciBDhHxfO3yjKuE=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
};
clojure = buildGrammar {
language = "clojure";
version = "8c23e0e";
version = "50468d3";
source = fetchFromGitHub {
owner = "sogaiu";
repo = "tree-sitter-clojure";
rev = "8c23e0ec078af461ccad43fffbbfc204aa6bc238";
hash = "sha256-rbR5/f9Cznl4AFybmpKgEcjKBw4GrUVP67tf4UT6/ZE=";
rev = "50468d3dc38884caa682800343d9a1d0fda46c9b";
hash = "sha256-JOqkgsefFp+nvRijPsd+/01w1JsXeW5cNcZNow0ZRyY=";
};
meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure";
};
@ -181,12 +181,12 @@
};
cpp = buildGrammar {
language = "cpp";
version = "5ead1e2";
version = "2d2c4ae";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-cpp";
rev = "5ead1e26c6ab71919db0f1880c46a278a93bc5ea";
hash = "sha256-h6mJdmQzJlxYIcY+d5IiaFghraUgBGZwqFPKwB3E4pQ=";
rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1";
hash = "sha256-BjNWSTpwytOSYw32lYFItNI4t3xw+uJUx/0htYo7aLs=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
};
@ -203,12 +203,12 @@
};
cuda = buildGrammar {
language = "cuda";
version = "7f1a79e";
version = "0091006";
source = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-cuda";
rev = "7f1a79e612160aa02be87f1a24469ae3655fe818";
hash = "sha256-zBlv/KyUPNHRA8fKWaDgCeE1AX3EYTkwjo/RYHaKjK0=";
rev = "0091006d6498ee5647f080ef6c09e5b95e481078";
hash = "sha256-t1wd32UE2Kz1VkIM4HfFFSDnttdCPGm1xOH9ZP+ATxc=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
};
@ -393,12 +393,12 @@
};
fortran = buildGrammar {
language = "fortran";
version = "f0f2f10";
version = "edcb337";
source = fetchFromGitHub {
owner = "stadelmanma";
repo = "tree-sitter-fortran";
rev = "f0f2f100952a353e64e26b0fa710b4c296d7af13";
hash = "sha256-ylQLalRFqRu5N/lUxvwOds/UbLH2JJ7T/rOpo9H4MZ4=";
rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7";
hash = "sha256-xZfWtRHWy3MQtkzN9jSwx+sAwLlcRiVLTJjYXyWEIs8=";
};
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
};
@ -448,12 +448,12 @@
};
gitcommit = buildGrammar {
language = "gitcommit";
version = "74b4077";
version = "0ef7dd0";
source = fetchFromGitHub {
owner = "gbprod";
repo = "tree-sitter-gitcommit";
rev = "74b40770e6299564f0b7ca474105d7d5238d0583";
hash = "sha256-WpPJ1EfTd5QavXiEtBIu6RBCtzN9MoklyU+/055NfOI=";
rev = "0ef7dd07236141a878b4cc2c488375baa5cc9d5d";
hash = "sha256-8OyjmnCLR14ivJBf/9KO4rmc99xL818iMY8uxkjtVGw=";
};
meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
};
@ -626,12 +626,12 @@
};
hlsl = buildGrammar {
language = "hlsl";
version = "39c822b";
version = "bd0d463";
source = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
rev = "39c822b795bd6533815d100b5e7d1ec7778a1c2a";
hash = "sha256-WXlOl+aopL332rW2c2dYyf/xoYx9g7BfkdMUIFJbxzg=";
rev = "bd0d463d1380816240a8cb1fd747fc0d3fed24aa";
hash = "sha256-0Dafbn0+8N1MBRyOhiaZBo7KZqm8YpFzg/ZwT3SLq+g=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
};
@ -659,12 +659,12 @@
};
http = buildGrammar {
language = "http";
version = "30a9c17";
version = "2c6c445";
source = fetchFromGitHub {
owner = "rest-nvim";
repo = "tree-sitter-http";
rev = "30a9c1789d64429a830802cde5b1760ff1064312";
hash = "sha256-XpKw6v6fnowdJmoIZGn3N1r9JXdJnNifgj+DPNFuoz0=";
rev = "2c6c44574031263326cb1e51658bbc0c084326e7";
hash = "sha256-R81n6vb7JzZlnK17SkiwYeJeMs0xYTXx/qFdTvT8V5c=";
};
meta.homepage = "https://github.com/rest-nvim/tree-sitter-http";
};
@ -1060,12 +1060,12 @@
};
prisma = buildGrammar {
language = "prisma";
version = "17a5923";
version = "eca2596";
source = fetchFromGitHub {
owner = "victorhqc";
repo = "tree-sitter-prisma";
rev = "17a59236ac25413b81b1613ea6ba5d8d52d7cd6c";
hash = "sha256-EdeKTmai/OM0WzCjcLmzHI41EqJWH/dOJJxvCE2sid8=";
rev = "eca2596a355b1a9952b4f80f8f9caed300a272b5";
hash = "sha256-MOqkM7DCQl1L8Jn9nyw89EoAr0ez4+d39HeKy2cb66c=";
};
meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma";
};
@ -1236,12 +1236,12 @@
};
scala = buildGrammar {
language = "scala";
version = "314bc06";
version = "c4c7d2e";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-scala";
rev = "314bc06e59b3e0a37f224b1d391fd764757abd70";
hash = "sha256-+qR4bOhJOUDBudR9LlLvH5a4W7jRgCV1XrxxFwHf+Fs=";
rev = "c4c7d2e454014659be7383a582bd84456688bb1c";
hash = "sha256-weAn9/X63M0ZOYv2eCgDblR5b9fUvdIFQ8sWcnrApGw=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
};
@ -1278,6 +1278,17 @@
};
meta.homepage = "https://github.com/jrmoulton/tree-sitter-slint";
};
smali = buildGrammar {
language = "smali";
version = "d7f535e";
source = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-smali";
rev = "d7f535e176c928d33b0e202dd808ac247cacf2ff";
hash = "sha256-wSUHzQdpWtIXuqfFvqMNJPQjvdRZ29PBcwtMnyKwRR4=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-smali";
};
solidity = buildGrammar {
language = "solidity";
version = "52ed088";
@ -1347,12 +1358,12 @@
};
swift = buildGrammar {
language = "swift";
version = "f94e1d6";
version = "5f0ffaf";
source = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
rev = "f94e1d6dd8f4df6c7c8aa07da625e498ebb27d09";
hash = "sha256-DtcGcywpwCZoGNllZEetE+s1bwMNrRdooGdttAG3Ra0=";
rev = "5f0ffaf21c7fda4d758d9ef5b20d563271653ce0";
hash = "sha256-tPcCa3hqWN2NuQZOJXnB10h0m1MzRL4M+dvrtlpkAGs=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@ -1496,12 +1507,12 @@
};
v = buildGrammar {
language = "v";
version = "e5ec6a4";
version = "497563e";
source = fetchFromGitHub {
owner = "vlang";
repo = "vls";
rev = "e5ec6a42f1af42d4101fb226a98b8db0f4f21c88";
hash = "sha256-Nl2c18MFhqbHp2jkUfUSCB6DwBoQD34AhKz6IQcSvKM=";
rev = "497563e140bf17d73f28e20b5a65e72740c2dc65";
hash = "sha256-2AU/QGAroq5NReGhCbSJkAnGvftubtCG4hnnBjPKbdY=";
};
location = "tree_sitter_v";
meta.homepage = "https://github.com/vlang/vls";
@ -1563,23 +1574,23 @@
};
wgsl = buildGrammar {
language = "wgsl";
version = "61d2604";
version = "4c03f73";
source = fetchFromGitHub {
owner = "szebniok";
repo = "tree-sitter-wgsl";
rev = "61d2604525d47238ecbce8aa38f10cb81ba68fd3";
hash = "sha256-dSWQAJN9+EyqPbGZv9wTR8upsK56ZWu9jOpJkJtkabs=";
rev = "4c03f73822c72130c63c385a112e44ad5a69f3e9";
hash = "sha256-YqGrjtWmBHthV6c9WvCUT2Q13vQJGpvWPR6DTwHMEr4=";
};
meta.homepage = "https://github.com/szebniok/tree-sitter-wgsl";
};
wgsl_bevy = buildGrammar {
language = "wgsl_bevy";
version = "c81dc77";
version = "2475727";
source = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-wgsl-bevy";
rev = "c81dc770310795caea5e00996505deba024ec698";
hash = "sha256-CNEZ8GKfcT5YOdlrqEFE8q2FF0Zs+GsWisd1DA6mnUk=";
rev = "24757275fa01e813ebfdb6acab85862ced9405d7";
hash = "sha256-Zevra1HCnQWyx5zZ2m9P/qEGnmpptTnwXyttNiciKCA=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy";
};

View File

@ -1052,7 +1052,7 @@ self: super: {
libiconv
];
cargoSha256 = "sha256-UCf5Jya1ATYgCggS/5SitLuQZwtMjrIY9qcBL4RDRAc=";
cargoSha256 = "sha256-5hez6snn0neQEE3W8PbwUoGeSj8Bvu23Ftxz5T0iPAw=";
};
in
''

View File

@ -461,6 +461,7 @@ https://github.com/fiatjaf/neuron.vim/,,
https://github.com/chr4/nginx.vim/,,
https://github.com/EdenEast/nightfox.nvim/,,
https://github.com/zah/nim.vim/,,
https://github.com/figsoda/nix-develop.nvim/,HEAD,
https://github.com/tamago324/nlsp-settings.nvim/,main,
https://github.com/tjdevries/nlua.nvim/,,
https://github.com/mcchrish/nnn.vim/,,

View File

@ -1483,8 +1483,8 @@ let
mktplcRef = {
name = "latex-workshop";
publisher = "James-Yu";
version = "9.2.1";
sha256 = "sha256-0+Kp0B56Z2ITx42+cgBkbOZMo9X0cJkPVypFXX8JXRI=";
version = "9.4.4";
sha256 = "sha256-EA3OABn80GciNecXwLcorWP7K3+jI+wgujpmvvFcNOA=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";

View File

@ -15,6 +15,7 @@
, qtbase
, qtsvg
, qttools
, qtwayland
, vulkan-loader
, wayland
, wrapQtAppsHook
@ -23,23 +24,25 @@
stdenv.mkDerivation {
pname = "duckstation";
version = "unstable-2022-12-08";
version = "unstable-2023-01-01";
src = fetchFromGitHub {
owner = "stenzek";
repo = "duckstation";
rev = "1905ce3e0163fd53e56cc949379f74a2e1c6228d";
sha256 = "sha256-q6r9VCGwYCTzyZ3s1BAhQiA8FKsue7QUcErGtuLJbCg=";
rev = "06d6447e59f208f21ba42f4df1665b789db13fb7";
sha256 = "sha256-DyuQ7J7MVSQHpvPZhMtwqNM8ifjI8UFYQ9SxY5kikBI=";
};
nativeBuildInputs = [
cmake
extra-cmake-modules
copyDesktopItems
ninja
pkg-config
qttools
wrapQtAppsHook
]
++ lib.optionals enableWayland [
extra-cmake-modules
];
buildInputs = [
@ -52,7 +55,10 @@ stdenv.mkDerivation {
qtsvg
vulkan-loader
]
++ lib.optionals enableWayland [ wayland ];
++ lib.optionals enableWayland [
qtwayland
wayland
];
cmakeFlags = [
"-DUSE_DRMKMS=ON"
@ -93,9 +99,7 @@ stdenv.mkDerivation {
runHook postCheck
'';
# Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173
qtWrapperArgs = [
"--set QT_QPA_PLATFORM xcb"
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}"
];

View File

@ -38,14 +38,14 @@ in
+ lib.optionalString enableQt "-qt"
+ lib.optionalString (!enableQt) "-sdl"
+ lib.optionalString forceWayland "-wayland";
version = "1.14.1";
version = "1.14.4";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
sha256 = "sha256-WGTPd3xcFk4E/Wf+DEv4pzGYf0dppzV3vUTwrYmZ2YM=";
sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc=";
};
postPatch = ''

View File

@ -23,20 +23,19 @@
stdenv.mkDerivation rec {
pname = "rnote";
version = "0.5.10";
version = "0.5.12";
src = fetchFromGitHub {
owner = "flxzt";
repo = "rnote";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-k1Ov35cz2U39yuIYIr9MW6M/A8MNasoybELC4U3xok0=";
hash = "sha256-wrx8+18jVDIhYhxD8VgU8wlRDLoUwMWIBOzSUozjUII=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-MsLpZl8AvF2BJU6PfC8BmTADR7T3e7+HstHQa+YYJFo=";
hash = "sha256-t0nmfM6Z30c+n0iANjMBVifOhYMXdBqgjxYdhOPOhYQ=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,64 @@
{ lib
, stdenv
, fetchurl
, vulkan-headers
, vulkan-tools
, vulkan-loader
, glslang
, glfw
, libjpeg
, pkg-config
, rsync
, cmake
, clang
, llvm
, llvmPackages
, pugixml
, freetype
, exiv2
, ffmpeg
, libvorbis
, libmad
}:
stdenv.mkDerivation rec {
pname = "vkdt";
version = "0.5.1";
src = fetchurl {
url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-IMCS6bJqOzPeAFZyQtjzd1rQ5ugIevqoFUW6Y0w1Pzs=";
};
buildInputs = [
vulkan-headers
vulkan-tools
vulkan-loader
glslang
glfw
libjpeg
pkg-config
rsync
cmake
clang
llvm
llvmPackages.openmp
pugixml
freetype
exiv2
ffmpeg
libvorbis
libmad
];
dontUseCmakeConfigure = true;
makeFlags = [ "DESTDIR=$(out)" "prefix=" ];
meta = with lib; {
description = "A vulkan-powered raw image processor";
homepage = "https://github.com/hanatos/vkdt";
license = licenses.bsd2;
maintainers = with maintainers; [ paperdigits ];
};
}

View File

@ -1,5 +1,4 @@
{ buildPackages
, buildPlatform
, fetchzip
, javaOpts ? "-XX:+UseZGC"
, jdk
@ -23,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
nativeBuildInputs = [ jdk makeWrapper ];
LANG = "en_US.UTF-8";
LOCALE_ARCHIVE = lib.optionalString (buildPlatform.libc == "glibc")
LOCALE_ARCHIVE = lib.optionalString (stdenvNoCC.buildPlatform.libc == "glibc")
"${buildPackages.glibcLocales}/lib/locale/locale-archive";
buildPhase = ''

View File

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "AusweisApp2";
version = "1.24.4";
version = "1.26.1";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = version;
sha256 = "sha256-YO0K8L03n/KQcINRKwls8BxG8nv5k3Myd95AU8agigI=";
sha256 = "sha256-Q+ZWnbYH80FMazKB1iSTh9cuYvuPom+qDjMZvC1gUoY=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -14,11 +14,12 @@
, gst_all_1
, libsoup_3
, libadwaita
, nix-update-script
}:
python3.pkgs.buildPythonApplication rec {
pname = "dialect";
version = "2.0.2";
version = "2.1.1";
format = "other";
@ -27,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
repo = pname;
rev = version;
fetchSubmodules = true;
hash = "sha256-55vqxS0ySV8lItxLl1J+wLvPtmR87HzGfAiOKuhigFA=";
hash = "sha256-ytZnolQTOj0dpv+ouN1N7sypr1LxSN/Uhp7qP0ZOTHE=";
};
nativeBuildInputs = [
@ -69,6 +70,10 @@ python3.pkgs.buildPythonApplication rec {
# handle setup hooks better
strictDeps = false;
passthru.updateScript = nix-update-script {
attrPath = pname;
};
meta = with lib; {
homepage = "https://github.com/dialect-app/dialect";
description = "A translation app for GNOME";

View File

@ -23,12 +23,12 @@ let
in stdenv.mkDerivation rec {
pname = "k40-whisperer";
version = "0.60";
version = "0.62";
src = fetchzip {
url = "https://www.scorchworks.com/K40whisperer/K40_Whisperer-${version}_src.zip";
stripRoot = true;
sha256 = "sha256-Nr7WYVu78msn5HuDNtSSvkdU6iCWtbiYZmh0rnMiyEg=";
sha256 = "sha256-3O+lCpmsCCu61REuxhrV8Uy01AgEGq/1DlMhjo45URM=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -4,11 +4,11 @@ let
inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map;
in buildDotnetPackage rec {
pname = "keepass";
version = "2.49";
version = "2.52";
src = fetchurl {
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
sha256 = "sha256-1hg4bRuQSG+UzEQGeQcSURTmTxt5ITGQqfg0IS7RWt0=";
sha256 = "sha256-6dGCfysen26VGHIHETuNGkqHbPyeWRIEopqJa6AMzXA=";
};
sourceRoot = ".";

View File

@ -43,15 +43,15 @@ diff --git a/KeePass/Util/AppLocator.cs b/KeePass/Util/AppLocator.cs
index af02803..8a32c9d 100644
--- a/KeePass/Util/AppLocator.cs
+++ b/KeePass/Util/AppLocator.cs
@@ -429,7 +429,7 @@ namespace KeePass.Util
@@ -468,7 +468,7 @@ namespace KeePass.Util
if(NativeLib.GetPlatformID() == PlatformID.MacOSX)
strArgPrefix = string.Empty; // FR 3535696
strOpt = string.Empty; // FR 3535696
- string str = NativeLib.RunConsoleApp("whereis", strArgPrefix + strApp);
+ string str = NativeLib.RunConsoleApp("@whereis@", strArgPrefix + strApp);
if(str == null) return null;
- string str = NativeLib.RunConsoleApp("whereis", strOpt + strApp);
+ string str = NativeLib.RunConsoleApp("@whereis@", strOpt + strApp);
if(string.IsNullOrEmpty(str)) return null;
str = str.Trim();
int iSep = str.IndexOf(':');
diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs
index ab49ee2..7f6c50f 100644
--- a/KeePass/Util/ClipboardUtil.Unix.cs
@ -108,14 +108,14 @@ diff --git a/KeePassLib/Native/NativeLib.cs b/KeePassLib/Native/NativeLib.cs
index 2d227a3..243f4ee 100644
--- a/KeePassLib/Native/NativeLib.cs
+++ b/KeePassLib/Native/NativeLib.cs
@@ -145,7 +145,7 @@ namespace KeePassLib.Native
// Mono returns PlatformID.Unix on Mac OS X, workaround this
if(m_platID.Value == PlatformID.Unix)
@@ -143,7 +143,7 @@ namespace KeePassLib.Native
// Mono returns PlatformID.Unix on MacOS, workaround this
if(g_platID.Value == PlatformID.Unix)
{
- if((RunConsoleApp("uname", null) ?? string.Empty).Trim().Equals(
+ if((RunConsoleApp("@uname@", null) ?? string.Empty).Trim().Equals(
"Darwin", StrUtil.CaseIgnoreCmp))
m_platID = PlatformID.MacOSX;
g_platID = PlatformID.MacOSX;
}
diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs
index e20bb3a..4fd875b 100644
@ -130,7 +130,7 @@ index e20bb3a..4fd875b 100644
private static Dictionary<uint, bool> g_dForceReq = new Dictionary<uint, bool>();
private static Thread g_thFixClip = null;
@@ -335,7 +335,7 @@ namespace KeePassLib.Utility
@@ -356,7 +356,7 @@ namespace KeePassLib.Utility
// }
// else { Debug.Assert(false); }

View File

@ -9,17 +9,17 @@ Subject: [PATCH] loadplugin
diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
index 347eaf5..b92e1e2 100644
--- a/KeePass/Forms/MainForm.cs
+++ b/KeePass/Forms/MainForm.cs
@@ -440,7 +440,$OUTPUT_LC$ @@ namespace KeePass.Forms
ToolStripItemCollection tsicT = m_ctxTray.Items;
ToolStripItem tsiPrevT = m_ctxTrayOptions;
- m_pluginManager.LoadAllPlugins();
--- a/KeePass/Forms/MainForm_Functions.cs
+++ b/KeePass/Forms/MainForm_Functions.cs
@@ -312,7 +312,$OUTPUT_LC$ @@ namespace KeePass.Forms
ToolStripItemCollection tsicT = m_ctxTray.Items;
ToolStripItem tsiPrevT = m_ctxTrayOptions;
- m_pluginManager.LoadAllPlugins();
$DO_LOADS$+
m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM);
m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM);
m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM);
m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM);
--
2.25.4

View File

@ -18,7 +18,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "metadata-cleaner";
version = "2.2.8";
version = "2.3.1";
format = "other";
@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "rmnvgr";
repo = pname;
rev = "v${version}";
hash = "sha256-646jGcgcEbhHk3PWdkKHWLVX8bNIB3BmYVMoXaGxHUw=";
hash = "sha256-nH2BsfXFwBdu7/YH2OuG90HxYgiuqKJqMC4p0PRlgPw=";
};
nativeBuildInputs = [

View File

@ -28,7 +28,6 @@
, wirelesstools
, libnl
, i3
, i3-gaps
, jsoncpp
# override the variables ending in 'Support' to enable or disable modules
@ -39,7 +38,6 @@
, iwSupport ? false
, nlSupport ? true
, i3Support ? false
, i3GapsSupport ? false
}:
stdenv.mkDerivation rec {
@ -59,7 +57,7 @@ stdenv.mkDerivation rec {
pkg-config
python3Packages.sphinx
removeReferencesTo
] ++ lib.optional (i3Support || i3GapsSupport) makeWrapper;
] ++ lib.optional i3Support makeWrapper;
buildInputs = [
cairo
@ -82,9 +80,7 @@ stdenv.mkDerivation rec {
++ lib.optional pulseSupport libpulseaudio
++ lib.optional iwSupport wirelesstools
++ lib.optional nlSupport libnl
++ lib.optional (i3Support || i3GapsSupport) jsoncpp
++ lib.optional i3Support i3
++ lib.optional i3GapsSupport i3-gaps;
++ lib.optionals i3Support [ jsoncpp i3 ];
patches = [ ./remove-hardcoded-etc.diff ];
@ -95,16 +91,10 @@ stdenv.mkDerivation rec {
'';
postInstall =
if i3Support then ''
lib.optionalString i3Support ''
wrapProgram $out/bin/polybar \
--prefix PATH : "${i3}/bin"
''
else if i3GapsSupport
then ''
wrapProgram $out/bin/polybar \
--prefix PATH : "${i3-gaps}/bin"
''
else "";
'';
postFixup = ''
remove-references-to -t ${stdenv.cc} $out/bin/polybar

View File

@ -4,21 +4,39 @@
, installShellFiles
}:
let config-module = "github.com/f1bonacc1/process-compose/src/config";
in
buildGoModule rec {
pname = "process-compose";
version = "0.29.1";
version = "0.29.7";
src = fetchFromGitHub {
owner = "F1bonacc1";
repo = pname;
rev = "v${version}";
hash = "sha256-FB0PjvPBfbytIXwYs+eT9PMnKX/yymrajlJ42FDlMFs=";
hash = "sha256-gVXil6Gc65/6VMuONfVyxU6SSV0vCbJKXDvtG4a+pbU=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
postFetch = ''
cd "$out"
git rev-parse --short HEAD > $out/COMMIT
# in format of 0000-00-00T00:00:00Z
date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
# ldflags based on metadata from git and source
preBuild = ''
ldflags+=" -X ${config-module}.Commit=$(cat COMMIT)"
ldflags+=" -X ${config-module}.Date=$(cat SOURCE_DATE_EPOCH)"
'';
ldflags = [
"-X ${config-module}.Version=v${version}"
"-s"
"-w"
"-X main.version=v${version}"
];
nativeBuildInputs = [

View File

@ -15,11 +15,11 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "safeeyes";
version = "2.1.4";
version = "2.1.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-SsZRyODeYRQk2pVspKzfJbSRX/zjD+M+aaK+YXPu6CE=";
sha256 = "sha256-IjFDhkqtMitdcQORerRqwty3ZMP8jamPtb9oMHdre4I=";
};
nativeBuildInputs = [

View File

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sioyek";
version = "unstable-2022-08-30";
version = "2.0.0";
src = fetchFromGitHub {
owner = "ahrm";
repo = "sioyek";
rev = "8d0a63484334e2cb2b0571a07a3875e6ab6c8916";
sha256 = "sha256-29Wxg/VVQPDDzzxKcvMa1+rtiP4bDkPAB/JJsj+F+WQ=";
rev = "v${finalAttrs.version}";
sha256 = "sha256-GFZaTXJhoBB+rSe7Qk6H6FZJVXr3nO9XgM+LAbS4te4=";
};
buildInputs = [
@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
homepage = "https://sioyek.info/";
description = "A PDF viewer designed for research papers and technical books";
changelog = "https://github.com/ahrm/sioyek/releases/tag/v1.5.0";
changelog = "https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ podocarp ];
platforms = platforms.unix;

View File

@ -8,12 +8,12 @@
}:
stdenv.mkDerivation rec {
version = "2.27";
version = "2.28";
pname = "links2";
src = fetchurl {
url = "${meta.homepage}/download/links-${version}.tar.bz2";
sha256 = "sha256-2N3L/O3nzd6Aq+sKI2NY9X+mvrK8+S4QliTpuJb567Q=";
sha256 = "sha256-L9VJmxPe5ZRXwTLBZ7hJXEDe2nU4lInGzMtoMZP0VLQ=";
};
buildInputs = with lib;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "atlantis";
version = "0.21.0";
version = "0.22.2";
src = fetchFromGitHub {
owner = "runatlantis";
repo = "atlantis";
rev = "v${version}";
sha256 = "sha256-wDyRXdlkZEzdqVSGYSzLroqMWZDTpPzsu94Mx7lvh2I=";
sha256 = "sha256-na/RYFl3g7/jOtmCeG/xQcmvDdxUqD17SLzdxJ0bYN4=";
};
vendorSha256 = "sha256-I3fKo4lsNGQTTi8a6de85rVGoTEvr8wwE2y4OQHks7o=";
vendorHash = "sha256-Gg6HxL2ptCE0hXG/dCuaxcnO16htLNPsuH4QAgCQa64=";
subPackages = [ "." ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clusterctl";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "cluster-api";
rev = "v${version}";
sha256 = "sha256-Qaq0I7ZCXRXIWtUN3fcpoN4SURq/OfH+u73nyWYmJOY=";
sha256 = "sha256-NmTMpTaekUTSMnIFn5e1DnuHehJLM5YToY+QK0hnvXk=";
};
vendorSha256 = "sha256-VDSMXE+Vlgmo7T1b+A7uW9BqSDBDyhrneJX1yH+XfDc=";
vendorSha256 = "sha256-0C3tQgmu7YQgHyXh8lIYTrLFksCvFQp0uvIhQRuqbYM=";
subPackages = [ "cmd/clusterctl" ];

View File

@ -30,13 +30,13 @@
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
},
"aiven": {
"hash": "sha256-6HZHDqdYeIthzqMwTEpYTyjh624tifhoAFOXIh8xqMg=",
"hash": "sha256-8kTT1tD88UZc/ZbunFDF+SlTYM5E3jyQgaBcRBULYlY=",
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
"owner": "aiven",
"repo": "terraform-provider-aiven",
"rev": "v3.10.0",
"rev": "v3.11.0",
"spdx": "MIT",
"vendorHash": "sha256-J/x5oc4Qr4c/K5RKswFeWgUDE+ns1bUxfpRlj29uCY0="
"vendorHash": "sha256-pCWrJPW39J2SE1U1nQ61XI8/WtB+hqQGu9wKkRNkS1k="
},
"akamai": {
"hash": "sha256-vna0TVanrfhbELwpD3ZidwkBfB20dM+11Gq6qdZ0MmA=",
@ -103,11 +103,11 @@
"vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE="
},
"aviatrix": {
"hash": "sha256-2KJVXIThZ3g1++y5fhKLQjeXZ9r685B8stmWfs2MAs0=",
"hash": "sha256-jZXTsCa1TDwdOFGJKX4xM3sB0zfix5nTBuBdBGtwOOs=",
"homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix",
"owner": "AviatrixSystems",
"repo": "terraform-provider-aviatrix",
"rev": "v3.0.0",
"rev": "v3.0.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -213,11 +213,11 @@
"vendorHash": null
},
"cloudamqp": {
"hash": "sha256-gT6Ik4okCAH8555KSGv0wmca0n0NFumRSkQrSvrGit4=",
"hash": "sha256-1T9ylCTG2wV5FmL6S5+t19H3Xct57WlLpbr6zMj5vwE=",
"homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
"owner": "cloudamqp",
"repo": "terraform-provider-cloudamqp",
"rev": "v1.21.0",
"rev": "v1.22.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ="
},
@ -368,11 +368,11 @@
"vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM="
},
"exoscale": {
"hash": "sha256-pJ9bbI7y6iOzJ8qPIw8SUOj8yLotRig6cmDsvLfc+6U=",
"hash": "sha256-F1tYiEy9eQ7GcgVPNfe6Jy6hXEWdFHGXA6esAnOgiQE=",
"homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
"owner": "exoscale",
"repo": "terraform-provider-exoscale",
"rev": "v0.41.1",
"rev": "v0.43.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -386,11 +386,11 @@
"vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY="
},
"fastly": {
"hash": "sha256-AlEO9isKHdOxhI7M7Egxv7lmrQ066s2zcIz9fm5dobM=",
"hash": "sha256-SaihRh+DuMY9Mcx+PBAUPv0vrWeKGqx437ayLT3kdjI=",
"homepage": "https://registry.terraform.io/providers/fastly/fastly",
"owner": "fastly",
"repo": "terraform-provider-fastly",
"rev": "v3.0.3",
"rev": "v3.0.4",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -442,24 +442,24 @@
"vendorHash": "sha256-7XiZP51K/S5Al+VNJw4NcqzkMeqs2iSHCOlNAI4+id4="
},
"google": {
"hash": "sha256-eF7y62pHjQ5YBs/M3Fh4h0qHyrTs6FyiPQ2hD+oHaVI=",
"hash": "sha256-g572Q+HasthrS6i7KXEmcY7HeQ7T4IYAXIikQKlkEHI=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.47.0",
"rev": "v4.48.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-kyE1MPc1CofhngsMYLIPaownEZQmHc9UMSegwVZ8zIA="
"vendorHash": "sha256-xi/OCf82RdoL46em7BaWylnD3eo4VGIWxtj+HdtYUKk="
},
"google-beta": {
"hash": "sha256-DcqVJ5qZIw/qUsZkbhcPiM2gSRpEOyn1irv9kbG5aCs=",
"hash": "sha256-YN0UOz6AG2hERKGrJ/38nagqYu+Uy/aJYLb/SbbfWwY=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.47.0",
"rev": "v4.48.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-kyE1MPc1CofhngsMYLIPaownEZQmHc9UMSegwVZ8zIA="
"vendorHash": "sha256-xi/OCf82RdoL46em7BaWylnD3eo4VGIWxtj+HdtYUKk="
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@ -788,13 +788,13 @@
"vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4="
},
"ns1": {
"hash": "sha256-qHR3KJa1y10B+iQPgH6lTt/JUqTmiK/60rPCa3gQDP8=",
"hash": "sha256-2w9x/FTtieWB88CIEkP7BH5saC6dt4IxdROBucczios=",
"homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1",
"owner": "ns1-terraform",
"repo": "terraform-provider-ns1",
"rev": "v1.13.0",
"rev": "v1.13.4",
"spdx": "MPL-2.0",
"vendorHash": "sha256-6ePPxdULuTzLdVzzr12BjLu/lBN+5yIUq8U8FVUw/PM="
"vendorHash": "sha256-/Rgerbd8c6Owo79LrYsR9O0JNBrDOODFD+k1Yd5G6cY="
},
"null": {
"hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=",
@ -879,20 +879,20 @@
"vendorHash": null
},
"ovh": {
"hash": "sha256-vYOL9FeYzUWt09rg2GkLDnOCNp6GPXOFv8OhXtUvRUY=",
"hash": "sha256-LcSrs4FUrtp/4tp1xlBPKkfQ3J8FlZ/peL9NcC7XQy4=",
"homepage": "https://registry.terraform.io/providers/ovh/ovh",
"owner": "ovh",
"repo": "terraform-provider-ovh",
"rev": "v0.25.0",
"rev": "v0.26.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
"pagerduty": {
"hash": "sha256-RKIKE+kOe1obxzloFzhPZpEk1kVL8Un+fV3of9/AAxQ=",
"hash": "sha256-mJnhjSkJDLMlZAKLfU9HbaHidEGGgPJq+g1vdvBVeKY=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
"rev": "v2.8.1",
"rev": "v2.9.1",
"spdx": "MPL-2.0",
"vendorHash": null
},

View File

@ -0,0 +1,67 @@
{ fetchFromGitHub,
findutils,
gnugrep,
gnused,
iproute2,
iptables,
lib,
nettools, # for hostname
openssh,
openssl,
parted,
procps, # for pidof,
python3,
shadow, # for useradd, usermod
util-linux, # for (u)mount, fdisk, sfdisk, mkswap
}:
let
inherit (lib) makeBinPath;
in
python3.pkgs.buildPythonPackage rec {
pname = "waagent";
version = "2.8.0.11";
src = fetchFromGitHub {
owner = "Azure";
repo = "WALinuxAgent";
rev = "04ded9f0b708cfaf4f9b68eead1aef4cc4f32eeb";
sha256 = "0fvjanvsz1zyzhbjr2alq5fnld43mdd776r2qid5jy5glzv0xbhf";
};
doCheck = false;
buildInputs = with python3.pkgs; [ distro ];
runtimeDeps = [
findutils
gnugrep
gnused
iproute2
iptables
nettools # for hostname
openssh
openssl
parted
procps # for pidof
shadow # for useradd, usermod
util-linux # for (u)mount, fdisk, sfdisk, mkswap
];
fixupPhase = ''
mkdir -p $out/bin/
WAAGENT=$(find $out -name waagent | grep sbin)
cp $WAAGENT $out/bin/waagent
wrapProgram "$out/bin/waagent" \
--prefix PYTHONPATH : $PYTHONPATH \
--prefix PATH : "${makeBinPath runtimeDeps}"
patchShebangs --build "$out/bin/"
'';
meta = {
description = "The Microsoft Azure Linux Agent (waagent)
manages Linux provisioning and VM interaction with the Azure
Fabric Controller";
homepage = "https://github.com/Azure/WALinuxAgent";
license = with lib.licenses; [ asl20 ];
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20221227-1";
version = "20230109-1";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
sha256 = "sha256-yOOKgB7MO9LW6qkr/JZOYtteQTW/Yms4CMAg4EIJGc8=";
sha256 = "sha256-wPx1W0eaQHpA/jcZ+A7YFL5FwPqz12j/jPgxa1JeEM8=";
};
postPatch = ''

View File

@ -47,23 +47,23 @@ let
# and often with different versions. We write them on three lines
# like this (rather than using {}) so that the updater script can
# find where to edit them.
versions.aarch64-darwin = "5.12.9.13190";
versions.x86_64-darwin = "5.12.9.13190";
versions.x86_64-linux = "5.12.9.367";
versions.aarch64-darwin = "5.13.4.14461";
versions.x86_64-darwin = "5.13.4.14461";
versions.x86_64-linux = "5.13.4.711";
srcs = {
aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg";
hash = "sha256-Htug/hmp0OjysUY4q8RO1oqjSsa2sgpqiAERr6ahBuw=";
hash = "sha256-gNlY7Cocv6t406o1biZj6UAiP5fwF+g/G2P2uN5bF7I=";
};
x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
hash = "sha256-nl+hrAZECaC5uceK8OZ/em3rY9pK4VrtezT6qCNmbCA=";
hash = "sha256-T5s8ERMNkdvIzsBq8ZtOUKu084/8uBjIoYgopkM09cI=";
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
hash = "sha256-7B9wS0myf6QkDq4ooqWen03s/36BeF7cSsOzjDdIw8g=";
hash = "sha256-sQk5fS/bS7e0T0IJ7+UB956XmCAbeMYfS8BVwncpoy0=";
};
};

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "kirc";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "mcpcpc";
repo = pname;
rev = version;
hash = "sha256-bLBrkbW/Iv1v9z5NOiMAA/dH5/9FlqusRV5rSqjdlPw=";
hash = "sha256-SXPtSFjGPLgORG9OCSCEStzNzdGZFzCx72YOrW288MU=";
};
dontConfigure = true;

View File

@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "mailspring";
version = "1.10.7";
version = "1.10.8";
src = fetchurl {
url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb";
sha256 = "sha256-r/xutH3BLYCsFmmYJ1hdphLLktCzdAeM1Uwp1l1C1LQ=";
sha256 = "sha256-aXpPn6tpSOwWL/34qlpJ+on/H+X7303J1jwvwcVOTNs=";
};
nativeBuildInputs = [

View File

@ -1,665 +1,665 @@
{
version = "102.6.0";
version = "102.6.1";
sources = [
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/af/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/af/thunderbird-102.6.1.tar.bz2";
locale = "af";
arch = "linux-x86_64";
sha256 = "ddc531e03819b6f1407dd8c91c65216bd85c977d217bd459f410a66ad586ba16";
sha256 = "417eb44163275bceea7251e544499f56056a16aa3defe97f9f26df0abaa8fe8b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ar/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ar/thunderbird-102.6.1.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
sha256 = "144a7ef7722ff71c30eaa8fc55bcca548863dfb33198da57a47709cb5415666f";
sha256 = "9717df3c3020d2b6814eb8ce99eafa62f71f56cbe0d7515044b7ff88c763cf44";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ast/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ast/thunderbird-102.6.1.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
sha256 = "f10c3787459c203ae60fdc1a3390a29be22634c42b8a9a67743fa87824f16e98";
sha256 = "b6984f90666a29a922e098635504786716c38c0cafe243b5a1d43b64af64d0ee";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/be/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/be/thunderbird-102.6.1.tar.bz2";
locale = "be";
arch = "linux-x86_64";
sha256 = "e7ffc96e12f3edad721e9349606ccbdd38364a91833541f15d38d2437e8c6a2a";
sha256 = "d9060ad38fc5da77c9c709dbc498ce656d20668b16d2c811dc400bf9170aceee";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/bg/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/bg/thunderbird-102.6.1.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
sha256 = "0afd93bc311d2069ca0cf87779e525ee735821f7e28791210bd169393eb69331";
sha256 = "936c52b46c7671a3328e6ebdd9d0ff0e61e761efc0210f0c470893072d04d7a8";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/br/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/br/thunderbird-102.6.1.tar.bz2";
locale = "br";
arch = "linux-x86_64";
sha256 = "cf0ebba13d341a56e455308ac856c8f67d2aee5b566dd4f6534e0c7c298c5b7e";
sha256 = "5c82a79835dd1f94b54113c9982e01c1a5cbce09c89a8ca5783407669de35665";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ca/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ca/thunderbird-102.6.1.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
sha256 = "6034897c6ca24a27caf91671851a1e022d807eb4e0bfe747f79e8d56a7f29f68";
sha256 = "4461d13cef193613c490eb3194e4a49c8273cd18a6802450c1bec7a239ff3236";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/cak/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cak/thunderbird-102.6.1.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
sha256 = "cceb7e008a4db037430fb14c2530f81acf406214c84f053872f36ce7ce632919";
sha256 = "3382850dab21c32bf31b1ba10474a2cb017c16af5d3fc3697fe15dc39ccd9b40";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/cs/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cs/thunderbird-102.6.1.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
sha256 = "a02cef9419a94aec3aac68f484ff042344b9c714d5443d8017e517e6a36315f7";
sha256 = "1d9f24e160547e4af0d6420b443e2c36762a13bfe7a0c552162fac05c08d8b1b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/cy/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cy/thunderbird-102.6.1.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
sha256 = "91088a138f0d66d4cc9cf7cccfd1668d744de0d6e9199ed74d7139aec20e95a8";
sha256 = "dcb3a9894021d08f31dc9b5eb14bff17bd4e0ae8009c9f65b444c1ff0aca4d91";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/da/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/da/thunderbird-102.6.1.tar.bz2";
locale = "da";
arch = "linux-x86_64";
sha256 = "3d610380be8097f949f9c7baa83d4b4c8514065bc0b5d18b3a2b979931b1f5c3";
sha256 = "0fed9e8faebbeadbeae53aa06a773b412d45adafde237742b93dfd9196c9e9e4";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/de/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/de/thunderbird-102.6.1.tar.bz2";
locale = "de";
arch = "linux-x86_64";
sha256 = "c9fb5d6952bf580f0a83667d8111ee0bf7a0f424d70d678bdc4551a7314784b5";
sha256 = "dd9a22884495c0d1ebb18fd7721688a2e14917684bc176c90578c8008d3836e8";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/dsb/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/dsb/thunderbird-102.6.1.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
sha256 = "aebb4617fbee83e88873b49726c63adbff9613628dc5c0115da6eea16f2f15e2";
sha256 = "2a84bf4e6862346bd03a05be6fdbeeb79347890294ec6f93809bedfa089005dd";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/el/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/el/thunderbird-102.6.1.tar.bz2";
locale = "el";
arch = "linux-x86_64";
sha256 = "20cd55bfb8608ba906ab72536f1beae8c1b04efc1bc8608c898e6a7c45c3d7d4";
sha256 = "f758bd822941145ba0da6e296f12264329a30c3f1cb5b8ce16f9887ad89caf8b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/en-CA/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-CA/thunderbird-102.6.1.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
sha256 = "80240a7fd45975fb05387eb5b6c17073b4d5b152907273a2e6c54e690b42e285";
sha256 = "4f0edd405507b23fac31461f9511f35aacd096d92a4b598801f021ac5d3021a8";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/en-GB/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-GB/thunderbird-102.6.1.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
sha256 = "efc3fc6e571b21ddbd2fefc04adc1a646c667531f6a04366a1f08fb442c3252d";
sha256 = "15443e7ed39849346c562a67a673fb4bd39e05f8bf616fd7170e9352ea4b5404";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/en-US/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-US/thunderbird-102.6.1.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
sha256 = "6c889cf71cf02cc703f9c6d20278b5f2394669c7f6dbf86d1cd8413c46ea0dfa";
sha256 = "501c5f0c97e89d5b5fb066b5f480cc3598a1bdc86dfc32482d3bf2c453ed29c3";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/es-AR/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-AR/thunderbird-102.6.1.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
sha256 = "fa9dd4eb3895c4507ef064e0aced1b0259f50e4dacc63d3f1fb9b45926be3e6d";
sha256 = "c228716b6c6bf78efdbfe877a01d98a697c048ba36b5b692d4a9e4f35c5c8359";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/es-ES/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-ES/thunderbird-102.6.1.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
sha256 = "85bff3585cb72f8b2aeebb0fe987e73bbdadc8b30b1e745a48663f7d81a3f533";
sha256 = "35ff4ab3acdacaa17c31577f34e791f805f039fff636f696f483e0e77a13cdce";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/es-MX/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-MX/thunderbird-102.6.1.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
sha256 = "981f4e582b42a2b3c5bb04554fe333ed7b46e3741248c73f33a1bd6da41e1b01";
sha256 = "da0dac340fe0467d48c75ca25a0f0c6ca40e7904969aff5efac7d14b8e2a790e";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/et/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/et/thunderbird-102.6.1.tar.bz2";
locale = "et";
arch = "linux-x86_64";
sha256 = "cc43f9a48515ebb7e5f5dc3a98f09889222c7403fd3a7a678825cf70cf52b496";
sha256 = "840bef653741da3b19b85c645fed1375ba706dee4bf2e6c8684b9f50a2d54a35";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/eu/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/eu/thunderbird-102.6.1.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
sha256 = "2a1ad9ff0a1b129cc1553c5324d1a20bcf7a2f07fdfff1b73deb7be7b1c8aa7c";
sha256 = "397a1a04b45f4035338328a52baa2bfc30be9f48fcc76137122d18e0a350fcd3";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/fi/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fi/thunderbird-102.6.1.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
sha256 = "58b0dbc3f5a108bb17d447b3de43281f96ec2c402eb95494fbd80202f414bc56";
sha256 = "9af605e6b57db7d2c661ecd95f422b613f1819110bd9ceee7b8d4da546fbe069";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/fr/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fr/thunderbird-102.6.1.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
sha256 = "8a23d307f6092dd319c0c406ac75bf60a98c000a233e59f7126552e98b335579";
sha256 = "44c4a26ba5da3ddd8fb5368529279a50ffc3593f3b7cef35eb903d915d7720c1";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/fy-NL/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fy-NL/thunderbird-102.6.1.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
sha256 = "de1a19d8a0e0058470e5aca0261737ec640386fe776a9f388f88eff4244f17fd";
sha256 = "74023e7e027554a79362cdaeb8921393e55d902c10653221c7edc9c245646f99";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ga-IE/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ga-IE/thunderbird-102.6.1.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
sha256 = "76887469f4f639db0d1a4c30ac7b362482c9aaae1e6de061c266977d1ab2c2ff";
sha256 = "04f6ea825e23b89ea5f55d5fdf86c11ed7c4f224df2f5fbcb1b800a5f45b22f1";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/gd/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/gd/thunderbird-102.6.1.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
sha256 = "9ad8fcf191ea18e7b6bcefe87f68cc508b01f7f412f60345a3430ab65b03b468";
sha256 = "fb428e74e80863cc6a69b2f9ede1694daa490637c166c5aacc041fa70943b5b2";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/gl/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/gl/thunderbird-102.6.1.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
sha256 = "070160bd3423f38790210120d34dc6be5173fbf5277c1f274309d36045dd565b";
sha256 = "c548d0f51b881b220dbc8c93a69add3f1b19579236b3e47d0bb3cccdb7d8647d";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/he/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/he/thunderbird-102.6.1.tar.bz2";
locale = "he";
arch = "linux-x86_64";
sha256 = "d49d7d5460a7d26abf6da98e4dcb892318555cd240c9b5af0882da03cde6a81f";
sha256 = "b22faa9d7646eb8efa3fc0e15c966f7286b53c12d72baa534a92ba20432ff8b7";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/hr/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hr/thunderbird-102.6.1.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
sha256 = "ac786d73b7b532f2173e45cffd19f2f6fba69be7d75bbda4a2b1a3504a03f425";
sha256 = "05571451a11e827ba451354f97695e449afe85d7c7dcd2c0ff3aea24727272c5";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/hsb/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hsb/thunderbird-102.6.1.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
sha256 = "e58b0dd020e85badaae1121e4bae2e7863f96faadc70aa5571f6b4eaea4c325e";
sha256 = "a3c0f43e1db05456aea23dc1f17b1057eb86124cc14a1ca5e80b71b1518a1fda";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/hu/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hu/thunderbird-102.6.1.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
sha256 = "4e593b2a9356260208f97a7900745e56183d57d0aa0a1c496e010bc833a12d23";
sha256 = "6b0f9ac8947699adc325435be839cb0c08052db330d0d2c8327fce5f4cc2eb22";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/hy-AM/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hy-AM/thunderbird-102.6.1.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
sha256 = "eca558fec17b96795eb21c53c62c59bf5a523bb60ef4c893569b2feb8255945e";
sha256 = "0150496630287f01ed05dcf9e3dda88a923936e77cac41e2df856d8f4298f240";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/id/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/id/thunderbird-102.6.1.tar.bz2";
locale = "id";
arch = "linux-x86_64";
sha256 = "5d85920ab3def7b3cb72f12bff40c39ae59df39a03b86e245e7c07fa298b7dd8";
sha256 = "0a2946beef4068a760f139f32782cea1f7ed20d8d577448bed785146394094ed";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/is/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/is/thunderbird-102.6.1.tar.bz2";
locale = "is";
arch = "linux-x86_64";
sha256 = "024af862706817bfd66ccdf0f9e86196a08cdd21fb6b7cee095dd6a52170c35c";
sha256 = "9e876cd8b01e9ec4c77311c325b807d3318a17c7d4943a42dd1faf6500f222fe";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/it/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/it/thunderbird-102.6.1.tar.bz2";
locale = "it";
arch = "linux-x86_64";
sha256 = "eb928588955c211ee43b784205653608aa6a7566d16ac698cab0f95849d7cab7";
sha256 = "92a90f181df2b5ef167a0b2fcbc5169615a39287b75a7428650bc679e211c755";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ja/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ja/thunderbird-102.6.1.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
sha256 = "289741d28748595dd3d4cf3a02cecbd90c4e362384e413a8fa29ffd712ac43c6";
sha256 = "a90c125ee302827c11ba1ec41f6548c7c42c88041713747aa7ecfdb84b307d92";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ka/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ka/thunderbird-102.6.1.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
sha256 = "5fada9a77a88fe4fd26d264f0a67e4f63ec8879a11fa56a3ff2f5e3bce9f29a1";
sha256 = "a26c7070396101c94c35a35aada3869309d19e060f8c4e44ffa77a9cb6d291e4";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/kab/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/kab/thunderbird-102.6.1.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
sha256 = "9961ea98641b279f09bb6bf45c9ff3f85eeec29673ea8227c23f95dbc8329d01";
sha256 = "4596eec5222f4fc3c9f27c3af1426880ec3846b981b5719bf97decde06f14580";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/kk/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/kk/thunderbird-102.6.1.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
sha256 = "e0f18494421c61f61b47b33a30101a63925e093e24d89aeb8e295ea5457057e7";
sha256 = "957df20187a944e587f16426b975e0b25dc274ac6ff0112f8ad96f7b520f35f3";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ko/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ko/thunderbird-102.6.1.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
sha256 = "01b452e1b2f980228a72c3529e89db3c5357a1b5603e5578af1e32c3a3a52307";
sha256 = "77cb35952ebd1b14e661d6c67933fe5c28e5670e2a08399227e90e0d1665a149";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/lt/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/lt/thunderbird-102.6.1.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
sha256 = "96cf9f188946695becc4022f3ebbe04138259d878a3702c8dac260daa2e41b87";
sha256 = "fda5d9ee40b2a9266a14969187fe54f5dfa97b3029cd23bb4f74dba31139cb9b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/lv/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/lv/thunderbird-102.6.1.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
sha256 = "4504a245d791c6cc5c5f372fad8f208846ae697e32dd9462b2c1a539ebea1a00";
sha256 = "088a7b5746926614ce27ec42ac8e50dfa573006e76bc2cb2cab8d94b820ed3db";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ms/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ms/thunderbird-102.6.1.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
sha256 = "23e14058f426497aebfe4ee38ba627b485012271c018b4a2c86ec9cda4a41c94";
sha256 = "827c08cdc65fbd81bdd326b2036071d2174d469c72224929af899c3af90cbb1b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/nb-NO/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nb-NO/thunderbird-102.6.1.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
sha256 = "93c7b7084ebd270a2e1f85d60d0a9f59afe8cf29c364eb99ca0c658520d6f9f3";
sha256 = "f049be571b8d9b39dae313d370e2510251a0521ab64cb82cb432843fb26c407b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/nl/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nl/thunderbird-102.6.1.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
sha256 = "7ad0aee2c5b35953edcb8dc0f1b90e55bba13e03e47b7504b320bf4d706b9066";
sha256 = "26fb69eceb626eb7482f67ef0043dd9fa58003b534bf4066aef3d51792ea1834";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/nn-NO/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nn-NO/thunderbird-102.6.1.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
sha256 = "3cd1127e6eff5462716812d06b36ee5ba4ea8ac78608ac5aaf806f8561d3244d";
sha256 = "4e586bda023baecaee92853a4e6e993e35ce193ca2770071bc22ba2006109898";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/pa-IN/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pa-IN/thunderbird-102.6.1.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
sha256 = "72aabe72bd1bffb4cd8666296a7069ba91ffbe89ac753e52645957352cd679eb";
sha256 = "8fad3effac8d00d5a07466b94b8d51ad6ecc23552ffec658fef6d127b0b80e4b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/pl/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pl/thunderbird-102.6.1.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
sha256 = "64bd01b72b38eb81025425a64495aeb1405e6c75c6a140ee75cb2a433f09b73d";
sha256 = "7dc544a10b244425e76e341fc1164b52e915fb5e6c12fc755bcca173810827b7";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/pt-BR/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pt-BR/thunderbird-102.6.1.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
sha256 = "98af0995d54f5ec6acf67b5cd7542f96778bfe8a28f2092d90033196bf5c7bc3";
sha256 = "7b38735922511f3a03febc10e98fced7880a8874ccb53c3c946d4db225d02823";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/pt-PT/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pt-PT/thunderbird-102.6.1.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
sha256 = "df9930a733b6a29cf9043241322469fbbf07b3c36c933b1f1ed2caa31ac64369";
sha256 = "4baa786ae442af119a3c9d794a31aedee06839b8dc9551b46028a4578c4086bc";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/rm/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/rm/thunderbird-102.6.1.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
sha256 = "a7f6ca7d64d4eb821d070753662928b7f830ba53ac5c05d5cc973d74d71bc833";
sha256 = "087b4ecbbf95853ca6937a828f4f806d32f8c56d0feaf0f5e05628e2ca2e3ace";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ro/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ro/thunderbird-102.6.1.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
sha256 = "9e4f65dca7ce9cfd42fff95a6cff6f094f43bd4a0dacd6fe0ad2645d162140e1";
sha256 = "d3324a4fc7ab8e00d35fb7d1a4c6567a3a3f1b4c50590ca206eb6d5a6b950842";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ru/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ru/thunderbird-102.6.1.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
sha256 = "d71164338b7b42f31b4af3fb8b29253353d215c5bbb25622b0626d28ce31f4e1";
sha256 = "6a2d2daf0f325f8f033869b3fe4e644ba5022244bff1031b35a439e43999cf44";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sk/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sk/thunderbird-102.6.1.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
sha256 = "bc785d8712dbb1539cf7be4ec04c928e8565f36154702f97628dd6f61db9f2ac";
sha256 = "275785c953e5c88adf3b234c604ded4b04a087f28f32bfbf39e0b3a8e1e64c82";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sl/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sl/thunderbird-102.6.1.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
sha256 = "d19966328e1e1205cdf1bd104361325e988e3a0e5ba0d9780f7b32cd9b76f296";
sha256 = "398725e455f26782f3d44a8165897bc375a9d0b7544e1ee37f70b77898ee4ff9";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sq/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sq/thunderbird-102.6.1.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
sha256 = "bbe4c32736b85079d8f1615861500c51ef4b03a88d729064a2f10dba7ce3480b";
sha256 = "cd2c03610f93518a95bd75cc0c7fc867b3922aaaf7e891d67dd6562aa4bc3064";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sr/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sr/thunderbird-102.6.1.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
sha256 = "ee6e9940fe94a8518c001caff24aeaa7de87802a6969af2013f92326d7dd4304";
sha256 = "bf380394a724353bf91fae056a00e1e8238a14bd1d221bb47cc2ad6247ec721f";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sv-SE/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sv-SE/thunderbird-102.6.1.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
sha256 = "51a16521bc656b71831ab1cfdfa3a477c6c991182d83aff9dfc479d0f8e64db3";
sha256 = "8b57f7ed92a353a970c063c9374303c273a190fcc04045a7fb9ed7774a2bbfb6";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/th/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/th/thunderbird-102.6.1.tar.bz2";
locale = "th";
arch = "linux-x86_64";
sha256 = "3d7e5bdbe8e4cf0cf24dc2dbff38eee869ed102ffcd6f5656bacf79047ff4ef0";
sha256 = "99abebff09161c06c5985e74e5e1337153d99d13fa8661abf8e4f1895c12d1ff";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/tr/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/tr/thunderbird-102.6.1.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
sha256 = "a6abcf600cf36226bdddda04d082a0501afa44032f14d73e33a6534b24309afe";
sha256 = "b17a54aab88fc7c13c3e5551f9b9a14153e124b19d58fef3da28392dd1a18157";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/uk/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/uk/thunderbird-102.6.1.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
sha256 = "48b179d8039612f3609c0245d7911727118c31f2b4bbe9954f04a7ea36410d2b";
sha256 = "63565388a50fe92887ec6adbbcb9a2ee9835873fbaee782901b7f7fd8e35500f";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/uz/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/uz/thunderbird-102.6.1.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
sha256 = "62857d7add0bc98051360c59ba8eccd469523d54c5435bc35ec5d73831323354";
sha256 = "ad501a7dd6f98f5b263fd7c71572632088a4801b52ccb6ee37ebf235162fddb1";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/vi/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/vi/thunderbird-102.6.1.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
sha256 = "ec10fa8d9aad1682a63e2a7aaf67ab7b3e07a67d3723fe28b4e07a8e4d8a7b92";
sha256 = "fd5d17c2965a94fcc0e2d167d5f202a67a024c0797afcc92481a3413d6445ffe";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/zh-CN/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/zh-CN/thunderbird-102.6.1.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
sha256 = "9e61c0470df8111a51cd89039ad552bd02918a072064d71417ab83e9fff98d4e";
sha256 = "e666ac3bd0f75b3f7915bfade39b044b69af7f3d5901c0f48311ff614f4d710b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/zh-TW/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/zh-TW/thunderbird-102.6.1.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
sha256 = "b613f0257d6856b3ead2bc20a21b9e0d392f5640d8c3a90b398dd526edb1bb19";
sha256 = "5c85008c1974b961e08065976a28b0897ff9d5199bc69e1c3c403a10d546156b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/af/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/af/thunderbird-102.6.1.tar.bz2";
locale = "af";
arch = "linux-i686";
sha256 = "fba04abef7dc96e031a41f468b92655c1c1a623f50413c2b7005497bae60b882";
sha256 = "e8c7b235b856b7c3ff1859acf856c8917d5a1dfc7e4a6d2b9d4736b3709f9150";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ar/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ar/thunderbird-102.6.1.tar.bz2";
locale = "ar";
arch = "linux-i686";
sha256 = "1ac92219e3158d2740347c5446d2ff3d1c7cfa0076793a3942e219df7827c37d";
sha256 = "8594ee599a9bcd600b679e762956042e71cfcc60d6942f22ec9c3a25a0790f78";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ast/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ast/thunderbird-102.6.1.tar.bz2";
locale = "ast";
arch = "linux-i686";
sha256 = "18b3131e47297d5bc6dc8cc686702a8b2cbcafa7453ce3ad04423516b5f9c338";
sha256 = "15d81d66cee46104d0ba9af9dd6704b1dfde2c3720a68fd23fe5181b56b2942d";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/be/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/be/thunderbird-102.6.1.tar.bz2";
locale = "be";
arch = "linux-i686";
sha256 = "2a39fa0aa407865e1e071ba265bc67a7ac1cbcc177ec03fbc57a55e29ea6c6e6";
sha256 = "07bc7abcc461b68d4bd7015518a4ab0f00486c3104ff04fb195244af826ce99e";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/bg/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/bg/thunderbird-102.6.1.tar.bz2";
locale = "bg";
arch = "linux-i686";
sha256 = "eaea602188d3cb3b5d6d9527ee4e4941693cf8ac88be7385226e29074c399a20";
sha256 = "3c3995a3c75d7100d3b5a37de7d96032b41365cc27337af3f90bc01c318c621b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/br/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/br/thunderbird-102.6.1.tar.bz2";
locale = "br";
arch = "linux-i686";
sha256 = "48e6754fd590cf9a49e13e7bf5b3d608b62e0b62c9ee574a4642ddd57e1ed2d3";
sha256 = "a390683e704cafa6b594028c02db0729519688b14284cbf4e23af06d797030b6";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ca/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ca/thunderbird-102.6.1.tar.bz2";
locale = "ca";
arch = "linux-i686";
sha256 = "ba3ae39cb7817a87f478167739de71b6195852d91b501a55a5185812a0bce3bf";
sha256 = "bae799d097b2a072b4f8ecee6dd18b91a07d08f070da39a22dbd669bffa9cb33";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/cak/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cak/thunderbird-102.6.1.tar.bz2";
locale = "cak";
arch = "linux-i686";
sha256 = "7e18692b7b408fd0ccb35595423da99ffd2bcccb112fe8cfa5c120f2d696fb08";
sha256 = "68af639a2d228cc8925702ab32c8f7e6fd9ed48c83111325d93b477811177f80";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/cs/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cs/thunderbird-102.6.1.tar.bz2";
locale = "cs";
arch = "linux-i686";
sha256 = "31037a48c2646569f4b0d160dbd84d9db541f59b78545c52c4c4a4f5c961532f";
sha256 = "191ec59655ec025ca02360710b180899bb3486910b5c6721165b4cc8ec78f9b2";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/cy/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cy/thunderbird-102.6.1.tar.bz2";
locale = "cy";
arch = "linux-i686";
sha256 = "a309dc3c9b7717433af192b3ac41ade7882f7422bd875ae85837b9a66d75a31c";
sha256 = "a65d91c31430b9b0b138014135d23d56e4ecd849aec398539c6dadb63fdbf03c";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/da/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/da/thunderbird-102.6.1.tar.bz2";
locale = "da";
arch = "linux-i686";
sha256 = "5b42f683b415c4235d216d35cc0489bd38087bf59d0bf8bedbf3980dd5460767";
sha256 = "9306558c123903497e2e5ad7968aa69e94b9c4e809f6f5b4d35b9aafcbc75ed0";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/de/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/de/thunderbird-102.6.1.tar.bz2";
locale = "de";
arch = "linux-i686";
sha256 = "90e11c7e2be2a1137c6db78e9bf3da6c3d09a41f3b0bf40338ddc8b64432fef2";
sha256 = "ab06a47e5472db33702187a88bd8a794632809977632bf129f3d980b8a06ceb5";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/dsb/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/dsb/thunderbird-102.6.1.tar.bz2";
locale = "dsb";
arch = "linux-i686";
sha256 = "c5f61a10c59ff0b4d65e60b83a6f0fb11ed3045b40ca4bdc583a7de04ceb5108";
sha256 = "05adea0c112d5d481990a7960de93c7a61d055f8268cbf617b295f86daaeb5b9";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/el/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/el/thunderbird-102.6.1.tar.bz2";
locale = "el";
arch = "linux-i686";
sha256 = "31f20c16f2d9d430615058b2fc7f1f49e0c39fcec71429d179f583750d3bb316";
sha256 = "6d4d1913ae19fa528aa6986c617226d30cd46099825afb2bae83b052f5aac490";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/en-CA/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-CA/thunderbird-102.6.1.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
sha256 = "dd1bdc4cd28ddced917ffde9f598ff33760a148126e262127084732d0d50b4df";
sha256 = "9919702fe73038c05cbcdf747126b22b7b4fd62549ad4d1361ef85fe6aa92f71";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/en-GB/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-GB/thunderbird-102.6.1.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
sha256 = "7248388e91e24538e5bd8c3d877711e4f8794bd4ad2ab8f5eb71c31fa0d7423d";
sha256 = "5d8b8bcf27c67d6a0c70bb6754167474e9bd9fb7489f1fd21f3754d27d872326";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/en-US/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-US/thunderbird-102.6.1.tar.bz2";
locale = "en-US";
arch = "linux-i686";
sha256 = "754f3e6bebc1f36bf76d0cecb08bcd9a7dc4d43bb2467c69d3f4611b79358131";
sha256 = "b24ea963c7e09d1f69b1297a6f86a7d0462403a9172d81ef47c375141d54cce9";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/es-AR/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-AR/thunderbird-102.6.1.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
sha256 = "bf6852b5e907117b60cd5325f8571e8b287a1ddf6a5ec7f93cc667adec647969";
sha256 = "1617dc229307d42e1a60ea44f359a62f042f53064360dac7ffd59b6a7c90da41";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/es-ES/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-ES/thunderbird-102.6.1.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
sha256 = "9df45a34e94952bac3b84eb633177e88a420863a8049b7f417db539114ab9bdf";
sha256 = "9f19e6654ff4e2eab1d9f7ee555da87c270e60cffb820b000b7892583f4faf6f";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/es-MX/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-MX/thunderbird-102.6.1.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
sha256 = "da66de3a423965bae1825bf863864d3bad4b91759ab4392f825586ec9abfe00e";
sha256 = "7b055cfb21573399df99e4d6884cb4c61ce2221ac8ea463d1d2b7115d97ece2a";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/et/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/et/thunderbird-102.6.1.tar.bz2";
locale = "et";
arch = "linux-i686";
sha256 = "c1954615d54c66e20687485ad3eb68aee68559670ac84f37ad83169dd5c6ea0f";
sha256 = "cbeef98898969cd7b858bb127c6ca8b6b9888cda0e230e303a8c4c777a30d151";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/eu/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/eu/thunderbird-102.6.1.tar.bz2";
locale = "eu";
arch = "linux-i686";
sha256 = "02e4f09053b0af0f16b573539cff6fb4a0670e8c63413d34b13bfbaa1ccc1851";
sha256 = "5e8160115595350cf5b0a44e71c09d32fbac65ffda9ac6f22cb5e910d18462c1";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/fi/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fi/thunderbird-102.6.1.tar.bz2";
locale = "fi";
arch = "linux-i686";
sha256 = "0687aa8b0c694de151bea3cbb669a3e9e492ce7e35ae15f284a3612ccf3a1274";
sha256 = "291883c64f376bad4b6345864d10f0e067123589a2b30f38dc24a99b25854949";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/fr/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fr/thunderbird-102.6.1.tar.bz2";
locale = "fr";
arch = "linux-i686";
sha256 = "06469b90502e9779c71785c0296f16dc8ef53d7a7dfb44acfab106d6a492d657";
sha256 = "7b57f6a1f499a009176cd894df6fa9fd151b707b63aec8dfb62e426a294c53d4";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/fy-NL/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fy-NL/thunderbird-102.6.1.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
sha256 = "0f9d43cc9415f7e56c110e555f8bb07a0fccc1b470b3e580213f813ef612c36b";
sha256 = "6e355a646c8dd77c72fe16c896c25572c9b87c4806364836b3681407bf7941b7";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ga-IE/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ga-IE/thunderbird-102.6.1.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
sha256 = "e8d61bea673be01ff4ee5dca08aa323815f768ea5b7aa7039943ff0d9a07c750";
sha256 = "fc2b1fbfc5aeb15082e656c01a71943045233ee593c3e1710440a79f50d4c0cc";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/gd/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/gd/thunderbird-102.6.1.tar.bz2";
locale = "gd";
arch = "linux-i686";
sha256 = "a39df1bfef807166c8df652e307a57007b1605bc3a4c8322bb012b05dc64d994";
sha256 = "e8be8dba1751fb4633dc5bef4a047b3ff85ed9e799b89669f26f8e0e3125e30a";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/gl/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/gl/thunderbird-102.6.1.tar.bz2";
locale = "gl";
arch = "linux-i686";
sha256 = "a40c0ea5adac744b654ba6af033b9319dd3d9e8d7741e93a641d30254bacef16";
sha256 = "78ffb29b73629b7d319bf752471608e3d44624b5b99b6eaea7f241901d623a05";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/he/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/he/thunderbird-102.6.1.tar.bz2";
locale = "he";
arch = "linux-i686";
sha256 = "4279dedfd093231c88cfb716d22c1977e20b067d00327777d90cf862fc8a2ba7";
sha256 = "3bb4469702756c39cb70b0639b825e922d769a9aae7e78f296d8188b039499b6";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/hr/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hr/thunderbird-102.6.1.tar.bz2";
locale = "hr";
arch = "linux-i686";
sha256 = "ca0b0d3f5dddbfbe3a08ab2e1a0db1e04f86ec96d3666f93e6bf03ea2186c045";
sha256 = "acd95b3717e6b617212c75be3b9e0b193f33cf5e5636d2ea535a720006f7cfe8";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/hsb/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hsb/thunderbird-102.6.1.tar.bz2";
locale = "hsb";
arch = "linux-i686";
sha256 = "dc03a363f9740fb0d2aadc916d2145261ecb10969fd2d2fc0135e03f30a2c2a2";
sha256 = "7c65d7f28c713723c58ed62715404224b8f4163a1915f702d125f827e642b509";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/hu/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hu/thunderbird-102.6.1.tar.bz2";
locale = "hu";
arch = "linux-i686";
sha256 = "24db5084de2564550f2053e676d51251a98de4c6c580daca27490e6474614fcc";
sha256 = "6d206289e4e8ef8db85c29ec001b91add5eac67bca3d7f5eb42099cdc9934c6b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/hy-AM/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hy-AM/thunderbird-102.6.1.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
sha256 = "9f8688668f29e7016a2ec3a076c3dbe8ff69f36abfd4e071dcdf896a8b108801";
sha256 = "8823ea085d97bedddb4ea16517626dae9747db2450900eaa102139121eacc5fb";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/id/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/id/thunderbird-102.6.1.tar.bz2";
locale = "id";
arch = "linux-i686";
sha256 = "a7c2d0baac5cfade4c1d1f3988af42d4082030297dd4a6f6d31d08effee9b533";
sha256 = "e6fc35cb393f7a0cd63625700e11c313124a2542cebd431159e065c826581176";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/is/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/is/thunderbird-102.6.1.tar.bz2";
locale = "is";
arch = "linux-i686";
sha256 = "3328640fc5a720928e6ac9fa0dfa8b62df2a395e542e36dbd1f4a07155a6607c";
sha256 = "f92db50f2f743436373da51e2f3b9bba7c4f6943254a70e7459ebb7d90dba3a0";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/it/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/it/thunderbird-102.6.1.tar.bz2";
locale = "it";
arch = "linux-i686";
sha256 = "881b13cab011b635f78ff748066b2efe187ef2bf71303630fc10aa01a057ddb0";
sha256 = "9cbf3eeb035ddd0f60c3404efc79faccb454fe406467a3c66d71b6ad4e87389e";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ja/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ja/thunderbird-102.6.1.tar.bz2";
locale = "ja";
arch = "linux-i686";
sha256 = "64abc0dcec7166e70f40e33c4fbd7bf36f65996494f0f73928a6fcc097fa73b0";
sha256 = "38c5621f8b32d55b67a79103704541b14599bc67090216a9561ac1cb4c311bd8";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ka/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ka/thunderbird-102.6.1.tar.bz2";
locale = "ka";
arch = "linux-i686";
sha256 = "04aa0ef70410afba51d380389a77edb0fe3f2701a78c4c70c972c57cefea81d1";
sha256 = "05b906fba741580368f52b7ddbc4772181f4d1fb4ecca20c94bfa0d41364383b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/kab/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/kab/thunderbird-102.6.1.tar.bz2";
locale = "kab";
arch = "linux-i686";
sha256 = "f86ba0cf6a1c8f046bb6af07e969ef8252afafde7e44e8fc3417099b681d7cd4";
sha256 = "a225ab4d086e1b21afa6d0d1d8b33434832f37c7bfc4982d2024783111cd7d01";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/kk/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/kk/thunderbird-102.6.1.tar.bz2";
locale = "kk";
arch = "linux-i686";
sha256 = "0486501081c34771d4a0a5743409493031be5a9b72ab660b280f1e5478f0c253";
sha256 = "38f0349f890702adf3f6854893e3a8bec5d6244ecbd69b86fa839f417a9e86c8";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ko/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ko/thunderbird-102.6.1.tar.bz2";
locale = "ko";
arch = "linux-i686";
sha256 = "f02ae10df782f6a0c31e6ae72f59d0a8a0f9399cc631188ed0840eed99059ef1";
sha256 = "d838976ac2902cd6cd055480a1f4b7510abb83cb2448b64fb36d600525a90a88";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/lt/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/lt/thunderbird-102.6.1.tar.bz2";
locale = "lt";
arch = "linux-i686";
sha256 = "aa07291e95cab61e73bf763f4f76578b662e6114dd0b2e5f950bcb2dd1c06dee";
sha256 = "14e66fca1018cdc74b7bb50c46def97b0c6f25d667f869fc0c17d8ac16d7cc5d";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/lv/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/lv/thunderbird-102.6.1.tar.bz2";
locale = "lv";
arch = "linux-i686";
sha256 = "03b9cbe138ec34997a35fd4b948cf0e3a2e171b1d05615835604c448284f4d2b";
sha256 = "6b7fa2d6c712b373f5013f3acf875f8ea8b8fdb582b6759e96469094b375540f";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ms/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ms/thunderbird-102.6.1.tar.bz2";
locale = "ms";
arch = "linux-i686";
sha256 = "e435619639653789ddac471343008a21b09a7dcd70af4997566b820f3b93b16b";
sha256 = "fc42cae3d6ba0910df7aaa2c1df8391e70da60a093aaff60287503feaae37260";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/nb-NO/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nb-NO/thunderbird-102.6.1.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
sha256 = "b23fdc44c0aab4ff6656898e4134c3d05c8b612174acff0ac09dc4dbe2599240";
sha256 = "0ffb1b18c916f9c27e5ba3ab8bb5ee3107e37f983c2645a1955e9a4904cd8c47";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/nl/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nl/thunderbird-102.6.1.tar.bz2";
locale = "nl";
arch = "linux-i686";
sha256 = "ef56023d4cf3fd8b1aa8f325782d32123715a544c43a0369d6f002ad257af639";
sha256 = "fcd3a85abbff759ed27c314f0b9d47d1a216ebe9bdaa3926885be81b31fdcc5a";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/nn-NO/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nn-NO/thunderbird-102.6.1.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
sha256 = "6667688821f43d9a1e3984479abb286b56c9ba42a25785231f4832ed232cd6aa";
sha256 = "affde5a378f0ac70d48d7e4c75f6b2f680517cb2106a28aa4a53e376349b43d3";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/pa-IN/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pa-IN/thunderbird-102.6.1.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
sha256 = "ceafa5a4b290ae439eb65cc409dcfa67606d71e9a66b0ea968845ed965d7d850";
sha256 = "81984847af5c43eeb35870d39eb6e006d8b9df35b5e03135670973ae6f5f7d1d";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/pl/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pl/thunderbird-102.6.1.tar.bz2";
locale = "pl";
arch = "linux-i686";
sha256 = "dab264929f800384c4e44daf5a3bf0dddcdb5786ad8bff0fb68683bb5cc1929b";
sha256 = "4710f6042126da09159cb5d465909bea3dff62753b6c5811f8920ca7782bcf73";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/pt-BR/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pt-BR/thunderbird-102.6.1.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
sha256 = "0d2bd65dd8551e72e7b0d905450596d9fd35eb7f72478f7dc7ac7e44d1cca9e4";
sha256 = "92c564bb0623a9a258fefdacd7a76a3e636ca5211f962c3b3a68cfb16cc5217a";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/pt-PT/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pt-PT/thunderbird-102.6.1.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
sha256 = "e4310e455f2843a2ef23dd2be75bc43babdfb82b222b0f7e7c04648f0dc7ef45";
sha256 = "37fb096c984cd78174def41da70d0c352536b1780a817731759f35ac3554e330";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/rm/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/rm/thunderbird-102.6.1.tar.bz2";
locale = "rm";
arch = "linux-i686";
sha256 = "fce4a2d49f35d18a68fb59a7ca65550d09267919218281d9a26f5272a7cb5fbe";
sha256 = "b72355afb5333ef44336d4686141a44b4f291edf110c75168070959380bbac58";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ro/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ro/thunderbird-102.6.1.tar.bz2";
locale = "ro";
arch = "linux-i686";
sha256 = "41c342b6148eb75608c4d5a8e38ef1e4522a5fd755d1aeda0f59e038ce596d3a";
sha256 = "8536fa781ea743fce1379137da66394ce1f79ccce4daf4f9d5e2c28432c94466";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ru/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ru/thunderbird-102.6.1.tar.bz2";
locale = "ru";
arch = "linux-i686";
sha256 = "5804852fae2c30d9f19418cf4138c0ebcf66effae30db3af5ad96b8554b768ce";
sha256 = "69b0d192d7cb04aedff4f356e9520ef6ce5f8125fc2309c60a1e6073dee64cc3";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sk/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sk/thunderbird-102.6.1.tar.bz2";
locale = "sk";
arch = "linux-i686";
sha256 = "5a5ed95e6ce2a8f37580177813d0e3586ba71bbb8a52cf242b8f83f6ce236565";
sha256 = "0a1c3955f1ccd027a45249b7d0d44f40fa8a47c680dcd0411d04cf8dacfacad2";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sl/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sl/thunderbird-102.6.1.tar.bz2";
locale = "sl";
arch = "linux-i686";
sha256 = "93c06443cb2df81f62fb43347a7b023c7122914a733e9e9f3d267f325c8ab7e7";
sha256 = "e9659cb2099dd02c1a990914383f75569b01a1f39f1f79c1dd60b24129c0986c";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sq/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sq/thunderbird-102.6.1.tar.bz2";
locale = "sq";
arch = "linux-i686";
sha256 = "91e395232f22abf530b729347798544feeeca02fad6ccc36cfad827ab7393c60";
sha256 = "080493bf33a13e2e705d8200f8b6edf4f85ba292881d71df4dd38600fee105da";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sr/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sr/thunderbird-102.6.1.tar.bz2";
locale = "sr";
arch = "linux-i686";
sha256 = "d5e2bcfe948a1cac8df11905a57fa6706a7e8e85d7be12d3bcb7f7b54e53f2ec";
sha256 = "dd1efccc8bfba45aef4e25d872652b39a05de669e57aa30827b09574968f4ab7";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sv-SE/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sv-SE/thunderbird-102.6.1.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
sha256 = "96e07de3298723d7cab43b804aabe6187c15ea89252d1344abf4bbd25cb9b9f2";
sha256 = "f04fee4bbcdcf35c18be80c3a0d5cfde8cd3c918854c254f775272a3a005e2e6";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/th/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/th/thunderbird-102.6.1.tar.bz2";
locale = "th";
arch = "linux-i686";
sha256 = "67cce516f665cfd559867e5e00931ba540ad63f2906ec511d8c855806fe3ab01";
sha256 = "841d28387ddcc3fdbaec217a8bc987bbed43a735b1d0ffe2eeb8b6fa58458f47";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/tr/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/tr/thunderbird-102.6.1.tar.bz2";
locale = "tr";
arch = "linux-i686";
sha256 = "c1de3a1814d76a4c8d72b6f3df2a9e601e07b0cdbdcc4813a20c97c1874a712a";
sha256 = "e4d793ff7e738389aabc7ec9d6893e2e4162e63996c36341f64af570b26f5f6a";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/uk/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/uk/thunderbird-102.6.1.tar.bz2";
locale = "uk";
arch = "linux-i686";
sha256 = "308bbd7f01a30f9663d5cd68dfbf167395fcfafe24ea400033bed4f7e96328d6";
sha256 = "03fecaf497d2a4188474e4ee6a0fcf084a32d0903fa041cbe39eab29421f7276";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/uz/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/uz/thunderbird-102.6.1.tar.bz2";
locale = "uz";
arch = "linux-i686";
sha256 = "858c07c3f2c1ce396d9ab11a4081e35f878deb24b3e6acd9ca1e29bf011f8140";
sha256 = "d463b9108838a61c153ae4a8fc69fb805881589b441206c08e583289ef18c314";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/vi/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/vi/thunderbird-102.6.1.tar.bz2";
locale = "vi";
arch = "linux-i686";
sha256 = "d7897016c1ad4cd7f7f97953dd5cfd752c035d1047fe769cb9ad40a3d37cb9b9";
sha256 = "8f7cb20aa60e27c1b776ea03842f38629044b6ee1c3c49df172c774cc387f409";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/zh-CN/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/zh-CN/thunderbird-102.6.1.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
sha256 = "aea218e4dedca2ffa80b9003c50e018e40675c9cce5d2d3cebef31ff82a789d6";
sha256 = "90d52ae6329d04ddfa8f37d5f54f98ee0893ece5a7c73c550fbea568538c7485";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/zh-TW/thunderbird-102.6.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/zh-TW/thunderbird-102.6.1.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
sha256 = "942333eec6039114389721fc0681f9f11f6958b6e3dea9a3ab914f09fee50a7a";
sha256 = "35b625402841a21a128eaf7c92ff277c996d6ff07f269fdf92f0d6cb3e04876c";
}
];
}

View File

@ -5,13 +5,13 @@ rec {
thunderbird-102 = (buildMozillaMach rec {
pname = "thunderbird";
version = "102.6.0";
version = "102.6.1";
application = "comm/mail";
applicationName = "Mozilla Thunderbird";
binaryName = pname;
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "34f79068685ace75ca65141d8165138d25326e9d0a1c25b0463ea69c64a7240dd19c6c894c875c5429cf7b40344fbd32b1ba0412bf8893c4bb744c83f8bc25ad";
sha512 = "06ea2fce76c08609d638435869fddc1c4d7f4b748951ebfb2476b4dba9f1f76d3de2c11e5f62540f297a5d30bb0fc637852d8e57f4fadc2c905f299757949d83";
};
extraPatches = [
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.

View File

@ -2,10 +2,10 @@
let
pname = "raven-reader";
version = "1.0.74";
version = "1.0.78";
src = fetchurl {
url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage";
sha256 = "sha256-BwJK0V19aLpTRa/7wzlWdALiJrOhfejCkKCGrZyA5EQ=";
sha256 = "sha256-H9V2zTD80fBuIuNZnGDR21IYAAl/b6iYrde5rfsMECQ=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };

View File

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchurl
, cmake
, pkg-config
, openssl
@ -47,14 +46,6 @@ in stdenv.mkDerivation {
fetchSubmodules = true;
};
patches = [
# fix build with openssl 3.0
(fetchurl {
url = "https://salsa.debian.org/debian/transmission/-/raw/debian/3.00-2.1/debian/patches/openssl3-compat.patch";
hash = "sha256-v+SDTW/lCtc8B3TuhQB1pmjW/QRAGLtYncaImNNwpes=";
})
];
outputs = [ "out" "apparmor" ];
cmakeFlags =

View File

@ -1,4 +1,12 @@
{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }:
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, openssl
, libsamplerate
, alsa-lib
, AppKit
}:
stdenv.mkDerivation rec {
pname = "pjsip";
@ -13,6 +21,16 @@ stdenv.mkDerivation rec {
patches = [
./fix-aarch64.patch
(fetchpatch {
name = "CVE-2022-23537.patch";
url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch";
sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA=";
})
(fetchpatch {
name = "CVE-2022-23547.patch";
url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch";
sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k=";
})
];
buildInputs = [ openssl libsamplerate ]

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "treesheets";
version = "unstable-2022-12-30";
version = "unstable-2023-01-04";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
rev = "9607a9a05b20e0c0246358aa90643b5b9699377e";
sha256 = "Bg82vZXGTkFLf0cBtPHUEXHuH9rpYYqydWyuEbJm9Gk=";
rev = "fad7747720a602268525d5a900c03c252c9070dd";
sha256 = "2n8AEK2YZd+zZjYiDNFe45ACW2cl7YMoOpGIidsKLZU=";
};
nativeBuildInputs = [

View File

@ -2,7 +2,9 @@
, fetchFromGitHub
, cmake
, pkg-config
, qt5
, qtbase
, qtsvg
, qtwayland
, gnuradio3_8Minimal
, thrift
, mpir
@ -10,6 +12,7 @@
, alsa-lib
, libjack2
, wrapGAppsHook
, wrapQtAppsHook
# drivers (optional):
, rtl-sdr
, hackrf
@ -30,13 +33,13 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec {
owner = "gqrx-sdr";
repo = "gqrx";
rev = "v${version}";
sha256 = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg=";
hash = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg=";
};
nativeBuildInputs = [
cmake
pkg-config
qt5.wrapQtAppsHook
wrapQtAppsHook
wrapGAppsHook
];
buildInputs = [
@ -46,8 +49,9 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec {
alsa-lib
libjack2
gnuradio3_8Minimal.unwrapped.boost
qt5.qtbase
qt5.qtsvg
qtbase
qtsvg
qtwayland
gnuradio3_8Minimal.pkgs.osmosdr
rtl-sdr
hackrf

View File

@ -42,14 +42,13 @@
mkDerivation rec {
pname = "sdrangel";
version = "7.8.3";
version = "7.8.5";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
sha256 = "sha256-zP3Ic0mru0FcX7ZuE/IKGmHA596lq5Y1cWdBESzzU0U=";
fetchSubmodules = false;
sha256 = "sha256-m5b51rR2l4EdF2kMogHIi1ojoy3UwuU0Q3pfB1ev300=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -25,14 +25,14 @@ let
};
in
stdenv.mkDerivation rec {
version = "14.32.76";
version = "14.32.83";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
sha256 = "sha256-KdQZKiAJFKE2PW0/DdZGIOC8QQ1icQR+TY4hoXCQdxg=";
sha256 = "sha256-otvaDPdGRmtUfWfy7m+CJOyDOFuW/AExbskYnYEikY8=";
};
patchPhase = ''

View File

@ -0,0 +1,99 @@
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, copyDesktopItems, makeWrapper
, jre, maven, git
}:
let
pkgDescription = "A digital logic designer and circuit simulator.";
version = "0.29";
buildDate = "2022-02-11T18:10:34+01:00"; # v0.29 commit date
desktopItem = makeDesktopItem {
type = "Application";
name = "Digital";
desktopName = pkgDescription;
comment = "Easy-to-use digital logic designer and circuit simulator";
exec = "digital";
icon = "digital";
categories = [ "Education" "Electronics" ];
mimeTypes = [ "text/x-digital" ];
terminal = false;
keywords = [ "simulator" "digital" "circuits" ];
};
# Use the "no-git-rev" maven profile, which deactivates the plugin that
# inspect the .git folder to find the version number we are building, we then
# provide that version number manually as a property.
# (see https://github.com/hneemann/Digital/issues/289#issuecomment-513721481)
mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate}";
in
stdenv.mkDerivation rec {
pname = "digital";
inherit version jre;
src = fetchFromGitHub {
owner = "hneemann";
repo = "Digital";
rev = "287dd939d6f2d4d02c0d883c6178c3425c28d39c";
sha256 = "o5gaExUTTbk6WgQVw7/IeXhpNkj1BLkwD752snQqjIg=";
};
# Use fixed dates in the pom.xml and upgrade the jar and assembly plugins to
# a version where they support reproducible builds
patches = [ ./pom.xml.patch ];
# Fetching maven dependencies from "central" needs the network at build phase,
# we do that in this extra derivation that explicitely specifies its
# outputHash to ensure determinism.
mavenDeps = stdenv.mkDerivation {
name = "${pname}-${version}-maven-deps";
inherit src nativeBuildInputs version patches postPatch;
dontFixup = true;
buildPhase = ''
mvn package ${mvnOptions} -Dmaven.repo.local=$out
'';
# keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with
# lastModified timestamps inside
installPhase = ''
find $out -type f \
-name \*.lastUpdated -or \
-name resolver-status.properties -or \
-name _remote.repositories \
-delete
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "X5ppGUVwNQrMnjzD4Kin1Xmt4O3x+qr7jK4jr6E8tCI=";
};
nativeBuildInputs = [ copyDesktopItems maven makeWrapper ];
postPatch = ''
substituteInPlace pom.xml --subst-var-by buildDate "${buildDate}"
'';
buildPhase = ''
mvn package --offline ${mvnOptions} -Dmaven.repo.local=${mavenDeps}
'';
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/java
classpath=$(find ${mavenDeps} -name "*.jar" -printf ':%h/%f');
install -Dm644 target/Digital.jar $out/share/java
makeWrapper ${jre}/bin/java $out/bin/${pname} \
--add-flags "-classpath $out/share/java/${pname}-${version}.jar:''${classpath#:}" \
--add-flags "-jar $out/share/java/Digital.jar"
'';
desktopItems = [ desktopItem ];
meta = with lib; {
homepage = "https://github.com/hneemann/Digital";
description = pkgDescription;
license = licenses.gpl3Only;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ Dettorer ];
};
}

View File

@ -0,0 +1,30 @@
diff --git a/pom.xml b/pom.xml
index d5f8330b4..58ed18b63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +130,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.5</version>
+ <version>3.2.0</version>
<configuration>
<archive>
<manifest>
@@ -188,6 +189,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>3.2.0</version>
<configuration>
<finalName>Digital</finalName>
<appendAssemblyId>false</appendAssemblyId>
@@ -202,7 +204,7 @@
</manifest>
<manifestEntries>
<Build-SCM-Revision>${git.commit.id.describe}</Build-SCM-Revision>
- <Build-Time>${maven.build.timestamp}</Build-Time>
+ <Build-Time>@buildDate@</Build-Time>
<SplashScreen-Image>icons/splash.png</SplashScreen-Image>
</manifestEntries>
</archive>

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "cbmc";
version = "5.71.0";
version = "5.74.0";
src = fetchFromGitHub {
owner = "diffblue";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-GApVmLTa1GsZNhwVW6R0KsNJOQH/2qP1CfR7VyP+o8I=";
sha256 = "sha256-n4a/0Ak2psHDCXykVSPYavuIl22uq2ZP7LUcdSzg1ow=";
};
nativeBuildInputs = [
@ -78,5 +78,7 @@ stdenv.mkDerivation rec {
license = licenses.bsdOriginal;
maintainers = with maintainers; [ jiegec ];
platforms = platforms.unix;
# https://github.com/diffblue/cbmc/issues/7423
broken = stdenv.isLinux && stdenv.isAarch64;
};
}

View File

@ -4,7 +4,6 @@
, alex
, happy
, Agda
, buildPlatform
, buildPackages
, ghcWithPackages
}:
@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
LANG = "en_US.UTF-8";
LOCALE_ARCHIVE =
lib.optionalString (buildPlatform.libc == "glibc")
lib.optionalString (stdenv.buildPlatform.libc == "glibc")
"${buildPackages.glibcLocales}/lib/locale/locale-archive";
postPatch = ''

View File

@ -1,10 +1,10 @@
{lib, stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}:
{ lib, stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq }:
stdenv.mkDerivation rec {
pname = "satallax";
version = "2.7";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ocaml zlib which eprover coq];
buildInputs = [ ocaml zlib which eprover coq ];
src = fetchurl {
url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz";
sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
./fix-declaration-gcc9.patch
];
prePatch = ''
patch -p1 -i ${../avy/minisat-fenv.patch} -d minisat
'';
preConfigure = ''
mkdir fake-tools
echo "echo 'Nix-build-host.localdomain'" > fake-tools/hostname
@ -41,7 +45,8 @@ stdenv.mkDerivation rec {
)
'';
postBuild = "echo testing; ! (bash ./test | grep ERROR)";
# error: invalid suffix on literal; C++11 requires a space between literal and identifier
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-reserved-user-defined-literal";
installPhase = ''
mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax"
@ -59,11 +64,22 @@ stdenv.mkDerivation rec {
cp -r coq* "$out/lib/satallax/"
'';
doCheck = stdenv.isLinux;
checkPhase = ''
runHook preCheck
if bash ./test | grep ERROR; then
echo "Tests failed"
exit 1
fi
runHook postCheck
'';
meta = {
description = "Automated theorem prover for higher-order logic";
license = lib.licenses.mit ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.raskin ];
platforms = lib.platforms.unix;
downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php";
homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php";
};

View File

@ -1,15 +1,17 @@
{ lib, stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg
, zlib, libGL, libGLU, xorg, opencascade-occt }:
, zlib, libGL, libGLU, xorg, opencascade-occt
, python ? null, enablePython ? false }:
assert (!blas.isILP64) && (!lapack.isILP64);
assert enablePython -> (python != null);
stdenv.mkDerivation rec {
pname = "gmsh";
version = "4.11.0";
version = "4.11.1";
src = fetchurl {
url = "https://gmsh.info/src/gmsh-${version}-source.tgz";
sha256 = "sha256-PPLyRFXuCSUsmeZNTmRilW5o8P8fN7rKC3jICdbMVXo=";
sha256 = "sha256-xf4bfL1AOIioFJKfL9D11p4nYAIioYx4bbW3boAFs2U=";
};
buildInputs = [
@ -18,10 +20,31 @@ stdenv.mkDerivation rec {
libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes
xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM
xorg.libICE
] ++ lib.optional enablePython python;
enableParallelBuilding = true;
patches = [ ./fix-python.patch ];
postPatch = ''
substituteInPlace api/gmsh.py --subst-var-by LIBPATH ${placeholder "out"}/lib/libgmsh.so
'';
# N.B. the shared object is used by bindings
cmakeFlags = [
"-DENABLE_BUILD_SHARED=ON"
"-DENABLE_BUILD_DYNAMIC=ON"
"-DENABLE_OPENMP=ON"
];
nativeBuildInputs = [ cmake gfortran ];
postFixup = lib.optionalString enablePython ''
mkdir -p $out/lib/python${python.pythonVersion}/site-packages
mv $out/lib/gmsh.py $out/lib/python${python.pythonVersion}/site-packages
mv $out/lib/*.dist-info $out/lib/python${python.pythonVersion}/site-packages
'';
doCheck = true;
meta = {

View File

@ -0,0 +1,50 @@
diff --git a/api/gmsh.py b/api/gmsh.py
index 747acb203..02004da5d 100644
--- a/api/gmsh.py
+++ b/api/gmsh.py
@@ -44,44 +44,7 @@ moduledir = os.path.dirname(os.path.realpath(__file__))
parentdir1 = os.path.dirname(moduledir)
parentdir2 = os.path.dirname(parentdir1)
-if platform.system() == "Windows":
- libname = "gmsh-4.11.dll"
-elif platform.system() == "Darwin":
- libname = "libgmsh.4.11.dylib"
-else:
- libname = "libgmsh.so.4.11"
-
-# check if the library is in the same directory as the module...
-libpath = os.path.join(moduledir, libname)
-
-# ... or in the parent directory or its lib or Lib subdirectory
-if not os.path.exists(libpath):
- libpath = os.path.join(parentdir1, libname)
-if not os.path.exists(libpath):
- libpath = os.path.join(parentdir1, "lib", libname)
-if not os.path.exists(libpath):
- libpath = os.path.join(parentdir1, "Lib", libname)
-
-# ... or in the parent of the parent directory or its lib or Lib subdirectory
-if not os.path.exists(libpath):
- libpath = os.path.join(parentdir2, libname)
-if not os.path.exists(libpath):
- libpath = os.path.join(parentdir2, "lib", libname)
-if not os.path.exists(libpath):
- libpath = os.path.join(parentdir2, "Lib", libname)
-
-# if we couldn't find it, use ctype's find_library utility...
-if not os.path.exists(libpath):
- if platform.system() == "Windows":
- libpath = find_library("gmsh-4.11")
- if not libpath:
- libpath = find_library("gmsh")
- else:
- libpath = find_library("gmsh")
-
-# ... and print a warning if everything failed
-if not os.path.exists(libpath):
- print("Warning: could not find Gmsh shared library " + libname)
+libpath = "@LIBPATH@"
lib = CDLL(libpath)

View File

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "xmedcon";
version = "0.22.0";
version = "0.23.0";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "sha256-Ui7XoLSzTMPIFW/3nARCmvlGF+1l7pmcnKsnvn3NFJE=";
sha256 = "sha256-g1CRJDokLDzB+1YIuVQNByBLx01CI47EwGeluqVDujk=";
};
buildInputs = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "sherpa";
version = "2.2.12";
version = "2.2.13";
src = fetchurl {
url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
sha256 = "sha256-UpRkd1yoKLncllEQUm80DedDtgA8Hm+Kvi/BRVCu0AE=";
sha256 = "sha256-FIozm2AmxaELIDiLBNx8RtUCy1fIjTGtnpFiAcKcZXE=";
};
postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''

View File

@ -0,0 +1,67 @@
{ augeas
, buildGoModule
, fetchFromGitHub
, gotools
, lib
, libvirt
, libxml2
, nex
, pkg-config
, ragel
}:
buildGoModule rec {
pname = "mgmt";
version = "unstable-2022-10-24";
src = fetchFromGitHub {
owner = "purpleidea";
repo = pname;
rev = "d8820fa1855668d9e0f7a7829d9dd0d122b2c5a9";
hash = "sha256-jurZvEtiaTjWeDkmCJDIFlTzR5EVglfoDxkFgOilo8s=";
};
# patching must be done in prebuild, so it is shared with go-modules
# see https://github.com/NixOS/nixpkgs/issues/208036
preBuild = ''
for file in `find -name Makefile -type f`; do
substituteInPlace $file --replace "/usr/bin/env " ""
done
substituteInPlace lang/types/Makefile \
--replace "unset GOCACHE && " ""
patchShebangs misc/header.sh
make lang funcgen
'';
buildInputs = [
augeas
libvirt
libxml2
];
nativeBuildInputs = [
gotools
nex
pkg-config
ragel
];
ldflags = [
"-s"
"-w"
"-X main.program=${pname}"
"-X main.version=${version}"
];
subPackages = [ "." ];
vendorHash = "sha256-Dtqy4TILN+7JXiHKHDdjzRTsT8jZYG5sPudxhd8znXY=";
meta = with lib; {
description = "Next generation distributed, event-driven, parallel config management!";
homepage = "https://mgmtconfig.com";
license = licenses.gpl3Only;
maintainers = with maintainers; [ urandom ];
};
}

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-cliff";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "orhun";
repo = "git-cliff";
rev = "v${version}";
hash = "sha256-2EaPVNRcSiXN43iazK5MkZ8ytiALlnYRCH2gEtlqBW0=";
hash = "sha256-WpLg9kBJnEEzWIx3dJN++Np1jUkYnFGlgCrUdvz2/3w=";
};
cargoSha256 = "sha256-kWWg3Ul6SzULdW7oOmkz5Lm2FK1vF/TkggrZcNbIzck=";
cargoHash = "sha256-UN5X+rvL7nsFkIj+XZSdZ/qmHlkVVJy1BA2zSVQxqPw=";
# attempts to run the program on .git in src which is not deterministic
doCheck = false;

View File

@ -3,7 +3,6 @@
, cacert
, curl
, runCommandLocal
, targetPlatform
, unzip
, appimage-run
, addOpenGLRunpath
@ -49,7 +48,7 @@ let
SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}";
USERAGENT = builtins.concatStringsSep " " [
"User-Agent: Mozilla/5.0 (X11; Linux ${targetPlatform.linuxArch})"
"User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})"
"AppleWebKit/537.36 (KHTML, like Gecko)"
"Chrome/77.0.3865.75"
"Safari/537.36"

View File

@ -13,7 +13,7 @@
, testers
, qtsvg
, qtimageformats
# For the tests
# For the tests
, glaxnimate # Call itself, for the tests
, xvfb-run
}:
@ -67,10 +67,10 @@ stdenv.mkDerivation rec {
qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ];
passthru.tests.version = testers.testVersion {
passthru.tests.version = lib.optionalAttrs stdenv.isLinux (testers.testVersion {
package = glaxnimate;
command = "${xvfb-run}/bin/xvfb-run glaxnimate --version";
};
});
meta = with lib; {
homepage = "https://gitlab.com/mattbas/glaxnimate";

View File

@ -1,7 +1,7 @@
{ lib
, stdenv
, callPackage
, buildPackages
, hostPlatform
}:
let
@ -34,9 +34,9 @@ let
};
in
(
if hostPlatform.system == "aarch64-darwin" then aarch64-dmg
else if hostPlatform.isDarwin then x86_64-dmg
else if hostPlatform.isCygwin then x86_64-windows
if stdenv.hostPlatform.system == "aarch64-darwin" then aarch64-dmg
else if stdenv.hostPlatform.isDarwin then x86_64-dmg
else if stdenv.hostPlatform.isCygwin then x86_64-windows
else x86_64-appimage
).overrideAttrs
(oldAttrs: {

View File

@ -55,7 +55,7 @@ in mkDerivation {
installPhase = ''
runHook preInstall
install -Dm555 -t $out/bin out/makemkv out/mmccextr ../makemkv-bin-${version}/bin/amd64/makemkvcon
install -Dm555 -t $out/bin out/makemkv out/mmccextr out/mmgplsrv ../makemkv-bin-${version}/bin/amd64/makemkvcon
install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.*
install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/*
install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop

View File

@ -73,6 +73,7 @@ let
# older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu
isGccArchSupported = arch:
if targetPlatform.isPower then false else # powerpc does not allow -march=
if isGNU then
{ # Intel
skylake = versionAtLeast ccVersion "6.0";
@ -433,8 +434,9 @@ stdenv.mkDerivation {
echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before
''
# -mcpu is not very useful. You should use mtune and march
# instead. Its provided here for backwards compatibility.
# -mcpu is not very useful, except on PowerPC where it is used
# instead of march. On all other platforms you should use mtune
# and march instead.
# TODO: aarch64-darwin has mcpu incompatible with gcc
+ optionalString ((targetPlatform ? gcc.cpu) && (isClang || !(stdenv.isDarwin && stdenv.isAarch64))) ''
echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before

View File

@ -26,7 +26,6 @@
, git
, dart
, nukeReferences
, targetPlatform
, bash
, curl
, unzip
@ -57,7 +56,7 @@ let
self =
(self: llvmPackages_13.stdenv.mkDerivation (args // {
deps = stdenvNoCC.mkDerivation (lib.recursiveUpdate (getAttrsOrNull fetchAttrs args) {
name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${targetPlatform.system}.tar.gz";
name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${stdenvNoCC.targetPlatform.system}.tar.gz";
nativeBuildInputs = flutterDeps ++ [
nukeReferences

View File

@ -1,6 +1,6 @@
{ lib, buildPlatform, buildRustCrate, fetchgit }:
let kernel = buildPlatform.parsed.kernel.name;
abi = buildPlatform.parsed.abi.name;
{ lib, stdenv, buildRustCrate, fetchgit }:
let kernel = stdenv.buildPlatform.parsed.kernel.name;
abi = stdenv.buildPlatform.parsed.abi.name;
include = includedFiles: src: builtins.filterSource (path: type:
lib.lists.any (f:
let p = toString (src + ("/" + f)); in

View File

@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: theme variants" [
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2022-11-17";
version = "2023-01-08";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
hash = "sha256-crZ6JQeXeSjTHGIBptioNiFZas7MksJcjaKGlMP4fo0=";
hash = "sha256-xqKGZPlGl8kNZ4AQYZWAywL+6UxwGzYOZ9WvB85JKZk=";
};
nativeBuildInputs = [ gtk3 jdupes ];

View File

@ -1,16 +1,17 @@
{ mkDerivation
, stdenv
{ stdenv
, lib
, fetchFromGitHub
, nix-update-script
, cmake
, ninja
, qtbase
, qtwayland
, qt5
, xorg
, useQt6 ? false
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "adwaita-qt";
version = "1.4.1";
@ -30,9 +31,19 @@ mkDerivation rec {
buildInputs = [
qtbase
qt5.qtx11extras
] ++ lib.optionals stdenv.isLinux [
xorg.libxcb
] ++ lib.optionals (!useQt6) [
qt5.qtx11extras
] ++ lib.optionals useQt6 [
qtwayland
];
# Qt setup hook complains about missing `wrapQtAppsHook` otherwise.
dontWrapQtApps = true;
cmakeFlags = lib.optionals useQt6 [
"-DUSE_QT6=true"
];
postPatch = ''

View File

@ -16,13 +16,13 @@
mkDerivation rec {
pname = "libfm-qt";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = "libfm-qt";
rev = version;
sha256 = "Lg+BQ0VFLF5Nhxzr4eeaDVWQG/pC1/w60pQg+lTddHY=";
sha256 = "CrCLwAdkSIhEKJtVJdtHvwEUNKhcvF22p3OOWOuxBAk=";
};
nativeBuildInputs = [

View File

@ -30,13 +30,13 @@
mkDerivation rec {
pname = "lxqt-panel";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "A/zoK6V+4tFeu8mSFukLeKnFVKl66QtKLtu7N7Z2P2w=";
sha256 = "TwVM0JY+BMvw6e/mzy82AH5E6pPsffE6oadd0BuCZk0=";
};
nativeBuildInputs = [

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