Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2022-02-18 00:08:41 +00:00 committed by GitHub
commit 7a18a9a681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
138 changed files with 2929 additions and 1478 deletions

View File

@ -3,7 +3,7 @@
</p> </p>
<p align="center"> <p align="center">
<a href="https://www.codetriage.com/nixos/nixpkgs"><img src="https://www.codetriage.com/nixos/nixpkgs/badges/users.svg" alt="Code Triagers badge" /></a> <a href="https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md"><img src="https://img.shields.io/github/contributors-anon/NixOS/nixpkgs" alt="Contributors badge" /></a>
<a href="https://opencollective.com/nixos"><img src="https://opencollective.com/nixos/tiers/supporter/badge.svg?label=Supporter&color=brightgreen" alt="Open Collective supporters" /></a> <a href="https://opencollective.com/nixos"><img src="https://opencollective.com/nixos/tiers/supporter/badge.svg?label=Supporter&color=brightgreen" alt="Open Collective supporters" /></a>
</p> </p>

View File

@ -1200,6 +1200,12 @@
githubId = 262763; githubId = 262763;
name = "Ayaz Hafiz"; name = "Ayaz Hafiz";
}; };
azuwis = {
email = "azuwis@gmail.com";
github = "azuwis";
githubId = 9315;
name = "Zhong Jianxin";
};
b4dm4n = { b4dm4n = {
email = "fabianm88@gmail.com"; email = "fabianm88@gmail.com";
github = "B4dM4n"; github = "B4dM4n";
@ -8119,13 +8125,6 @@
githubId = 1001112; githubId = 1001112;
name = "Marcin Janczyk"; name = "Marcin Janczyk";
}; };
mjlbach = {
email = "m.j.lbach@gmail.com";
matrix = "@atrius:matrix.org";
github = "mjlbach";
githubId = 13316262;
name = "Michael Lingelbach";
};
mjp = { mjp = {
email = "mike@mythik.co.uk"; email = "mike@mythik.co.uk";
github = "MikePlayle"; github = "MikePlayle";
@ -10115,6 +10114,20 @@
githubId = 16624; githubId = 16624;
name = "Maxim Ivanov"; name = "Maxim Ivanov";
}; };
reckenrode = {
name = "Randy Eckenrode";
email = "randy@largeandhighquality.com";
matrix = "@reckenrode:matrix.org";
github = "reckenrode";
githubId = 7413633;
keys = [
# compare with https://keybase.io/reckenrode
{
longkeyid = "ed25519/0xFBF19A982CCE0048";
fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048";
}
];
};
redfish64 = { redfish64 = {
email = "engler@gmail.com"; email = "engler@gmail.com";
github = "redfish64"; github = "redfish64";
@ -13202,6 +13215,12 @@
githubId = 1297598; githubId = 1297598;
name = "Konrad Borowski"; name = "Konrad Borowski";
}; };
xgroleau = {
email = "xgroleau@gmail.com";
github = "xgroleau";
githubId = 31734358;
name = "Xavier Groleau";
};
xiorcale = { xiorcale = {
email = "quentin.vaucher@pm.me"; email = "quentin.vaucher@pm.me";
github = "xiorcale"; github = "xiorcale";

View File

@ -214,7 +214,6 @@ with lib.maintainers; {
mguentner mguentner
ekleog ekleog
ralith ralith
mjlbach
dandellion dandellion
sumnerevans sumnerevans
]; ];

View File

@ -58,8 +58,8 @@ let
package = (cfg.package.override (oldArgs: { package = (cfg.package.override (oldArgs: {
# Respect overrides that already exist in the passed package and # Respect overrides that already exist in the passed package and
# concat it with values passed via the module. # concat it with values passed via the module.
extraComponents = oldArgs.extraComponents ++ extraComponents; extraComponents = oldArgs.extraComponents or [] ++ extraComponents;
extraPackages = ps: (oldArgs.extraPackages ps) ++ (cfg.extraPackages ps); extraPackages = ps: (oldArgs.extraPackages or (_: []) ps) ++ (cfg.extraPackages ps);
})); }));
in { in {
imports = [ imports = [

View File

@ -173,13 +173,18 @@ sub parseSystemdIni {
# #
# If a directory with the same basename ending in .d exists next to the unit file, it will be # If a directory with the same basename ending in .d exists next to the unit file, it will be
# assumed to contain override files which will be parsed as well and handled properly. # assumed to contain override files which will be parsed as well and handled properly.
sub parseUnit { sub parse_unit {
my ($unitPath) = @_; my ($unit_path) = @_;
# Parse the main unit and all overrides # Parse the main unit and all overrides
my %unitData; my %unit_data;
parseSystemdIni(\%unitData, $_) for glob("${unitPath}{,.d/*.conf}"); # Replace \ with \\ so glob() still works with units that have a \ in them
return %unitData; # Valid characters in unit names are ASCII letters, digits, ":", "-", "_", ".", and "\"
$unit_path =~ s/\\/\\\\/gmsx;
foreach (glob "${unit_path}{,.d/*.conf}") {
parseSystemdIni(\%unit_data, "$_")
}
return %unit_data;
} }
# Checks whether a specified boolean in a systemd unit is true # Checks whether a specified boolean in a systemd unit is true
@ -310,7 +315,7 @@ sub handleModifiedUnit {
# Revert of the attempt: https://github.com/NixOS/nixpkgs/pull/147609 # Revert of the attempt: https://github.com/NixOS/nixpkgs/pull/147609
# More details: https://github.com/NixOS/nixpkgs/issues/74899#issuecomment-981142430 # More details: https://github.com/NixOS/nixpkgs/issues/74899#issuecomment-981142430
} else { } else {
my %unitInfo = $newUnitInfo ? %{$newUnitInfo} : parseUnit($newUnitFile); my %unitInfo = $newUnitInfo ? %{$newUnitInfo} : parse_unit($newUnitFile);
if (parseSystemdBool(\%unitInfo, "Service", "X-ReloadIfChanged", 0) and not $unitsToRestart->{$unit} and not $unitsToStop->{$unit}) { if (parseSystemdBool(\%unitInfo, "Service", "X-ReloadIfChanged", 0) and not $unitsToRestart->{$unit} and not $unitsToStop->{$unit}) {
$unitsToReload->{$unit} = 1; $unitsToReload->{$unit} = 1;
recordUnit($reloadListFile, $unit); recordUnit($reloadListFile, $unit);
@ -412,12 +417,12 @@ while (my ($unit, $state) = each %{$activePrev}) {
if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) { if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") { if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") {
my %unitInfo = parseUnit($prevUnitFile); my %unitInfo = parse_unit($prevUnitFile);
$unitsToStop{$unit} = 1 if parseSystemdBool(\%unitInfo, "Unit", "X-StopOnRemoval", 1); $unitsToStop{$unit} = 1 if parseSystemdBool(\%unitInfo, "Unit", "X-StopOnRemoval", 1);
} }
elsif ($unit =~ /\.target$/) { elsif ($unit =~ /\.target$/) {
my %unitInfo = parseUnit($newUnitFile); my %unitInfo = parse_unit($newUnitFile);
# Cause all active target units to be restarted below. # Cause all active target units to be restarted below.
# This should start most changed units we stop here as # This should start most changed units we stop here as
@ -451,8 +456,8 @@ while (my ($unit, $state) = each %{$activePrev}) {
} }
else { else {
my %old_unit_info = parseUnit($prevUnitFile); my %old_unit_info = parse_unit($prevUnitFile);
my %new_unit_info = parseUnit($newUnitFile); my %new_unit_info = parse_unit($newUnitFile);
my $diff = compare_units(\%old_unit_info, \%new_unit_info); my $diff = compare_units(\%old_unit_info, \%new_unit_info);
if ($diff eq 1) { if ($diff eq 1) {
handleModifiedUnit($unit, $baseName, $newUnitFile, \%new_unit_info, $activePrev, \%unitsToStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip); handleModifiedUnit($unit, $baseName, $newUnitFile, \%new_unit_info, $activePrev, \%unitsToStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip);

View File

@ -48,7 +48,12 @@ in
what = "tmpfs"; what = "tmpfs";
where = "/tmp"; where = "/tmp";
type = "tmpfs"; type = "tmpfs";
mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=${toString cfg.tmpOnTmpfsSize}" ]; mountConfig.Options = concatStringsSep "," [ "mode=1777"
"strictatime"
"rw"
"nosuid"
"nodev"
"size=${toString cfg.tmpOnTmpfsSize}" ];
} }
]; ];

View File

@ -18,8 +18,12 @@ import ./make-test-python.nix ({ pkgs, ... }: {
# simple BEGIN probe (user probe on bpftrace itself) # simple BEGIN probe (user probe on bpftrace itself)
print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\"); exit(); }'")) print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\"); exit(); }'"))
# tracepoint # tracepoint
print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit(); }'")) print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit() }'"))
# kprobe # kprobe
print(machine.succeed("bpftrace -e 'kprobe:schedule { print(probe); exit() }'")) print(machine.succeed("bpftrace -e 'kprobe:schedule { print(probe); exit() }'"))
# BTF
print(machine.succeed("bpftrace -e 'kprobe:schedule { "
" printf(\"tgid: %d\", ((struct task_struct*) curtask)->tgid); exit() "
"}'"))
''; '';
}) })

View File

@ -145,6 +145,23 @@ import ./make-test-python.nix ({ pkgs, ...} : {
systemd.services.test.serviceConfig."X-Test" = "test"; systemd.services.test.serviceConfig."X-Test" = "test";
}; };
unitWithBackslash.configuration = {
systemd.services."escaped\\x2ddash" = {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = "${pkgs.coreutils}/bin/true";
ExecReload = "${pkgs.coreutils}/bin/true";
};
};
};
unitWithBackslashModified.configuration = {
imports = [ unitWithBackslash.configuration ];
systemd.services."escaped\\x2ddash".serviceConfig.X-Test = "test";
};
restart-and-reload-by-activation-script.configuration = { restart-and-reload-by-activation-script.configuration = {
systemd.services = rec { systemd.services = rec {
simple-service = { simple-service = {
@ -433,6 +450,25 @@ import ./make-test-python.nix ({ pkgs, ...} : {
assert_lacks(out, "as well:") assert_lacks(out, "as well:")
assert_contains(out, "would start the following units: test.service\n") assert_contains(out, "would start the following units: test.service\n")
# Ensure \ works in unit names
out = switch_to_specialisation("${machine}", "unitWithBackslash")
assert_contains(out, "stopping the following units: test.service\n")
assert_lacks(out, "NOT restarting the following changed units:")
assert_lacks(out, "reloading the following units:")
assert_lacks(out, "\nrestarting the following units:")
assert_lacks(out, "\nstarting the following units:")
assert_contains(out, "the following new units were started: escaped\\x2ddash.service\n")
assert_lacks(out, "as well:")
out = switch_to_specialisation("${machine}", "unitWithBackslashModified")
assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n")
assert_lacks(out, "NOT restarting the following changed units:")
assert_lacks(out, "reloading the following units:")
assert_lacks(out, "\nrestarting the following units:")
assert_contains(out, "\nstarting the following units: escaped\\x2ddash.service\n")
assert_lacks(out, "the following new units were started:")
assert_lacks(out, "as well:")
with subtest("failing units"): with subtest("failing units"):
# Let the simple service fail # Let the simple service fail
switch_to_specialisation("${machine}", "simpleServiceModified") switch_to_specialisation("${machine}", "simpleServiceModified")

View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cp $src $out/lib/JMusicBot cp $src $out/lib/JMusicBot
makeWrapper ${jre}/bin/java $out/bin/JMusicBot \ makeWrapper ${jre}/bin/java $out/bin/JMusicBot \
--add-flags "-Xmx1G -Dnogui=true -jar $out/lib/JMusicBot" --add-flags "-Xmx1G -Dnogui=true -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -jar $out/lib/JMusicBot"
''; '';
meta = with lib; { meta = with lib; {

View File

@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "pyradio"; pname = "pyradio";
version = "0.8.9.10"; version = "0.8.9.12";
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
requests requests
@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
owner = "coderholic"; owner = "coderholic";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1cvrvy5ll97yyrzakxr8lb25qxmzk9fvcabsgc98jf89ikxgax4w"; sha256 = "sha256-ZBlb0wpw5/s3JuyV2OpGZwlY1UcQzLHP1/VhGlEr6Zo=";
}; };
checkPhase = '' checkPhase = ''

View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tauon"; pname = "tauon";
version = "7.0.1"; version = "7.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Taiko2k"; owner = "Taiko2k";
repo = "TauonMusicBox"; repo = "TauonMusicBox";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Sw9w6vFXk2Cx7LdfMsou9IDheVckdusc0iGWkVsVtCQ="; sha256 = "sha256-p48fVuigfQuFrCUnTD5NTFtgiO3WaBeKOhGLoQU4O5U=";
}; };
postPatch = '' postPatch = ''

View File

@ -5,13 +5,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "rednotebook"; pname = "rednotebook";
version = "2.22"; version = "2.23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jendrikseipp"; owner = "jendrikseipp";
repo = "rednotebook"; repo = "rednotebook";
rev = "v${version}"; rev = "v${version}";
sha256 = "11n970ad0j57vlll5j30ngkrfyil23v1b29ickbnblcldvjbgwa5"; sha256 = "sha256-CLQWbwwJnr6Al223GvV1hVNK13p2iAyjNF7PhdaU9N0=";
}; };
# We have not packaged tests. # We have not packaged tests.
@ -36,8 +36,9 @@ buildPythonApplication rec {
meta = with lib; { meta = with lib; {
homepage = "https://rednotebook.sourceforge.io/"; homepage = "https://rednotebook.sourceforge.io/";
changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md";
description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";
license = licenses.gpl2; license = licenses.gpl2Plus;
maintainers = with maintainers; [ orivej tstrobel ]; maintainers = with maintainers; [ orivej tstrobel ];
}; };
} }

View File

@ -18,13 +18,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imagemagick"; pname = "imagemagick";
version = "7.1.0-24"; version = "7.1.0-25";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ImageMagick"; owner = "ImageMagick";
repo = "ImageMagick"; repo = "ImageMagick";
rev = version; rev = version;
hash = "sha256-tTdtVUQDBfVS3Rze1KKKR4wL8t8+ka5Ku9qcl+DP6Eo="; hash = "sha256-zSbngA56YnJ1W+ZlA6Q850NTtZovjue51zEgbKI3iqc=";
}; };
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

View File

@ -0,0 +1,76 @@
{ lib
, stdenv
, fetchFromGitHub
, desktop-file-utils
, gio-sharp
, glib
, gstreamer
, gtk4
, libadwaita
, libxml2
, meson
, ninja
, pkg-config
, poppler
, python3
, rustPlatform
, shared-mime-info
, wrapGAppsHook4
}:
stdenv.mkDerivation rec {
pname = "rnote";
version = "0.3.5";
src = fetchFromGitHub {
owner = "flxzt";
repo = "rnote";
rev = "v${version}";
sha256 = "5g5SQJc5aopYxtHNP5T85TtcazovrveUCnMhJ90p2t4=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-vnLesWXdqNzlWNQsUVy03kfmcDNazQ1BbizQDoG1kgM=";
};
nativeBuildInputs = [
desktop-file-utils # For update-desktop-database
meson
ninja
pkg-config
python3 # For the postinstall script
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
rustPlatform.rust.rustc
shared-mime-info # For update-mime-database
wrapGAppsHook4
];
buildInputs = [
gio-sharp
glib
gstreamer
gtk4
libadwaita
libxml2
poppler
];
postPatch = ''
pushd build-aux
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
popd
'';
meta = with lib; {
homepage = "https://github.com/flxzt/rnote";
description = "Simple drawing application to create handwritten notes";
license = licenses.gpl3Only;
maintainers = with maintainers; [ dotlambda yrd ];
platforms = platforms.linux;
};
}

View File

@ -1,27 +1,77 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, libpng, cairo, freetype { lib
, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre, wrapGAppsHook , stdenv
, fetchFromGitHub
, cmake
, pkg-config
, wrapGAppsHook
, at-spi2-core
, cairo
, dbus
, freetype
, fontconfig
, glew
, gtkmm3
, json_c
, libdatrie
, libepoxy
, libGLU
, libpng
, libselinux
, libsepol
, libthai
, libxkbcommon
, pangomm
, pcre
, util-linuxMinimal # provides libmount
, xorg
, zlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "solvespace"; pname = "solvespace";
version = "v3.0"; version = "3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = "v${version}";
sha256 = "04aympdsjp37vp0p13mb8nwkc080hp9cdrjpyy5m1mhwkm8jm9k9"; hash = "sha256-aaYqUZ0c1lCL91fmxtKFAAE2uUWrjnDB3WdcqdutXhE=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config cmake wrapGAppsHook cmake
]; pkg-config
buildInputs = [ wrapGAppsHook
zlib libpng cairo freetype
json_c fontconfig gtkmm3 pangomm glew libGLU
xorg.libpthreadstubs xorg.libXdmcp pcre
]; ];
preConfigure = '' buildInputs = [
at-spi2-core
cairo
dbus
freetype
fontconfig
glew
gtkmm3
json_c
libdatrie
libepoxy
libGLU
libpng
libselinux
libsepol
libthai
libxkbcommon
pangomm
pcre
util-linuxMinimal
xorg.libpthreadstubs
xorg.libXdmcp
xorg.libXtst
zlib
];
postPatch = ''
patch CMakeLists.txt <<EOF patch CMakeLists.txt <<EOF
@@ -20,9 +20,9 @@ @@ -20,9 +20,9 @@
# NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds # NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds
@ -35,16 +85,14 @@ stdenv.mkDerivation rec {
EOF EOF
''; '';
postInstall = '' cmakeFlags = [ "-DENABLE_OPENMP=ON" ];
substituteInPlace $out/share/applications/solvespace.desktop \
--replace /usr/bin/ $out/bin/
'';
meta = with lib; { meta = with lib; {
description = "A parametric 3d CAD program"; description = "A parametric 3d CAD program";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = [ maintainers.edef ]; maintainers = [ maintainers.edef ];
platforms = platforms.linux; platforms = platforms.linux;
homepage = "http://solvespace.com"; homepage = "https://solvespace.com";
changelog = "https://github.com/solvespace/solvespace/raw/v${version}/CHANGELOG.md";
}; };
} }

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gpxsee"; pname = "gpxsee";
version = "10.3"; version = "10.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tumic0"; owner = "tumic0";
repo = "GPXSee"; repo = "GPXSee";
rev = version; rev = version;
sha256 = "sha256-rKUj2XeVI2KdyCinwqipINg9OO0IhCSFBjSeYBSMLcQ="; sha256 = "sha256-3AwUfx8IIWJO4uVAhXJE5Oola+60VUpXUwmALqJo2vw=";
}; };
patches = (substituteAll { patches = (substituteAll {

View File

@ -1,7 +1,10 @@
{ lib { lib
, mkDerivation , mkDerivation
, fetchFromGitHub , fetchFromGitHub
, qmake , qmake
, qttools
, curl , curl
, ffmpeg , ffmpeg
, libmediainfo , libmediainfo
@ -10,7 +13,6 @@
, qtdeclarative , qtdeclarative
, qtmultimedia , qtmultimedia
, qtsvg , qtsvg
, qttools
, quazip , quazip
}: }:
@ -28,7 +30,7 @@ mkDerivation rec {
nativeBuildInputs = [ qmake qttools ]; nativeBuildInputs = [ qmake qttools ];
buildInputs = [ curl libmediainfo libzen ffmpeg qtbase qtdeclarative qtmultimedia qtsvg ]; buildInputs = [ curl ffmpeg libmediainfo libzen qtbase qtdeclarative qtmultimedia qtsvg ];
qmakeFlags = [ qmakeFlags = [
"USE_EXTERN_QUAZIP=${quazip}/include/quazip5" "USE_EXTERN_QUAZIP=${quazip}/include/quazip5"
@ -38,6 +40,11 @@ mkDerivation rec {
substituteInPlace MediaElch.pro --replace "/usr" "$out" substituteInPlace MediaElch.pro --replace "/usr" "$out"
''; '';
qtWrapperArgs = [
# libmediainfo.so.0 is loaded dynamically
"--prefix LD_LIBRARY_PATH : ${libmediainfo}/lib"
];
meta = with lib; { meta = with lib; {
homepage = "https://mediaelch.de/mediaelch/"; homepage = "https://mediaelch.de/mediaelch/";
description = "Media Manager for Kodi"; description = "Media Manager for Kodi";

View File

@ -2,13 +2,13 @@
xmrig.overrideAttrs (oldAttrs: rec { xmrig.overrideAttrs (oldAttrs: rec {
pname = "xmrig-mo"; pname = "xmrig-mo";
version = "6.16.2-mo2"; version = "6.16.4-mo1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MoneroOcean"; owner = "MoneroOcean";
repo = "xmrig"; repo = "xmrig";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-o2TtkoKa4DQ6tM1GdKVEmkWoJvnvxQc514wwgsfTDnE="; sha256 = "sha256-OnKz/Sl/b0wpZ1tqeEXhNxNNmQJXBhv5YNnKu9aOVZA=";
}; };
meta = with lib; { meta = with lib; {

View File

@ -27,7 +27,8 @@
let let
# Courtesy of sternenseemann and FRidh # Courtesy of sternenseemann and FRidh
mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; mesonFeatureFlag = feature: flag:
"-D${feature}=${if flag then "enabled" else "disabled"}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "yambar"; pname = "yambar";
@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
owner = "dnkl"; owner = "dnkl";
repo = "yambar"; repo = "yambar";
rev = version; rev = version;
sha256 = "0d8n9hvmxj7759pfqssqcl9wvb986qsph8bnjsjm9bf97mflhy6d"; hash = "sha256-zXhIXT3JrVSllnYheDU2KK3NE2VYa+xuKufIXjdMFjU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -19,9 +19,9 @@
} }
}, },
"beta": { "beta": {
"version": "99.0.4844.27", "version": "99.0.4844.35",
"sha256": "07srkycb92sajbxcjbwgjcj0xgb17k9i4b7cg50dvz3pwdvm7y8y", "sha256": "085vsfp08y4vmv73z37ncynvax645qm302h883skx9xk4yyjkynj",
"sha256bin64": "1a3a66kmcim3f8wvi19330m2iixxngsfiwv44g8zz51qk4rg4wx3", "sha256bin64": "18kys3f0zjkrp1x2vkcc9vx6vhj5yfrpb88lli7ql6q9b0ijjjn4",
"deps": { "deps": {
"gn": { "gn": {
"version": "2022-01-10", "version": "2022-01-10",

View File

@ -190,6 +190,8 @@ stdenv.mkDerivation {
ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json"; ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json";
''; '';
passthru.applicationName = "firefox";
passthru.libName = "firefox-bin-${version}";
passthru.execdir = "/bin"; passthru.execdir = "/bin";
passthru.ffmpegSupport = true; passthru.ffmpegSupport = true;
passthru.gssSupport = true; passthru.gssSupport = true;

View File

@ -42,7 +42,7 @@ let
# https://github.com/mozilla/policy-templates#enterprisepoliciesenabled # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled
, extraPolicies ? {} , extraPolicies ? {}
, extraPoliciesFiles ? [] , extraPoliciesFiles ? []
, libName ? "firefox" # Important for tor package or the like , libName ? browser.libName or "firefox" # Important for tor package or the like
, nixExtensions ? null , nixExtensions ? null
}: }:
@ -152,24 +152,7 @@ let
# # # #
############################# #############################
# TODO: remove this after the next release (21.03) in stdenv.mkDerivation {
configPlugins = lib.filter (a: builtins.hasAttr a cfg) [
"enableAdobeFlash"
"enableAdobeReader"
"enableBluejeans"
"enableDjvu"
"enableFriBIDPlugin"
"enableGoogleTalkPlugin"
"enableMPlayer"
"enableVLC"
"icedtea"
"jre"
];
pluginsError =
"Your configuration mentions ${lib.concatMapStringsSep ", " (p: applicationName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins).";
in if configPlugins != [] then throw pluginsError else
(stdenv.mkDerivation {
inherit pname version; inherit pname version;
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -219,8 +202,8 @@ let
find . -type f \( -not -name "${applicationName}" \) -exec ln -sT "${browser}"/{} "$out"/{} \; find . -type f \( -not -name "${applicationName}" \) -exec ln -sT "${browser}"/{} "$out"/{} \;
find . -type f -name "${applicationName}" -print0 | while read -d $'\0' f; do find . -type f \( -name "${applicationName}" -o -name "${applicationName}-bin" \) -print0 | while read -d $'\0' f; do
cp -P --no-preserve=mode,ownership "${browser}/$f" "$out/$f" cp -P --no-preserve=mode,ownership --remove-destination "${browser}/$f" "$out/$f"
chmod a+rwx "$out/$f" chmod a+rwx "$out/$f"
done done
@ -369,5 +352,5 @@ let
hydraPlatforms = []; hydraPlatforms = [];
priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package
}; };
}); };
in lib.makeOverridable wrapper in lib.makeOverridable wrapper

View File

@ -8,13 +8,13 @@
buildGoModule rec { buildGoModule rec {
pname = "bosh-cli"; pname = "bosh-cli";
version = "6.4.15"; version = "6.4.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudfoundry"; owner = "cloudfoundry";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-3JPnXOpjHjBZMdOtggjSns4cKc7uffJS1RkTAKGxAVI="; sha256 = "sha256-yjW0XlMXa1MyNIud3uGm7RNj47B4Bp3DK9tvBrfqkoA=";
}; };
vendorSha256 = null; vendorSha256 = null;

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "clusterctl"; pname = "clusterctl";
version = "1.1.1"; version = "1.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes-sigs"; owner = "kubernetes-sigs";
repo = "cluster-api"; repo = "cluster-api";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-bgc9M7shcgL1gQ9klUP0JIY4UeraO1oLsLEdG5tOLpY="; sha256 = "sha256-IjkksHa94gkNiaeksGHlLdeHlLS/uwI0GnKK0d3s5wk=";
}; };
vendorSha256 = "sha256-T2a5FBjISXprgMA6ye2xwAFLE62Qb3AUQVjpGtnduU0="; vendorSha256 = "sha256-3PzaMB7U19HnqS+zRbIupErE1S8+MzG92vQFq3oxHpE=";
subPackages = [ "cmd/clusterctl" ]; subPackages = [ "cmd/clusterctl" ];

View File

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1vcwzksixc9n016gf8zavkdk7ba33zkmymclvjwb32pwsanvzdz7"; sha256 = "1vcwzksixc9n016gf8zavkdk7ba33zkmymclvjwb32pwsanvzdz7";
}; };
vendorSha256 = "1yl9lmqvw70a6z0c85vkzvdzyzqjizfa1rahfw8gb175fax1f0sz"; vendorSha256 = "0v4xk1ia6zhh4h2rgpinfl0hs300lk84vabm35mjahch7kmvfhvb";
nativeBuildInputs = [ go-bindata installShellFiles ]; nativeBuildInputs = [ go-bindata installShellFiles ];

View File

@ -2,7 +2,7 @@
let let
inherit (pkgs) callPackage fetchurl; inherit (pkgs) callPackage fetchurl;
versions = if stdenv.isLinux then { versions = if stdenv.isLinux then {
stable = "0.0.16"; stable = "0.0.17";
ptb = "0.0.27"; ptb = "0.0.27";
canary = "0.0.133"; canary = "0.0.133";
} else { } else {
@ -21,7 +21,7 @@ let
stable = fetchurl { stable = fetchurl {
url = url =
"https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
sha256 = "UTVKjs/i7C/m8141bXBsakQRFd/c//EmqqhKhkr1OOk="; sha256 = "058k0cmbm4y572jqw83bayb2zzl2fw2aaz0zj1gvg6sxblp76qil";
}; };
ptb = fetchurl { ptb = fetchurl {
url = url =

View File

@ -61,7 +61,7 @@ mkDerivation rec {
description = "A client for matrix, the decentralized communication protocol."; description = "A client for matrix, the decentralized communication protocol.";
homepage = "https://apps.kde.org/en/neochat"; homepage = "https://apps.kde.org/en/neochat";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ mjlbach peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
platforms = with platforms; linux; platforms = with platforms; linux;
}; };
} }

View File

@ -1,655 +1,655 @@
{ {
version = "91.5.1"; version = "91.6.1";
sources = [ sources = [
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/af/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/af/thunderbird-91.6.1.tar.bz2";
locale = "af"; locale = "af";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "90a7b62161c8e4bd0dfcb0c69995e80b1733b86513d5786559eefd0ee19ca6ec"; sha256 = "b0d36d12bb29897b4502fe28fd5d05117b8cf3c6f2a8f9a0a88542b915587cda";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ar/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ar/thunderbird-91.6.1.tar.bz2";
locale = "ar"; locale = "ar";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "f7167cdff08c42f0a067e8631f8ae85ea12f301a7d49ba8919fa90cdf5ac1aaf"; sha256 = "26c86b4a73085d1b2b08e73a9adb1a2e8148fce1c8b27f3b1f9566fb72269361";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ast/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ast/thunderbird-91.6.1.tar.bz2";
locale = "ast"; locale = "ast";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "74ffcdac8a170ba700d2c58066c66143129a7f21f8123c174dfd598240f2271d"; sha256 = "f0ffeb6273b2c748cdeb2b6e73e17848c6c1b583ee0dfae1ec7eda8b295bef09";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/be/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/be/thunderbird-91.6.1.tar.bz2";
locale = "be"; locale = "be";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "aabe3dce7ddcfcaad6212549f7ce709c6832c01aa7cfaa15fad82d75259fa8ee"; sha256 = "b55b54e87b28329d717023397d42d162299bf89dc47b6db5910b57263b377645";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/bg/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/bg/thunderbird-91.6.1.tar.bz2";
locale = "bg"; locale = "bg";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "f0fa8e63643e1a44ab6997caf148812e749004a450825b0b77f1ac0cc52c6ec3"; sha256 = "93d99a4eebf65152ffede2b86f94f0bb4a626c0a0b0925514e529785b717ec21";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/br/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/br/thunderbird-91.6.1.tar.bz2";
locale = "br"; locale = "br";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "8391eb495214140878bba1f658cb1dbab4a93187f32bb99e65613b09db70269c"; sha256 = "944395c06dbc26d14add54d6e9e990496179ee0e956d585d84246e90d3a5a058";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ca/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ca/thunderbird-91.6.1.tar.bz2";
locale = "ca"; locale = "ca";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "82b1498ee1745b087b58f44ca57f1d355b61aa42ec2787302e6a59dfb5391a3e"; sha256 = "426f1f2b8c3849e60e1e88e74f33c1bc51f8de3007fbbf9d58c0c477e7c4d0f2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cak/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cak/thunderbird-91.6.1.tar.bz2";
locale = "cak"; locale = "cak";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "52761eec2ef3327ea5f435bfcb73dd4a5c378e78d57f9849283460ed39318af8"; sha256 = "04baa09f4f28e62057cb4a62981f916c820a82be5c7418367be67a5f1f180dff";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cs/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cs/thunderbird-91.6.1.tar.bz2";
locale = "cs"; locale = "cs";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "406bff52470379be7d6b8315909067e1a1f7623a7d4415a23b6f53ea4f896064"; sha256 = "d724b84ac07ec0dd8f81b790f4baf58c2d81f9d1e8aa121fe379aa968fd7c78a";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cy/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cy/thunderbird-91.6.1.tar.bz2";
locale = "cy"; locale = "cy";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "4fa869d8592709da2ddba8657424475377aea9617ad411abb25c8ae8e55612fe"; sha256 = "bde7231dda570182a0c4e73645025aad818be321bea0c0425dddb275b28d438c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/da/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/da/thunderbird-91.6.1.tar.bz2";
locale = "da"; locale = "da";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "1ed471dab670fe7ba58ccb4fe39bec2f3ee6625a6713c3b1f3fe9703e0a703cf"; sha256 = "b671d892a013f551ce32c3ee98d956227561a9ad9f168095521f8be1899bd1fe";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/de/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/de/thunderbird-91.6.1.tar.bz2";
locale = "de"; locale = "de";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "16b6e291489f37699587b62cafb3caa3e09ae21b160c9739afb35ae450dcffbc"; sha256 = "cca775ff187ab71db985c031ff08d906fcfba2aa2aa25ad204f1223c94ee1fd8";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/dsb/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/dsb/thunderbird-91.6.1.tar.bz2";
locale = "dsb"; locale = "dsb";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "3872f1263a7ba9f6a31f1fcd26440ab3ec231efca678cd75459bd71a4b0637f9"; sha256 = "19bd301bb47874abaece776961e85b277ae02cfe772c11f62b731d19c3d87b39";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/el/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/el/thunderbird-91.6.1.tar.bz2";
locale = "el"; locale = "el";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "aaab178dc1f6d9f1818f63b98091113546bdf36e823efc0c252979b570406ef0"; sha256 = "40f279167634c0903f60297a76ce483a34233110c34d50d01fdd976f65337e41";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-CA/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-CA/thunderbird-91.6.1.tar.bz2";
locale = "en-CA"; locale = "en-CA";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "d2e98a42a5de6793f34725f989b645a0531dfca95e014e58bcb951fd5a4f9681"; sha256 = "41ac7d58a099e68cf87f604d77e8fa844e48264b52409b9f8637fc777d15bdad";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-GB/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-GB/thunderbird-91.6.1.tar.bz2";
locale = "en-GB"; locale = "en-GB";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "4459fb379c2299be6915a5a54ad6963dbd80dd5a9838baf1d2edcf63ef0354bd"; sha256 = "e20e547b074816931fce3cffe04eb7b9690439f047b2154d2f0d36b7eda9071e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-US/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-US/thunderbird-91.6.1.tar.bz2";
locale = "en-US"; locale = "en-US";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "a88c57cb36623d18a53c1940ccfa5874c222b6a2e44aab7760ccd6c70518f748"; sha256 = "08e963292b4e63be2dad7a24eb125bca484107b05856dcebf98ceddaf47f1e87";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/es-AR/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-AR/thunderbird-91.6.1.tar.bz2";
locale = "es-AR"; locale = "es-AR";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "979514cb958a4626d07379099c3fc77ed4208cecd3b0af9c059a04064e60df43"; sha256 = "23775b4446630146d6e6c34760cbb9c155a21bfa759d6b18135fe28e80459c7f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/es-ES/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-ES/thunderbird-91.6.1.tar.bz2";
locale = "es-ES"; locale = "es-ES";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "745d0865606c238512e01e414305f83664b1395ff9d02b36f9df37b1bcca0e2f"; sha256 = "0ba964ad2cc0d86b12e8498ccfd374931d0e26fb163994704aae622a420bffe8";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/et/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/et/thunderbird-91.6.1.tar.bz2";
locale = "et"; locale = "et";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "1a009c0ec4ad94819de0eb006c6f0919080271e8d5c6c5b324c6624657ef8440"; sha256 = "94a73f46e5e2e9672a0c54a4a445c5a24a60924e45d57218a0c5a3eda7437091";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/eu/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/eu/thunderbird-91.6.1.tar.bz2";
locale = "eu"; locale = "eu";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "3beab0dd08c2089dabf99d246d9a06bb0339b88945e012fadc53a9420b105eb7"; sha256 = "3fed5e7cc72572e7a71f2916ac1750b40c0896d7786bfb76a49679d15ac07031";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fi/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fi/thunderbird-91.6.1.tar.bz2";
locale = "fi"; locale = "fi";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "d0006d6b5a2fdeb69171452c9eee4f7e54d18cf0a42bbccc056144af127109c8"; sha256 = "b7e233e744afd3569748013d091f57fbb8339e1cefd328d1808cccd0abd9f7c7";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fr/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fr/thunderbird-91.6.1.tar.bz2";
locale = "fr"; locale = "fr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "4345711b2199bd5f0cc89e34cd7a65bb22290268c872c990fb32ee49c174d58e"; sha256 = "1066814d16f3de8e0a6b0aad4ecbc078bc4e76a5daad8173d7a0af1986fc49ba";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fy-NL/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fy-NL/thunderbird-91.6.1.tar.bz2";
locale = "fy-NL"; locale = "fy-NL";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "7f90afe3e04e1a7db5236d12d2133c3552e0d6744262f5107522dc1b88b9d26d"; sha256 = "eeb7f557ac32ab426c5843061c1fa394671328794f9b0d5313351768ea020fa1";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ga-IE/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ga-IE/thunderbird-91.6.1.tar.bz2";
locale = "ga-IE"; locale = "ga-IE";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "ecf987ec7a479fcd1aeec4a680fe7b785f3273914be7bc5ea34a1160024bca30"; sha256 = "8c1adead3a4c715cd2e6ebd7d23a086a6bb5308cb8620e35aeef151c3a25ad40";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/gd/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gd/thunderbird-91.6.1.tar.bz2";
locale = "gd"; locale = "gd";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "e688777e2ca5a0964bdb295c17de71f0b3e7ce8ed3a81a027cb58d65f0b13843"; sha256 = "23db6bd6aded7d7424c2c0b5a5c9da938b504b517297b535d0eee907c20ff921";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/gl/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gl/thunderbird-91.6.1.tar.bz2";
locale = "gl"; locale = "gl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "b7e37320a6f29312851d814713522c0edaf3ad10bb6096e08e60ad9d6eae3c34"; sha256 = "10483ac92240dd7f1a4cc25dfae74291ef3546ff36b51205bcb3fa2af2e97489";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/he/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/he/thunderbird-91.6.1.tar.bz2";
locale = "he"; locale = "he";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "9e317e22ca0e8e6d809437efee263fb3e0b6418696282f8670b7f8f92ec6c56a"; sha256 = "211c4f58cd5553da8933386c4b1a7847f61df83212228f3ec4ef807a2115f220";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hr/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hr/thunderbird-91.6.1.tar.bz2";
locale = "hr"; locale = "hr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "51f6eec36a08b766bc9567ae7dbac5b015890c0792dd4a37f9654345bd34f9be"; sha256 = "3b71a6ab9df2a45c15342f241cb63f323170f692d204e9a98f9772f6e50809f4";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hsb/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hsb/thunderbird-91.6.1.tar.bz2";
locale = "hsb"; locale = "hsb";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "1f91258f84978b313d2ced008ef0e760e5e425dde3116d1e6adfd7d87895a043"; sha256 = "0603f34c825bee5e813fb63c5f1060e5de31ab89d12abe4259f5f2c56f880e65";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hu/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hu/thunderbird-91.6.1.tar.bz2";
locale = "hu"; locale = "hu";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "d5665c6b1415493f18085c1606b12e4ff52f02ac9d932f5e14c6794685b7c68e"; sha256 = "64db18fb3477198f696cbf8d100b45abb2cf74abc960c90143abad224fe56e48";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hy-AM/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hy-AM/thunderbird-91.6.1.tar.bz2";
locale = "hy-AM"; locale = "hy-AM";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "2100b04070066d8ce65d7bb3bf25d4f3dcdec4c14dce3f9c5455923de84e6c84"; sha256 = "ec3064d387558c56e80965fc87a73c19ae530802ffff3f0cd35e7026f76655e3";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/id/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/id/thunderbird-91.6.1.tar.bz2";
locale = "id"; locale = "id";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "7e9e2f1d5ee6db5f72a46a5345c6d4bd4e6cfa76c2637609dab0e415b93e1975"; sha256 = "a7635897857f1c4bc86b9208ecbfa983a80a889a24274ce2c41d1fd401163230";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/is/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/is/thunderbird-91.6.1.tar.bz2";
locale = "is"; locale = "is";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "089acd20ab3894dc04ecec3cb85317d40ff9f86a2fef381429f06a70b92f4785"; sha256 = "310cae89c6a62b5a9cf19a81622395b1d9d2de1670dfb9542d8465fd2bebe3a6";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/it/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/it/thunderbird-91.6.1.tar.bz2";
locale = "it"; locale = "it";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "22efeb3bdf740d1b0dfe1850589403758fea11b443ad6099c630e7cab866fbe8"; sha256 = "826223383cfd0ed931f0df19100ec24e22c5ed6eabb71ebee2663a4199368fd5";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ja/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ja/thunderbird-91.6.1.tar.bz2";
locale = "ja"; locale = "ja";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "5e950fb7dae9573d877b783eb12f36cb801f0299fe360e2538aab9a86ffb5911"; sha256 = "a62b2d76c228d54a00dcb81931a010369ab5cb5f7e5d5601fa74076431ec39c9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ka/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ka/thunderbird-91.6.1.tar.bz2";
locale = "ka"; locale = "ka";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "24cb7fb080728903c118a31e56a7d1e02e554b2a03ca272ee0e8f14d58e1b1cd"; sha256 = "2e7b571096baa8d4d68eec97f25197b7504ef0e196bb711344180f4324b260e9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/kab/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kab/thunderbird-91.6.1.tar.bz2";
locale = "kab"; locale = "kab";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "0bfd4b98c2659b7541cdaf2fe4be33f71463d6eaeb14b5722f2916abe82411d0"; sha256 = "378de38b2393987fcbd22057c64c581365ddff6239d8055ac631df9903df4ed4";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/kk/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kk/thunderbird-91.6.1.tar.bz2";
locale = "kk"; locale = "kk";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "62d530819b0bc304416db7e470a8856afb8d41813165a8b3ebc417957d5447fd"; sha256 = "51e8c5d832f8deb27d962ef175cd2bf6ea66fd8c0a24b7c647d4d98d524c3bef";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ko/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ko/thunderbird-91.6.1.tar.bz2";
locale = "ko"; locale = "ko";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "f081bbe2756b4ea78dbbe1a18377eb64ac729329a5bf2c97489dfb03ab1c2949"; sha256 = "a63cf39f84cab3c6a6164a6c62ace5aab948ab71d8934f5869cd2290851c17ac";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/lt/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lt/thunderbird-91.6.1.tar.bz2";
locale = "lt"; locale = "lt";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "26f2cca527fee03e4b7747dceaa0ce1ee0c3f6efb2adc670ec6c1f19d2118d3b"; sha256 = "1d44efdae4a299d57c1ab4769fccc5326e85b95cb2078332aadde3a3d0d72c7a";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/lv/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lv/thunderbird-91.6.1.tar.bz2";
locale = "lv"; locale = "lv";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "f39fb8ddd6e246643750c5f23fa1d5993437c78f4062acc4c3db22d8b1dc3b56"; sha256 = "cc8e4b043ae003d43240df52eed2b3b3a16cc09e963c6bc768d672e6dcb59022";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ms/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ms/thunderbird-91.6.1.tar.bz2";
locale = "ms"; locale = "ms";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "07835a7669f3595f20d7d41db4e799c968d30166f0db764d47b2fb1a8d8e6f0a"; sha256 = "8b64d50a219467347cbe02e237fc1f5473a9d86d8b29fa0cfaa5c423c7265db3";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nb-NO/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nb-NO/thunderbird-91.6.1.tar.bz2";
locale = "nb-NO"; locale = "nb-NO";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "2dda693d9dcd5602cdde27d54871cf5b2b06afceaa0133a77632637a81a4bd69"; sha256 = "71256fe14843fc5c3026dc17d39d9f10b0dcb5ebe0d1769740397db45164e8fe";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nl/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nl/thunderbird-91.6.1.tar.bz2";
locale = "nl"; locale = "nl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "05a884da304dd5c8692ced6b5d974f14e1b0007ae683f3511285b7432828b71c"; sha256 = "6cc1efd14f8fdfde047ac8245fcbd42cc6829d4973fadad43e5113d95c2334af";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nn-NO/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nn-NO/thunderbird-91.6.1.tar.bz2";
locale = "nn-NO"; locale = "nn-NO";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "8250f8d18feb596ed758b07933d590d7f3de016c5ce08eedb6024a4d116acb63"; sha256 = "efcf3519eed57080c022d8ea3e45bb50cb302d6eead93b2e50d3e6d69635b1db";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pa-IN/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pa-IN/thunderbird-91.6.1.tar.bz2";
locale = "pa-IN"; locale = "pa-IN";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "5a510109f30fed267a61d8586714e2554b74866de8b1948c80a39ad7db42e460"; sha256 = "69e27e7a1e7534b6903f3e6a1248b8d62617dbeda0051453f78ebe68bd0e978c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pl/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pl/thunderbird-91.6.1.tar.bz2";
locale = "pl"; locale = "pl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "d3fad496d1aac376fe9557ba039a916a7527a1a120e102724fd35c469adeb8eb"; sha256 = "8903c2302e4ec1a77076cf51a770861738793d4f5ec87faa87da922f1be2d620";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pt-BR/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-BR/thunderbird-91.6.1.tar.bz2";
locale = "pt-BR"; locale = "pt-BR";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "bfd0685dae994a75a284220358b1ebf4d0a71d151b2b674215b5d1c4566784de"; sha256 = "558adf768654a03738f755b765a2c6c3aad514ffbe532b4e47c0d94cd9dfd262";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pt-PT/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-PT/thunderbird-91.6.1.tar.bz2";
locale = "pt-PT"; locale = "pt-PT";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "d4cded9e8e065c312573931b4e60a5a62a154763fdf859a5fc53d120209520f9"; sha256 = "2fb3c682ee289e2bdf1263b5c32f38e31090d742b108b373befb3f093d655e30";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/rm/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/rm/thunderbird-91.6.1.tar.bz2";
locale = "rm"; locale = "rm";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "5761e7778adc41e69351c49db232792096a3d69994f79ce556cd4dbb1a356530"; sha256 = "9e489ce3861ee17a2ee145ed5edb1c0b2c0c3f1446f6fb64081ac623f381ef1d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ro/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ro/thunderbird-91.6.1.tar.bz2";
locale = "ro"; locale = "ro";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "63bd9a8c5035d8964e609159d301ca52e68fef0f136ad378a8016fd1dc7a1ea4"; sha256 = "4bf6b617ea7d4a2ebe81a73c09e24cd1e1bb360ca501a4f139c99a84d1492005";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ru/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ru/thunderbird-91.6.1.tar.bz2";
locale = "ru"; locale = "ru";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "a0d3731c3a6f207e8549d3d5e2e143c0b4620eda6902e9636d8c37558a78d09e"; sha256 = "fd88dd41fd4c93d829c6e44d2d88092652827ed08121c6ba25cd410082cf4991";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sk/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sk/thunderbird-91.6.1.tar.bz2";
locale = "sk"; locale = "sk";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "22635dd9abad4690c52932afd8b9b8cdad03270ef87c18ae3061308c62932064"; sha256 = "53b6fa462a3057e9eec72f75d698631486514839bdf30f6388f9749848846462";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sl/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sl/thunderbird-91.6.1.tar.bz2";
locale = "sl"; locale = "sl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "e2c395a8483115801b34c8de7a34bea1ce219e1cd0012c7d27af4b11e11577f8"; sha256 = "cebe056640e0589c8f4ff029aa74f1666b1a0faeb742f356b74e07b2b0998e39";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sq/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sq/thunderbird-91.6.1.tar.bz2";
locale = "sq"; locale = "sq";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "aeb72ddfb97fa6fad9f4295f00bd01eccc78f919c34b899925383d7877d10454"; sha256 = "9f1bf49edf710455bcf23cd6c14618518ae4b07a75d259e2cc821d5c85c0e0aa";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sr/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sr/thunderbird-91.6.1.tar.bz2";
locale = "sr"; locale = "sr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "ce9b6671b7d138bbad4ccb4a2dd660d8f2ba452f5f331dc8b630005e4a64ff91"; sha256 = "f287d6abde4537dffa599c54910bda7e0f90596f931d88921d0d3248c941166a";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sv-SE/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sv-SE/thunderbird-91.6.1.tar.bz2";
locale = "sv-SE"; locale = "sv-SE";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "59bdd6acf2aecdddb2f31a0e6305ac5eb59d8d8c3ffd6fbaded92d97a8deff4f"; sha256 = "02952a1f2d47394b4a8ce06af67a1058822c47660f69d606e719f215205709d8";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/th/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/th/thunderbird-91.6.1.tar.bz2";
locale = "th"; locale = "th";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "62c76e4291580ec271f36737cb6dd621c6e30ddf02a070b008d312afed0cc727"; sha256 = "8cec77f0fd16e9ab2b316ba884c26f35dbe15694e22e02ecd27d3caec68970bc";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/tr/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/tr/thunderbird-91.6.1.tar.bz2";
locale = "tr"; locale = "tr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "4c59cb186ea76ee79b123d29e3cc8a9c75e58a5f8c46e3b71a7a0b1937d99e42"; sha256 = "aa66efd16a8e5328e20052676d0e06f3ede903a88262c4b01ff0a78ec013f9cb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/uk/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uk/thunderbird-91.6.1.tar.bz2";
locale = "uk"; locale = "uk";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "19df95c2001aee2a6ed00df011caaa5be03062a559619971897640511848856f"; sha256 = "23d654a7755a846b2354c392a6d86f0794f126425e64a19af7c1f047bd758cae";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/uz/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uz/thunderbird-91.6.1.tar.bz2";
locale = "uz"; locale = "uz";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "d773684ed49309e642436b40012b52980286fd07c508d8a9ee92c6210063fa13"; sha256 = "c97b2d05e7043ba438f313569bb6165fd106b9f2351478549a6de5467f980280";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/vi/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/vi/thunderbird-91.6.1.tar.bz2";
locale = "vi"; locale = "vi";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "8bda4d3c6a9ceda51fcccfeadb9942c595acffb8a14823a59523468871332651"; sha256 = "0c4341944eeb0d6724dbabda5dc68796cf40034dffed1d0af2d942af5eb242f2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/zh-CN/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-CN/thunderbird-91.6.1.tar.bz2";
locale = "zh-CN"; locale = "zh-CN";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "4ffa3da9d6c9f45fa90527621af47e67e1c76f09c325a1176be2f14f52ea9362"; sha256 = "86bb80438e4e729faaf57a3b5651b936647ec6ff58c78e263011e242d7e41fbe";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/zh-TW/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-TW/thunderbird-91.6.1.tar.bz2";
locale = "zh-TW"; locale = "zh-TW";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "e3c053b3835566481e1207cc1da3922ce4949c0215553bc2dce5a62715a7a919"; sha256 = "733ec3383204fff674456bdda36f7088e32914fceaa62fa6a98768e9ecbef321";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/af/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/af/thunderbird-91.6.1.tar.bz2";
locale = "af"; locale = "af";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "f131f7266ae90708a4f5a544d5b6b656488e676e79e91e998ac4dacd969effe4"; sha256 = "3c8f1f172919ef3c5327bf337a49ed428f6581e3dc6f3ed69c7f6268cf8f4fea";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ar/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ar/thunderbird-91.6.1.tar.bz2";
locale = "ar"; locale = "ar";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "8dbb28b438d1f72d314b32ad8b884829a9bda3bb3a8d4a677e3abcb0f7edc005"; sha256 = "e938549a5be6c8f1dff66e330cc9e059a352ed9b539145a812838aeec2668bdf";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ast/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ast/thunderbird-91.6.1.tar.bz2";
locale = "ast"; locale = "ast";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "0c1dfbb7b8d001e28ba6fb5648af5d993b3a89e19381cb9bdee898ea7134ec64"; sha256 = "a0d93d9f8c9ed659409f971ebecdd6134db8a4b954db9638b7a440c898adb0b3";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/be/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/be/thunderbird-91.6.1.tar.bz2";
locale = "be"; locale = "be";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "dc4888c238652ff13e66ada3d21e129f3bc01f663dec38bed1f200426c5ec8af"; sha256 = "741da67fb46ef6e73196dec3f0c71ce1024e282421c6a8e111ffb9ba2a2a5014";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/bg/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/bg/thunderbird-91.6.1.tar.bz2";
locale = "bg"; locale = "bg";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "77c370a1f1e9e0683baf5a6a6abe937f198be08cf6ed3a6f29c59c3be64080ff"; sha256 = "afb8fac75b94957f60686c170bec9af438d04c4f42d259e80c07bb446c875aff";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/br/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/br/thunderbird-91.6.1.tar.bz2";
locale = "br"; locale = "br";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "bce47698480a1c38d5b0d397c3e69c3c5ac99a0937885abbd633284614daea6a"; sha256 = "474656d25e48718b303b2d4463465bb7a272cadcabf6360adfaa7dd23c808c2b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ca/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ca/thunderbird-91.6.1.tar.bz2";
locale = "ca"; locale = "ca";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "bf288be4f977ebaffcd2e16c691a3223924fec7f39ec3e7368fb9b88f9c1156b"; sha256 = "c2b4e38ea9810f10455c78de2d68a76655eb855ea8e3d55c895e6f8d5df84066";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cak/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cak/thunderbird-91.6.1.tar.bz2";
locale = "cak"; locale = "cak";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "fcfb6268df5aba758dcefae6e6c0469648d56663789d32175a8e52068d48aaf8"; sha256 = "1da916a640b36c8e2f84e733dfa6b1cd4a7e90dc2367e56522ad3525d646712d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cs/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cs/thunderbird-91.6.1.tar.bz2";
locale = "cs"; locale = "cs";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "529b31c7cd03b0c199a8acab13dfb684db5c2bd9fa10f96e8da748bcaa5e0a04"; sha256 = "f0ff0220167566300fb0913f58056ff81c5b70f2835830d325c1235caa468a99";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cy/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cy/thunderbird-91.6.1.tar.bz2";
locale = "cy"; locale = "cy";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "c4b22b81608421ff5c6ce74ea7b145a6ad09ae506ae25af9ad93ac0434ad1734"; sha256 = "1b8e7ae9b27dab0872443a2b26733888d569765e6e72cfaea775d157273c8344";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/da/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/da/thunderbird-91.6.1.tar.bz2";
locale = "da"; locale = "da";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "cf28d1a77ac2acf26fc314628fe21e5c9ddfcbe85a76d28070d15d78a6b73360"; sha256 = "79ae2ac91c0540e76578556c82bec7340baee79758ef0e157155aed8f1d68b3b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/de/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/de/thunderbird-91.6.1.tar.bz2";
locale = "de"; locale = "de";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "a752cd04414a80ed92e42bf95b6460714b500e1d466d5663a64c9dcc7a678e66"; sha256 = "cf5096d178152abfcc5fbe7cd109722875d8d11575b526577e713a4efd28d226";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/dsb/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/dsb/thunderbird-91.6.1.tar.bz2";
locale = "dsb"; locale = "dsb";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "31ef88cc4cc2892fd501df71a751aa3c3ee8acc61fdb437897172de8e75de9c2"; sha256 = "a650eda884498dd7d0e3dbd73cb1e9b020f10e690ce26d77ed654c0202f1d915";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/el/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/el/thunderbird-91.6.1.tar.bz2";
locale = "el"; locale = "el";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "5edf4e1008b3d8d19d623a8f3cf2d8fb1f7a1030de9db686bfb8c09c61e740d2"; sha256 = "be65c035956efd25246265fa102f934fc14794457fc110d815b140165c81fed9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-CA/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-CA/thunderbird-91.6.1.tar.bz2";
locale = "en-CA"; locale = "en-CA";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "60e91f33b0b5e75e4a18f1fac688e4c249be77874103d1a44ad2cbd1188afc6d"; sha256 = "dc906637f397a2ad86b72d8c4636b511263255327b3a92da5adc9d3444117311";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-GB/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-GB/thunderbird-91.6.1.tar.bz2";
locale = "en-GB"; locale = "en-GB";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "b08d2650702304409b19967d5ff6883881d37577c8e3ed0d545e36e81306cc96"; sha256 = "0f028e97594448ab058b839e3a4ab2f3aaefe79732512a4f193c53dc75c59e3c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-US/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-US/thunderbird-91.6.1.tar.bz2";
locale = "en-US"; locale = "en-US";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "347dfd3d8bf993e2fdc7c844c8b1a94925ab637acad9e07a1616f8657e8574b3"; sha256 = "5f24ac86a2e91f4568d179529caf5254c3aff65593b3a79d25ef96d03211d0c0";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/es-AR/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-AR/thunderbird-91.6.1.tar.bz2";
locale = "es-AR"; locale = "es-AR";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "e2c23ea75312f53201e02079063c946ae76fd11acb75cafed8d643ad49e5d484"; sha256 = "5c5a93460f61d7e8a7168c14a46ff24fdecbf67c06da0aab2b30602bd1a1ef51";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/es-ES/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-ES/thunderbird-91.6.1.tar.bz2";
locale = "es-ES"; locale = "es-ES";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "205d541dc22a3961b1aaaafd617743d1a25b52ee5bdf8b9add6ca56fbcd6861e"; sha256 = "8ecf33158eda96155604583c57dccc55c7168abd8dc161e8801da0e7c7d24b40";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/et/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/et/thunderbird-91.6.1.tar.bz2";
locale = "et"; locale = "et";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "4967717f2b6c21d9868e4fdb812e999f3002bb197b3a111a479d97fabc70d2c2"; sha256 = "a0e3b7c8c095dd8c116630fec01f50fca6b07d83902a7a004d2f4b52b02536e2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/eu/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/eu/thunderbird-91.6.1.tar.bz2";
locale = "eu"; locale = "eu";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "ea5ad491a38b4fd3b78f0741b7545ea7a9d11c3cd82f992fe7b6f38acd4f1a36"; sha256 = "e18f1f105a7e7a88410e749ed9e6e51685cbd6d9fd44f37c8146d333ba405274";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fi/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fi/thunderbird-91.6.1.tar.bz2";
locale = "fi"; locale = "fi";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "45884d2b6d7af2a2f9f4195d5ddc9eadbd34a0d6cae039193b4eba4da49e3909"; sha256 = "984c5d69ef752ae62b08e6615ca19384ff9b2a46167d17ad01e71bec48dd7996";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fr/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fr/thunderbird-91.6.1.tar.bz2";
locale = "fr"; locale = "fr";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "1d2153eb9e903a37e03596e11d2bc0a869260421ac07b3787d05a163c9c5b32d"; sha256 = "ae2fabdf55e587f3b57849ddd518bfac0035f5c0e1eaed585713f022fb50fcab";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fy-NL/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fy-NL/thunderbird-91.6.1.tar.bz2";
locale = "fy-NL"; locale = "fy-NL";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "6ad87450cbb8a98fbd55d7399ef73f5668c1f8e288cb6d36b426fc8c373837bd"; sha256 = "a4abcd89e36fbdad7f2102142b0790f1223116b5a016bce6cffd59f5547b26e7";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ga-IE/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ga-IE/thunderbird-91.6.1.tar.bz2";
locale = "ga-IE"; locale = "ga-IE";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "4b268107debcde5a45fc69c5ce4881b0bc8b9809a2cfcf877fe655339ec5890d"; sha256 = "eff63f42237deb6ecaa60b940ec877e88827769346e14d55624ce3044fac1860";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/gd/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gd/thunderbird-91.6.1.tar.bz2";
locale = "gd"; locale = "gd";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "3a6f0b431d5301a9cdf1499b186580bfbf468aad4e7123175a9defa04e68e6ac"; sha256 = "4399f90f6e28be1bfd68ef3273a4b11cb3a912394033a4ba4f0f722eceeb916e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/gl/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gl/thunderbird-91.6.1.tar.bz2";
locale = "gl"; locale = "gl";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "e79001ca8b96cc9c5cb1a9ada3362e5365b68c05b4324ff2d36e1421faee691a"; sha256 = "be6a01476604cf120131724e0e5afc1951421baf489c231fd10115b947a56f41";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/he/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/he/thunderbird-91.6.1.tar.bz2";
locale = "he"; locale = "he";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "d246a1b5a9d03e656392df6fdd4a6dda9e035551d0498519fbf53d44ec033a34"; sha256 = "fd3548a80dc4983b264f5a2062d87bd9956c681fc191d35246bac2248c61c429";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hr/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hr/thunderbird-91.6.1.tar.bz2";
locale = "hr"; locale = "hr";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "f3d4604bea32362a4ee9ca41d3ef98e910ff448b32e37d0c59dc33d92366ab1f"; sha256 = "e149a9a469ef013264ffbcf10051e1476f946f52ad4eae8f734643394f6f74c8";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hsb/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hsb/thunderbird-91.6.1.tar.bz2";
locale = "hsb"; locale = "hsb";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "8ca969121ab8fc69dc598415a7d5ece9fd86e51c3b90f48f9c51d01157a3a14e"; sha256 = "77baab4a6d3ba3339cc32475fdd654034eb57e61d2c51258e38eba6c14aa2f89";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hu/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hu/thunderbird-91.6.1.tar.bz2";
locale = "hu"; locale = "hu";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "8b76452c8aa27409237d592fa386f8fa257bf44151e77f5cbf990b1c7580689f"; sha256 = "c796ac09b0e4033f1ab9d1e6da4b78e540f1b731bfbcda040743e409164ea2f1";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hy-AM/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hy-AM/thunderbird-91.6.1.tar.bz2";
locale = "hy-AM"; locale = "hy-AM";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "7855e8b013d16365fcbf883646ac83f8c094b3efc4ab9c6ada1eccf211c53d2e"; sha256 = "c6023895e3e26e7b52c277640702a821bf4a562287ba7d8e632a59774a6757ee";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/id/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/id/thunderbird-91.6.1.tar.bz2";
locale = "id"; locale = "id";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "b41b74af5f85a56e0ffe6345f78f39190b22a867110ef043f24300f68e845324"; sha256 = "a76f567644ef6092168e2c526839bc0901a18533f08ac525381e74f77e9fcb7d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/is/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/is/thunderbird-91.6.1.tar.bz2";
locale = "is"; locale = "is";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "963c23e640536d88fc486b654e69584587cdc39d2acff9f64372faf7fd73f8db"; sha256 = "a023e32837355ab83583bcf504e9ff3210f3a68d30c73477ec158ef1162df4eb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/it/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/it/thunderbird-91.6.1.tar.bz2";
locale = "it"; locale = "it";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "4835f22538eaf2da8913d79ae575c7401fcc7fb3b7c0d21d386906c055ed7912"; sha256 = "459aec2da31a3159f0d81cb0876686e63d9b1e72ad36e967472d1ce98c380983";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ja/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ja/thunderbird-91.6.1.tar.bz2";
locale = "ja"; locale = "ja";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "edd3a047d63172f5f42fa31b4b89a8d07c6d9eccb3d53d19f4f7ad8cc1cea539"; sha256 = "307faf7556594072ab83121c1774005392bc556396c5234a2467ef6843a490f9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ka/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ka/thunderbird-91.6.1.tar.bz2";
locale = "ka"; locale = "ka";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "06b55cb6215cece0d95827eeb196bd5f1255d348a7d906a0515667a71050ef85"; sha256 = "42cd7f10453541b23099631f402ff70103131025ef868de06fe2e82430bb7eb3";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/kab/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kab/thunderbird-91.6.1.tar.bz2";
locale = "kab"; locale = "kab";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "36de72132e0311c4428182c5795249e37042f1eb05d1c05aeff9f1e46b602656"; sha256 = "cc62b8ce7bea99dd9e9cf660f5dcaac4b9a44746b7b4cccf84612ef844df9e7e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/kk/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kk/thunderbird-91.6.1.tar.bz2";
locale = "kk"; locale = "kk";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "e3462a463f867b4645bc77739e275deae77bf64068a6ddd1522ac281cfbfbd3d"; sha256 = "ee9e74534c1d7716ea80e2874007b4f9778942bcae559effc830477e614341ee";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ko/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ko/thunderbird-91.6.1.tar.bz2";
locale = "ko"; locale = "ko";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "e90f011e920958ea853dd426f57a1e5cb0593ce117d5a9e19a90c6df69d729c9"; sha256 = "12106fad7493ce63c189b0a7e92c9828c7b2d46d7f5cd9ecadbc90be041e6bbd";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/lt/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lt/thunderbird-91.6.1.tar.bz2";
locale = "lt"; locale = "lt";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "4e3eaffa505b5f8a37b0534a754ab89c2f7b4dc65ead78ca266d4fa8cb5aa841"; sha256 = "ead9b5e035f2fcd1213aba5e63c8898b96bf0bfaefde7709228014aadf608420";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/lv/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lv/thunderbird-91.6.1.tar.bz2";
locale = "lv"; locale = "lv";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "0dd8c818bd60cd6e67df751933c0aeb89bf10fa64235edc639955c86a0e51168"; sha256 = "72980d6c676a269b9d3220a171cffd67ebc1dc0759bef5ac15db76725aac86cc";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ms/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ms/thunderbird-91.6.1.tar.bz2";
locale = "ms"; locale = "ms";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "b0b9f303014a1b90a52ec39f36f2e2029562ef70fcc9b77c0f7048558f1ad7bf"; sha256 = "dfd0cfceee31c31a300ebe37fe99690008f5a21992e7188680b319fe5b5d0207";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nb-NO/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nb-NO/thunderbird-91.6.1.tar.bz2";
locale = "nb-NO"; locale = "nb-NO";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "89f787643d5d2451a0f7095f69805d4c0d0e05c62fbe0468c78b6bcc9dfc0dcd"; sha256 = "7610a56f57d4753f6fd7a55147d7a22157453b47548fe807b5fdbc1ef166eda0";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nl/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nl/thunderbird-91.6.1.tar.bz2";
locale = "nl"; locale = "nl";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "9ebf8a5cd8df953078dc634ac17325c8e0fdd01cce3dbb8561fb29e8b8a4e6cd"; sha256 = "6a470f707e9838937c67e2ce7c2da216e23964bab94c4590d20cedb4b337d18d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nn-NO/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nn-NO/thunderbird-91.6.1.tar.bz2";
locale = "nn-NO"; locale = "nn-NO";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "ec702407e9dfd14de776a5409413b8ddf3c32cf6aa17e8a37ba349e8fa7ba1db"; sha256 = "e393dfbd10ae6ce910ed594ca6d314d048d57e98a1a01d53be82788d6a3988d2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pa-IN/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pa-IN/thunderbird-91.6.1.tar.bz2";
locale = "pa-IN"; locale = "pa-IN";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "f26de0a71646669f07ba23c8e181700b1569ce41049f62215c19ca746a4ca38d"; sha256 = "ddc8558e84531478a4295fe1a3b09f95df458e1f1ecec89b0e1ee19e0dea6e5c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pl/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pl/thunderbird-91.6.1.tar.bz2";
locale = "pl"; locale = "pl";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "d497057a71cfe867f53a5dadf3b1b8fdf30db8470cbfedd416b39acef3d61163"; sha256 = "015e25da0565942bbad23a9e0a345cbec4b24676c21286bbce3cf85938031ca2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pt-BR/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-BR/thunderbird-91.6.1.tar.bz2";
locale = "pt-BR"; locale = "pt-BR";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "90367905fe8dd83f9c6acb093e9ba6583124171037755ef2f3a6771c94e1cb44"; sha256 = "2966875426c08658dcc5aec7e91305e40342bb7318b8ba19482b036d6f1efc9e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pt-PT/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-PT/thunderbird-91.6.1.tar.bz2";
locale = "pt-PT"; locale = "pt-PT";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "b611af59f7f88efa10aef43f8ac464b5c514412b534cff39eb2844ae1ca18077"; sha256 = "c3ee66dff637e75aaa4a8e3d40c85176e152c19464e7afcbd40cc1e3108a1d91";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/rm/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/rm/thunderbird-91.6.1.tar.bz2";
locale = "rm"; locale = "rm";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "5d75ac9e6c0c27b0faf436d69305f206e09867c306264a4de30cd3b1f879c1d0"; sha256 = "c320c05190b160ad807528e9be6604ac5f79958fad9a4de32c55842a94db20fd";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ro/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ro/thunderbird-91.6.1.tar.bz2";
locale = "ro"; locale = "ro";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "aa64e96ad2d1a361c8cd96b5b0e88cdd51eba2c3c036ac453ff9225320d08f6a"; sha256 = "90547a8965aec3db8d4150c0e232bdf6e623df1850cb206a9cbca43432a3cd35";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ru/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ru/thunderbird-91.6.1.tar.bz2";
locale = "ru"; locale = "ru";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "6d293d0ee9eebd01c6e36e085333c4da15f0ce2ece73dc99015545255a435538"; sha256 = "1dbaf198232b519711c90646c05d77b16bdad20054aaa7f313255ac15e773dec";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sk/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sk/thunderbird-91.6.1.tar.bz2";
locale = "sk"; locale = "sk";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "37436cda08659abd49108f7e9a8ee5645d2ee1ed0086a7b4158279342d0cbdfb"; sha256 = "8d92baafe787bdd054cf7c76a7135a6075da0bd573237f28dcb379fb6e1f7c49";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sl/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sl/thunderbird-91.6.1.tar.bz2";
locale = "sl"; locale = "sl";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "fc8e6fed968e6312f69545479b5b3230390d41490a2a5b6385f046a2a3709018"; sha256 = "f6ba6c8a7c7aacd28959c85adf708ad1661b4921c82035a1c954c6f6264d101a";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sq/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sq/thunderbird-91.6.1.tar.bz2";
locale = "sq"; locale = "sq";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "ce68e8f855d6d366b1490cc3b7e044a84fba63bcfa11453afc4b98ec665450c6"; sha256 = "e4fe39206253ab53000e5d5265e2cf3183f8c15900f1f0e5ba23cbe141145e20";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sr/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sr/thunderbird-91.6.1.tar.bz2";
locale = "sr"; locale = "sr";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "128843650ddfa57493c8691e7c591685cca4b1ab6c118949ef1580318954f110"; sha256 = "469cda2fad3873e8de320ee7a68c45c4da6cad5e6d9904242d2c489a1e5b829e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sv-SE/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sv-SE/thunderbird-91.6.1.tar.bz2";
locale = "sv-SE"; locale = "sv-SE";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "7180055d5184c38f3fb893538b0c270d3d125da4434debe6fffdcd3288d8ea53"; sha256 = "0303bb0290c84ede66d657ac88795e879611c42815e5eaec98beb235d7764922";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/th/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/th/thunderbird-91.6.1.tar.bz2";
locale = "th"; locale = "th";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "4b964b7517b941622f18328f73813aca740a4da1799805a0a267b510704308e7"; sha256 = "5915739123b4c14d72f919fdb193a65e3a15ef472e563d21d7e1e872858f3364";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/tr/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/tr/thunderbird-91.6.1.tar.bz2";
locale = "tr"; locale = "tr";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "71d551988a6ff2bd96900bf4ce72e05ac47bcb36af9a25af4e3b76d16da37d50"; sha256 = "8cf4a385c861d5905b742a0366df783666a05e154b4e0f23e65f883c81b2bfd9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/uk/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uk/thunderbird-91.6.1.tar.bz2";
locale = "uk"; locale = "uk";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "e62b6fce0bb1175c9c6acb37ff9454509766d4953fb0d4494023143fd70650a9"; sha256 = "7e1a14c20e1ef7aa923bdb8d09a3a513dedd653388721d8537f42354c0cf386d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/uz/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uz/thunderbird-91.6.1.tar.bz2";
locale = "uz"; locale = "uz";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "c5c9e10e82ab793d9a82d95bcb20eb288395e32c27dcf5ca2a91fc937e479aba"; sha256 = "8f129954fcccf19fe4e46cb66f35fa298ef396d5327f647d1e7b813345dc7ecf";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/vi/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/vi/thunderbird-91.6.1.tar.bz2";
locale = "vi"; locale = "vi";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "081895dc1684360c0859d5084ece871c7539e91b858392dbaa3ddf8ee0f38ea9"; sha256 = "ab232199fe149938019dd3e8a242630875be9529e32050f94add2419d2690726";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/zh-CN/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-CN/thunderbird-91.6.1.tar.bz2";
locale = "zh-CN"; locale = "zh-CN";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "b5fadde23bd94f3ab2fbe6b8070040d9e89a506a399d9c1348b80a8639b8220b"; sha256 = "cb58b53ffb9eb1d05ff3ae856a80f8f504f86e8cdaa2075ff5b5bfcc27712b97";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/zh-TW/thunderbird-91.5.1.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-TW/thunderbird-91.6.1.tar.bz2";
locale = "zh-TW"; locale = "zh-TW";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "4d31d6a8d4f94486e4ebec3c98d2d535fd5485b3b73dfa0a52760300608c7eac"; sha256 = "441a2fc15f7d4efeb7f76cef1166c694cd7713b12f75aab0ceae161f3e77f934";
} }
]; ];
} }

View File

@ -10,12 +10,12 @@ in
rec { rec {
thunderbird = common rec { thunderbird = common rec {
pname = "thunderbird"; pname = "thunderbird";
version = "91.6.0"; version = "91.6.1";
application = "comm/mail"; application = "comm/mail";
binaryName = pname; binaryName = pname;
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "a11eafe1390141ee3508eea06ba8ab135d0725513977a3b37b3b35f413a1f825dc14fef530b9ac961840804be59291c7f5cba3c93b12726605d4a7255660f749"; sha512 = "a74d9489bbd2d62916eac8214c6c3a54dfa0c03b56ad471750724315f8bdd96b6ee1079687ac973264ba0f70bdfbf2f183f359c33f7fcda9a9e48914636b1ab2";
}; };
patches = [ patches = [
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.

View File

@ -9,18 +9,18 @@
buildGoModule rec { buildGoModule rec {
pname = "shellhub-agent"; pname = "shellhub-agent";
version = "0.8.2"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shellhub-io"; owner = "shellhub-io";
repo = "shellhub"; repo = "shellhub";
rev = "v${version}"; rev = "v${version}";
sha256 = "saaohHHjX9ws74SXlpP+V9cks0ddLkz04ceY14uoVhA="; sha256 = "A1634b3uxlILMpx/9jpCIApqAqofvD4ZPasVKL29Gtc=";
}; };
modRoot = "./agent"; modRoot = "./agent";
vendorSha256 = "sha256-Xfzk6Ts6+LzGaMTcbopGG6WT541nkAnZxq/3AlX81ks="; vendorSha256 = "sha256-LxJtLQr8djoRGznT5hL2agTgtZY6pFS8Zo0BwHDmugc=";
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "SPAdes"; pname = "SPAdes";
version = "3.15.3"; version = "3.15.4";
src = fetchurl { src = fetchurl {
url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-suWp/XplruWriGIi1q9Pe3vH91XaegOUFXH6vWueFJk="; sha256 = "sha256-OyQcUopCqL398j5b+PAISDR5BZDQhJHezqnw8AnYWJ8=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -1,18 +1,25 @@
{lib, stdenv, fetchurl}: { lib, stdenv, fetchurl, cmake }:
let version = "1.6.0"; in stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "tetgen"; pname = "tetgen";
inherit version; version = "1.6.0";
src = fetchurl { src = fetchurl {
url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz"; url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz";
sha256 = "sha256-h7XmHr06Rx/E8s3XEkwrEd1mOfT+sflBpdL1EQ0Fzjk="; sha256 = "sha256-h7XmHr06Rx/E8s3XEkwrEd1mOfT+sflBpdL1EQ0Fzjk=";
}; };
nativeBuildInputs = [ cmake ];
installPhase = '' installPhase = ''
mkdir -p $out/bin runHook preInstall
mkdir -p $out/{bin,lib,include}
cp tetgen $out/bin cp tetgen $out/bin
cp libtet.a $out/lib
cp ../tetgen.{cxx,h} $out/include
runHook postInstall
''; '';
meta = { meta = {

View File

@ -7,13 +7,13 @@ assert !cudaSupport || cudatoolkit != null;
let boost_static = boost17x.override { enableStatic = true; }; let boost_static = boost17x.override { enableStatic = true; };
in in
mkDerivation rec { mkDerivation rec {
version = "3.6"; version = "3.7";
pname = "colmap"; pname = "colmap";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "colmap"; owner = "colmap";
repo = "colmap"; repo = "colmap";
rev = version; rev = version;
sha256 = "1kfivdmhpmdxjjf30rr57y2iy7xmdpg4h8aw3qgacv8ckfpgda3n"; sha256 = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I=";
}; };
buildInputs = [ buildInputs = [
@ -30,7 +30,7 @@ mkDerivation rec {
with a graphical and command-line interface. with a graphical and command-line interface.
''; '';
homepage = "https://colmap.github.io/index.html"; homepage = "https://colmap.github.io/index.html";
license = licenses.bsd2; license = licenses.bsd3;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ lebastr ]; maintainers = with maintainers; [ lebastr ];
}; };

View File

@ -1,8 +1,8 @@
{ lib, python3Packages }: { lib, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "snakemake"; pname = "snakemake";
version = "6.10.0"; version = "6.15.5";
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
appdirs appdirs
@ -29,12 +29,31 @@ python3Packages.buildPythonApplication rec {
wrapt wrapt
]; ];
src = python3Packages.fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "snakemake";
sha256 = "199a86c8d1fcfdb88c4271a1507b0ab371a15bc407f2dad9b0ab8c43438adff8"; repo = pname;
rev = "v${version}";
sha256 = "sha256-i8C7gPLzUzSxNH9xwpr+fUKI1SvpYFsFBlspS74LoWU=";
}; };
doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json # See
# https://github.com/snakemake/snakemake/blob/main/.github/workflows/main.yml#L99
# for the current basic test suite. Tibanna and Tes require extra
# setup.
checkInputs = with python3Packages; [
pandas
pytestCheckHook
requests-mock
];
disabledTestPaths = [
"tests/test_tes.py"
"tests/test_tibanna.py"
"tests/test_linting.py"
];
pythonImportsCheck = [ "snakemake" ];
meta = with lib; { meta = with lib; {
homepage = "https://snakemake.github.io"; homepage = "https://snakemake.github.io";

View File

@ -6,7 +6,7 @@
mkDerivation rec { mkDerivation rec {
pname = "qgroundcontrol"; pname = "qgroundcontrol";
version = "4.1.4"; version = "4.2.0";
qtInputs = [ qtInputs = [
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
@ -29,6 +29,8 @@ mkDerivation rec {
"CONFIG+=StableBuild" "CONFIG+=StableBuild"
# Default install tries to copy Qt files into package # Default install tries to copy Qt files into package
"CONFIG+=QGC_DISABLE_BUILD_SETUP" "CONFIG+=QGC_DISABLE_BUILD_SETUP"
# Tries to download x86_64-only prebuilt binaries
"DEFINES+=DISABLE_AIRMAP"
"../qgroundcontrol.pro" "../qgroundcontrol.pro"
]; ];
@ -62,13 +64,13 @@ mkDerivation rec {
owner = "mavlink"; owner = "mavlink";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0lhc36jpy7a5bnysqi574nk5izglj557mf8n9lcsgvzwxlkb2rbf"; sha256 = "sha256-TBnJQKO9cwxP9q+bIB1CaGnm9npymJ3iEAD9kPJi9JA=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta = with lib; { meta = with lib; {
description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks";
homepage = "http://qgroundcontrol.org/"; homepage = "http://qgroundcontrol.com/";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ lopsided98 ]; maintainers = with maintainers; [ lopsided98 ];

View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, libgit2, ...}: { fetchFromGitHub, libgit2, ... }:
libgit2.overrideAttrs (oldAttrs: { libgit2.overrideAttrs (oldAttrs: {
cmakeFlags = oldAttrs.cmakeFlags ++ [ cmakeFlags = oldAttrs.cmakeFlags ++ [
@ -8,15 +8,18 @@ libgit2.overrideAttrs (oldAttrs: {
"-DUSE_BUNDLED_ZLIB=ON" "-DUSE_BUNDLED_ZLIB=ON"
"-DUSE_GSSAPI=OFF" "-DUSE_GSSAPI=OFF"
"-DUSE_HTTPS=OFF" "-DUSE_HTTPS=OFF"
"-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2 "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2
"-DUSE_NTLMCLIENT=OFF" "-DUSE_NTLMCLIENT=OFF"
"-DUSE_SSH=OFF" "-DUSE_SSH=OFF"
"-DZERO_NSEC=ON" "-DZERO_NSEC=ON"
]; ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "romkatv"; owner = "romkatv";
repo = "libgit2"; repo = "libgit2";
rev = "tag-0ad3d776aa86dd607dc86dcd7f77ad3ed7ebec61"; rev = "tag-0ad3d776aa86dd607dc86dcd7f77ad3ed7ebec61";
sha256 = "sha256-mXCmspM3fqI14DF9sAIMH5vGdMMjWkdDjdME4EiQuqY="; sha256 = "sha256-mXCmspM3fqI14DF9sAIMH5vGdMMjWkdDjdME4EiQuqY=";
}; };
patches = [ ];
}) })

View File

@ -14,6 +14,8 @@ let
rev = "109b4c887ffb63962c7017a66fc4a1f48becb48e"; rev = "109b4c887ffb63962c7017a66fc4a1f48becb48e";
sha256 = "sha256-w029FHpOv5K49wE1OJMOlkTe+2cv+ORYqEHxs59GDBI="; sha256 = "sha256-w029FHpOv5K49wE1OJMOlkTe+2cv+ORYqEHxs59GDBI=";
}; };
patches = [];
}); });
rubyEnv = bundlerEnv rec { rubyEnv = bundlerEnv rec {

View File

@ -143,5 +143,6 @@ mkDerivation rec {
maintainers = with maintainers; [ jb55 MP2E V ]; maintainers = with maintainers; [ jb55 MP2E V ];
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
mainProgram = "obs";
}; };
} }

View File

@ -1,7 +1,20 @@
{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }: { lib
, stdenv
, fetchFromGitHub
, gtk3
, hicolor-icon-theme
, jdupes
, colorVariants ? [] # default: all
}:
let
pname = "vimix-icon-theme";
in
lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Black" "White" ] colorVariants
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vimix-icon-theme"; inherit pname;
version = "2021-11-09"; version = "2021-11-09";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -23,10 +36,16 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
patchShebangs install.sh patchShebangs install.sh
./install.sh -a -d $out/share/icons
./install.sh \
${if colorVariants != [] then builtins.toString colorVariants else "-a"} \
-d $out/share/icons
# replace duplicate files with symlinks # replace duplicate files with symlinks
jdupes -l -r $out/share/icons jdupes -L -r $out/share/icons
runHook postInstall runHook postInstall
''; '';

View File

@ -1,4 +1,5 @@
{ lib, stdenv { stdenv
, lib
, meson , meson
, fetchurl , fetchurl
, python3 , python3
@ -7,12 +8,12 @@
, glib , glib
, adwaita-icon-theme , adwaita-icon-theme
, libpeas , libpeas
, libxml2
, gtksourceview4 , gtksourceview4
, gsettings-desktop-schemas , gsettings-desktop-schemas
, wrapGAppsHook , wrapGAppsHook
, ninja , ninja
, libsoup , libsoup
, tepl
, gnome , gnome
, gspell , gspell
, perl , perl
@ -23,11 +24,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gedit"; pname = "gedit";
version = "40.1"; version = "41.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm"; sha256 = "epsYsViAjRiSmJFl83BsTxooKXkHmrdFinnTwkrU3rU=";
}; };
patches = [ patches = [
@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils desktop-file-utils
itstool itstool
libxml2
meson meson
ninja ninja
perl perl
@ -57,7 +59,6 @@ stdenv.mkDerivation rec {
gtksourceview4 gtksourceview4
libpeas libpeas
libsoup libsoup
tepl
]; ];
postPatch = '' postPatch = ''
@ -81,7 +82,7 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Apps/Gedit"; homepage = "https://wiki.gnome.org/Apps/Gedit";
description = "Official text editor of the GNOME desktop environment"; description = "Official text editor of the GNOME desktop environment";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl2; license = licenses.gpl2Plus;
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "evolution-data-server"; pname = "evolution-data-server";
version = "3.42.3"; version = "3.42.4";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "b1hHoSNHmQc+lYXbhhwhOBoJ7VUNwKISXwC6X5C9Nh0="; sha256 = "fftBs+bAWBHUSajeTfx3q5sZ+O3yCzL92FeRhmIm0lI=";
}; };
patches = [ patches = [

View File

@ -68,11 +68,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-control-center"; pname = "gnome-control-center";
version = "41.2"; version = "41.4";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-gnH8azPsJBileDBN0+V9Zl8NfMcGqZqXvkGYSGGP4kg="; sha256 = "sha256-1tsMTLcIV77PSKxQB/ErX2O51dfoDqfuV9O+USZp98k=";
}; };
patches = [ patches = [

View File

@ -42,11 +42,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-software"; pname = "gnome-software";
version = "41.3"; version = "41.4";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "ZQVjN3q2mxAQXfdxuz8hY3lVO7evQISNjDBljgEAmLw="; sha256 = "evhzzkcs8racUbyevGG4Nt+8z9b0Jwbj7TqpCaruxGU=";
}; };
patches = [ patches = [

View File

@ -2,7 +2,7 @@
, stdenv , stdenv
, gettext , gettext
, fetchurl , fetchurl
, webkitgtk_4_1 , webkitgtk
, pkg-config , pkg-config
, gtk3 , gtk3
, glib , glib
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
glib glib
webkitgtk_4_1 webkitgtk
sqlite sqlite
libxml2 libxml2
libxslt libxslt
@ -44,6 +44,10 @@ stdenv.mkDerivation rec {
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-good
]; ];
# To reduce the GNOME ISO closure size. Remove when other packages
# are using webkit2gtk_4_1.
configureFlags = ["--with-webkit2gtk-4-0"];
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = "yelp"; packageName = "yelp";

View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-autoar"; pname = "gnome-autoar";
version = "0.4.2"; version = "0.4.3";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "HSBpQHkwDhL+q9t3MEqWnRzBkNHRKpSb6EXK0Bx4pdM="; sha256 = "e98HiVU0lqvdw8ljsM5zY4BcDALAJf7d68qsx4cknog=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -17,14 +17,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.42.2"; version = "3.42.5";
pname = "gpaste"; pname = "gpaste";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Keruspe"; owner = "Keruspe";
repo = "GPaste"; repo = "GPaste";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-VWtq1jPwUHHIDpVaSYQ0FiihlfulRofFmacMyv/buMw="; sha256 = "sha256-BpDA2V40V+VF2CB7ik+edMxrRtYSFnTQ48ec6pt8Jo4=";
}; };
patches = [ patches = [

View File

@ -30,7 +30,7 @@ mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Look at your windows and desktops from above."; description = "Look at your windows and desktops from above.";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ mjlbach ]; maintainers = with maintainers; [ ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
inherit (kwindowsystem.meta) platforms; inherit (kwindowsystem.meta) platforms;
}; };

View File

@ -0,0 +1,106 @@
{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
, ffmpeg, python3, ruby, icu68 }:
let
major = "17";
update = ".0.0.1";
build = "+1";
repover = "${major}${update}${build}";
gradle_ = (gradle_7.override {
java = openjdk17_headless;
});
makePackage = args: stdenv.mkDerivation ({
version = "${major}${update}${build}";
src = fetchFromGitHub {
owner = "openjdk";
repo = "jfx";
rev = repover;
sha256 = "sha256-PSiE9KbF/4u9VyBl9PAMLGzKyGFB86/XByeh7vhL6Kw=";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg icu68 ];
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];
dontUseCmakeConfigure = true;
config = writeText "gradle.properties" (''
CONF = Release
JDK_HOME = ${openjdk17_headless.home}
'' + args.gradleProperties or "");
buildPhase = ''
runHook preBuild
export GRADLE_USER_HOME=$(mktemp -d)
ln -s $config gradle.properties
export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
gradle --no-daemon $gradleFlags sdk
runHook postBuild
'';
} // args);
# Fake build to pre-download deps into fixed-output derivation.
# We run nearly full build because I see no other way to download everything that's needed.
# Anyone who knows a better way?
deps = makePackage {
pname = "openjfx-deps";
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
installPhase = ''
find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
| sh
rm -rf $out/tmp
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo=";
};
in makePackage {
pname = "openjfx-modular-sdk";
gradleProperties = ''
COMPILE_MEDIA = true
COMPILE_WEBKIT = false
'';
preBuild = ''
swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)"
substituteInPlace build.gradle \
--replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \
--replace 'name: SWT_FILE_NAME' "files('$swtJar')"
'';
installPhase = ''
cp -r build/modular-sdk $out
'';
stripDebugList = [ "." ];
postFixup = ''
# Remove references to bootstrap.
export openjdkOutPath='${openjdk17_headless.outPath}'
find "$out" -name \*.so | while read lib; do
new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
patchelf --set-rpath "$new_refs" "$lib"
done
'';
disallowedReferences = [ openjdk17_headless ];
passthru.deps = deps;
meta = with lib; {
homepage = "http://openjdk.java.net/projects/openjfx/";
license = licenses.gpl2;
description = "The next-generation Java client toolkit";
maintainers = with maintainers; [ abbradar ];
platforms = platforms.unix;
};
}

View File

@ -11,19 +11,20 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zig"; pname = "zig";
version = "0.9.0"; version = "0.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ziglang"; owner = "ziglang";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-Hfl1KKtGcopMrn+U9r0/qr/wReWJIgb8+IgwMoguv/0="; hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
llvmPackages.llvm.dev llvmPackages.llvm.dev
]; ];
buildInputs = [ buildInputs = [
libxml2 libxml2
zlib zlib

View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "BoCA"; pname = "BoCA";
version = "1.0.5"; version = "1.0.6a";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "enzo1982"; owner = "enzo1982";
repo = "boca"; repo = "boca";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ooLPpwTxG7QBAGhEGhta4T06ZDWlPysocHbb/Sq7Wyo="; sha256 = "sha256-LndlwdM5NlTv73Z1lMkHuIZkVfn48P/LssBnE4X9Sgc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1,38 +0,0 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, python3
, zlib, libssh2, openssl, pcre, http-parser
, libiconv, Security
}:
stdenv.mkDerivation rec {
pname = "libgit2";
version = "1.3.0";
# keep the version in sync with python3.pkgs.pygit2 and libgit2-glib
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920=";
};
cmakeFlags = [
"-DTHREADSAFE=ON"
"-DUSE_HTTP_PARSER=system"
];
nativeBuildInputs = [ cmake python3 pkg-config ];
buildInputs = [ zlib libssh2 openssl pcre http-parser ]
++ lib.optional stdenv.isDarwin Security;
propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv;
doCheck = false; # hangs. or very expensive?
meta = {
description = "The Git linkable library";
homepage = "https://libgit2.github.com/";
license = lib.licenses.gpl2;
platforms = with lib.platforms; all;
};
}

View File

@ -62,7 +62,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gtk4"; pname = "gtk4";
version = "4.6.0"; version = "4.6.1";
outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
outputBin = "dev"; outputBin = "dev";
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
sha256 = "eC1ZUfv9WF/J7HbAnQfijmAUxy2wAftWf/8hf7luTYw="; sha256 = "2FUI0hy7zWPVaKeGKvXs1juXjX1XmcvkBMkdI4nQ7F8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -7,14 +7,11 @@
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = let postfix = if gtkVersion == null then "glib" else "gtk${gtkVersion}"; pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}";
in "libdbusmenu-${postfix}-${version}"; version = "16.04.0";
version = "${versionMajor}.${versionMinor}";
versionMajor = "16.04";
versionMinor = "0";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/${versionMajor}/${version}/+download/libdbusmenu-${version}.tar.gz"; url = "https://launchpad.net/dbusmenu/${lib.versions.majorMinor version}/${version}/+download/libdbusmenu-${version}.tar.gz";
sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r";
}; };

View File

@ -0,0 +1,58 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, python3
, zlib
, libssh2
, openssl
, pcre
, http-parser
, libiconv
, Security
}:
stdenv.mkDerivation rec {
pname = "libgit2";
version = "1.4.0";
# also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "sha256-21t7fD/5O+HIHUDEv8MqloDmAIm9sSpJYqreCD3Co2k=";
};
patches = [
(fetchpatch {
url = "https://github.com/libgit2/libgit2/commit/8bc9eda779b2e2602fc74944aba5d39198e0642f.patch";
sha256 = "sha256-r2i4+WsrxIpSwH0g/AikBdAajBncXb1zz0uOQB0h1Jk=";
})
];
cmakeFlags = [
"-DTHREADSAFE=ON"
"-DUSE_HTTP_PARSER=system"
"-DUSE_SSH=ON"
];
nativeBuildInputs = [ cmake python3 pkg-config ];
buildInputs = [ zlib libssh2 openssl pcre http-parser ]
++ lib.optional stdenv.isDarwin Security;
propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv;
doCheck = false; # hangs. or very expensive?
meta = {
description = "Linkable library implementation of Git that you can use in your application";
homepage = "https://libgit2.org/";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ ];
};
}

View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmysqlconnectorcpp"; pname = "libmysqlconnectorcpp";
version = "8.0.27"; version = "8.0.28";
src = fetchurl { src = fetchurl {
url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz";
sha256 = "sha256-WIZpj8aCpeh0CCLtm0YbxRtgz5y6304cf+vllYSyv7c="; sha256 = "sha256-yyb+neBaO18e0ioZlCm2eR7OGEM+sEZeKnP89EWGQgs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "https://dev.mysql.com/downloads/connector/cpp/"; homepage = "https://dev.mysql.com/downloads/connector/cpp/";
description = "C++ library for connecting to mysql servers"; description = "C++ library for connecting to mysql servers";
license = lib.licenses.gpl2; license = lib.licenses.gpl2Only;
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ndpi"; pname = "ndpi";
version = "4.0"; version = "4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ntop"; owner = "ntop";
repo = "nDPI"; repo = "nDPI";
rev = version; rev = version;
sha256 = "0snzvlracc6s7r2pgdn0jqcc7nxjxzcivsa579h90g5ibhhplv5x"; sha256 = "sha256-ZWWuyPGl+hbrfXdtPvCBqMReuJ4FiGx+qiI7qCz6wtQ=";
}; };
configureScript = "./autogen.sh"; configureScript = "./autogen.sh";
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
nDPI is a library for deep-packet inspection based on OpenDPI. nDPI is a library for deep-packet inspection based on OpenDPI.
''; '';
homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/"; homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/";
license = with licenses; lgpl3; license = with licenses; [ lgpl3Plus bsd3 ];
maintainers = with maintainers; [ takikawa ]; maintainers = with maintainers; [ takikawa ];
platforms = with platforms; unix; platforms = with platforms; unix;
}; };

View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Vulkan Header files and API registry"; description = "Vulkan Header files and API registry";
homepage = "https://www.lunarg.com"; homepage = "https://www.lunarg.com";
platforms = platforms.linux; platforms = platforms.unix;
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.ralith ]; maintainers = [ maintainers.ralith ];
}; };

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb
, libXrandr, wayland, vulkan-headers, addOpenGLRunpath }: , libXrandr, wayland, moltenvk, vulkan-headers, addOpenGLRunpath }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vulkan-loader"; pname = "vulkan-loader";
@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
}); });
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libX11 libxcb libXrandr vulkan-headers wayland ]; buildInputs = [ vulkan-headers ]
++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ];
cmakeFlags = [ cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]
"-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share"
"-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share";
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "LunarG Vulkan loader"; description = "LunarG Vulkan loader";
homepage = "https://www.lunarg.com"; homepage = "https://www.lunarg.com";
platforms = platforms.linux; platforms = platforms.unix;
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.ralith ]; maintainers = [ maintainers.ralith ];
}; };

View File

@ -8,17 +8,21 @@
, haversine , haversine
, pytest-asyncio , pytest-asyncio
, pytestCheckHook , pytestCheckHook
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aio-geojson-client"; pname = "aio-geojson-client";
version = "0.15"; version = "0.16";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exxamalte"; owner = "exxamalte";
repo = "python-aio-geojson-client"; repo = "python-aio-geojson-client";
rev = "v${version}"; rev = "v${version}";
sha256 = "0sbzrzmny7x4bkbg6z0cjn4d10r50nxdyaq7g6lagwd8ijpkg8l3"; hash = "sha256-u3SwrSxeBJrBTHfqKY/mAb2p1jqW2AvRsHomKsI81gM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -34,7 +38,9 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
pythonImportsCheck = [ "aio_geojson_client" ]; pythonImportsCheck = [
"aio_geojson_client"
];
meta = with lib; { meta = with lib; {
description = "Python module for accessing GeoJSON feeds"; description = "Python module for accessing GeoJSON feeds";

View File

@ -7,17 +7,21 @@
, pytest-asyncio , pytest-asyncio
, pytestCheckHook , pytestCheckHook
, pytz , pytz
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aio-geojson-geonetnz-quakes"; pname = "aio-geojson-geonetnz-quakes";
version = "0.13"; version = "0.14";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exxamalte"; owner = "exxamalte";
repo = "python-aio-geojson-geonetnz-quakes"; repo = "python-aio-geojson-geonetnz-quakes";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-M1QleYVPqLFjxBmOlNJdydxDTk0JJf+GYVtOTC3YUTA="; hash = "sha256-T3vQodb0/3YEjsyHLSI8DBKK75J8hvsaBqyQI7GkT3U=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -32,7 +36,9 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
pythonImportsCheck = [ "aio_geojson_geonetnz_quakes" ]; pythonImportsCheck = [
"aio_geojson_geonetnz_quakes"
];
meta = with lib; { meta = with lib; {
description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds";

View File

@ -6,13 +6,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "25.0.0"; version = "26.0.0";
pname = "azure-mgmt-compute"; pname = "azure-mgmt-compute";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "sha256-Y0WNBtQ9v0yhTVFfTvfcudWHOjzGagGB+/b++3Ie5Kk="; sha256 = "sha256-nGot8UIeL0DNuw5+v7XmLjrNiJMfpsk1z2K2Tdo4Q+s=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -2,6 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, nose , nose
, pythonOlder
}: }:
let let
@ -19,11 +20,14 @@ let
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "bc-python-hcl2"; pname = "bc-python-hcl2";
version = "0.3.24"; version = "0.3.30";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-YsiMkTPRSKR4511csJOv9/Jf1b3TVUM7N2lInejdNrQ="; hash = "sha256-wfcTIPKbMPa7xpXzkFtxnxG2ZRFzTw35EP7f4zwHxcs=";
}; };
# Nose is required during build process, so can not use `checkInputs`. # Nose is required during build process, so can not use `checkInputs`.

View File

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boost-histogram"; pname = "boost-histogram";
version = "1.2.1"; version = "1.3.1";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
pname = "boost_histogram"; pname = "boost_histogram";
inherit version; inherit version;
sha256 = "a27842b2f1cfecc509382da2b25b03056354696482b38ec3c0220af0fc9b7579"; sha256 = "sha256-Mc05Zlbzo3g04H0wTNuE2ZBrwhcmJqPZL+V30IvPQQ8=";
}; };
nativeBuildInputs = [ setuptools-scm ]; nativeBuildInputs = [ setuptools-scm ];

View File

@ -1,18 +1,27 @@
{ lib, fetchPypi, buildPythonPackage, six }: { lib
, fetchPypi
, buildPythonPackage
, pythonOlder
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "dict2xml"; pname = "dict2xml";
version = "1.7.0"; version = "1.7.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0bfn8n8sb3slwx7ra8m8fbfy65k20h2qxcqfq99hwqrrkgcffihl"; hash = "sha256-ZgCqMx8X7uODNhH3GJmkOnZhLKdVoVdpzyBJLEsaoBY=";
}; };
propagatedBuildInputs = [ six ]; pythonImportsCheck = [
"dict2xml"
];
meta = with lib; { meta = with lib; {
description = "Super simple library to convert a Python dictionary into an xml string"; description = "Library to convert a Python dictionary into an XML string";
homepage = "https://github.com/delfick/python-dict2xml"; homepage = "https://github.com/delfick/python-dict2xml";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ johnazoidberg ]; maintainers = with maintainers; [ johnazoidberg ];

View File

@ -11,14 +11,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "georss-client"; pname = "georss-client";
version = "0.14"; version = "0.15";
format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exxamalte"; owner = "exxamalte";
repo = "python-georss-client"; repo = "python-georss-client";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-rviXXNmDLEVNYOCkqvLT9EXSuVpI5wMlCXnlpUUl1P0="; sha256 = "sha256-D1ggfEDU+vlFmi1USwdHj1due0PrCQCpKF4zaarHCFs=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -32,7 +34,9 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
pythonImportsCheck = [ "georss_client" ]; pythonImportsCheck = [
"georss_client"
];
meta = with lib; { meta = with lib; {
description = "Python library for accessing GeoRSS feeds"; description = "Python library for accessing GeoRSS feeds";

View File

@ -8,14 +8,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "georss-ign-sismologia-client"; pname = "georss-ign-sismologia-client";
version = "0.4"; version = "0.5";
format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exxamalte"; owner = "exxamalte";
repo = "python-georss-ign-sismologia-client"; repo = "python-georss-ign-sismologia-client";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-g7lZC5ZiJV8dNZJceLROqyBRZSuqaivGFhaQrKe4B7g="; hash = "sha256-i3VdxntFwieCmB4ihHRSCV5YKDyYytl3XnU/G1LwLhg=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -26,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
pythonImportsCheck = [ "georss_ign_sismologia_client" ]; pythonImportsCheck = [
"georss_ign_sismologia_client"
];
meta = with lib; { meta = with lib; {
description = "Python library for accessing the IGN Sismologia GeoRSS feed"; description = "Python library for accessing the IGN Sismologia GeoRSS feed";

View File

@ -8,14 +8,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "georss-ingv-centro-nazionale-terremoti-client"; pname = "georss-ingv-centro-nazionale-terremoti-client";
version = "0.5"; version = "0.6";
format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exxamalte"; owner = "exxamalte";
repo = "python-georss-ingv-centro-nazionale-terremoti-client"; repo = "python-georss-ingv-centro-nazionale-terremoti-client";
rev = "v${version}"; rev = "v${version}";
sha256 = "1pd0qsr0n8f1169p2nz8s0zrbrxh0rdzaxdb3jmdymzp4xz28wb0"; sha256 = "sha256-zqjo70NzpUt5zNEar0P1sl/gMb+ZcS+7GX7QGuFjMYY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -26,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
pythonImportsCheck = [ "georss_ingv_centro_nazionale_terremoti_client" ]; pythonImportsCheck = [
"georss_ingv_centro_nazionale_terremoti_client"
];
meta = with lib; { meta = with lib; {
description = "Python library for accessing the INGV Centro Nazionale Terremoti GeoRSS feed"; description = "Python library for accessing the INGV Centro Nazionale Terremoti GeoRSS feed";

View File

@ -8,14 +8,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "georss-nrcan-earthquakes-client"; pname = "georss-nrcan-earthquakes-client";
version = "0.3"; version = "0.4";
format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exxamalte"; owner = "exxamalte";
repo = "python-georss-nrcan-earthquakes-client"; repo = "python-georss-nrcan-earthquakes-client";
rev = "v${version}"; rev = "v${version}";
sha256 = "1brn6ycsw3d3znbqi2w2cxjw8hyfb44p2lra18rx2gyvgnkxg19l"; hash = "sha256-FFm37+dCkdoZXgvAjYhcHOYFf0oQ37bxJb7vzbWDTro=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -26,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
pythonImportsCheck = [ "georss_nrcan_earthquakes_client" ]; pythonImportsCheck = [
"georss_nrcan_earthquakes_client"
];
meta = with lib; { meta = with lib; {
description = "Python library for accessing Natural Resources Canada Earthquakes feed"; description = "Python library for accessing Natural Resources Canada Earthquakes feed";

View File

@ -9,13 +9,15 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "georss-qld-bushfire-alert-client"; pname = "georss-qld-bushfire-alert-client";
version = "0.5"; version = "0.5";
format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exxamalte"; owner = "exxamalte";
repo = "python-georss-qld-bushfire-alert-client"; repo = "python-georss-qld-bushfire-alert-client";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk="; hash = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -26,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
pythonImportsCheck = [ "georss_qld_bushfire_alert_client" ]; pythonImportsCheck = [
"georss_qld_bushfire_alert_client"
];
meta = with lib; { meta = with lib; {
description = "Python library for accessing Queensland Bushfire Alert feed"; description = "Python library for accessing Queensland Bushfire Alert feed";

View File

@ -9,13 +9,15 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "georss-tfs-incidents-client"; pname = "georss-tfs-incidents-client";
version = "0.3"; version = "0.3";
format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exxamalte"; owner = "exxamalte";
repo = "python-georss-tfs-incidents-client"; repo = "python-georss-tfs-incidents-client";
rev = "v${version}"; rev = "v${version}";
sha256 = "11nvwrjzax4yy6aj971yym05yyizwfafy4ccsyy1qpwbs6dwbw7m"; hash = "sha256-9fDFm9GLXxy814wR75TjP3pfQPU+nCSV8Z509WXm24Y=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -26,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
pythonImportsCheck = [ "georss_tfs_incidents_client" ]; pythonImportsCheck = [
"georss_tfs_incidents_client"
];
meta = with lib; { meta = with lib; {
description = "Python library for accessing Tasmania Fire Service Incidents feed"; description = "Python library for accessing Tasmania Fire Service Incidents feed";

View File

@ -9,13 +9,15 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "georss-wa-dfes-client"; pname = "georss-wa-dfes-client";
version = "0.3"; version = "0.3";
format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exxamalte"; owner = "exxamalte";
repo = "python-georss-wa-dfes-client"; repo = "python-georss-wa-dfes-client";
rev = "v${version}"; rev = "v${version}";
sha256 = "01fk67kc6ww88yzsans8g81i6j7s0276gma5fk76la1c8vj2ifs7"; hash = "sha256-R7so5EYsKGrOdEXVZ44A+kgTA3pIW6W/R4hzw+Yx0wU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -26,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
pythonImportsCheck = [ "georss_wa_dfes_client" ]; pythonImportsCheck = [
"georss_wa_dfes_client"
];
meta = with lib; { meta = with lib; {
description = "Python library for accessing WA Department of Fire and Emergency Services (DFES) feed"; description = "Python library for accessing WA Department of Fire and Emergency Services (DFES) feed";

View File

@ -1,9 +1,9 @@
{ buildPythonApplication { lib
, buildPythonApplication
, click , click
, fetchPypi , fetchPypi
, git , git
, httpretty , httpretty
, lib
, qrcode , qrcode
, pygments , pygments
, pyopenssl , pyopenssl
@ -11,43 +11,54 @@
, requests , requests
, rollbar , rollbar
, stripe , stripe
, pythonOlder
, sure , sure
}: }:
buildPythonApplication rec { buildPythonApplication rec {
pname = "gigalixir"; pname = "gigalixir";
version = "1.2.5"; version = "1.2.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw="; hash = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw=";
}; };
propagatedBuildInputs = [
click
pygments
pyopenssl
qrcode
requests
rollbar
stripe
];
checkInputs = [
git
httpretty
pytestCheckHook
sure
];
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "'pytest-runner'," "" \ --replace "'pytest-runner'," "" \
--replace "cryptography==" "cryptography>=" --replace "cryptography==" "cryptography>="
''; '';
propagatedBuildInputs = [ disabledTests = [
click # Test requires network access
requests "test_rollback_without_version"
stripe
rollbar
pygments
qrcode
pyopenssl
]; ];
checkInputs = [ pythonImportsCheck = [
httpretty "gigalixir"
sure
pytestCheckHook
git
]; ];
pythonImportsCheck = [ "gigalixir" ];
meta = with lib; { meta = with lib; {
description = "Gigalixir Command-Line Interface"; description = "Gigalixir Command-Line Interface";
homepage = "https://github.com/gigalixir/gigalixir-cli"; homepage = "https://github.com/gigalixir/gigalixir-cli";

View File

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-container"; pname = "google-cloud-container";
version = "2.10.4"; version = "2.10.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-YQ7VahPxoAM87RNCkFOUmMrLdKs0uHJ4e0dFgA4twpY="; sha256 = "sha256-doxO6Q8SaRqXNNMQow8kPp2BawpiTtSm2yuzyaOl7RY=";
}; };
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];

View File

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hahomematic"; pname = "hahomematic";
version = "0.34.0"; version = "0.34.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84"; owner = "danielperna84";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-XgVZwCXdUae1BA3WUm+mJ+zmnqLpp13ht+FRJ3udmQk="; sha256 = "sha256-S2zbm0S6LhQSRW6wFdbvqZdXHqIqLRSkqxVTQdIRGT4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -16,11 +16,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "holoviews"; pname = "holoviews";
version = "1.14.7"; version = "1.14.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "8d8d171227e9c9eaadd4b037b3ddaa01055a33bacbdbeb57a5efbd273986665f"; sha256 = "sha256-bDZVmaLLFnk7tifJtcVDCYK7WRyd6IhQAv+RtTm2ETM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -14,6 +14,7 @@
, numpy , numpy
, pandas , pandas
, parsy , parsy
, poetry-core
, pyarrow , pyarrow
, pytest , pytest
, pytest-mock , pytest-mock
@ -49,7 +50,7 @@ in
buildPythonPackage rec { buildPythonPackage rec {
pname = "ibis-framework"; pname = "ibis-framework";
version = "2.1.1"; version = "2.1.1";
format = "setuptools"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -60,6 +61,8 @@ buildPythonPackage rec {
sha256 = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200="; sha256 = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200=";
}; };
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ propagatedBuildInputs = [
atpublic atpublic
cached-property cached-property
@ -77,7 +80,7 @@ buildPythonPackage rec {
sqlalchemy sqlalchemy
tables tables
toolz toolz
] ++ lib.optionals (pythonOlder "3.8") [ ] ++ lib.optionals (pythonOlder "3.8" && lib.versionOlder version "3.0.0") [
importlib-metadata importlib-metadata
]; ];
@ -90,8 +93,13 @@ buildPythonPackage rec {
]; ];
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace pyproject.toml \
--replace "atpublic>=2.3,<3" "atpublic>=2.3" --replace 'atpublic = ">=2.3,<3"' 'atpublic = ">=2.3"'
'';
preBuild = ''
# setup.py exists only for developer convenience and is automatically generated
rm setup.py
''; '';
disabledTests = [ disabledTests = [
@ -135,7 +143,7 @@ buildPythonPackage rec {
done done
wait wait
'' + lib.optionalString (lib.versionOlder version "3.0.0") ''
export PYTEST_BACKENDS="${backendsString}" export PYTEST_BACKENDS="${backendsString}"
''; '';

View File

@ -16,14 +16,16 @@ let
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "iso4217"; pname = "iso4217";
version = "1.7"; version = "1.8";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dahlia"; owner = "dahlia";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-Ih2l6bGM7i5TUkzJPkgx8EOOL4a3/qE28SUZS6M4sQc="; hash = "sha256-L0vx6Aan6D1lusgBh/pcT373ZTxbtWpQnFKB2V0dxlA=";
}; };
propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [

View File

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "meshtastic"; pname = "meshtastic";
version = "1.2.83"; version = "1.2.84";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "meshtastic"; owner = "meshtastic";
repo = "Meshtastic-python"; repo = "Meshtastic-python";
rev = version; rev = version;
sha256 = "sha256-QOTRmr7x4vB8shyxSNt6HX9+JnQ9vODGSR9aVQu+WSM="; sha256 = "sha256-0ItNYdbGnIzgIh23Qtg9zQ5lm7zhY3qz+5s4MCfXN0E=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, httpx
, pythonOlder
, zeep
}:
buildPythonPackage rec {
pname = "onvif-zeep-async";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-O4H6oL9cFvgX6whoESA7eRI6+VoT1ncRk/tehQT1WcM=";
};
propagatedBuildInputs = [
httpx
zeep
];
pythonImportsCheck = [
"onvif"
];
# Tests are not shipped
doCheck = false;
meta = with lib; {
description = "ONVIF Client Implementation in Python";
homepage = "https://github.com/hunterjm/python-onvif-zeep-async";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, poetry
, rich
, setuptools
}:
buildPythonPackage rec {
version = "0.2.0";
pname = "pipenv-poetry-migrate";
format = "pyproject";
src = fetchFromGitHub {
owner = "yhino";
repo = "pipenv-poetry-migrate";
rev = "v${version}";
hash = "sha256-2/e6uGwpUvzxXlz+51gUriE054bgNeJNyLDCIyiGflM=";
};
propagatedBuildInputs = [
poetry
rich
setuptools
];
postPatch = ''
substituteInPlace pyproject.toml --replace 'rich = "^9.6.1"' 'rich = ">9"'
'';
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "This is simple migration script, migrate pipenv to poetry";
homepage = "https://github.com/yhino/pipenv-poetry-migrate";
license = licenses.asl20;
maintainers = with maintainers; [ gador ];
};
}

View File

@ -19,14 +19,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "plugwise"; pname = "plugwise";
version = "0.16.4"; version = "0.16.5";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = "python-plugwise"; repo = "python-plugwise";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-G1PpVqq66uBAigrFxJVvcIKdyL3zTKxcosgkZTjy3Is="; sha256 = "sha256-qvzocaqWIkhSdVm4x/pUIVtNBC0D5FRFEkonH7F6Oaw=";
}; };
postPatch = '' postPatch = ''

View File

@ -3,15 +3,19 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, aiohttp , aiohttp
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyeconet"; pname = "pyeconet";
version = "0.1.14"; version = "0.1.15";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-x0mkC2k65VrDhv7UavgDUuRWIQoAJMDtA7jNXNUJuVg="; sha256 = "sha256-zxD2sjKWB/bmxwpVFgkKTngMhr4bVuW+qkSt+pbxqPY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -21,7 +25,10 @@ buildPythonPackage rec {
# Tests require credentials # Tests require credentials
doCheck = false; doCheck = false;
pythonImportsCheck = [ "pyeconet" ];
pythonImportsCheck = [
"pyeconet"
];
meta = with lib; { meta = with lib; {
description = "Python interface to the EcoNet API"; description = "Python interface to the EcoNet API";

View File

@ -25,12 +25,12 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ]; checkInputs = [ pytestCheckHook ];
preCheck = '' disabledTestPaths = [
# disable tests that require networking # disable tests that require networking
rm test/test_repository.py "test/test_repository.py"
rm test/test_credentials.py "test/test_credentials.py"
rm test/test_submodule.py "test/test_submodule.py"
''; ];
# Tests require certificates # Tests require certificates
# https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582674047 # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582674047
@ -44,11 +44,10 @@ buildPythonPackage rec {
# https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068 # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068
doCheck = false; doCheck = false;
disabled = !isPy3k;
meta = with lib; { meta = with lib; {
description = "A set of Python bindings to the libgit2 shared library"; description = "A set of Python bindings to the libgit2 shared library";
homepage = "https://pypi.python.org/pypi/pygit2"; homepage = "https://pypi.python.org/pypi/pygit2";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ ];
}; };
} }

View File

@ -1,6 +1,7 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, poetry-core , poetry-core
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
@ -28,11 +29,14 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
postPatch = '' patches = [
# https://github.com/nficano/humps/pull/240 # Fix naming, https://github.com/nficano/humps/pull/246
substituteInPlace pyproject.toml \ (fetchpatch {
--replace 'version = "3.0.2"' 'version = "${version}"' name = "fix-naming.patch";
''; url = "https://github.com/nficano/humps/commit/118f6bce785d170b10dd3afee467d26dcc8b425d.patch";
sha256 = "sha256-oQxkLsihnHZlHiZEupwG9Dr1Ss1w+KjDsBtbEVDced4=";
})
];
pythonImportsCheck = [ pythonImportsCheck = [
"humps" "humps"

View File

@ -0,0 +1,58 @@
{ lib
, aiohttp
, attrs
, backoff
, boto3
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pyhumps
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, warrant-lite
}:
buildPythonPackage rec {
pname = "pyoverkiz";
version = "1.3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "iMicknl";
repo = "python-overkiz-api";
rev = "v${version}";
hash = "sha256-KxZYluXa15RojAyNe5hA8Yf/Q9/mVl+b0TrDGRE6iuM=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
attrs
aiohttp
backoff
pyhumps
boto3
warrant-lite
];
checkInputs = [
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"pyoverkiz"
];
meta = with lib; {
description = "Module to interact with the Somfy TaHoma API or other OverKiz APIs";
homepage = "https://github.com/iMicknl/python-overkiz-api";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -8,13 +8,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-keycloak"; pname = "python-keycloak";
version = "0.26.1"; version = "0.27.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "marcospereirampj"; owner = "marcospereirampj";
repo = "python-keycloak"; repo = "python-keycloak";
rev = version; rev = version;
sha256 = "sha256-YWDj/dLN72XMxDXpSPQvkxHF5xJ15xWJjw3vtfmxlwo="; sha256 = "sha256-XCOfzzUs0K5/peprgpEXY2pX6wYOF7hg9ec1XPEYHCI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -48,6 +48,6 @@ buildPythonPackage rec {
description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python";
homepage = "https://github.com/romis2012/python-socks"; homepage = "https://github.com/romis2012/python-socks";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ mjlbach ]; maintainers = with maintainers; [ ];
}; };
} }

View File

@ -1,20 +1,32 @@
{ lib, buildPythonPackage, fetchPypi, requests }: { lib
, buildPythonPackage
, fetchPypi
, requests
, pythonOlder
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "stripe"; pname = "stripe";
version = "2.65.0"; version = "2.66.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "2e55d4d7262085de9cef2228f14581925c35350ba58a332352b1ec9e19a7b7a6"; hash = "sha256-d8YDIjD3cUsaG0WQdPCMYNYMIpucO+rDcnGQY+PRQJw=";
}; };
propagatedBuildInputs = [ requests ]; propagatedBuildInputs = [
requests
];
# Tests require network connectivity and there's no easy way to disable them # Tests require network connectivity and there's no easy way to disable them
doCheck = false; doCheck = false;
pythonImportsCheck = [ "stripe" ]; pythonImportsCheck = [
"stripe"
];
meta = with lib; { meta = with lib; {
description = "Stripe Python bindings"; description = "Stripe Python bindings";

View File

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, click
, fetchFromGitHub
, mock
, netifaces
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "wsdiscovery";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "andreikop";
repo = "python-ws-discovery";
rev = version;
hash = "sha256-6LGZogNRCnmCrRXvHq9jmHwqW13KQPpaGaao/52JPtk=";
};
propagatedBuildInputs = [
click
netifaces
];
checkInputs = [
mock
pytestCheckHook
];
pythonImportsCheck = [
"wsdiscovery"
];
meta = with lib; {
description = "WS-Discovery implementation for Python";
homepage = "https://github.com/andreikop/python-ws-discovery";
license = with licenses; [ lgpl3Plus ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -32,13 +32,13 @@ with py.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "checkov"; pname = "checkov";
version = "2.0.853"; version = "2.0.859";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bridgecrewio"; owner = "bridgecrewio";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-qD6P3ppxckqiCB6wiypdVQtY+b3PN3dhuAQP5REDq3U="; hash = "sha256-uvuAMD/upr8mvK/YCvvlPGIZBMZ0SHxXMdv18NIsOYM=";
}; };
nativeBuildInputs = with py.pkgs; [ nativeBuildInputs = with py.pkgs; [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "oclgrind"; pname = "oclgrind";
version = "19.10"; version = "21.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jrprice"; owner = "jrprice";
repo = "oclgrind"; repo = "oclgrind";
rev = "v${version}"; rev = "v${version}";
sha256 = "12v5z5x3ls26p3y3yc4mqmh12cazc0nlrwvmfbn6cyg4af9dp0zn"; sha256 = "sha256-DGCF7X2rPV1w9guxg2bMylRirXQgez24sG7Unlct3ow=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pmd"; pname = "pmd";
version = "6.41.0"; version = "6.42.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
sha256 = "sha256-kXyUukqLFIdaBpO+oimyrzmGm6bNwoQaRDIoMtZq45k="; sha256 = "sha256-rVqHMhiuFLVTz/J9TGnA/42m9GaGORsf+CrUUqsdUfs=";
}; };
nativeBuildInputs = [ unzip makeWrapper ]; nativeBuildInputs = [ unzip makeWrapper ];
@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = "https://pmd.github.io/"; homepage = "https://pmd.github.io/";
changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html"; changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html";
platforms = platforms.unix; platforms = platforms.unix;
license = with licenses; [ bsdOriginal asl20 lgpl3Plus ]; license = with licenses; [ bsdOriginal asl20 ];
}; };
} }

View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, unzip }: { lib, stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.2.6"; version = "4.3.0";
pname = "randoop"; pname = "randoop";
src = fetchurl { src = fetchurl {
url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip";
sha256 = "sha256-69cKAyMwORG4A91OARmY4uQKgBZIx9N/zc7TZ086CK0="; sha256 = "sha256-3svBmXcRvscaK8YD4qm/geQSJ6cAm0en/d7H09h41PQ=";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

View File

@ -3,7 +3,7 @@
rec { rec {
gen = gen =
{ version, nativeVersion, sha256, defaultJava ? jdk8 }: { version, nativeVersion, sha256, defaultJava ? jdk8, supportedPlatforms ? null }:
{ lib, stdenv, fetchurl, makeWrapper, unzip, java ? defaultJava { lib, stdenv, fetchurl, makeWrapper, unzip, java ? defaultJava
, javaToolchains ? [ ], ncurses5, ncurses6 }: , javaToolchains ? [ ], ncurses5, ncurses6 }:
@ -87,7 +87,7 @@ rec {
changelog = "https://docs.gradle.org/${version}/release-notes.html"; changelog = "https://docs.gradle.org/${version}/release-notes.html";
downloadPage = "https://gradle.org/next-steps/?version=${version}"; downloadPage = "https://gradle.org/next-steps/?version=${version}";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.unix; platforms = if (supportedPlatforms != null) then supportedPlatforms else platforms.unix;
maintainers = with maintainers; [ lorenzleutgeb liff ]; maintainers = with maintainers; [ lorenzleutgeb liff ];
}; };
}; };
@ -100,6 +100,9 @@ rec {
nativeVersion = "0.22-milestone-23"; nativeVersion = "0.22-milestone-23";
sha256 = "0d56bgd2m64pzmycjk29hwdlhbpn1kkm7fjik1sibn6vslw71hlc"; sha256 = "0d56bgd2m64pzmycjk29hwdlhbpn1kkm7fjik1sibn6vslw71hlc";
defaultJava = jdk17; defaultJava = jdk17;
# Gradle 7 ships some binaries that are only available for some platforms
# See https://github.com/gradle/native-platform#supported-platforms
supportedPlatforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows" ];
}; };
gradle_6 = gen { gradle_6 = gen {
@ -107,6 +110,9 @@ rec {
nativeVersion = "0.22-milestone-20"; nativeVersion = "0.22-milestone-20";
sha256 = "13qyk3f6namw27ynh6nxljxpk9r3l12vxl3f0qpglprdf3c6ydcb"; sha256 = "13qyk3f6namw27ynh6nxljxpk9r3l12vxl3f0qpglprdf3c6ydcb";
defaultJava = jdk11; defaultJava = jdk11;
# Gradle 6 ships some binaries that are only available for some platforms
# See https://github.com/gradle/native-platform#supported-platforms
supportedPlatforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows" ];
}; };
# NOTE: No GitHub Release for the following versions. `update.sh` will not work. # NOTE: No GitHub Release for the following versions. `update.sh` will not work.

View File

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff"; pname = "sqlfluff";
version = "0.10.0"; version = "0.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-kWGj0THunXXv3fz9oRLPx314bBU8mdHElmz0v7ALNpE="; hash = "sha256-ZgLg+pIdTBxMNXgFFL8jCbQa444pkgtnSx+QjMqQhag=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

View File

@ -1,23 +1,36 @@
{ lib, stdenv, fetchurl, python2 }: { lib
, stdenv
, fetchurl
, pkg-config
, python3
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "omniorb"; pname = "omniorb";
version = "4.3.0";
version = "4.2.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
sha256 = "0vvsvi5nx4k7kk4qh1pkf3f5fpz7wv4rsdna4hayihbnvz81rh18"; hash = "sha256-l2BFojQfTpqFBosh9L2SiZMpKTPu7O/qNy2wngIZ6t0=";
}; };
buildInputs = [ python2 ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ python3 ];
enableParallelBuilding = true;
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
meta = with lib; { meta = with lib; {
description = "A robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant"; description = "A robust high performance CORBA ORB for C++ and Python";
longDescription = ''
omniORB is a robust high performance CORBA ORB for C++ and Python.
It is freely available under the terms of the GNU Lesser General Public License
(for the libraries),and GNU General Public License (for the tools).
omniORB is largely CORBA 2.6 compliant.
'';
homepage = "http://omniorb.sourceforge.net/"; homepage = "http://omniorb.sourceforge.net/";
license = licenses.gpl2Plus; license = with licenses; [ gpl2Plus lgpl21Plus ];
maintainers = with maintainers; [ smironov ]; maintainers = with maintainers; [ smironov ];
platforms = platforms.unix; platforms = platforms.unix;
}; };

View File

@ -0,0 +1,24 @@
{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1, AppKit }:
rustPlatform.buildRustPackage rec {
pname = "probe-rs-cli";
version = "0.12.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-XYrB/aKuFCe0FNe6N9vqDdr408tAiN6YvT5BL6lCxmU=";
};
cargoSha256 = "sha256-aXSJMSGNl2fzob1j/qiPHHZLisYQeU1gUO5cYbzSHYA=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
meta = with lib; {
description = "CLI tool for on-chip debugging and flashing of ARM chips";
homepage = "https://probe.rs/";
changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ xgroleau ];
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "sd-local"; pname = "sd-local";
version = "1.0.32"; version = "1.0.40";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "screwdriver-cd"; owner = "screwdriver-cd";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-4VKTp4q2CoIWQTiSgs254deafuowiTpuLVJ79nmqAaA="; sha256 = "sha256-/b9ZmwTw9DbdO0KI7rfT0YW0Xo2cxfwhk1TEfTe3ySU=";
}; };
vendorSha256 = "sha256-4xuWehRrmVdS2F6r00LZLKq/oHlWqCTQ/jYUKeIJ6DI="; vendorSha256 = "sha256-43hcIIGqBscMjQzaIGdMqV5lq3od4Ls4TJdTeFGtu5Y=";
subPackages = [ "." ]; subPackages = [ "." ];

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