diff --git a/lib/customisation.nix b/lib/customisation.nix
index dc5dd7691976..37a7951896b0 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -217,4 +217,31 @@ rec {
};
in self;
+ /* Like the above, but aims to support cross compilation. It's still ugly, but
+ hopefully it helps a little bit. */
+ makeScopeWithSplicing = splicePackages: newScope: otherSplices: keep: f:
+ let
+ spliced = splicePackages {
+ pkgsBuildBuild = otherSplices.selfBuildBuild;
+ pkgsBuildHost = otherSplices.selfBuildHost;
+ pkgsBuildTarget = otherSplices.selfBuildTarget;
+ pkgsHostHost = otherSplices.selfHostHost;
+ pkgsHostTarget = self; # Not `otherSplices.selfHostTarget`;
+ pkgsTargetTarget = otherSplices.selfTargetTarget;
+ } // keep self;
+ self = f self // {
+ newScope = scope: newScope (spliced // scope);
+ callPackage = newScope spliced; # == self.newScope {};
+ # N.B. the other stages of the package set spliced in are *not*
+ # overridden.
+ overrideScope = g: makeScopeWithSplicing
+ splicePackages
+ newScope
+ otherSplices
+ keep
+ (lib.fixedPoints.extends g f);
+ packages = f;
+ };
+ in self;
+
}
diff --git a/lib/default.nix b/lib/default.nix
index e3c1ed713463..f985266ed938 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -101,7 +101,7 @@ let
noDepEntry fullDepEntry packEntry stringAfter;
inherit (self.customisation) overrideDerivation makeOverridable
callPackageWith callPackagesWith extendDerivation hydraJob
- makeScope;
+ makeScope makeScopeWithSplicing;
inherit (self.meta) addMetaAttrs dontDistribute setName updateName
appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio
hiPrioSet;
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ceec2f8073e1..f2e33938e051 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3193,12 +3193,6 @@
githubId = 313929;
name = "Gabriel Ebner";
};
- genesis = {
- email = "ronan@aimao.org";
- github = "bignaux";
- githubId = 149484;
- name = "Ronan Bignaux";
- };
georgewhewell = {
email = "georgerw@gmail.com";
github = "georgewhewell";
@@ -6159,10 +6153,10 @@
githubId = 6455574;
name = "Matt Votava";
};
- mwilsoninsight = {
- email = "max.wilson@insight.com";
- github = "mwilsoninsight";
- githubId = 47782621;
+ maxwilson = {
+ email = "nixpkgs@maxwilson.dev";
+ github = "mwilsoncoding";
+ githubId = 43796009;
name = "Max Wilson";
};
myrl = {
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 9763c78789aa..9f56686e24f2 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -108,4 +108,12 @@ with lib.maintainers; {
];
scope = "Maintain Podman and CRI-O related packages and modules.";
};
+
+ sage = {
+ members = [
+ timokau
+ omasanori
+ ];
+ scope = "Maintain SageMath and the dependencies that are likely to break it.";
+ };
}
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 5c017c65a253..da4f083d01ac 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -172,6 +172,12 @@
please note that your non-root pools will now be forcibly imported.
+
+
+ openafs now points to openafs_1_8,
+ which is the new stable release. OpenAFS 1.6 was removed.
+
+
diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix
index 1fc17ec72daf..b341a9005c2a 100644
--- a/nixos/modules/services/monitoring/telegraf.nix
+++ b/nixos/modules/services/monitoring/telegraf.nix
@@ -21,7 +21,7 @@ in {
};
environmentFiles = mkOption {
- type = types.nullOr (types.listOf types.path);
+ type = types.listOf types.path;
default = [];
example = "/run/keys/telegraf.env";
description = ''
@@ -38,17 +38,13 @@ in {
description = "Extra configuration options for telegraf";
type = settingsFormat.type;
example = {
- outputs = {
- influxdb = {
- urls = ["http://localhost:8086"];
- database = "telegraf";
- };
+ outputs.influxdb = {
+ urls = ["http://localhost:8086"];
+ database = "telegraf";
};
- inputs = {
- statsd = {
- service_address = ":8125";
- delete_timings = true;
- };
+ inputs.statsd = {
+ service_address = ":8125";
+ delete_timings = true;
};
};
};
diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix
index 095024d2c8af..d782f7821656 100644
--- a/nixos/modules/services/network-filesystems/openafs/server.nix
+++ b/nixos/modules/services/network-filesystems/openafs/server.nix
@@ -251,7 +251,6 @@ in {
wantedBy = [ "multi-user.target" ];
restartIfChanged = false;
unitConfig.ConditionPathExists = [
- "|/etc/openafs/server/rxkad.keytab"
"|/etc/openafs/server/KeyFileExt"
];
preStart = ''
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index ddcc0ed8f5a4..fd35c35d32ad 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -10,20 +10,9 @@ let
rpcMountpoint = "${nfsStateDir}/rpc_pipefs";
- idmapdConfFile = pkgs.writeText "idmapd.conf" ''
- [General]
- Pipefs-Directory = ${rpcMountpoint}
- ${optionalString (config.networking.domain != null)
- "Domain = ${config.networking.domain}"}
-
- [Mapping]
- Nobody-User = nobody
- Nobody-Group = nogroup
-
- [Translation]
- Method = nsswitch
- '';
+ format = pkgs.formats.ini {};
+ idmapdConfFile = format.generate "idmapd.conf" cfg.idmapd.settings;
nfsConfFile = pkgs.writeText "nfs.conf" cfg.extraConfig;
requestKeyConfFile = pkgs.writeText "request-key.conf" ''
create id_resolver * * ${pkgs.nfs-utils}/bin/nfsidmap -t 600 %k %d
@@ -38,6 +27,25 @@ in
options = {
services.nfs = {
+ idmapd.settings = mkOption {
+ type = format.type;
+ default = {};
+ description = ''
+ libnfsidmap configuration. Refer to
+
+ for details.
+ '';
+ example = literalExample ''
+ {
+ Translation = {
+ GSS-Methods = "static,nsswitch";
+ };
+ Static = {
+ "root/hostname.domain.com@REALM.COM" = "root";
+ };
+ }
+ '';
+ };
extraConfig = mkOption {
type = types.lines;
default = "";
@@ -54,6 +62,20 @@ in
services.rpcbind.enable = true;
+ services.nfs.idmapd.settings = {
+ General = mkMerge [
+ { Pipefs-Directory = rpcMountpoint; }
+ (mkIf (config.networking.domain != null) { Domain = config.networking.domain; })
+ ];
+ Mapping = {
+ Nobody-User = "nobody";
+ Nobody-Group = "nogroup";
+ };
+ Translation = {
+ Method = "nsswitch";
+ };
+ };
+
system.fsPackages = [ pkgs.nfs-utils ];
boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 640cc84c8032..3c10d6215186 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -103,6 +103,7 @@ in
etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};
etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};
fancontrol = handleTest ./fancontrol.nix {};
+ fcitx = handleTest ./fcitx {};
ferm = handleTest ./ferm.nix {};
firefox = handleTest ./firefox.nix {};
firefox-esr = handleTest ./firefox.nix { esr = true; };
diff --git a/nixos/tests/fcitx/config b/nixos/tests/fcitx/config
new file mode 100644
index 000000000000..169768994e28
--- /dev/null
+++ b/nixos/tests/fcitx/config
@@ -0,0 +1,12 @@
+[Hotkey]
+SwitchKey=Disabled
+IMSwitchHotkey=ALT_SHIFT
+TimeInterval=240
+
+[Program]
+DelayStart=5
+
+[Output]
+
+[Appearance]
+
diff --git a/nixos/tests/fcitx/default.nix b/nixos/tests/fcitx/default.nix
new file mode 100644
index 000000000000..d28a5801f97f
--- /dev/null
+++ b/nixos/tests/fcitx/default.nix
@@ -0,0 +1,142 @@
+import ../make-test-python.nix (
+ {
+ pkgs, ...
+ }:
+ # copy_from_host works only for store paths
+ rec {
+ name = "fcitx";
+ machine =
+ {
+ pkgs,
+ ...
+ }:
+ {
+ virtualisation.memorySize = 1024;
+
+ imports = [
+ ../common/user-account.nix
+ ];
+
+ environment.systemPackages = [
+ # To avoid clashing with xfce4-terminal
+ pkgs.alacritty
+ ];
+
+
+ services.xserver =
+ {
+ enable = true;
+
+ displayManager = {
+ lightdm.enable = true;
+ autoLogin = {
+ enable = true;
+ user = "alice";
+ };
+ };
+
+ desktopManager.xfce.enable = true;
+ };
+
+ i18n = {
+ inputMethod = {
+ enabled = "fcitx";
+ fcitx.engines = [
+ pkgs.fcitx-engines.m17n
+ pkgs.fcitx-engines.table-extra
+ ];
+ };
+ };
+ }
+ ;
+
+ testScript = { nodes, ... }:
+ let
+ user = nodes.machine.config.users.users.alice;
+ userName = user.name;
+ userHome = user.home;
+ xauth = "${userHome}/.Xauthority";
+ fcitx_confdir = "${userHome}/.config/fcitx";
+ in
+ ''
+ # We need config files before login session
+ # So copy first thing
+
+ # Point and click would be expensive,
+ # So configure using files
+ machine.copy_from_host(
+ "${./profile}",
+ "${fcitx_confdir}/profile",
+ )
+ machine.copy_from_host(
+ "${./config}",
+ "${fcitx_confdir}/config",
+ )
+
+ start_all()
+
+ machine.wait_for_file("${xauth}")
+ machine.succeed("xauth merge ${xauth}")
+
+ machine.sleep(5)
+
+ machine.succeed("su - ${userName} -c 'alacritty&'")
+ machine.succeed("su - ${userName} -c 'fcitx&'")
+ machine.sleep(10)
+
+ ### Type on terminal
+ machine.send_chars("echo ")
+ machine.sleep(1)
+
+ ### Start fcitx Unicode input
+ machine.send_key("ctrl-alt-shift-u")
+ machine.sleep(5)
+ machine.sleep(1)
+
+ ### Search for smiling face
+ machine.send_chars("smil")
+ machine.sleep(1)
+
+ ### Navigate to the second one
+ machine.send_key("tab")
+ machine.sleep(1)
+
+ ### Choose it
+ machine.send_key("\n")
+ machine.sleep(1)
+
+ ### Start fcitx language input
+ machine.send_key("ctrl-spc")
+ machine.sleep(1)
+
+ ### Default zhengma, enter 一下
+ machine.send_chars("a2")
+ machine.sleep(1)
+
+ ### Switch to Harvard Kyoto
+ machine.send_key("alt-shift")
+ machine.sleep(1)
+
+ ### Enter क
+ machine.send_chars("ka ")
+ machine.sleep(1)
+
+ machine.send_key("alt-shift")
+ machine.sleep(1)
+
+ ### Turn off Fcitx
+ machine.send_key("ctrl-spc")
+ machine.sleep(1)
+
+ ### Redirect typed characters to a file
+ machine.send_chars(" > fcitx_test.out\n")
+ machine.sleep(1)
+ machine.screenshot("terminal_chars")
+
+ ### Verify that file contents are as expected
+ file_content = machine.succeed("cat ${userHome}/fcitx_test.out")
+ assert file_content == "☺一下क\n"
+ ''
+ ;
+ }
+)
diff --git a/nixos/tests/fcitx/profile b/nixos/tests/fcitx/profile
new file mode 100644
index 000000000000..77497a1496bd
--- /dev/null
+++ b/nixos/tests/fcitx/profile
@@ -0,0 +1,4 @@
+[Profile]
+IMName=zhengma-large
+EnabledIMList=fcitx-keyboard-us:True,zhengma-large:True,m17n_sa_harvard-kyoto:True
+PreeditStringInClientWindow=False
diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix
index 938bbd518b5a..7f4b36752582 100644
--- a/nixos/tests/telegraf.nix
+++ b/nixos/tests/telegraf.nix
@@ -6,9 +6,9 @@ import ./make-test-python.nix ({ pkgs, ...} : {
machine = { ... }: {
services.telegraf.enable = true;
- services.telegraf.environmentFiles = [pkgs.writeText "secrets" ''
+ services.telegraf.environmentFiles = [(pkgs.writeText "secrets" ''
SECRET=example
- ''];
+ '')];
services.telegraf.extraConfig = {
agent.interval = "1s";
agent.flush_interval = "1s";
diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix
index 4f4ad4b8c5b0..53adb3f146f1 100644
--- a/pkgs/applications/audio/cadence/default.nix
+++ b/pkgs/applications/audio/cadence/default.nix
@@ -94,7 +94,7 @@ mkDerivation rec {
homepage = "https://github.com/falkTX/Cadence/";
description = "Collection of tools useful for audio production";
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ genesis worldofpeace ];
+ maintainers = with stdenv.lib.maintainers; [ worldofpeace ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index da0449f41d1f..4c4f3f2b29e3 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
- version = "2.15.0";
+ version = "2.16.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
- sha256 = "06sm4ah05j0f3bxb1sbdi8mazmxk166y2gaycll6p2xhd105ins3";
+ sha256 = "16z2cy41vxbrvjblj09in6669pks1p9y3rgx8b7afjwf102ba9yi";
};
appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix
index c7ac671c15bf..48c83b053108 100644
--- a/pkgs/applications/editors/bluefish/default.nix
+++ b/pkgs/applications/editors/bluefish/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "bluefish-2.2.11";
+ name = "bluefish-2.2.12";
src = fetchurl {
url = "mirror://sourceforge/bluefish/${name}.tar.bz2";
- sha256 = "1zy2ppdg3nq9iy3zgfhnw93bq5zbbhyampf7bk3grpfvq5zqfk25";
+ sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d";
};
nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index 32892c7c26e7..9c37d00c9ee1 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, callPackage, fetchurl, fetchpatch,
+{ lib, mkDerivation, callPackage, fetchFromGitHub,
guile_1_8, qtbase, xmodmap, which, freetype,
libjpeg,
sqlite,
@@ -16,7 +16,7 @@
let
pname = "TeXmacs";
- version = "1.99.14";
+ version = "1.99.15";
common = callPackage ./common.nix {
inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
};
@@ -24,9 +24,11 @@ in
mkDerivation {
name = "${pname}-${version}";
- src = fetchurl {
- url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
- sha256 = "1zbl1ddhppgnn3j213jl1b9mn8zmwnknxiqswm25p4llj0mqcgna";
+ src = fetchFromGitHub {
+ owner = "texmacs";
+ repo = "texmacs";
+ rev = "v${version}";
+ sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index 27e8e00bdb3a..7dbe03d9f281 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -33,11 +33,11 @@
stdenv.mkDerivation rec {
pname = "gthumb";
- version = "3.10.0";
+ version = "3.10.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0j7cxp4hhkvkckyvll6pmqkv5rwrknlzq9j1my0grb01b8wzhw9y";
+ sha256 = "0gm7q6n9lnjsdqpx5b0cqjayhzwnplqb6p5pshzhbfp2zqd2g9ss";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/kde/kmahjongg.nix b/pkgs/applications/kde/kmahjongg.nix
index b51d0d147e2e..93588b241e11 100644
--- a/pkgs/applications/kde/kmahjongg.nix
+++ b/pkgs/applications/kde/kmahjongg.nix
@@ -14,6 +14,6 @@ mkDerivation {
buildInputs = [ kdeclarative libkmahjongg knewstuff libkdegames ];
meta = {
license = with lib.licenses; [ gpl2 ];
- maintainers = with lib.maintainers; [ genesis ];
+ maintainers = with lib.maintainers; [ ];
};
}
diff --git a/pkgs/applications/kde/ksudoku.nix b/pkgs/applications/kde/ksudoku.nix
index 3641c1b33323..678c21d5870e 100644
--- a/pkgs/applications/kde/ksudoku.nix
+++ b/pkgs/applications/kde/ksudoku.nix
@@ -13,6 +13,6 @@ mkDerivation {
buildInputs = [ libGLU kdeclarative libkdegames ];
meta = {
license = with lib.licenses; [ gpl2 ];
- maintainers = with lib.maintainers; [ genesis ];
+ maintainers = with lib.maintainers; [ ];
};
}
diff --git a/pkgs/applications/kde/libkmahjongg.nix b/pkgs/applications/kde/libkmahjongg.nix
index 4b7b8538290c..295b97842686 100644
--- a/pkgs/applications/kde/libkmahjongg.nix
+++ b/pkgs/applications/kde/libkmahjongg.nix
@@ -9,7 +9,7 @@ mkDerivation {
name = "libkmahjongg";
meta = {
license = with lib.licenses; [ gpl2 ];
- maintainers = with lib.maintainers; [ genesis ];
+ maintainers = with lib.maintainers; [ ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons ki18n
diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix
index a74a3962996b..e57ffd352717 100644
--- a/pkgs/applications/misc/cointop/default.nix
+++ b/pkgs/applications/misc/cointop/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "cointop";
- version = "1.5.4";
+ version = "1.5.5";
src = fetchFromGitHub {
owner = "miguelmota";
repo = pname;
rev = "v${version}";
- sha256 = "1gkrwh5g69mywlllszy310xpahr8rz8nghjjpiamd85djf1iz43b";
+ sha256 = "051jxa07c58ym1w0mwckwxh60v28gqcpqw5nv8sm5wxil1crcayr";
};
goPackagePath = "github.com/miguelmota/cointop";
diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix
index 49a16b583661..d3aff8e6b1ba 100644
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dasel";
- version = "1.5.1";
+ version = "1.6.2";
src = fetchFromGitHub {
owner = "TomWright";
repo = pname;
rev = "v${version}";
- sha256 = "14xh5fjh0ngf8rmhqgfxmz25yz7far3sf8yza9iprs7y7ad61qz9";
+ sha256 = "sha256-LGrFs9JNb0gjXg6IRkUfUOWS+sr1nukzOEWK4XUfkfw=";
};
vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw";
diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix
index 099bcbfb25df..e04669d68964 100644
--- a/pkgs/applications/misc/navit/default.nix
+++ b/pkgs/applications/misc/navit/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.navit-project.org";
description = "Car navigation system with routing engine using OSM maps";
license = licenses.gpl2;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix
index f5c237da440a..3cd9d5db0067 100644
--- a/pkgs/applications/misc/pueue/default.nix
+++ b/pkgs/applications/misc/pueue/default.nix
@@ -2,27 +2,26 @@
rustPlatform.buildRustPackage rec {
pname = "pueue";
- version = "0.7.1";
+ version = "0.8.1";
src = fetchFromGitHub {
owner = "Nukesor";
repo = pname;
rev = "v${version}";
- sha256 = "1ksks8c35q9aq5vnjxh480vqjyaa8c1fz1fb465vngnlyw762b22";
+ sha256 = "0rqnbils0r98qglhm2jafw5d119fqdzszmk825yc0bma4icm7xzp";
};
- cargoSha256 = "0v1h4jhrzfb55zmpnbq18188rdvx7a7lvnjqh0w7cy90kvxssian";
+ cargoSha256 = "1f3g5i0yh82qll1hyihrvv08pbd4h9vzs6jy6bf94bzabyjsgnzv";
nativeBuildInputs = [ installShellFiles ];
- checkFlagsArray = [ "--skip=test_single_huge_payload" ];
+ checkFlags = [ "--skip=test_single_huge_payload" "--skip=test_create_unix_socket" ];
postInstall = ''
- # zsh completion generation fails. See: https://github.com/Nukesor/pueue/issues/57
- for shell in bash fish; do
+ for shell in bash fish zsh; do
$out/bin/pueue completions $shell .
- installShellCompletion pueue.$shell
done
+ installShellCompletion pueue.{bash,fish} _pueue
'';
meta = with lib; {
diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix
index d03d78a9fd1d..cbca2a33d59e 100644
--- a/pkgs/applications/misc/xkbd/default.nix
+++ b/pkgs/applications/misc/xkbd/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/mahatma-kaganovich/xkbd";
description = "onscreen soft keyboard for X11";
license = licenses.gpl2Plus;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index b52e4fc8e7e3..431ed105f0dc 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,965 @@
{
- version = "82.0.3";
+ version = "83.0";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ach/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ach/firefox-83.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "cebf34988221418454b7674778aeb165cfa5d455c93a7b1ff8461c1460f28913";
+ sha256 = "cea6ad61bd402e6c84a81a3f504f1b9292079c9d48d2353b51db4f03a8837fb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/af/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/af/firefox-83.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "cffc807143433dc414415843eb14b34ca3d3f18d5fa26e6ccec090032bb98965";
+ sha256 = "d4bd0a9579f38d53f559412cc3cc04f11871ba22c81eee54dd9ab16c56303513";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/an/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/an/firefox-83.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "1c7b084e089ed4d938f30ecb338f6a20001fc5c92b7ddd7d54dfebabcee67549";
+ sha256 = "10741a6921210643250013c45e9e21bc295da8e41f2bb5c5fadcd86c0e828c80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ar/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ar/firefox-83.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "10930a02e0a902d67b2e3eab8d9cd45dc93611bb77834f6ac7b7ef109d592cb3";
+ sha256 = "3fd4aeef281e5aafdda572d4814e70295c018b7fae6d214c40dabcac367ace69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ast/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ast/firefox-83.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "91191ea0d52b33f2815b02be6af05ed462f394d112218638c427fccd7aef56e2";
+ sha256 = "237e8ff5b3fbc9d7c4095951ca014a5c26cc076305aee705ca943d81e72541dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/az/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/az/firefox-83.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "47dc248859683863c2907867e3c411c4d3620c2ae3001c5a0c693b485a0e5b87";
+ sha256 = "79ca0c798243841cc34281f917aad06c2f546a5e11b443a96e5030aefb8de9b3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/be/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/be/firefox-83.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "2e4ddfdbb28d7444b30f58235f634f9f16f88989fd61e7ef8dbf238c0a8455de";
+ sha256 = "c15b0f929b3e3c6ad5618ccf6f9f6b143f893b6f77e176b52ecc608ca3157ab8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/bg/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bg/firefox-83.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "4c19e9af25e58bbc70d913f5cbaf8551443beee81c854ff8af2f81019b516534";
+ sha256 = "fd2094c59a057e8c35054f7d09c31699aeef927cf9688a87559a8ba69a93f600";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/bn/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bn/firefox-83.0.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "40628ea1443ef7c8840ee65767d684f90ddb8ee547ec62367c6bb2e0833e7d8f";
+ sha256 = "c9755c408ca1a4f426f1432339020ef3d7c675d426fae9d8697cded4c7d493f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/br/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/br/firefox-83.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "7a44ab9c67ec58f098cc8ca210ec2e37f922587aaf7495bb0dea60f1b0330e72";
+ sha256 = "d47b889d31b945a5b768b3bbb336fdc43d62c9cc86f13916225cbfe68a560972";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/bs/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bs/firefox-83.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "017d91858f3df6744eaf2b6764f4f2a303712cb23eaa8ab8ccf58f9b8b215a27";
+ sha256 = "c36da445560b989ae9cf16a1ec72cd2cae82db670f90d27abe0499f8cc025eee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ca-valencia/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ca-valencia/firefox-83.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "f97c9f63139c23167c90b0cb91eddc1e887a827e2f839a7ab9d7a8cb1ec971ea";
+ sha256 = "ef5ee80cc0d6b1b299bc8bb6577b8e26f5de8b541530ddda231e2fafa863e6a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ca/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ca/firefox-83.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "631ae73074f22c446899ac82713c1f5404fbf63efbdde7aa93612f828d64a5af";
+ sha256 = "7c349aa7406899835bc9e70893f28c8109e17ee9ef018e7a723085117f8dd32f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/cak/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cak/firefox-83.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "72085e68e7f8cccbe4bf4244e11ddbbfa94f6a16c3dfa582fab94ca7ef191e68";
+ sha256 = "3e7aabe665ce423bd47e7d0474039d7bfeb9958849c18e98c37f28def5fae1aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/cs/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cs/firefox-83.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "41da43aa44eaa092aa6481269d7100792a675764be92af7375e3bbbb21663ae2";
+ sha256 = "97d5e4c255fc87430751c81edc62186e1b4ec901ccf17bfdad7a8ef918077bc1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/cy/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cy/firefox-83.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "b61d03510d351c0c00f7a2e8cc459e736f72cec01e596cb0b95ef53d32e0ce26";
+ sha256 = "c1856b51dedc5788b40671faee8f8cb996108eb514d1263de998043377f2f7c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/da/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/da/firefox-83.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "5c495d632ae0ce2e3f990b41473c12551e66269b612b32ca0a2bf0f9ebddb268";
+ sha256 = "990da1f47d04ec9200d41fa401b23d9607a8e4c11d7cc78989e81785b9633cb0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/de/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/de/firefox-83.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "c9c7c2d8f5dea3639d213185718f64266fce8e267d2bc2b6afa9313e1452fd83";
+ sha256 = "94ad875d88a18f24ae38f20b324d074a367969368e660ea2b4b0645e31300c94";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/dsb/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/dsb/firefox-83.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "f8c563b71e221e6ced9ecf927e37d9a351ab83303b252e52fc4aae51d6db0703";
+ sha256 = "c3edd46c44bae1b00803e587e6f52560b28ddc2fc935c1fe62714bf16fa72d80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/el/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/el/firefox-83.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "dc0c4e503cab7913cba4186f22c96ebe3f80af59fdb5c9ef1373c799c0f6fc8b";
+ sha256 = "3572a260ec17f76631ca627747ed53d1911ee1180d3e574051b3baf0afd9dcd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/en-CA/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-CA/firefox-83.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "735a3a4eddc0f660029020ec694d06e5dcf62b95b6b18dc90453a5a2262d18f9";
+ sha256 = "e3c9363e8b93c625234624ac5c3ab0274055c5b8f4f854da955409b9bdf28d52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/en-GB/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-GB/firefox-83.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "985ee60c7d017569db4f455cd1fdaf252432057ed153d6449594d72139833d0c";
+ sha256 = "240a732c034bf2ac286cefc33b02b56df205c4e175457cd84adb7666418e0be4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/en-US/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-US/firefox-83.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "54e1f9516aee97ef2858e04a67d691956a461591fdcfecc9bdf9c34c3f026472";
+ sha256 = "93ff827fdcba92ddb71851c46ac8192a727ed61402e896c6262943e382f92412";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/eo/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/eo/firefox-83.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "b07fc960e9204d1995e040ca3e70a61aa531e34bf0dfe6e09cfc35583559f988";
+ sha256 = "456933a6c1fb1e6ad5b2217a7e3730bd54ff037d3d718414b2c92557fea3659d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/es-AR/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-AR/firefox-83.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "b8c5d160a92bfe94b66fc9554e3343b3385d39e2551bc6b9b0a917135f4f0407";
+ sha256 = "040e8a4a74b8bc77e1d485c3376690f4c5ba85015b360f679ceacd848b0ca574";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/es-CL/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-CL/firefox-83.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "c89601e6a8dbd91723d8d9174cbba25f43a2729da5bfdf92919abd8972dfa3fa";
+ sha256 = "80e8189ce09c736af1d9927d4943e08e30bc70e9aa7e116f150f14c0dab3fb15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/es-ES/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-ES/firefox-83.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "4643c154924c5153123796dbef8f759070b7446a31e056259be1f246fdf91ec3";
+ sha256 = "f48489abac5358a10d8ed36b77398493b6a9189a8327bf61bec6ceaca51ab696";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/es-MX/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-MX/firefox-83.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "026c72bcc1e22092a605145952fed6697a1de4945e81ee9f02b95f6654bc2f2b";
+ sha256 = "0d4805b30f05fb8a65b81a42337a8a3732c7664b322557e844929d2b049d0111";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/et/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/et/firefox-83.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "e69266e61365d94fb32b3d4f6560a66b94e5e793fe0e36d6cf075ac6ddb31b1f";
+ sha256 = "eb4a463b9271fdde45bddad28ce871953739b55126ae5613963a69a319908fb2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/eu/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/eu/firefox-83.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "3107f667f558c443ae1925d77b3c2a4b2b2b9257da16af3a3a0f5f03a28d9bf7";
+ sha256 = "3a662c575554d3a542e65950352c527cc51e82ae7a8f9d7ca1b69e30a683731e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/fa/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fa/firefox-83.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "bcdc8928b712bd988ef21065207bd8ce40ec7b40958094aaa15261457954f6d0";
+ sha256 = "b5ad3a5d39674d60b6e97cd656c77d7d2fb90943a66a590a29e4d42ec1e18c42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ff/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ff/firefox-83.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "1bd27b188cd1527512d3de37af6b6e0d49064f8e1688a1257c17c16c1cd632f7";
+ sha256 = "2db83d638474186f52fde5fe1ee25201e84b198e44397074203d7ce50e23e74c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/fi/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fi/firefox-83.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "2072f0847eb952e937de66bc0dc2a3b5e2cfa267909232b43b19c5f2e0a16622";
+ sha256 = "98bd9c50b5db43bf5fcdc829aa295975d3ec106bbc598fda3d7f26679c0ba08c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/fr/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fr/firefox-83.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "d858bffb885d64aefc589835f783bd8ff22cc962ff718bc142aa2fbb9f728795";
+ sha256 = "ab3427f5cf7cc88d5108b8be21806197420bd775f33d3f2dc983f0f4dec44d5b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/fy-NL/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fy-NL/firefox-83.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "7eb1301dfc9266093232c5dc8fe4da7b5139d1312b67266b2e3073e6a29d346b";
+ sha256 = "9f21d91d1529a05a2da7ba29cc8e875b23ffb4b453077b5e899133cf31813397";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ga-IE/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ga-IE/firefox-83.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "d08167164f083ddcff337da35d289dad0b83097243d9fe8bd77186d75b9dc8fa";
+ sha256 = "4c22b166cccede0bcea4e75f826e100dfa4f2def01f904fbffcef789d2d61695";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/gd/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gd/firefox-83.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "d8a6fa4815c170661b132256274250c2e5fa238d89156f17ce95eeb938ab142b";
+ sha256 = "6ca04d381205121dc695dff78ff646499a21976ae64c110763845eda0598b414";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/gl/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gl/firefox-83.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "b0ebff09180e34dffacd325465b0fb1a54dd2b59c757c8e1fe8425c86fcd44fb";
+ sha256 = "d08f4ea821af5e38c21364037c17b8c97c775d60f0697eb0817dcfc7c6d4c7dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/gn/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gn/firefox-83.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "f0f514ed9bba07b1cf72846a452bc74e1d2e13b8bf5ee664382e613ddf351a72";
+ sha256 = "90a8b2fdf1d3471311671761e81637d6771a61744eb480c0788cf03d295c30ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/gu-IN/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gu-IN/firefox-83.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "9c61f223ea072bcbe97e247f7e8cce8f0350366078dd2da276e5fc581b94f919";
+ sha256 = "bfe65e5c9795ecdff4dc947d2e2e84d01da894b0ae55c08d73f9397c5730ce17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/he/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/he/firefox-83.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "c19534b8c5e0af42c09f4afc091dedba6f15d9498183692d0a5e0285a0f743ae";
+ sha256 = "2dc01c5a929aa79056a66feb522d50cbbb567bc85589f8106e553c9ddfc02a7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hi-IN/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hi-IN/firefox-83.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "3f25c2b8a33984a085622494b19d22005e6fe5694ff7e277f02b638848d473f8";
+ sha256 = "ef2a61dce3ee713a4be3cee5a9dda8498095a7db69304a7d6585ac674970958a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hr/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hr/firefox-83.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "33bf5520c090f078daa53dbb3a2cdbdacafea8cae8ded68f7b0da30233f41916";
+ sha256 = "ab8357cc1f36965ccbd6f4298ffdbb3d77b09cc4b789a3be708d2c51468402bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hsb/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hsb/firefox-83.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "11628732d6da9db696f95d6fcc0df2faa756e9782d77bc00b633f99be5921d1e";
+ sha256 = "6a34074a96be7911672b7e83151244f1f963a8cc8930c8d1d113afe8a49c9529";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hu/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hu/firefox-83.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "e33f6bfae267454b3f541b4193ef2634ae66dfc7387c7bfbf7a8609f803cc131";
+ sha256 = "ffec1646df872a757b771a03c00e3e6df3397e7f4af46bd1d6c0fcab242b1721";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hy-AM/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hy-AM/firefox-83.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "0d9ea1d3adb92be4c6e40be915ab3d692eeee9e3c593b977b893e003fc7ddcbe";
+ sha256 = "1b9da538ced466302584fef4ecf415aeae5bee51a87d38bd0a6bb3ea155af66d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ia/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ia/firefox-83.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "bf3ad1ba8f77920ed6cb5574bb836f9780e7f19d5c34feb2d562a175ca9e7552";
+ sha256 = "5f8582508155f858c7e52e623579daa7da1aa77bb4e41c2c46d3e6ae8ace6b1e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/id/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/id/firefox-83.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "ffba9aefa174ff86bf963daa569796a39a3fbacb295b1932dd00a4d72f12cf86";
+ sha256 = "e5690dcc6b933ddbd27fcfb22f8ab9fc4e4c999d935b6088da38c87af2c567d1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/is/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/is/firefox-83.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "182c827998a8bead2b5f76477b01e91b66fa0b0b6ad9c20bb71684c951758728";
+ sha256 = "3776fe6aad623e9b74807a48e105d1619143e78e122906360c4efbc73c2891ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/it/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/it/firefox-83.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "3ef3bfcc25ed9e1c9883bd890c60a32acefd243db37bd13eaec71a0c556c2b70";
+ sha256 = "eb54c4596602150c619db6d0d5572a59f7d9c4def68a34cb874cbc6535939e2a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ja/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ja/firefox-83.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "67858f54408487c9d4414dd4f072790b686379cd02aaedea165aa2f42ad9f638";
+ sha256 = "54b70bef0507611ad1ea7560668b46385661b5275c7a0ecaad723db44fd8af88";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ka/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ka/firefox-83.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "da27168c3eeb9d0836df349e5e258b9f5936cd715374b1614c90fbb4292776a7";
+ sha256 = "56e72349133297d61dfdec4933a01c2cd8fa3d0da3d784e0598506c2db05938c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/kab/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kab/firefox-83.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "4f523312e1ff88ed06ead886ad8957be6b655063ecd451fcf502b387d4144e82";
+ sha256 = "45f554342449405990c84e910dc6436489046acd00fdc4a0ddabb4b28d7c1284";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/kk/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kk/firefox-83.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "b2cff1f5f94e94091d2f0d174ae5a979db34c554f4432891c9b894f0c07a7fd2";
+ sha256 = "3463c4ea5df4e072dfca22e8983fdc016adbe2326bf186a0168ea9ee2c36b3bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/km/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/km/firefox-83.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "0c7b18f57c87d6d94c273b6678ce0dc891afabf9cb9bff3c03a347214bb52cc6";
+ sha256 = "3bb7d2c3e5278d9c51b87d8140096ae01532e99160b866164d1920fb012c085c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/kn/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kn/firefox-83.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "bf0c5dfcf7c23c033b6180cc4916a014e5c7b44464377f8e1c400db7bd7ddcc0";
+ sha256 = "c9086912382dbff66045c79130403385b9f075bf782220aeb84f03f62a563638";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ko/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ko/firefox-83.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "a1b30b45cce0d3bd1a4acb3a9f335592a819bc740455e56626968f2d66a07839";
+ sha256 = "6f70169cd58ee1559ab224c3ea6f5309bf75267d9f315e389b7971e8e1feed09";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/lij/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lij/firefox-83.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "8802eef13ecf4b61adbb6f3350893ef7e4fead3395aebd290df95c7d5dc2bfe7";
+ sha256 = "0b089e6f7954f4d99e9e59bd25148c4be620f9486f8d36c3db68fec5ea700d94";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/lt/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lt/firefox-83.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "3fb34783d2768452aebfc20ff59b84a83139f2dcb04b1e11369b4984560f94d2";
+ sha256 = "b76c545aad6e5b66bd8ab34bf02f7d4f69ecee348381b16c271f4de0243c660d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/lv/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lv/firefox-83.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "ad3a91899e2a1e2d22f0f15d15956c9c569b8ec0af50b7f194369d969fe9a339";
+ sha256 = "8504d5c00c5569f008b2e308a9193cf62130e89a6e61b33fc842081e4d504322";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/mk/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/mk/firefox-83.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "b98a27b50ae6c21e20f0bdc43cdf176b0d434a85ace230474bef86cb0411e925";
+ sha256 = "636a421f6238de1fee37014c3af147220af6a1f3c04e2ce6ec9dd17898bc7c20";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/mr/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/mr/firefox-83.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "6f32b1ed9fe14162366d11ece5b53c185afa314131ba56105ff3aaf9c61cb621";
+ sha256 = "1e00d369be11ad8bfb2dda0ceeb3b7b516fd66427d9e85bff4cc1d699ff3659f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ms/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ms/firefox-83.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "4c7ca7b1e504a9a4c14b7954987f4a2fc3843f341e26f088113aad09c2ed1727";
+ sha256 = "0590f2bff7e43b9f6c081d57276299f8327df73415a8e2a2243e3c4ec9154200";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/my/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/my/firefox-83.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "52b234e2c32f52197d38e618b2d542c584012253d5da9b46dbb47c4198e1319a";
+ sha256 = "ae43f0e8d4ff32274b25a1b78e0af44446ea6989edc4eb3c0d9fae36fcf80908";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/nb-NO/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nb-NO/firefox-83.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "63baeaf173b4c83c65b160bc12102038be1729f7ab4e535e01726c83d6af4751";
+ sha256 = "9c3a74fc7670e2202be1f4f75208f0113c115169ef70614af631cf16879e081f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ne-NP/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ne-NP/firefox-83.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "c95567889ad498059516e5c4c38e74fae0d937ad85b91813135cb4205b4be527";
+ sha256 = "d830f802cccc7351a447fc59ed64562cac1521d281ddf218c84d1c9af8a65cb3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/nl/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nl/firefox-83.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "6ab74c0caa49412b41e9c26af51c18b4b23c9a2990868bb76ee640f77cf7ec81";
+ sha256 = "ecfd03850a48ebf7c3ec9400838100514826b8f35744b0167f61c9086893ae66";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/nn-NO/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nn-NO/firefox-83.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "8ab6be8b9883cd41a0b5ee84fed125b0592c526bd60b57658e3949e675b10909";
+ sha256 = "ad0e4a89afabf1929d441129066dfcbf532d37da31c76bc79108d123cf5cc649";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/oc/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/oc/firefox-83.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "ffa788bf89e7d0533e14c706830e3e5a7995cf0d8827dd6f56e7a02eda85ba63";
+ sha256 = "9b9bbba334c4d7d3907f55a6647cecdf0bb2cd6294569a0008d866cd6eb70a35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/pa-IN/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pa-IN/firefox-83.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "300caec712dfd4c2a0d615671468ad6ff249b5300d94a1bf18552ec205fc96fd";
+ sha256 = "083266958874618042ee8f2a6162184cd71bc725a994aeb68158d59edb0cafaa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/pl/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pl/firefox-83.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "61cefb394f5490950de3a86312bf13864490c7b77f400881ba67c4e6e04c4585";
+ sha256 = "cb7c72fdc91cd9269a2e53725a26ee94db0e2e608a60ff1120fbe5c1627814bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/pt-BR/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pt-BR/firefox-83.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "d22845a258c133004216d692071f64c8e639caab6475b09de8e880dd26a808fd";
+ sha256 = "a2a188a222fc6054ca59d24370528e8c8d4d7dc8e4ab18f71510b415dde73d05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/pt-PT/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pt-PT/firefox-83.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "390270b8a04f3e7e7185ebe895741c6d3b82de55bd8a88384f58a2412b1156db";
+ sha256 = "528e1893438ead94afd4013d3c4f4f51107a5d0c4b6d6e018a0687f0d25f9e53";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/rm/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/rm/firefox-83.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "c9f916a4bd9d01dbfa7c07988f25db6fc754e98fdf8fb0c6d28c7cf23799fd6c";
+ sha256 = "e4d6e53b642da4de5c7f30297c6fec22b37921a55cb744962dc0d60e26812549";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ro/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ro/firefox-83.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "3079e818963ce30e63f984ef3d24a321bccde52021f68abf7c38e166b63dd3df";
+ sha256 = "04ffa3eda69ea0dfc6251564c4c6bc742d5f8e5dbaf6184b4ee9461226ce5c86";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ru/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ru/firefox-83.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "5d5f1d4cf24e1f41f4f49edd2918790f3395bc45656bc385ff863ae996a2e964";
+ sha256 = "697ddeb8ec024b5459492ebd652a612cfa1911267071b230f5ea6ac78a1e3075";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/si/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/si/firefox-83.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "182d4f9f65d923aa4c190eadb2822813a0153d46a7dd789bd03e2c87deaaeee4";
+ sha256 = "a3256c648ea75ce36009306a3c039af228e645ea2e54361fe239ad0cf0869ead";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sk/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sk/firefox-83.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "9f38a513c7a35aa403bc570c50d1269fab04f3e0e78a2ee729bd306513b34655";
+ sha256 = "1ae0f898d34c74ea427228d93646ae47990834d14bc4f5563427409dba066f8d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sl/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sl/firefox-83.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "916cb70157af7c6f44558954ab38b22c0e35472ae449b2cd1b3355e24f69d8ac";
+ sha256 = "9e14b4ad7bd9a8026074e0a3da3d3ba74dbb1be31a2e9cae787802d090c7a965";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/son/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/son/firefox-83.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "4790b6f7fad51191663549d6c06a9a27d2a6edf153caf66c8cbaefc6a2e33547";
+ sha256 = "1b928ca974133a346950ffc663fbed9d1876a4c0bca53fd807d8077d031531d5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sq/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sq/firefox-83.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "3265c849c77d482145bdd6e67078ec82e1ba339a807ec15692431a4c43358e2f";
+ sha256 = "7bb9bcfe490bf5d577e55e9b612c932c93ac58252cef592b2af39c17987e700b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sr/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sr/firefox-83.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "3d5616ad78372ad3e64e0bd81046680f075de53641c3c1f73edb2aed66f54d96";
+ sha256 = "90e496a5fe9c5d8c38dfcf5a1a07ea04be983fe78c68cb13a2b99067b0f02e7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sv-SE/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sv-SE/firefox-83.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "bf1122a7ba4cbb5525d35d7245a68bc2534d191639955a6c9810f57dc6b41efc";
+ sha256 = "eab8a1e51a90d36b58901db6175e724f38afb91270b05c51a93c03f8c51fe432";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ta/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ta/firefox-83.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "8ad3ac098bec9283218e0e33dc106457b8f2f21b15aa7b821a5f061566d058fb";
+ sha256 = "bb6d49500393d20134a6f749a77de1fc4cae2feba4e49261862f8a634b4b9276";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/te/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/te/firefox-83.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "a366052f680073f1d0c300a5a8e45d6cbd1be7651463067db268626d2fe1a5ea";
+ sha256 = "a1104e292f949976e423b587fe9728fc741b7a11e276e7d747afd3a93abe3eb5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/th/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/th/firefox-83.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "509dcd38435c2923a5bac14bb5b2dc4838606f139c29138a0bd5d090fdcb0142";
+ sha256 = "403e4a86b5f95cb22cdb2100372c55d92fcb4708e3f719da72b643637c711458";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/tl/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/tl/firefox-83.0.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "37f39b2df1209fdfa9005e6213d31aa50a8b62c55ed269625ed90f5fefcd5169";
+ sha256 = "993cf86a1b045a477fd4c683e503314fc2aea5a0a52f1faaacd18a0fdc5c7def";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/tr/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/tr/firefox-83.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "6417ff882cd86cbb7238414fd8100769ed6dea0a3532af09ed9d7e05ea322f22";
+ sha256 = "8e9e96d0b1a2014dc7374ea893fe72bc72f3840742d305a6e73417468dd6245b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/trs/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/trs/firefox-83.0.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "2fa044fcba5f6155ed55501938df4646dcf83f7d67f53ea8ca945e319db54c29";
+ sha256 = "3590ebb4c888cf92ebd615df9eda2413fd0a3031293d68809fef74fc92fa759b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/uk/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/uk/firefox-83.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "345be40eeaa42900bf7091fc8098a92d16369ecea3992974e4a2ad8856f58f3f";
+ sha256 = "7a3a2bae67ddd2afd2d6953f5f045a831595ea29e5cc6ad7083b8ac89e55917b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ur/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ur/firefox-83.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "47679117a1295b74a4b06b1407ce0dd38fc45326af970f4a20caa4ed8343e739";
+ sha256 = "445a599ba623d8673d71f6ebde70c64a93e28e57b6859e325b0151240f1d49e5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/uz/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/uz/firefox-83.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "85dc93248a9db047cd9c97a87e0f36ccd25456c167390bff19e0e84dc93b6756";
+ sha256 = "b63e6c1c6afdc3694ee1d2b21175f4a5603c4454e43f0a08e87ccf800862b6bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/vi/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/vi/firefox-83.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "7882f5c1e3330a567967444fde09e0bca8e2259e4f836603bac61d7fc4de47ed";
+ sha256 = "7127340d189ff601f96ba6f5e6a6175d850e822599e10762908d406b2174a256";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/xh/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xh/firefox-83.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "fcb914c24f93751ea1ba760818bee0323e5220c14ef95f3d6f302f80d58a0271";
+ sha256 = "41772e457eaf385230086a461033854ad214b4160c6f99f7eb6c4df8dd137dc5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/zh-CN/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/zh-CN/firefox-83.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "0e3635c27c594395f2364d6f4c140eac66173130afa0130bc4043e500fd91481";
+ sha256 = "013fe88aea216fbc4de9fdaaf559d65678ba389049bcff896540dae8d0a9564d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/zh-TW/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/zh-TW/firefox-83.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "7c3588bdac4147a43d5a40e376f359823a3503c3ae491e3d98b66b285c924e25";
+ sha256 = "7e9eea2a326842f652aad4995f796af9550d03c034587d171e4b2a33da934645";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ach/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ach/firefox-83.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "ed00c332dc5069a5b4755a759c4096112aa07b5fabaf0827fe63dcc8f96c70f9";
+ sha256 = "9974b19f4f15d9aa33b5432cceea05efe44f31c4123596aca9fb5cd3dd734152";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/af/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/af/firefox-83.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "41b4929336370eacd9fcf61bf56adc26377305f253ef8beacae8a3528949a2d9";
+ sha256 = "5600ad5fad398648d2e7a2d7bdf7901769fa428f9ef9f79046917133e12a7eb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/an/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/an/firefox-83.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "d8138aebfe43f67f634f4a70142b5463497799396cd4e5ac6fcdd91a1c370d12";
+ sha256 = "d8e0843dafcaf1b010773b83a665fd593741858b60aaba61d4c308a86f765146";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ar/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ar/firefox-83.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "f58e993bde013b674863586dd016d4ac9f8a245a4dfffcca36ea8044afec20a6";
+ sha256 = "952b2ad360662341b9281cfdd93a141fe2efd16f73baa4fc4be1de7b8f12c8c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ast/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ast/firefox-83.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "7fa1d61e805f7f3f94abafd6dd73c5ec3ac518c3192c6fdb7e31f155cfb2d8a9";
+ sha256 = "a7728b09f7e96983a031a32b1b938fa362e1a1e58722b37ec03a4048a152f0b1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/az/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/az/firefox-83.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "354db7168cec8c18431e33d5d13efec2b2e1de6b38e462338935ec4157521f46";
+ sha256 = "c6019a3f7ef56583445acc5ab310770c937b44182a1bb3ed54ac452e6e19f8fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/be/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/be/firefox-83.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "bfc5689bfcd37bc6afd6438130fac2486670616ebcf3f40e40dbff85f2323ed8";
+ sha256 = "12ead04878e308682f04afb6ac9ce9ab134a5a542af328e029cd973c14fe7444";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/bg/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bg/firefox-83.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "18bc052d5ba75cd4406aa726648609bc95d869a633ad99f3dcb24dd2621b81c3";
+ sha256 = "7134539d5c259cdf6dd316205b857acae87730ca01bd6ef2efcca75f9d06d027";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/bn/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bn/firefox-83.0.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "896eaf0144040b5eb7281f46280b918bca93ab8ebcd3d8a9176d6468a7f82850";
+ sha256 = "a97524e0d6f6f61045b2573ac2fe98e31fa372429f5f53c25fb4cb4d32a31940";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/br/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/br/firefox-83.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "7af967b1fa2aeb7d9e97cc883bd118b4d04a98c8cf56ea2f4f435ee13d1a087b";
+ sha256 = "4619705703a6878fba4de4227d90143abb92237ba556a8c5f4a51c9701671821";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/bs/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bs/firefox-83.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "990778d72c382920590a92ff0c861f8d64274d09da56fa989b5ca124731eb1e4";
+ sha256 = "2131babd061761fa1119a536ae354145315875c5d8cd300405a35924bbbfcc34";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ca-valencia/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ca-valencia/firefox-83.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "ec0594197bea5db1058fe3dca4a5e3bdbda53797e87a2fb0af070664b7a7fe3d";
+ sha256 = "73238eb95ac828f4bc2ac220e4b953b950a75b88600b457bf3bd528245574cd8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ca/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ca/firefox-83.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "42a25d4006fe6e4f8e7f685304f13f715654d79df775cc6e740a49bf72e691d5";
+ sha256 = "73e65093a587c89c9a392e3b65375ad2158c88e2905ab116eaf8da7cc5841cda";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/cak/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cak/firefox-83.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "452438f73a0da6bc5922de9178c66ab95a0ddc94420a97b771d44d76053d1e71";
+ sha256 = "7f2dd3fdf1e0cae21a1517286b60bbbabd310dfc0dc18588fbe21ba671e97dd3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/cs/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cs/firefox-83.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "fa827fd11c25b37f2e93938be3461061b8c0bd3ca1391c0b50657981cd0e2ba6";
+ sha256 = "5f639cc6d14b06ae62f73fc01b909182efea32710dfd817be60499f4da3eafd7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/cy/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cy/firefox-83.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "12708a5c0f3559d8557f5eb11a5a654b999b2e758d075fa723d78434f1f0fbc9";
+ sha256 = "7a3e9921b2e6e407ebeeb22f1ac4b529222a1f5fbdc84c44fc902b8db6aeb1ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/da/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/da/firefox-83.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "660f0af8ecfbb07df68d5e28eb63b69065eec5ae1e31acbe8f89a7aac66596c6";
+ sha256 = "05dc3274927f692ec3c60f8353a30e2bcb1a36b54f4ddff90407e2818a497a38";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/de/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/de/firefox-83.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "16492891efe70c69774e10a83465a5b7ada5a25a1057de0a744c347126667a1a";
+ sha256 = "c95affb4655b7a0ad6959651cf10090970035c74601ea141366cbb5d44f8a526";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/dsb/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/dsb/firefox-83.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "7c830c85f67d2d54b63ddfb94765f5fe1270df06d72e05cc5e0a1dc745e3dbbe";
+ sha256 = "c9baf7df51fdebbb2521dd10830f759110a9c92dcdb579fad99d0c4112126e66";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/el/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/el/firefox-83.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "f4c42a7b3b7c8faea5a54affeb47083f7070a37e3e05a85bd26d53eb2571182a";
+ sha256 = "52afcd2037b9cda2c66975dd184276bcccca27833cd7a6da989e32c591a06060";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/en-CA/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-CA/firefox-83.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "fb55f47dd07ba7b8e1d4637d0cf693db8de3bae5b729bced9f22e6a3a7136e37";
+ sha256 = "375d3a11f236560f06397f157209b1ce476197a0e7b327cf187dc2002d053c90";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/en-GB/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-GB/firefox-83.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "98fcf28312060007364b6ae7e73b4e5ec5f78d5cf6b92c68deef49b8aac39e66";
+ sha256 = "610657a623b5680c2ea350a5f3d1ec676e9dac8720e0e67b3e627e37a58b0ad6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/en-US/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-US/firefox-83.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "53e1cd6dd28b764fc0e824174de5cb1d70a2b795f7f7e6d1ed400a84d996295b";
+ sha256 = "ac4df9d78ac0321f6be266e7fbf6b79d80bee7cfdf1b00c433072d2283c5fdf8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/eo/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/eo/firefox-83.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "0277e0d4f5296fcb5d360e3949991783808362014220eebdab8fd031203d03a5";
+ sha256 = "f23479cb30cf27fa368e9e04591aad2051eedde5e69d105bfc9ba6168792b44b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/es-AR/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-AR/firefox-83.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "db90a491dde00c0625bfb91f12820235ed4b23ace245520bcea8129bc0fe99ad";
+ sha256 = "5657636c105d301474cf5d2707733a35ac5f5687790002d5778dffb32a727adc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/es-CL/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-CL/firefox-83.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "da7ab44cfe8fef8a89be8180f503477d632e1b0d0e13b410e005971f1eab65cb";
+ sha256 = "896f2ac45b98eccd487de64b6c5aa98733d97bd4422dd1a16d02883e3a06c132";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/es-ES/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-ES/firefox-83.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "b774a59300369f9aa5e695eecf2923036ac28b790a2b265bff39fa004221351d";
+ sha256 = "9d337fc821dae150c4f3ce26c427ad0efa22c53f3b311b4ce7693b33c9ea4d7d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/es-MX/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-MX/firefox-83.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "f227f0904d927a9b7696dbd42c33e247b93a517ac465e63658297d266636dd63";
+ sha256 = "f9cbd03f9813157835ef7faf9fa2374e488144930ffdec765c370a95a9c72120";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/et/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/et/firefox-83.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "40c66a997e4a244775c4e094b313d8de66fdd8ca9b59b14b1858e331f0c1760e";
+ sha256 = "4f33cbb67003da1b4db4dc12ee2e7b9fe942bc6e6d770608361355ce7fcf8214";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/eu/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/eu/firefox-83.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "cc346925123d138c8f39f8feaaa830c87b31ec9f3e6d66d62f3c4201389528b8";
+ sha256 = "31970c98d028a83a6198dcee9c5f8191343cd84ec6a7fa032a31730db2cc7b00";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/fa/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fa/firefox-83.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "74ef4fb696e3a551e920d95341e6b24ebed1abc0f50c3753b5719e649ee6569b";
+ sha256 = "1125c534f2067e57701fab7ae3df55c52dc10693b069817021072c74b8b9bdcf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ff/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ff/firefox-83.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "300bd1d7ad740efdf7e783a19bbfbab32d699ded795857005e3d836086414ecf";
+ sha256 = "ef6c66b0d8a6edce0c982eaee55cd14a4ac4d365478976a0c4f1cd48a6c10c6d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/fi/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fi/firefox-83.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "be9e639888e7fe25508d1fecce9dff0d25fb8f4cc1df9485c06fd34dd1964341";
+ sha256 = "bcd529c0227bd64403dc023ef91459556fbb186e072c12075b705d50293d86c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/fr/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fr/firefox-83.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "a722540cedb2694bdd8cd347cce80f0e7bd6092227a0d69d64e35cd644f9eb77";
+ sha256 = "47c56fe2b88054d97622e9c0ff2043323b7a916da1e11541e96cf7b05c3e7d52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/fy-NL/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fy-NL/firefox-83.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "d8292b69187d3b69d3e6d38076e9e448cc1851ae560432d524c9ceb25b980302";
+ sha256 = "b0ed17e5022b0817d6b4f58ef990ce22774bde875151c60be1f7251ec90cb189";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ga-IE/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ga-IE/firefox-83.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "3d72fde2daf9dee7d7521dbdcc257aac3e5a3090f07a02aaa4eb1247e4dae774";
+ sha256 = "380aad276cadff8221e4f675751278ba994e08ddb46a0ebde12d87b741c23263";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/gd/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gd/firefox-83.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "b599939ac3927e3da21a8b85dfcfb2bbbfbc5ca9833543b7df3e8937184fcb0f";
+ sha256 = "0489ed6e1e9150a0facb4e6fb59bea7673e89669d167806d5651224b939fada5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/gl/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gl/firefox-83.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "f7d8f6915d9867e740aeeb06614ac3c2a9c29ad914937fef99490c37c329e822";
+ sha256 = "bc41c2b611ecb4ccdedbbf480138a3bc6326106d6c1641d6a06e40f502427af0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/gn/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gn/firefox-83.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "940c94891a5bf80b12c24b49276e87c50f6edc601c1876a75ddfb36853f94c02";
+ sha256 = "ade8fe9ab75b0a5f75ce80ba0f8065c4b4cbf54d7772f4c3be96886ca166b373";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/gu-IN/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gu-IN/firefox-83.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "8961e66ea0bab00b29ccd365351517d932c75af5fceb9381a0670e225bb9a20e";
+ sha256 = "bc20ad60eee0e6a3d532e436d9b62175872fcb27dab4c9a5083ed6f4bda5f036";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/he/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/he/firefox-83.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "a253c246e6a2820a6552a81291f9887007174120e13f3becd3e3f06d55e12457";
+ sha256 = "a08862d8ebdfa2d6c4f038b91f264c9abe873537d1a7cd2997a1eb4d73bf6f4c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hi-IN/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hi-IN/firefox-83.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "39f7bd90f28ce92b83c46580e8297367d02042eb274809a0c94f58f6fbd2d0f4";
+ sha256 = "8ed5b454bdc38f07c79924a1dc08e76e65a48bd671991744a441693185683916";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hr/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hr/firefox-83.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "37237b7a1b28028c31118b3f6012f6122b428ed81cd0289b224aff910700c92e";
+ sha256 = "97356a661d56d51a9210109db8ad75d61e3e00e4c7570d4e824712b52337af27";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hsb/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hsb/firefox-83.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "e4c1d598ebd277309e1d9bec979373162cb34ec7874637a7140184c07e590653";
+ sha256 = "5706aa76b23161baf24b79d2b45dd706006fb73aeedd06f41f3273f8078f371b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hu/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hu/firefox-83.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "a273f90e185fea5e02fa7be0e859d6569d5a18690dca2485db39719f04f96821";
+ sha256 = "3b894beaef35012df54ba4c7509a06ece1a0cdf741308b3510ddc702c4eb3656";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hy-AM/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hy-AM/firefox-83.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "0da0b1db8a5632776a38d8ca53fc59bb2922b9caeecb779e4fd69086330eb153";
+ sha256 = "b2894092de59b7d6bd6dcd2111fa4591b1a4ed054fd107e2093bd0962edb4405";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ia/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ia/firefox-83.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "53fc34e4f99ace2f287a39dc8ce1d13546574da940dc85703fd81f7bfa7c4483";
+ sha256 = "9d9ee7e05a02078b7d4041c3b63e79f91f0a888b919cf726e2e69090ff05f71d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/id/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/id/firefox-83.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "33088caa35f9939e24e1686a97762c86e6bfde246467544383b4dd20a477ce01";
+ sha256 = "13e54589a23323e9043d4dac5586a31e5d43bdde0356b1a00a86f91ee5813eb2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/is/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/is/firefox-83.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "e8651697dd1c6507e950dab2a7c1a3e61c7a1fff5507fa6967577c076aca43d6";
+ sha256 = "955a8a4ff1c5ba7124593b3c8537201ffb1fe33ea5c3edd6ab30e80e6b28f60a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/it/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/it/firefox-83.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "faed37a9099007b2a06a66f0d2baf19f743a5370d354d9295d3c04d283a840c2";
+ sha256 = "23927419191d7aee8b29da29d213ee9c7ff39363f3fc9171c70d801158cb895b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ja/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ja/firefox-83.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "cc403028cdfecfab642f99e4fbf6920cb036f71da9ca05343b41990c01e3974a";
+ sha256 = "4ffaf6df345922bcd82942956a0f344c4b52ac49ec64879fef7307a0c34eb8e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ka/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ka/firefox-83.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "279655a3c1a9151af171066bf164c71a4541344d5bddc02e208faae5af61052b";
+ sha256 = "df1027754efd054bae379b35228067799e75820b08ca7e6aff5a527fdaf046a8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/kab/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kab/firefox-83.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "febad3151c3b6dbd0e3747a4814d2451e7703d8907407255810cd87383a5d665";
+ sha256 = "6fc1e5d662ce742a48c003145b1b4b58cb296b43a20f718bdcffdc05e386078f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/kk/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kk/firefox-83.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "25135a1305e6c4269ef9beec7353669d403023fd552ae43cb7a4b8042eaa9a40";
+ sha256 = "52cb3ac3a33da1227c3aa5e47e04620be2cc020bc520fcf013fe11ad74ad6378";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/km/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/km/firefox-83.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "80daab49e0fd64640fc1b0a7ecaf3b764a0a7b38020aa4a758f1e5e8ee639b9a";
+ sha256 = "c598fa97bb79f56d01afb30caeff29a2c7dd1f162d2fb49c0632ee259d0fe860";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/kn/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kn/firefox-83.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "dd911926a98835fe4a0a97ad0ee88867bc637a673743b9c6ee75aefea1cf60b9";
+ sha256 = "d6795f3f3c0978dbc399768fd824cceb6a3c1c883c153f65102ef476f74d6408";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ko/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ko/firefox-83.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "975f10dc01c190604cac28705f98b0abb352adf21aa1adb031a11c8061fdb4d5";
+ sha256 = "b4d0b62cdfd332d8e9878b75918a0362a7b68db0b62e4e4508dfa176e79b8ed7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/lij/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lij/firefox-83.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "9f6183b484eeabfbd4440d644d3da60c1068af430638b1bf9e4e5a4fe47e123a";
+ sha256 = "257eec8bead076119b0c3679feb4f3de34c9cf66bd05215e7d76936e6d3ce052";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/lt/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lt/firefox-83.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "e95b0760385490b65c774943f72835423c3339030a9b347eeaa7a3cd172065bb";
+ sha256 = "326925d68306ec6e5b7334eb413cff395ce6a27abf5b0981dee25a7888c64079";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/lv/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lv/firefox-83.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "6a2387d24680d541e12547f6fe38c56e9960beb317e450a39cfdd481b56485d8";
+ sha256 = "036264de51a7a81b3d636b8217db571db70631231d485f353e64e9f43f0192f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/mk/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/mk/firefox-83.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "c95e5e94680ce2dd06adb6cc6ab7cb2545e2283b34f9f6702db9c4ee48635d7d";
+ sha256 = "6d4966ae49ba7746395b17b98c158c07d33293b68a6c648d0238107812ccfc03";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/mr/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/mr/firefox-83.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "6e2ac911d8b4ff89fa5719593b390ffb68f31ea9c53ca075ae91c47907ed67bf";
+ sha256 = "88a90205bfd157fbcb0697efbd4884772a463f776f5110aae9903dbc1151fcbc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ms/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ms/firefox-83.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "4c573fc813f878c9baf9ebd2aee71f5459160a2449c424e1bcfbb8035b3b7c50";
+ sha256 = "67d3651739404a73f263251896c129dc121808d4859169b3469b640345433e9e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/my/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/my/firefox-83.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "a42129e772ecef6e437aff59390da05595f55872c990122bfa07509aae204757";
+ sha256 = "d7e9a1fe6d2e0e32c2ab9a773d198de241ac2a7d330d9eddce4f3afb9a67671b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/nb-NO/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nb-NO/firefox-83.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "3d72dd2b24c1c99fc1257a9eecf91fd694e67a161b511b991a7294c6dade77c6";
+ sha256 = "66c165884d4397db3e420151d2b6fa3d7bb7c6de790e6d284815cdcc323da3fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ne-NP/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ne-NP/firefox-83.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "a85fa695c3c7a221ee54bee11b5eb88dab9d087d3535f63c143fc8fea759a83e";
+ sha256 = "f75832bd74f5ce8db3765201eee058f0386f196f407223e186c0be3d2a665fcf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/nl/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nl/firefox-83.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "48aa468f774d67526e41488882f3796a399ef1789b70793570407e14bf112251";
+ sha256 = "beb68fb193dfcccbe22369f9adcbebe701fd4c9ab5943ec685d5d20398a1ea5d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/nn-NO/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nn-NO/firefox-83.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "857abf782407625492859630cd47be120e5daf8843dbdcb61535fafaa0d5d3cd";
+ sha256 = "de2716b8f4c13c6ef76537ef52f1d0529016302ce220a90d9b5062af9becb5b7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/oc/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/oc/firefox-83.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "b8606e264be062dcafc162b5d69191d2962b547fa906e76e68345395378ea471";
+ sha256 = "af2a788560a65cb9f3d2ce98acce4ecd3b3105b6c924c6a4de1a9deb6f2a4d42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/pa-IN/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pa-IN/firefox-83.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "7279685c4da5b614f6ae0832636676b06ec3384667e1cc1e25379d61b52ebe5c";
+ sha256 = "a3575371b20bab63a8bccc110343e0cd0736cffbc5c72dd7aa371c646a057060";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/pl/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pl/firefox-83.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "436d60ea9bb7b84bb20973ac39ebaf1fbd6c7966b5fe5677fa829935d76f4932";
+ sha256 = "daa554b493ce1efa90a1b040e78d2f2e7ad8ca70c16ee19312c69ed4a12f00e3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/pt-BR/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pt-BR/firefox-83.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "47e972cd908b61b1ffb3a194ef12bb1b9e0033a3b30804e0201a94a5dc4c9d42";
+ sha256 = "4f3fe4a1ce0e12383b37832f44b59fbb40b8fb6e95786edc57ea67ea3d5530bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/pt-PT/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pt-PT/firefox-83.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "cab8ffd436e69f7102519bc9ef73d7473336a0a45452f1e85cb0b0ce7c50d197";
+ sha256 = "c16bcb116b845a6b28b72096ae43d50f19c7b9868c8bbb833db60eaaa70b001d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/rm/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/rm/firefox-83.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "26e71bcc89580f7a2510f7018481b86c7674b0534070a85f675a2f576de2d9c1";
+ sha256 = "334d3dcf333a66f4bd169536f7f3b56ba4b257793dfd0837badff2a77b3668f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ro/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ro/firefox-83.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "2c9838ca56e808cbcc0f08987c1b21615119d94dc93cf94dba915491130a0706";
+ sha256 = "1e6ad9735fe0046beaf80ac35d0a1831aade14f388d08991b9bc583135ebd94c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ru/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ru/firefox-83.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "4f9b41754a1dd74d8979940eb17be6578c6907b0deea700697eb340fe607a586";
+ sha256 = "a252bcd66f01375fbc4ce040b89c853c34745e8dede116d200303c56d6307f15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/si/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/si/firefox-83.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "203b50ef0d0d76ab3db56bed03a1b78f3f20819cc804cb5ce470470bd6b6148b";
+ sha256 = "ebc5ce83b456f75b671694ac954258ca480caee563e0cb395786692aedf24d88";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sk/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sk/firefox-83.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "650cf2fe9ad5628b927f655fe1e88e9260c98543b7fdf6dd5faf9a1cbdf50f08";
+ sha256 = "28aac94a71298c459f14949c9c82b379762d3192a16d92e90605ab8925cb31ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sl/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sl/firefox-83.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "7c0aadbc5d6dfff44906eca393acc08388238fb502d183653a094f4ef7095d02";
+ sha256 = "7fe0eb68a898488bcb697120542fbdcfd1d972c658b4c361bba351a8f5eb76e0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/son/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/son/firefox-83.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "7e60dd64c8ac8052cbc6efb8cba46713ebefd17e66626a6fa2896a3bf88e9553";
+ sha256 = "f9cb1327834b6a6e41d4abf531410391a40f33a8d168d562dc367faf31d9e042";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sq/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sq/firefox-83.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "d8fa2f61a2fdace3374effb32484504afb78651406216c1dc900f6958ed52561";
+ sha256 = "15370cc0527797f451a5a1f47637c6663437c8f49fc5c056ccbc2e7510cd6c94";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sr/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sr/firefox-83.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "f58146fd202221fec3980ed9fbe7bf84d26465fb63c334826b3271c705e5bc61";
+ sha256 = "c44773c36eb39067e429fb4a4b57676abc7eb9fcf45bd6654d96761f64747c6a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sv-SE/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sv-SE/firefox-83.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "23f71c61978bcf531790a3894e86c7bcd7c930464f9276e4d4464de3d199db53";
+ sha256 = "aa8d2dc50dce8a53a926c71a4a7a57023a017d5fbd54cd1e446ef74b5eef7dea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ta/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ta/firefox-83.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "78fda229fc9583bcfb3b1ee12d494d04955845a703a594e836e9bf3ae67531a7";
+ sha256 = "5fc3e8a048ec24e49c4c4a0e36712b378687e927c30dc8ecb3ec63bcf983062a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/te/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/te/firefox-83.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "86aef155c9b1db83727d8e2df9cf73148ef7146aa6ec77f751f7e548e1ff3e72";
+ sha256 = "ff123410cec64c47d239a432d32eaefa494e7cd7fb0157cc45917fe04b2916ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/th/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/th/firefox-83.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "ae647ba530f60dfad84c95d0b70ee8dba7ef183f1b76c9861b2ef3da6d95779d";
+ sha256 = "cb7cbf97884a5b4f62c4e0932ead0e5de018c9623590ac3798a86986916258dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/tl/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/tl/firefox-83.0.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "137722d3de0ae236bb17dfc940b8eccd5ac7ed291d22a59486c2e79505d3b34d";
+ sha256 = "0d55a23e2c0b7da80a6c042e50fc3c9364c3f24309cf255bfbe55a320ec2cf00";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/tr/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/tr/firefox-83.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "0a2c8be857398f202cafeb97db2a8ac963695e285137c8e7e7df40a9673f0c2f";
+ sha256 = "bfc1adb570f79b4f095bc87ab5a54c6b5179579840ded61319a10ad5ff39d52f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/trs/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/trs/firefox-83.0.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "6c2d08829057be94edc1923b176fd52ee8cac5cc40e2484c38577865d179cde1";
+ sha256 = "05b5a2252380147ec47561e29514e3f994414b46aae3dd168909f03e7dec16ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/uk/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/uk/firefox-83.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "b2b9b997a9bcbe12d3378cf18928ce8cb842a4c3962a0629f6abdd41340f36e1";
+ sha256 = "7e34b52f4d46a735e36f549295d0f9704113024058a7d8d69a8ee6a023d03755";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ur/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ur/firefox-83.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "b91073657e73985254dde8542ca420087111de7297d7efa368204a45cd8c0932";
+ sha256 = "1d48e536c09f862bc00fcaf9a175eaeffac1e0aaff66d71ca49123c00cc885bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/uz/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/uz/firefox-83.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "6e966992653870494fc3f44a44c8e3a4863b477c506e21c384905ecf7d79077e";
+ sha256 = "1f1cf131b3196886aa0f923c5dbaa279b86c3473dc048ce23d58fe811ca1266c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/vi/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/vi/firefox-83.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "8b1d1fdac04d9fd18a52497bdd2351c511fdd7480914b142e9e83a67b8c2d352";
+ sha256 = "b98507cd809abd28c51514448bf995661dede7c727808ab8c2db46da8da0a164";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/xh/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/xh/firefox-83.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "74156e07e1a42d2cdcf8dd533f191673bb7acd6c14fffde0a2ca557cd15bb05e";
+ sha256 = "73de4ec29cd09610359909ada39820a119a15c3ae0cc1658c2e9b874801a9015";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/zh-CN/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/zh-CN/firefox-83.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "4ff34ab97154152f0c1ae67640a7bfd51bf40fdcaa55635573cf9dd315566d5e";
+ sha256 = "fea085476f4456133c1f0973121319f1c3efadcc50134cbf5ccde351bbe2ff06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/zh-TW/firefox-82.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/zh-TW/firefox-83.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "3c6e1b67a2e4132be1a506bbb1ff25c61519be5a1daa962ef629e0d1f8b670c9";
+ sha256 = "5aebd374f2e73f83bec4c14239555d9f2771d3379280fc55f90f1ae0909be009";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index a98891df4d13..fd3982a7c62c 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -4,7 +4,7 @@
{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip
, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
-, freetype, fontconfig, file, nspr, nss, libnotify
+, freetype, fontconfig, file, nspr, nss, nss_3_53, libnotify
, yasm, libGLU, libGL, sqlite, unzip, makeWrapper
, hunspell, libXdamage, libevent, libstartup_notification
, libvpx_1_8
@@ -106,6 +106,8 @@ let
# 78 ESR won't build with rustc 1.47
inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45)
rustc cargo;
+
+ nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss;
in
buildStdenv.mkDerivation ({
@@ -116,12 +118,37 @@ buildStdenv.mkDerivation ({
patches = [
./env_var_for_system_dir.patch
- ] ++ lib.optional pipewireSupport
+ ] ++
+
+ # there are two flavors of pipewire support
+ # The patches for the ESR release and the patches for the current stable
+ # release.
+ # Until firefox upstream stabilizes pipewire support we will have to continue
+ # tracking multiple versions here.
+ lib.optional (pipewireSupport && lib.versionOlder ffversion "83")
(fetchpatch {
# https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch
url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch";
sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab";
})
+ ++
+ # This picks pipewire patches from fedora that are part of https://bugzilla.mozilla.org/show_bug.cgi?id=1672944
+ lib.optionals (pipewireSupport && lib.versionAtLeast ffversion "83") (let
+ fedora_revision = "d6756537dd8cf4d9816dc63ada66ea026e0fd128";
+ mkPWPatch = spec: fetchpatch {
+ inherit (spec) name sha256;
+ url = "https://src.fedoraproject.org/rpms/firefox/raw/${fedora_revision}/f/${spec.name}";
+ };
+ in map mkPWPatch [
+ { name = "pw1.patch"; sha256 = "1a7zvngn3k7dg886zmi38kmrsdzh2rrr46aw59bhr1gfmq8wlwn0"; }
+ { name = "pw2.patch"; sha256 = "17irg3yb2mchcy0z0nr4k65mwvkps467cvvczr10fnm06lhkhw1l"; }
+ { name = "pw3.patch"; sha256 = "12p6ql5ff2lfzlni6xkpz63h2xr6n2a9zf8hhjl99fj56rif6706"; }
+ { name = "pw4.patch"; sha256 = "0rvysc92rdm98s47w5lvbnrklrf7d299k3918qnldniyb4b9p4mg"; }
+ { name = "pw5.patch"; sha256 = "0kk2yxq4qkfwc4px6m08jrn18a7a7dhrngfiaw84r9ga6sgn0z00"; }
+ { name = "pw6.patch"; sha256 = "12lhx9wjpw0ahbfmw07wsx76bb223mr453q9cg8cq951vyskch3s"; }
+ { name = "pw7.patch"; sha256 = "0afw7cfd48vn62zb9y5kd2l26fg44s3aq1kyg3gm4q3rj34xidf6"; }
+ ])
+
++ patches;
@@ -144,7 +171,7 @@ buildStdenv.mkDerivation ({
# yasm can potentially be removed in future versions
# https://bugzilla.mozilla.org/show_bug.cgi?id=1501796
# https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ
- nspr nss
+ nspr nss_pkg
]
++ lib.optional alsaSupport alsaLib
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
@@ -165,14 +192,14 @@ buildStdenv.mkDerivation ({
NIX_CFLAGS_COMPILE = toString [
"-I${glib.dev}/include/gio-unix-2.0"
- "-I${nss.dev}/include/nss"
+ "-I${nss_pkg.dev}/include/nss"
];
MACH_USE_SYSTEM_PYTHON = "1";
postPatch = ''
rm -rf obj-x86_64-pc-linux-gnu
- '' + lib.optionalString pipewireSupport ''
+ '' + lib.optionalString (pipewireSupport && lib.versionOlder ffversion "83") ''
# substitute the /usr/include/ lines for the libraries that pipewire provides.
# The patch we pick from fedora only contains the generated moz.build files
# which hardcode the dependency paths instead of running pkg_config.
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 5786e4113946..352e7bac5e9c 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
- ffversion = "82.0.3";
+ ffversion = "83.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "0j5s5fkph9bm87lv53d4xvfj02qjfqzj5graxcc8air49iqswfmqjdzghna6bj9m8fbn6f5klgm6jbrmavdsycbps0y88x23b6kab5i";
+ sha512 = "3va5a9471677jfzkhqp8xkba45n0bcpphbabhqbcbnps6p85m3y98pl5jy9q7cpq3a6gxc4ax7bp90yz2nfvfq7i64iz397xpprri2a";
};
patches = [
@@ -35,10 +35,10 @@ rec {
firefox-esr-78 = common rec {
pname = "firefox-esr";
- ffversion = "78.4.1esr";
+ ffversion = "78.5.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "3gfhipbihyznnh822lxams6rm0bcslh31b58lzibjx8a9dn99hy3p04h07slygcqazbz1rrs7b2b8q321fknp27aisk0sz8cynrcw18";
+ sha512 = "20h53cn7p4dds1yfm166iwbjdmw4fkv5pfk4z0pni6x8ddjvg19imzs6ggmpnfhaji8mnlknm7xp5j7x9vi24awvdxdds5n88rh25hd";
};
patches = [
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 134d25ae678e..6281d652d0c3 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -11,9 +11,9 @@
buildGoModule rec {
pname = "minikube";
- version = "1.14.2";
+ version = "1.15.0";
- vendorSha256 = "057mlmja3mygfdf0cp0bcm0chq7s30bjcs5hqacwl6c79ivrjf89";
+ vendorSha256 = "1xkk4f8qjqx5x878iniclni3jm2f7ka47va756vc3vk8p5s6vpdk";
doCheck = false;
@@ -21,7 +21,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "1fidvfm9x3rbqfjn9zm5kx9smk94dmjm4gb98rrdmgsld5fg99xj";
+ sha256 = "1n1jhsa0lrfpqvl7m5il37l3f22ffgg4zv8g42xq24cgna951a1z";
};
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];
diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
index d64178b1e658..a583bc335142 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terraform-provider-lxd";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "sl1pm4t";
repo = "terraform-provider-lxd";
rev = "v${version}";
- sha256 = "1k54021178zybh9dqly2ly8ji9x5rka8dn9xd6rv7gkcl5w3y6fv";
+ sha256 = "00gj7zj45wm9sf7a7nybjijdrdr00g2yf8h41c6j679a6nfnx0fd";
};
- vendorSha256 = "1shdpl1zsbbpc3mfs0l65ykq2h15ggvqylaixcap4j4lfl7m9my0";
+ vendorSha256 = "0xq8zgx8h47pc88nkdvy5skpr8vk87b4212mm5msfxk8n7nl4fi2";
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index e607a9ee75ba..68c41c64d86f 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, makeWrapper, terraform }:
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper }:
buildGoModule rec {
pname = "terragrunt";
@@ -19,11 +19,6 @@ buildGoModule rec {
buildFlagsArray = [ "-ldflags=" "-X main.VERSION=v${version}" ];
- postInstall = ''
- wrapProgram $out/bin/terragrunt \
- --set TERRAGRUNT_TFPATH ${lib.getBin terraform.full}/bin/terraform
- '';
-
meta = with lib; {
description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices";
homepage = "https://github.com/gruntwork-io/terragrunt/";
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index bbf3f0514c45..ad346104f969 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -35,7 +35,9 @@ in python.pkgs.buildPythonPackage {
postPatch = ''
# yarl 1.4+ only requires Python 3.6+
- sed -iE "s/yarl==1.3.0//" requirements.txt
+ substituteInPlace requirements.txt \
+ --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \
+ --replace "yarl==1.3.0" ""
'';
propagatedBuildInputs = with python.pkgs; [
diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix
index 9487780634da..551953d43375 100644
--- a/pkgs/applications/networking/irc/convos/default.nix
+++ b/pkgs/applications/networking/irc/convos/default.nix
@@ -6,13 +6,13 @@ with stdenv.lib;
perlPackages.buildPerlPackage rec {
pname = "convos";
- version = "4.40";
+ version = "5.00";
src = fetchFromGitHub {
owner = "Nordaaker";
repo = pname;
rev = version;
- sha256 = "0yyykr86d494xq1ga5ncr6jmdf0ny1r4gm0wzwn49bxn2x1l0xck";
+ sha256 = "0mdbh9q1vclwgnjwvb3z637s7v804h65zxazbhmd7qi3zislnhg1";
};
nativeBuildInputs = [ makeWrapper ]
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 57d12b38dcdc..c982f6db485b 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -32,7 +32,7 @@
, nasm
, nodejs
, nspr
-, nss
+, nss_3_53
, pango
, perl
, pkgconfig
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
libvpx
libwebp
nspr
- nss
+ nss_3_53
pango
perl
sqlite
@@ -142,7 +142,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE =[
"-I${glib.dev}/include/gio-unix-2.0"
- "-I${nss.dev}/include/nss"
+ "-I${nss_3_53.dev}/include/nss"
];
patches = [
diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index 2a8a06227133..0d2fc0fd833c 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -23,7 +23,7 @@ mkDerivation rec {
dontBuild = true;
dontConfigure = true;
-
+
nativeBuildInputs = [ imagemagick autoPatchelfHook desktop-file-utils ];
buildInputs = [ qtmultimedia stdenv.cc.cc ];
@@ -53,7 +53,7 @@ mkDerivation rec {
description = "Official Qt SoulSeek client";
homepage = "https://www.slsknet.org";
license = licenses.unfree;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix
index 02b14b72c18b..444a6dcf45c7 100644
--- a/pkgs/applications/networking/ps2client/default.nix
+++ b/pkgs/applications/networking/ps2client/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
patchPhase = ''
sed -i -e "s|-I/usr/include||g" -e "s|-I/usr/local/include||g" Makefile
'';
-
+
installPhase = ''
make PREFIX=$out install
'';
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
description = "Desktop clients to interact with ps2link and ps2netfs";
homepage = "https://github.com/ps2dev/ps2client";
license = licenses.bsd3;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index 7ab53b19ce04..03da2170b3d3 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings-desktop-schemas }:
+{ stdenv, fetchurl, makeWrapper, makeDesktopItem, wrapGAppsHook, gtk3, gsettings-desktop-schemas
+, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsaLib, libav, cairo, freetype, pango, gdk-pixbuf, glib }:
stdenv.mkDerivation rec {
- version = "3.8.1";
+ version = "5.1";
pname = "jabref";
src = fetchurl {
- url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}.jar";
- sha256 = "11asfym74zdq46i217z5n6vc79gylcx8xn7nvwacfqmym0bz79cg";
+ url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}-portable_linux.tar.gz";
+ sha256 = "04f612byrq3agzy26byg1sgrjyhcpa8xfj0ssh8dl8d8vnhx9742";
};
+ preferLocalBuild = true;
+
desktopItem = makeDesktopItem {
comment = meta.description;
name = "jabref";
@@ -19,21 +22,44 @@ stdenv.mkDerivation rec {
exec = "jabref";
};
- buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings-desktop-schemas ];
+ nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+ buildInputs = [ gsettings-desktop-schemas ] ++ systemLibs;
- dontUnpack = true;
+ systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsaLib libav cairo freetype pango gdk-pixbuf glib ];
+ systemLibPaths = stdenv.lib.makeLibraryPath systemLibs;
installPhase = ''
- mkdir -p $out/bin $out/share/java $out/share/icons
+ mkdir -p $out/share/java $out/share/icons
+
+ cp -r lib $out/lib
+
+ for f in $out/lib/runtime/bin/j*; do
+ patchelf \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${ stdenv.lib.makeLibraryPath [ zlib ]}:$out/lib/runtime/lib:$out/lib/runtime/lib/server" $f
+ done
+
+ for f in $out/lib/runtime/lib/*.so; do
+ patchelf \
+ --set-rpath "${systemLibPaths}:$out/lib/runtime/lib:$out/lib/runtime/lib/server" $f
+ done
+
+ # patching the libs in the JImage runtime image is quite impossible as there is no documented way
+ # of rebuilding the image after it has been extracted
+ # the image format itself is "intendedly not documented" - maybe one of the reasons the
+ # devolpers constantly broke "jimage recreate" and dropped it in OpenJDK 9 Build 116 Early Access
+ # so, for now just copy the image and provide our lib paths through the wrapper
+
+ makeWrapper $out/lib/runtime/bin/java $out/bin/jabref \
+ --add-flags '-Djava.library.path=${systemLibPaths}' --add-flags "-p $out/lib/app -m org.jabref/org.jabref.JabRefLauncher" \
+ --run 'export LD_LIBRARY_PATH=${systemLibPaths}:$LD_LIBRARY_PATH'
cp -r ${desktopItem}/share/applications $out/share/
- jar xf $src images/icons/JabRef-icon-mac.svg
- cp images/icons/JabRef-icon-mac.svg $out/share/icons/jabref.svg
-
- ln -s $src $out/share/java/jabref-${version}.jar
- makeWrapper ${jre}/bin/java $out/bin/jabref \
- --add-flags "-jar $out/share/java/jabref-${version}.jar"
+ # we still need to unpack the runtime image to get the icon
+ mkdir unpacked
+ $out/lib/runtime/bin/jimage extract --dir=./unpacked lib/runtime/lib/modules
+ cp unpacked/org.jabref/icons/jabref.svg $out/share/icons/jabref.svg
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix
index 3811c8fd6f26..5f7ee88a029b 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/applications/radio/fldigi/default.nix
@@ -2,12 +2,12 @@
libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
stdenv.mkDerivation rec {
- version = "4.1.15";
+ version = "4.1.16";
pname = "fldigi";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
- sha256 = "1fzbcv2dgg6byb2l8m2d6i69yn0a44pq52mpmms756jdf6z622i6";
+ sha256 = "1dfkvhs0ri5kbyskk730ik8ix5z138qys26b31p6kixd8jjkw3k4";
};
buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio
diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
index cb3f3131ea14..4a6bdd9d1e9c 100644
--- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
+++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.astrolabeproject.com";
description = "A Java-based tool for generating EPS files for constructing astrolabes and related tools";
license = licenses.gpl3;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index 3035a69dc193..9adb8e3674b8 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = "https://sourceforge.net/projects/jmol";
license = licenses.lgpl2;
platforms = platforms.all;
- maintainers = with maintainers; [ timokau mounium ];
+ maintainers = with maintainers; [ mounium ] ++ teams.sage.members;
};
}
diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix
index 84a1034849f7..ddab526ebe79 100644
--- a/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/pkgs/applications/science/chemistry/marvin/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "marvin";
- version = "20.19.0";
+ version = "20.20.0";
src = fetchurl {
name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
- sha256 = "0b9a0yl3mxfb2dfdkgs2wphhxsgwixqk6nl2hsn1ly3gz53cws1q";
+ sha256 = "1a8b0drb0c95c8arm3aa0z0sbdm9ilj4h1g90i0qyn4g2wk2xsal";
};
nativeBuildInputs = [ dpkg makeWrapper ];
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 25ee66e8f75a..e4fbe8a7f2de 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -113,6 +113,6 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
hydraPlatforms = platforms.linux;
- maintainers = with maintainers; [ peti timokau ];
+ maintainers = with maintainers; [ peti ] ++ teams.sage.members;
};
}
diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix
index 438a84c0e0be..ddd470e621a0 100644
--- a/pkgs/applications/science/math/lrcalc/default.nix
+++ b/pkgs/applications/science/math/lrcalc/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
description = "Littlewood-Richardson calculator";
homepage = "http://math.rutgers.edu/~asbuch/lrcalc/";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index d75fc9731cdf..76e7c796a138 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
inherit version;
description = ''Programs for computing automorphism groups of graphs and digraphs'';
license = licenses.asl20;
- maintainers = with maintainers; [ raskin timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
# I'm not sure if the filename will remain the same for future changelog or
# if it will track changes to minor releases. Lets see. Better than nothing
diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix
index c383438002f4..9ae4fe1ba920 100644
--- a/pkgs/applications/science/math/palp/default.nix
+++ b/pkgs/applications/science/math/palp/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
# version was released that pointed to gplv2 however, so thats probably
# the right license.
license = licenses.gpl2;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index bd730a1eaaaa..a3e2f99ab274 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
homepage = "http://pari.math.u-bordeaux.fr";
downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ ertes raskin AndersonTorres timokau ];
+ maintainers = with maintainers; [ ertes AndersonTorres ] ++ teams.sage.members;
platforms = platforms.linux ++ platforms.darwin;
updateWalker = true;
};
diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix
index 82e331216712..3e6057c9aef0 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/pkgs/applications/science/math/pynac/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
'';
homepage = "http://pynac.org";
license = licenses.gpl3;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/science/math/sage/flask-oldsessions.nix b/pkgs/applications/science/math/sage/flask-oldsessions.nix
index 403dc8708fab..86fe9912c19e 100644
--- a/pkgs/applications/science/math/sage/flask-oldsessions.nix
+++ b/pkgs/applications/science/math/sage/flask-oldsessions.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Provides a session class that works like the one in Flask before 0.10.";
license = licenses.bsd2;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
homepage = "https://github.com/mitsuhiko/flask-oldsessions";
};
}
diff --git a/pkgs/applications/science/math/sage/flask-openid.nix b/pkgs/applications/science/math/sage/flask-openid.nix
index 527173dec80a..900b033429ef 100644
--- a/pkgs/applications/science/math/sage/flask-openid.nix
+++ b/pkgs/applications/science/math/sage/flask-openid.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Adds openid support to flask applications";
license = licenses.bsd2;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
homepage = "https://pythonhosted.org/Flask-OpenID/";
};
}
diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/pkgs/applications/science/math/sage/pybrial.nix
index 718414126ae8..5fc8a4aa6f48 100644
--- a/pkgs/applications/science/math/sage/pybrial.nix
+++ b/pkgs/applications/science/math/sage/pybrial.nix
@@ -20,6 +20,6 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "python implementation of BRiAl";
license = licenses.gpl2;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
};
}
diff --git a/pkgs/applications/science/math/sage/python-openid.nix b/pkgs/applications/science/math/sage/python-openid.nix
index 4c7fdadadaf0..1e8a908ac79a 100644
--- a/pkgs/applications/science/math/sage/python-openid.nix
+++ b/pkgs/applications/science/math/sage/python-openid.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "OpenID library for Python";
license = licenses.asl20;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
homepage = "https://github.com/openid/python-openid/";
};
}
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
index 4fa8ae6270ba..e2acef7b8eb5 100644
--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/pkgs/applications/science/math/sage/sage.nix
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab";
license = licenses.gpl2;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
};
}
diff --git a/pkgs/applications/science/math/sage/sagenb.nix b/pkgs/applications/science/math/sage/sagenb.nix
index 77b2168ad974..ad5c53b6c118 100644
--- a/pkgs/applications/science/math/sage/sagenb.nix
+++ b/pkgs/applications/science/math/sage/sagenb.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Sage Notebook";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
};
# let sagenb use mathjax
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index a8c4f6bb9a09..8c5eac2c06d2 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A CAS for polynomial computations";
- maintainers = with maintainers; [ raskin timokau ];
+ maintainers = teams.sage.members;
# 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'`
platforms = subtractLists platforms.i686 platforms.unix;
license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix
index b363137fb99c..ca752259797f 100644
--- a/pkgs/applications/science/math/symmetrica/default.nix
+++ b/pkgs/applications/science/math/symmetrica/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = ''A collection of routines for representation theory and combinatorics'';
license = licenses.isc;
- maintainers = with maintainers; [raskin timokau];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
homepage = "https://gitlab.com/sagemath/symmetrica";
};
diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
index 853fe22f0bf2..e3e8fcd32a5d 100644
--- a/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "mlterm";
- version = "3.9.0";
+ version = "3.9.1";
src = fetchurl {
url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "17h6j4nmbyvsx2shm8mqm7smzq9i7mbqxjw19c2m0rhf5yzqhr3k";
+ sha256 = "03fnynwv7d1aicwk2rp31sgncv5m65agvygqvsgn59v9di40gnnb";
};
nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ];
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 827d9539dba6..8b93bf2176ac 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
- version = "7.3.2";
+ version = "7.4.0";
src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
- sha256 = "0bw75m87qbnnn1gjphik3xcjx2zwczsa37rpr16la1zjhqjl5m7j";
+ sha256 = "0ih0jxdm74vr4dgslhnl3llvi31zin0g2xjw6a4pdji2y2kajkzk";
};
dontBuild = true;
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 6d0cbc50aeca..d4fc2eb98eb4 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "man-pages";
- version = "5.08";
+ version = "5.09";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
- sha256 = "1xzp3f6wvw3wplk1a1x09zfv0jp0pdc9wh95czndh3h8z0qwv9yf";
+ sha256 = "1whbxim4diyan97y9pz9k4ck16rmjalw5i1m0dg6ycv3pxv386nz";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index f72431c5a27c..34e0ec132a9f 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -13,12 +13,17 @@ let
sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy";
};
+ version = "3.57";
+ underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in
stdenv.mkDerivation {
- name = "nss-cacert-${nss.version}";
+ name = "nss-cacert-${version}";
- src = nss.src;
+ src = fetchurl {
+ url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/nss-${version}.tar.gz";
+ sha256 = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382";
+ };
outputs = [ "out" "unbundled" ];
@@ -60,6 +65,8 @@ stdenv.mkDerivation {
setupHook = ./setup-hook.sh;
+ passthru.updateScript = ./update.sh;
+
meta = {
homepage = "https://curl.haxx.se/docs/caextract.html";
description = "A bundle of X.509 certificates of public Certificate Authorities (CA)";
diff --git a/pkgs/data/misc/cacert/update.sh b/pkgs/data/misc/cacert/update.sh
new file mode 100755
index 000000000000..7bf3d46cb02f
--- /dev/null
+++ b/pkgs/data/misc/cacert/update.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix common-updater-scripts jq
+
+# Build both the cacert package and an overriden version where we use the source attribute of NSS.
+# Cacert and NSS are both from the same upstream sources. They are decoupled as
+# the cacert output only cares about a few infrequently changing files in the
+# sources while the NSS source code changes frequently.
+#
+# By having cacert on a older source revision that produces the same
+# certificate output as a newer version we can avoid large amounts of
+# unnecessary rebuilds.
+#
+# As of this writing there are a few magnitudes more packages depending on
+# cacert than on nss.
+
+
+set -ex
+
+BASEDIR="$(dirname "$0")/../../../.."
+
+
+CURRENT_PATH=$(nix-build --no-out-link -A cacert.out)
+PATCHED_PATH=$(nix-build --no-out-link -E "with import $BASEDIR {}; (cacert.overrideAttrs (_: { inherit (nss) src version; })).out")
+
+# Check the hash of the etc subfolder
+# We can't check the entire output as that contains the nix-support folder
+# which contains the output path itself.
+CURRENT_HASH=$(nix-hash "$CURRENT_PATH/etc")
+PATCHED_HASH=$(nix-hash "$PATCHED_PATH/etc")
+
+if [[ "$CURRENT_HASH" != "$PATCHED_HASH" ]]; then
+ NSS_VERSION=$(nix-instantiate --json --eval -E "with import $BASEDIR {}; nss.version" | jq -r .)
+ update-source-version cacert "$NSS_VERSION"
+fi
diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/pkgs/data/misc/combinatorial_designs/default.nix
index 5df7343f3be7..a14e13749589 100644
--- a/pkgs/data/misc/combinatorial_designs/default.nix
+++ b/pkgs/data/misc/combinatorial_designs/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.publicDomain;
platforms = platforms.all;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
};
}
diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix
index f51d2293a7ef..d6413439dede 100644
--- a/pkgs/data/misc/conway_polynomials/default.nix
+++ b/pkgs/data/misc/conway_polynomials/default.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
description = "Contains a small database of Conway polynomials";
license = licenses.gpl2;
platforms = platforms.all;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
};
}
diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix
index 49b8736b0846..9b296487670d 100644
--- a/pkgs/data/misc/elliptic_curves/default.nix
+++ b/pkgs/data/misc/elliptic_curves/default.nix
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl2;
platforms = platforms.all;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
};
}
diff --git a/pkgs/data/misc/fedora-backgrounds/default.nix b/pkgs/data/misc/fedora-backgrounds/default.nix
new file mode 100644
index 000000000000..31bc28a9f9c1
--- /dev/null
+++ b/pkgs/data/misc/fedora-backgrounds/default.nix
@@ -0,0 +1,23 @@
+{ callPackage, lib, fetchurl }:
+
+let
+ fedoraBackground = callPackage ./generic.nix { };
+in {
+ f32 = fedoraBackground rec {
+ version = "32.2.2";
+ src = fetchurl {
+ url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz";
+ hash = "sha256-1F75aae7Jj7M2IPn/vWKcUF+O5mZ0Yey7hWuFj/4Fhg=";
+ };
+ };
+
+ f33 = fedoraBackground rec {
+ version = "33.0.7";
+ src = fetchurl {
+ url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz";
+ hash = "sha256-lAn5diEYebCo2ZJCOn9rD87rOasUU0qnSOr0EnZKW4o=";
+ };
+ # Fix broken symlinks in the Xfce background directory.
+ patches = [ ./f33-fix-xfce-path.patch ];
+ };
+}
diff --git a/pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch b/pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch
new file mode 100644
index 000000000000..eabdacddaa53
--- /dev/null
+++ b/pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch
@@ -0,0 +1,15 @@
+diff --git a/default/Makefile b/default/Makefile
+index ec8095a..9391f8f 100644
+--- a/default/Makefile
++++ b/default/Makefile
+@@ -48,8 +48,8 @@ install:
+
+ #~ XFCE background
+ $(MKDIR) $(XFCE_BG_DIR)
+- $(LN_S) ../default/$(WP_NAME)-02-day.png \
++ $(LN_S) ../../backgrounds/$(WP_NAME)/default/$(WP_NAME)-02-day.png \
+ $(XFCE_BG_DIR)/$(WP_NAME).png
+ for tod in 01-dawn 03-dusk 04-night; do \
+- $(LN_S) ../default/$(WP_NAME)-$${tod}.png $(XFCE_BG_DIR)/$(WP_NAME)-$${tod}.png; \
++ $(LN_S) ../../backgrounds/$(WP_NAME)/default/$(WP_NAME)-$${tod}.png $(XFCE_BG_DIR)/$(WP_NAME)-$${tod}.png; \
+ done;
diff --git a/pkgs/data/misc/fedora-backgrounds/generic.nix b/pkgs/data/misc/fedora-backgrounds/generic.nix
new file mode 100644
index 000000000000..25043c34e5d9
--- /dev/null
+++ b/pkgs/data/misc/fedora-backgrounds/generic.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, coreutils
+}:
+
+{ version
+, src
+, patches ? [ ]
+}:
+
+stdenv.mkDerivation {
+ inherit patches src version;
+
+ pname = "fedora${stdenv.lib.versions.major version}-backgrounds";
+
+ dontBuild = true;
+
+ postPatch = ''
+ for f in default/Makefile extras/Makefile; do
+ substituteInPlace $f \
+ --replace "usr/share" "share" \
+ --replace "/usr/bin/" "" \
+ --replace "/bin/" ""
+ done
+
+ for f in $(find . -name '*.xml'); do
+ substituteInPlace $f \
+ --replace "/usr/share" "$out/share"
+ done;
+ '';
+
+ installFlags = [
+ "DESTDIR=$(out)"
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/fedoradesign/backgrounds";
+ description = "A set of default and supplemental wallpapers for Fedora";
+ license = licenses.cc-by-sa-40;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ danieldk ];
+ };
+}
diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/data/misc/graphs/default.nix
index 14551c6a4a47..bf7f8d4fd0e8 100644
--- a/pkgs/data/misc/graphs/default.nix
+++ b/pkgs/data/misc/graphs/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
description = "A database of graphs";
license = licenses.gpl2;
platforms = platforms.all;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
};
}
diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix
index b07be5a0c050..644a50a8ddeb 100644
--- a/pkgs/data/misc/pari-galdata/default.nix
+++ b/pkgs/data/misc/pari-galdata/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
homepage = "http://pari.math.u-bordeaux.fr/";
license = licenses.gpl2Plus;
platforms = platforms.all;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
};
}
diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix
index 01ffd6db64fb..a9c9a62839ce 100644
--- a/pkgs/data/misc/pari-seadata-small/default.nix
+++ b/pkgs/data/misc/pari-seadata-small/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
homepage = "http://pari.math.u-bordeaux.fr/";
license = licenses.gpl2Plus;
platforms = platforms.all;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
};
}
diff --git a/pkgs/data/misc/polytopes_db/default.nix b/pkgs/data/misc/polytopes_db/default.nix
index 8fec9a854260..95ca8af82a7b 100644
--- a/pkgs/data/misc/polytopes_db/default.nix
+++ b/pkgs/data/misc/polytopes_db/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
description = "Reflexive polytopes database";
license = licenses.gpl2;
platforms = platforms.all;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
};
}
diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index b9489526dd71..4676155c3c1c 100644
--- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
@@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-pomodoro";
- version = "0.17.0";
+ version = "0.18.0";
src = fetchFromGitHub {
owner = "codito";
repo = "gnome-pomodoro";
rev = version;
- sha256 = "0s9wzx7wbynpqgj7nlgs5wwx4w2akz7nli89sy7pxcn4xpnahqgn";
+ sha256 = "0990m8ydryd77kv25nfqli1n209i0h5dkjg9gkyww8bfrjhw47mc";
};
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix
index 15694734d487..406ea73f2aed 100644
--- a/pkgs/development/compilers/julia/1.3.nix
+++ b/pkgs/development/compilers/julia/1.3.nix
@@ -72,13 +72,15 @@ stdenv.mkDerivation rec {
makeFlags =
let
arch = head (splitString "-" stdenv.system);
- march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch}
+ march = {
+ x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
+ i686 = "pentium4";
+ aarch64 = "armv8-a";
+ }.${arch}
or (throw "unsupported architecture: ${arch}");
# Julia requires Pentium 4 (SSE2) or better
- cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch}
+ cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch}
or (throw "unsupported architecture: ${arch}");
- # Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM
- # https://github.com/JuliaLang/julia/tree/master/deps/patches
in [
"ARCH=${arch}"
"MARCH=${march}"
@@ -119,7 +121,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- doCheck = !stdenv.isDarwin;
+ # Other versions of Julia pass the tests, but we are not sure why these fail.
+ doCheck = false;
checkTarget = "testall";
# Julia's tests require read/write access to $HOME
preCheck = ''
diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix
index 87dae128f732..37e07a230aec 100644
--- a/pkgs/development/compilers/rasm/default.nix
+++ b/pkgs/development/compilers/rasm/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Z80 assembler";
# use -n option to display all licenses
license = licenses.mit; # expat version
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix
index a76e57a08078..890924dddc12 100644
--- a/pkgs/development/compilers/z88dk/default.nix
+++ b/pkgs/development/compilers/z88dk/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.z88dk.org";
description = "z80 Development Kit";
license = licenses.clArtistic;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index bebb5376b8a2..f12645ec2b62 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -14,22 +14,28 @@ stdenv.mkDerivation rec {
makeWrapper
];
+ # See https://github.com/clojure/brew-install/blob/1.10.1/src/main/resources/clojure/install/linux-install.sh
installPhase =
let
binPath = stdenv.lib.makeBinPath [ rlwrap jdk ];
in
''
- mkdir -p $out/libexec
- cp clojure-tools-${version}.jar $out/libexec
- cp example-deps.edn $out
- cp deps.edn $out
- cp exec.jar $out
+ clojure_lib_dir=$out
+ bin_dir=$out/bin
+ echo "Installing libs into $clojure_lib_dir"
+ install -Dm644 deps.edn "$clojure_lib_dir/deps.edn"
+ install -Dm644 example-deps.edn "$clojure_lib_dir/example-deps.edn"
+ install -Dm644 exec.jar "$clojure_lib_dir/libexec/exec.jar"
+ install -Dm644 clojure-tools-${version}.jar "$clojure_lib_dir/libexec/clojure-tools-${version}.jar"
+
+ echo "Installing clojure and clj into $bin_dir"
substituteInPlace clojure --replace PREFIX $out
+ install -Dm755 clojure "$bin_dir/clojure"
+ install -Dm755 clj "$bin_dir/clj"
- install -Dt $out/bin clj clojure
- wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
- wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
+ wrapProgram $bin_dir/clojure --prefix PATH : $out/bin:${binPath}
+ wrapProgram $bin_dir/clj --prefix PATH : $out/bin:${binPath}
installManPage clj.1 clojure.1
'';
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 2cfaa69a4c8b..26bd8a8f3609 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -19,6 +19,10 @@
# For the Python package set
, packageOverrides ? (self: super: {})
, buildPackages
+, pkgsBuildBuild
+, pkgsBuildTarget
+, pkgsHostHost
+, pkgsTargetTarget
, sourceVersion
, sha256
, passthruFun
@@ -35,7 +39,8 @@ with stdenv.lib;
let
- pythonForBuild = buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"};
+ pythonAttr = "python${sourceVersion.major}${sourceVersion.minor}";
+ pythonForBuild = buildPackages.${pythonAttr};
passthru = passthruFun rec {
inherit self sourceVersion packageOverrides;
@@ -45,6 +50,10 @@ let
pythonVersion = with sourceVersion; "${major}.${minor}";
sitePackages = "lib/${libPrefix}/site-packages";
inherit hasDistutilsCxxPatch pythonForBuild;
+ pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr};
+ pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr};
+ pythonPackagesHostHost = pkgsHostHost.${pythonAttr};
+ pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {};
} // {
inherit ucsEncoding;
};
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 77512c02d555..02777063a772 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -20,7 +20,11 @@
# For the Python package set
, packageOverrides ? (self: super: {})
, buildPackages
-, pythonForBuild ? buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"}
+, pkgsBuildBuild
+, pkgsBuildTarget
+, pkgsHostHost
+, pkgsTargetTarget
+, pythonForBuild ? buildPackages.${pythonAttr}
, sourceVersion
, sha256
, passthruFun
@@ -36,6 +40,7 @@
# Not using optimizations on Darwin
# configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found.
, enableOptimizations ? (!stdenv.isDarwin)
+, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
}:
# Note: this package is used for bootstrapping fetchurl, and thus
@@ -54,6 +59,7 @@ with stdenv.lib;
let
+
passthru = passthruFun rec {
inherit self sourceVersion packageOverrides;
implementation = "cpython";
@@ -62,6 +68,10 @@ let
pythonVersion = with sourceVersion; "${major}.${minor}";
sitePackages = "lib/${libPrefix}/site-packages";
inherit hasDistutilsCxxPatch pythonForBuild;
+ pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr};
+ pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr};
+ pythonPackagesHostHost = pkgsHostHost.${pythonAttr};
+ pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {};
};
version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index ae666d44f57b..19a7f44de369 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -14,13 +14,70 @@ with pkgs;
, packageOverrides
, sitePackages
, hasDistutilsCxxPatch
- , pythonForBuild
- , self
+ , pythonPackagesBuildBuild
+ , pythonForBuild # provides pythonPackagesBuildHost
+ , pythonPackagesBuildTarget
+ , pythonPackagesHostHost
+ , self # is pythonPackagesHostTarget
+ , pythonPackagesTargetTarget
}: let
- pythonPackages = callPackage ../../../top-level/python-packages.nix {
- python = self;
- overrides = packageOverrides;
- };
+ pythonPackages = callPackage
+ ({ pkgs, stdenv, python, overrides }: let
+ pythonPackagesFun = import ../../../top-level/python-packages.nix {
+ inherit stdenv pkgs;
+ python = self;
+ };
+ otherSplices = {
+ selfBuildBuild = pythonPackagesBuildBuild;
+ selfBuildHost = pythonForBuild.pkgs;
+ selfBuildTarget = pythonPackagesBuildTarget;
+ selfHostHost = pythonPackagesHostHost;
+ selfTargetTarget = pythonPackagesTargetTarget;
+ };
+ keep = self: {
+ # TODO maybe only define these here so nothing is needed to be kept in sync.
+ inherit (self)
+ isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder
+ python bootstrapped-pip buildPythonPackage buildPythonApplication
+ fetchPypi
+ hasPythonModule requiredPythonModules makePythonPath disabledIf
+ toPythonModule toPythonApplication
+ buildSetupcfg
+
+ eggUnpackHook
+ eggBuildHook
+ eggInstallHook
+ flitBuildHook
+ pipBuildHook
+ pipInstallHook
+ pytestCheckHook
+ pythonCatchConflictsHook
+ pythonImportsCheckHook
+ pythonNamespacesHook
+ pythonRecompileBytecodeHook
+ pythonRemoveBinBytecodeHook
+ pythonRemoveTestsDirHook
+ setuptoolsBuildHook
+ setuptoolsCheckHook
+ venvShellHook
+ wheelUnpackHook
+
+ wrapPython
+
+ pythonPackages
+
+ recursivePthLoader
+ ;
+ };
+ in lib.makeScopeWithSplicing
+ pkgs.splicePackages
+ pkgs.newScope
+ otherSplices
+ keep
+ (lib.extends overrides pythonPackagesFun))
+ {
+ overrides = packageOverrides;
+ };
in rec {
isPy27 = pythonVersion == "2.7";
isPy35 = pythonVersion == "3.5";
@@ -48,7 +105,6 @@ with pkgs;
python = self;
};
};
-
in {
python27 = callPackage ./cpython/2.7 {
diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
index d14eb9cbb09d..456aea4c5d8c 100644
--- a/pkgs/development/interpreters/python/hooks/default.nix
+++ b/pkgs/development/interpreters/python/hooks/default.nix
@@ -1,7 +1,6 @@
# Hooks for building Python packages.
{ python
, lib
-, callPackage
, makeSetupHook
, disabledIf
, isPy3k
@@ -9,6 +8,7 @@
}:
let
+ callPackage = python.pythonForBuild.pkgs.callPackage;
pythonInterpreter = python.pythonForBuild.interpreter;
pythonSitePackages = python.sitePackages;
pythonCheckInterpreter = python.interpreter;
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 482ba5df54ce..0647ce878642 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -22,9 +22,15 @@ let
implementation = "pypy";
libPrefix = "pypy${pythonVersion}";
executable = "pypy${if isPy3k then "3" else ""}";
- pythonForBuild = self; # No cross-compiling for now.
sitePackages = "site-packages";
hasDistutilsCxxPatch = false;
+
+ # No cross-compiling for now.
+ pythonForBuild = self;
+ pythonPackagesBuildBuild = {};
+ pythonPackagesBuildTarget = {};
+ pythonPackagesHostHost = {};
+ pythonPackagesTargetTarget = {};
};
pname = passthru.executable;
version = with sourceVersion; "${major}.${minor}.${patch}";
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index 6393e25f561d..a9fb5de0bd9f 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
description = ''A library for arbitrary-precision interval arithmetic'';
homepage = "http://arblib.org/";
license = stdenv.lib.licenses.lgpl21Plus;
- maintainers = with maintainers; [ raskin timokau ];
+ maintainers = teams.sage.members;
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix
index a9a10fc6317b..f286c881e46c 100644
--- a/pkgs/development/libraries/cddlib/default.nix
+++ b/pkgs/development/libraries/cddlib/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
inherit version;
description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron'';
license = licenses.gpl2Plus;
- maintainers = with maintainers; [raskin timokau];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html";
};
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index b6dfd429d75a..9273fb7fd78e 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
description = ''Elliptic curve tools'';
homepage = "https://github.com/JohnCremona/eclib";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ raskin timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index 23b31fe439fd..faa8ed3c70e4 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
inherit version;
description = ''Finite Field Linear Algebra Subroutines'';
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ raskin timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
homepage = "https://linbox-team.github.io/fflas-ffpack/";
};
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index 107635267c6f..82d56ea2af41 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
"https://groups.google.com/forum/#!searchin/fplll-devel/FPLLL$20${version}"
];
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [raskin timokau];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix
index 2409ee314d64..14ea3021914a 100644
--- a/pkgs/development/libraries/gf2x/default.nix
+++ b/pkgs/development/libraries/gf2x/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
description = ''Routines for fast arithmetic in GF(2)[x]'';
homepage = "http://gf2x.gforge.inria.fr";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ raskin timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index 124e03baee19..d771f7df7892 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
doCheck = true;
- meta = {
+ meta = with stdenv.lib; {
description = "The GNU Linear Programming Kit";
longDescription =
@@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
'';
homepage = "https://www.gnu.org/software/glpk/";
- license = stdenv.lib.licenses.gpl3Plus;
+ license = licenses.gpl3Plus;
- maintainers = with stdenv.lib.maintainers; [ bjg timokau ];
- platforms = stdenv.lib.platforms.all;
+ maintainers = with maintainers; [ bjg ] ++ teams.sage.members;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index a29fad8a4c94..0863d7d1a3e7 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -161,7 +161,6 @@ in stdenv.mkDerivation rec {
soundtouch
srtp
fluidsynth
- libva
libvdpau
libwebp
xvidcore
@@ -180,6 +179,7 @@ in stdenv.mkDerivation rec {
faac
] ++ optionals stdenv.isLinux [
bluez
+ libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs
wayland
wayland-protocols
] ++ optionals (!stdenv.isDarwin) [
@@ -259,6 +259,9 @@ in stdenv.mkDerivation rec {
"-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing
"-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing
]
+ ++ optionals (!stdenv.isLinux) [
+ "-Dva=disabled" # see comment on `libva` in `buildInputs`
+ ]
++ optionals stdenv.isDarwin [
"-Dbluez=disabled"
"-Dchromaprint=disabled"
@@ -272,6 +275,7 @@ in stdenv.mkDerivation rec {
"-Ddvb=disabled"
"-Dfbdev=disabled"
"-Duvch264=disabled" # requires gudev
+ "-Dv4l2codecs=disabled" # requires gudev
"-Dladspa=disabled" # requires lrdf
"-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs
"-Dwildmidi=disabled" # see dependencies above
diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix
index e8fdc6eb206b..09456433c1ac 100644
--- a/pkgs/development/libraries/libavif/default.nix
+++ b/pkgs/development/libraries/libavif/default.nix
@@ -11,21 +11,22 @@
stdenv.mkDerivation rec {
pname = "libavif";
- version = "0.8.2";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "AOMediaCodec";
repo = pname;
rev = "v${version}";
- sha256 = "0f0l8ywz2jhc9mkfrzdxdvr3q39a404yn9wcyvqshfbkbprsan4p";
+ sha256 = "1d6ql4vq338dvz61d5im06dh8m9rqfk37f9i356j3njpq604i1f6";
};
# reco: encode libaom slowest but best, decode dav1d fastest
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
- "-DAVIF_CODEC_AOM=ON"
- "-DAVIF_CODEC_DAV1D=ON"
+ "-DAVIF_CODEC_AOM=ON" # best encoder (slow but small)
+ "-DAVIF_CODEC_DAV1D=ON" # best decoder (fast)
+ "-DAVIF_CODEC_AOM_DECODE=OFF"
"-DAVIF_BUILD_APPS=ON"
];
diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
index a46b2aa74118..f0b430c91d81 100644
--- a/pkgs/development/libraries/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
@@ -9,11 +9,11 @@ assert postgresSupport -> postgresql != null;
(if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec {
pname = "libgda";
- version = "5.2.9";
+ version = "5.2.10";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "16vxv2qvysh22s8h9h6irx96sacagxkz0i4qgi1wc6ibly6fvjjr";
+ sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g";
};
configureFlags = with stdenv.lib; [
"--enable-gi-system-install=no"
diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
index 23ef2c067a62..e49fad551daf 100644
--- a/pkgs/development/libraries/libgpiod/default.nix
+++ b/pkgs/development/libraries/libgpiod/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "libgpiod";
- version = "1.6";
+ version = "1.6.1";
src = fetchurl {
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
- sha256 = "0xcwrg4p4w925lijmz4ci4500z83kj5gs1n501q4vhi54bdzn2k5";
+ sha256 = "0p3vjf4zj137miix1gbi8rv6g4wvi8kmyhwwxyirw00ankxbxp1n";
};
patches = [
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index 4072dcd1d251..7bca0c295c4b 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -70,12 +70,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
inherit version;
description = "C++ library for exact, high-performance linear algebra";
- license = stdenv.lib.licenses.lgpl21Plus;
- maintainers = [stdenv.lib.maintainers.timokau];
- platforms = stdenv.lib.platforms.unix;
+ license = licenses.lgpl21Plus;
+ maintainers = teams.sage.members;
+ platforms = platforms.unix;
homepage = "https://linalg.org/";
};
}
diff --git a/pkgs/development/libraries/nss/3.53.nix b/pkgs/development/libraries/nss/3.53.nix
new file mode 100644
index 000000000000..dcd9ade629b7
--- /dev/null
+++ b/pkgs/development/libraries/nss/3.53.nix
@@ -0,0 +1,169 @@
+{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja
+, # allow FIPS mode. Note that this makes the output non-reproducible.
+ # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6
+ enableFIPS ? false
+}:
+
+let
+ nssPEM = fetchurl {
+ url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
+ sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
+ };
+ version = "3.53.1";
+ underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
+
+in stdenv.mkDerivation rec {
+ pname = "nss";
+ inherit version;
+
+ src = fetchurl {
+ url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
+ sha256 = "05jk65x3zy6q8lx2djj8ik7kg741n88iy4n3bblw89cv0xkxxk1d";
+ };
+
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+ nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]
+ ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
+
+ buildInputs = [ zlib sqlite ];
+
+ propagatedBuildInputs = [ nspr ];
+
+ prePatch = ''
+ # strip the trailing whitespace from the patch line and the renamed CKO_NETSCAPE_ enum to CKO_NSS_
+ xz -d < ${nssPEM} | sed \
+ -e 's/-DIRS = builtins $/-DIRS = . builtins/g' \
+ -e 's/CKO_NETSCAPE_/CKO_NSS_/g' \
+ -e 's/CKT_NETSCAPE_/CKT_NSS_/g' \
+ | patch -p1
+
+ patchShebangs nss
+
+ for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do
+ substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env"
+ done
+
+ substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep"
+ '';
+
+ patches =
+ [
+ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
+ ./85_security_load.patch
+ ./ckpem.patch
+ ./fix-cross-compilation.patch
+ ];
+
+ patchFlags = [ "-p0" ];
+
+ postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+ substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
+ substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'"
+ '';
+
+ outputs = [ "out" "dev" "tools" ];
+
+ preConfigure = "cd nss";
+
+ buildPhase = let
+ getArch = platform: if platform.isx86_64 then "x64"
+ else if platform.isx86_32 then "ia32"
+ else if platform.isAarch32 then "arm"
+ else if platform.isAarch64 then "arm64"
+ else if platform.isPower && platform.is64bit then (
+ if platform.isLittleEndian then "ppc64le" else "ppc64"
+ )
+ else platform.parsed.cpu.name;
+ # yes, this is correct. nixpkgs uses "host" for the platform the binary will run on whereas nss uses "host" for the platform that the build is running on
+ target = getArch stdenv.hostPlatform;
+ host = getArch stdenv.buildPlatform;
+ in ''
+ runHook preBuild
+
+ sed -i 's|nss_dist_dir="$dist_dir"|nss_dist_dir="'$out'"|;s|nss_dist_obj_dir="$obj_dir"|nss_dist_obj_dir="'$out'"|' build.sh
+ ./build.sh -v --opt \
+ --with-nspr=${nspr.dev}/include:${nspr.out}/lib \
+ --system-sqlite \
+ --enable-legacy-db \
+ --target ${target} \
+ -Dhost_arch=${host} \
+ -Duse_system_zlib=1 \
+ --enable-libpkix \
+ ${stdenv.lib.optionalString enableFIPS "--enable-fips"} \
+ ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \
+ ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"}
+
+ runHook postBuild
+ '';
+
+ NIX_CFLAGS_COMPILE = "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\"";
+
+ installPhase = ''
+ runHook preInstall
+
+ rm -rf $out/private
+ find $out -name "*.TOC" -delete
+ mv $out/public $out/include
+
+ ln -s lib $out/lib64
+
+ # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672
+ # https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch?id=af1acce6c6d2c3adb17689261dfe2c2b6771ab8a
+ NSS_MAJOR_VERSION=`grep "NSS_VMAJOR" lib/nss/nss.h | awk '{print $3}'`
+ NSS_MINOR_VERSION=`grep "NSS_VMINOR" lib/nss/nss.h | awk '{print $3}'`
+ NSS_PATCH_VERSION=`grep "NSS_VPATCH" lib/nss/nss.h | awk '{print $3}'`
+ PREFIX="$out"
+
+ mkdir -p $out/lib/pkgconfig
+ sed -e "s,%prefix%,$PREFIX," \
+ -e "s,%exec_prefix%,$PREFIX," \
+ -e "s,%libdir%,$PREFIX/lib64," \
+ -e "s,%includedir%,$dev/include/nss," \
+ -e "s,%NSS_VERSION%,$NSS_MAJOR_VERSION.$NSS_MINOR_VERSION.$NSS_PATCH_VERSION,g" \
+ -e "s,%NSPR_VERSION%,4.16,g" \
+ pkg/pkg-config/nss.pc.in > $out/lib/pkgconfig/nss.pc
+ chmod 0644 $out/lib/pkgconfig/nss.pc
+
+ sed -e "s,@prefix@,$PREFIX," \
+ -e "s,@MOD_MAJOR_VERSION@,$NSS_MAJOR_VERSION," \
+ -e "s,@MOD_MINOR_VERSION@,$NSS_MINOR_VERSION," \
+ -e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \
+ pkg/pkg-config/nss-config.in > $out/bin/nss-config
+ chmod 0755 $out/bin/nss-config
+ '';
+
+ postFixup = let
+ isCross = stdenv.hostPlatform != stdenv.buildPlatform;
+ nss = if isCross then buildPackages.nss.tools else "$out";
+ in
+ (stdenv.lib.optionalString enableFIPS (''
+ for libname in freebl3 nssdbm3 softokn3
+ do '' +
+ (if stdenv.isDarwin
+ then ''
+ libfile="$out/lib/lib$libname.dylib"
+ DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \
+ '' else ''
+ libfile="$out/lib/lib$libname.so"
+ LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \
+ '') + ''
+ ${nss}/bin/shlibsign -v -i "$libfile"
+ done
+ '')) +
+ ''
+ moveToOutput bin "$tools"
+ moveToOutput bin/nss-config "$dev"
+ moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example
+ rm -f "$out"/lib/*.a
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://developer.mozilla.org/en-US/docs/NSS";
+ description = "A set of libraries for development of security-enabled client and server applications";
+ license = licenses.mpl20;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index cc9ad333d822..ef1cef84df5f 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -9,7 +9,13 @@ let
url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
- version = "3.57";
+
+ # NOTE: Whenever you updated this version check if the `cacert` package also
+ # needs an update. You can run the regular updater script for cacerts.
+ # It will rebuild itself using the version of this package (NSS) and if
+ # an update is required do the required changes to the expression.
+ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
+ version = "3.59";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
@@ -18,7 +24,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
- sha256 = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382";
+ sha256 = "096fs3z21r171q24ca3rq53p1389xmvqz1f2rpm7nlm8r9s82ag6";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index 0d9d39f39581..23d82d4ba2fa 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.shoup.net/ntl/";
# also locally at "${src}/doc/tour-changes.html";
changelog = "https://www.shoup.net/ntl/doc/tour-changes.html";
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
license = licenses.gpl2Plus;
platforms = platforms.all;
};
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index ed854e8a4609..8b2dce1d950f 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -1,9 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- version = "5.1.2";
+ version = "5.2.0";
src = fetchurl {
url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
- sha256 = "148j1i0zkwf09qdpk3nc5sssj1dvppw7p0n9rgrg8k56447l1h1b";
+ sha256 = "0xdk3cszkzb8nb757gl47slrr13mf6xz43ab4k343fv8llp8pd2g";
};
pname = "libosip2";
diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix
index 2e85732f3f3d..175de67ad7ee 100644
--- a/pkgs/development/libraries/science/math/brial/default.nix
+++ b/pkgs/development/libraries/science/math/brial/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/BRiAl/BRiAl";
description = "Legacy version of PolyBoRi maintained by sagemath developers";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix
index e56952abcb28..7fe80c323f68 100644
--- a/pkgs/development/libraries/science/math/cliquer/default.nix
+++ b/pkgs/development/libraries/science/math/cliquer/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
easy to use.
'';
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix
index 327fea3955d2..32fb70978cf9 100644
--- a/pkgs/development/libraries/science/math/flintqs/default.nix
+++ b/pkgs/development/libraries/science/math/flintqs/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/sagemath/FlintQS";
description = "Highly optimized multi-polynomial quadratic sieve for integer factorization";
license = with licenses; [ gpl2 ];
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix
index 3f00547efcec..6f80e1fd23e0 100644
--- a/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/pkgs/development/libraries/science/math/lcalc/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
homepage = "http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html";
description = "A program for calculating with L-functions";
license = with licenses; [ gpl2 ];
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix
index 2c6bc4c8711e..36d4ad54c3df 100644
--- a/pkgs/development/libraries/science/math/libbraiding/default.nix
+++ b/pkgs/development/libraries/science/math/libbraiding/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
A library to compute several properties of braids, including centralizer and conjugacy check.
'';
license = licenses.gpl3;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix
index d9b50a0fb2d1..788f534cc779 100644
--- a/pkgs/development/libraries/science/math/libhomfly/default.nix
+++ b/pkgs/development/libraries/science/math/libhomfly/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/miguelmarco/libhomfly/";
description = "Library to compute the homfly polynomial of knots and links";
license = licenses.unlicense;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix
index d8b4cbbffb48..f50c15abbdf1 100644
--- a/pkgs/development/libraries/science/math/m4ri/default.nix
+++ b/pkgs/development/libraries/science/math/m4ri/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = "https://malb.bitbucket.io/m4ri/";
description = "Library to do fast arithmetic with dense matrices over F_2";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix
index e1f86b346d7f..532285991a3c 100644
--- a/pkgs/development/libraries/science/math/m4rie/default.nix
+++ b/pkgs/development/libraries/science/math/m4rie/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
It uses the M4RI library, implementing the same operations over the finite field F2.
'';
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix
index 7767e23934cf..b1d6a072e130 100644
--- a/pkgs/development/libraries/science/math/planarity/default.nix
+++ b/pkgs/development/libraries/science/math/planarity/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite";
description = "A library for implementing graph algorithms";
license = licenses.bsd3;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix
index ded7b7dc90ac..53f4313a2069 100644
--- a/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Calculates rank-width and rank-decompositions";
license = with licenses; [ gpl2Plus ];
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix
index 6eeaddba0418..44f8150386e7 100644
--- a/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
gpl2 # Michael Reid's and Eric Dietz software
mit # Dik T. Winter's software
];
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix
index ae7a7c778de0..a83e2c835461 100644
--- a/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/pkgs/development/libraries/science/math/sympow/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
fullName = "Custom, BSD-like. See COPYING file.";
free = true;
};
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix
index a94a52936e8f..0d1a331798cf 100644
--- a/pkgs/development/libraries/science/math/zn_poly/default.nix
+++ b/pkgs/development/libraries/science/math/zn_poly/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
homepage = "http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/";
description = "Polynomial arithmetic over Z/nZ";
license = with licenses; [ gpl3 ];
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix
new file mode 100644
index 000000000000..ac587f0492b0
--- /dev/null
+++ b/pkgs/development/libraries/spandsp/3.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }:
+stdenv.mkDerivation rec {
+ version = "3.0.0";
+ pname = "spandsp";
+ src = fetchFromGitHub {
+ owner = "freeswitch";
+ repo = pname;
+ rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
+ sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
+ };
+
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [ autoreconfHook ];
+ propagatedBuildInputs = [ audiofile libtiff ];
+
+ meta = {
+ description = "A portable and modular SIP User-Agent with audio and video support";
+ homepage = "https://github.com/freeswitch/spandsp";
+ platforms = with stdenv.lib.platforms; linux;
+ maintainers = with stdenv.lib.maintainers; [ ajs124 ];
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index 92a6f66d6364..1f9834c08f47 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }:
+{stdenv, fetchurl, audiofile, libtiff}:
stdenv.mkDerivation rec {
- version = "3.0.0";
+ version = "0.0.6";
pname = "spandsp";
- src = fetchFromGitHub {
- owner = "freeswitch";
- repo = pname;
- rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
- sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
+ src=fetchurl {
+ url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
+ sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
};
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ autoreconfHook ];
- propagatedBuildInputs = [ audiofile libtiff ];
-
+ propagatedBuildInputs = [audiofile libtiff];
meta = {
description = "A portable and modular SIP User-Agent with audio and video support";
- homepage = "https://github.com/freeswitch/spandsp";
+ homepage = "http://www.creytiv.com/baresip.html";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [raskin];
license = stdenv.lib.licenses.gpl2;
+ downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
+ inherit version;
+ updateWalker = true;
};
}
diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix
index 136187e9d3c4..65b411c52d52 100644
--- a/pkgs/development/ocaml-modules/ca-certs/default.nix
+++ b/pkgs/development/ocaml-modules/ca-certs/default.nix
@@ -1,21 +1,21 @@
{ lib, buildDunePackage, fetchurl
-, bos, fpath, rresult, ptime, mirage-crypto, x509
+, bos, fpath, rresult, ptime, mirage-crypto, x509, astring, logs
}:
buildDunePackage rec {
pname = "ca-certs";
- version = "0.1.2";
+ version = "0.1.3";
minimumOCamlVersion = "4.07";
src = fetchurl {
url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz";
- sha256 = "10bbqbrsqcmslz56zc5407knalh3kqypbm7lblnzzbidbapa9wpz";
+ sha256 = "0jpghxjp2n8wx6ig0d2x87ycaql6mb92w8ai3xh3jb288m7g02zn";
};
useDune2 = true;
- propagatedBuildInputs = [ bos fpath rresult ptime mirage-crypto x509 ];
+ propagatedBuildInputs = [ bos fpath rresult ptime mirage-crypto x509 astring logs ];
# tests need access to network and systemwide ca cert chain
doCheck = false;
diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix
index 09753c14b35d..21d9d02da4b8 100644
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@@ -6,6 +6,7 @@ buildDunePackage rec {
pname = "dns";
version = "4.6.2";
+ useDune2 = true;
minimumOCamlVersion = "4.07";
src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/metrics/default.nix b/pkgs/development/ocaml-modules/metrics/default.nix
index 893b667f8364..58fcab5313a2 100644
--- a/pkgs/development/ocaml-modules/metrics/default.nix
+++ b/pkgs/development/ocaml-modules/metrics/default.nix
@@ -2,18 +2,20 @@
buildDunePackage rec {
pname = "metrics";
- version = "0.1.0";
+ version = "0.2.0";
+
+ useDune2 = true;
minimumOCamlVersion = "4.04";
src = fetchurl {
url = "https://github.com/mirage/metrics/releases/download/${version}/metrics-${version}.tbz";
- sha256 = "0jy88anrx3rh19046rrbrjmx922zvz3wlqkk8asilqv9pbvpnp1a";
+ sha256 = "0j215cji3n78lghzi9m6kgr3r1s91v681hfnn7cgybb31d7gjkqg";
};
propagatedBuildInputs = [ fmt ];
- checkInputs = lib.optional doCheck alcotest;
+ checkInputs = [ alcotest ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/metrics/influx.nix b/pkgs/development/ocaml-modules/metrics/influx.nix
new file mode 100644
index 000000000000..8394ec0c0f94
--- /dev/null
+++ b/pkgs/development/ocaml-modules/metrics/influx.nix
@@ -0,0 +1,14 @@
+{ buildDunePackage, metrics
+, astring, duration, fmt, lwt
+}:
+
+buildDunePackage rec {
+ pname = "metrics-influx";
+ inherit (metrics) version useDune2 src;
+
+ propagatedBuildInputs = [ astring duration fmt lwt metrics ];
+
+ meta = metrics.meta // {
+ description = "Influx reporter for the Metrics library";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/metrics/lwt.nix b/pkgs/development/ocaml-modules/metrics/lwt.nix
index 47b91e430c65..7085ff58148b 100644
--- a/pkgs/development/ocaml-modules/metrics/lwt.nix
+++ b/pkgs/development/ocaml-modules/metrics/lwt.nix
@@ -1,11 +1,11 @@
-{ buildDunePackage, ocaml_lwt, metrics }:
+{ buildDunePackage, logs, ocaml_lwt, metrics }:
buildDunePackage {
pname = "metrics-lwt";
- inherit (metrics) version src;
+ inherit (metrics) version useDune2 src;
- propagatedBuildInputs = [ ocaml_lwt metrics ];
+ propagatedBuildInputs = [ logs ocaml_lwt metrics ];
meta = metrics.meta // {
description = "Lwt backend for the Metrics library";
diff --git a/pkgs/development/ocaml-modules/metrics/mirage.nix b/pkgs/development/ocaml-modules/metrics/mirage.nix
new file mode 100644
index 000000000000..4a891505ac71
--- /dev/null
+++ b/pkgs/development/ocaml-modules/metrics/mirage.nix
@@ -0,0 +1,14 @@
+{ buildDunePackage, metrics, metrics-influx
+, cstruct, ipaddr, logs, lwt, mirage-clock, mirage-stack
+}:
+
+buildDunePackage {
+ pname = "metrics-mirage";
+ inherit (metrics) version useDune2 src;
+
+ propagatedBuildInputs = [ cstruct ipaddr logs lwt metrics metrics-influx mirage-clock mirage-stack ];
+
+ meta = metrics.meta // {
+ description = "Mirage backend for the Metrics library";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/metrics/unix.nix b/pkgs/development/ocaml-modules/metrics/unix.nix
index 45a92f108038..5a7bae1b29f3 100644
--- a/pkgs/development/ocaml-modules/metrics/unix.nix
+++ b/pkgs/development/ocaml-modules/metrics/unix.nix
@@ -1,14 +1,14 @@
-{ lib, buildDunePackage, gnuplot, ocaml_lwt, metrics, metrics-lwt, mtime, uuidm }:
+{ buildDunePackage, gnuplot, ocaml_lwt, metrics, metrics-lwt, mtime, uuidm }:
buildDunePackage rec {
pname = "metrics-unix";
- inherit (metrics) version src;
+ inherit (metrics) version useDune2 src;
propagatedBuildInputs = [ gnuplot ocaml_lwt metrics mtime uuidm ];
- checkInputs = lib.optional doCheck metrics-lwt;
+ checkInputs = [ metrics-lwt ];
doCheck = true;
diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix
index 07a9392b2528..129fbaf4ed39 100644
--- a/pkgs/development/php-packages/psalm/default.nix
+++ b/pkgs/development/php-packages/psalm/default.nix
@@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
let
pname = "psalm";
- version = "4.1.0";
+ version = "4.1.1";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
- sha256 = "1mpbw9q0fgh6vdfwsm222fz1vi9jrw6l5k1mz4gyv5kxvbyzmn4c";
+ sha256 = "05qjrg8wxlqxihv7xl31n73ygx7ykvcpbh2gq958iin4rr1bcy88";
};
phases = [ "installPhase" ];
diff --git a/pkgs/development/python-modules/aioextensions/default.nix b/pkgs/development/python-modules/aioextensions/default.nix
new file mode 100644
index 000000000000..62a6b90e9f8d
--- /dev/null
+++ b/pkgs/development/python-modules/aioextensions/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, pythonOlder
+
+# Python dependencies
+, uvloop
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "aioextensions";
+ version = "20.11.1517005";
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "10b8ddhd77ixxi2i8mw86m388smp324f7rr0mdpkwdb0ra99ra8m";
+ };
+
+ propagatedBuildInputs = [ uvloop ];
+
+ checkInputs = [ pytest ];
+ checkPhase = ''
+ cd test/
+ pytest
+ '';
+
+ meta = with lib; {
+ description = "High performance functions to work with the async IO";
+ homepage = "https://kamadorueda.github.io/aioextensions";
+ license = licenses.mit;
+ maintainers = with maintainers; [ kamadorueda ];
+ };
+}
diff --git a/pkgs/development/python-modules/arabic-reshaper/default.nix b/pkgs/development/python-modules/arabic-reshaper/default.nix
new file mode 100644
index 000000000000..ad5f64146a69
--- /dev/null
+++ b/pkgs/development/python-modules/arabic-reshaper/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, future, configparser, isPy27 }:
+
+buildPythonPackage rec {
+ pname = "arabic_reshaper";
+ version = "2.1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "zzGPpdUdLSJPpJv2vbu0aE9r0sBot1z84OYH+JrBmdw=";
+ };
+
+ propagatedBuildInputs = [ future ]
+ ++ lib.optionals isPy27 [ configparser ];
+
+ # Tests are not published on pypi
+ doCheck = false;
+
+ pythonImportsCheck = [ "arabic_reshaper" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/mpcabd/python-arabic-reshaper";
+ description = "Reconstruct Arabic sentences to be used in applications that don't support Arabic";
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/pkgs/development/python-modules/azure-applicationinsights/default.nix b/pkgs/development/python-modules/azure-applicationinsights/default.nix
index f0e70b8d86c0..e43e37720217 100644
--- a/pkgs/development/python-modules/azure-applicationinsights/default.nix
+++ b/pkgs/development/python-modules/azure-applicationinsights/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Application Insights Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix
index 05021c73edb0..906461252dc7 100644
--- a/pkgs/development/python-modules/azure-batch/default.nix
+++ b/pkgs/development/python-modules/azure-batch/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Batch Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix
index abf27b5d7ef2..be51a1248a22 100644
--- a/pkgs/development/python-modules/azure-common/default.nix
+++ b/pkgs/development/python-modules/azure-common/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure common code";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight ];
+ maintainers = with maintainers; [ olcai maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
index 7a7c0e7215d5..a2b686af6887 100644
--- a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure CosmosDB namespace package";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
index c11ffae1e3dd..5c580ccd3e2f 100644
--- a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
+++ b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Log Analytics Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix
index d7164affd9b8..0e97752ae578 100644
--- a/pkgs/development/python-modules/azure-datalake-store/default.nix
+++ b/pkgs/development/python-modules/azure-datalake-store/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "This project is the Python filesystem library for Azure Data Lake Store";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix
index 19a0210cc5eb..29392699ce2b 100644
--- a/pkgs/development/python-modules/azure-eventgrid/default.nix
+++ b/pkgs/development/python-modules/azure-eventgrid/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-graphrbac/default.nix b/pkgs/development/python-modules/azure-graphrbac/default.nix
index 57fec6ff5251..2b05d9ac83d8 100644
--- a/pkgs/development/python-modules/azure-graphrbac/default.nix
+++ b/pkgs/development/python-modules/azure-graphrbac/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Graph RBAC Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-loganalytics/default.nix b/pkgs/development/python-modules/azure-loganalytics/default.nix
index beca4018baba..1eed45d72f5a 100644
--- a/pkgs/development/python-modules/azure-loganalytics/default.nix
+++ b/pkgs/development/python-modules/azure-loganalytics/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Log Analytics Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight jonringer ];
+ maintainers = with maintainers; [ maxwilson jonringer ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
index f801d2a05932..a04f28f2a513 100644
--- a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Advisor Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
index 0208d082284d..7330ef5fb3e1 100644
--- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Application Insights Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
index 3a9d2e5de2e8..400d421ee098 100644
--- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Authorization Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix
index 5a1b7600ecfc..aa188e87efa1 100644
--- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Batch Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
index 8186f87fd727..6f7aedacfae2 100644
--- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Batch AI Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix
index 9aeaf50ce4ed..d1cb009355de 100644
--- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Billing Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
index d6aa79c6915d..172e33d08cd2 100644
--- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure CDN Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
index f6ee7fce5216..c138dde95d01 100644
--- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Cognitive Services Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
index 43829dcb59e3..1460cdb9ca37 100644
--- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Commerce Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight jonringer ];
+ maintainers = with maintainers; [ maxwilson jonringer ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix
index da8dc95dad00..28043046d8aa 100644
--- a/pkgs/development/python-modules/azure-mgmt-common/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Resource Management common code";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight ];
+ maintainers = with maintainers; [ olcai maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index 9acf4ddadc40..8ce4201a2d4e 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Compute Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight ];
+ maintainers = with maintainers; [ olcai maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
index 7e5771645115..175dd9de6e87 100644
--- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Consumption Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
index 2dfff00dfa61..a693820a14f6 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Container Instance Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index 9bc7207e1e2a..41089fdeaedb 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Container Service Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
index 38b580df2522..b91a9ea398c9 100644
--- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Cosmos DB Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index 2601f829d908..92597b3b910c 100644
--- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Data Factory Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix
index 1e4cdd88c957..8fc8b44f3e6a 100644
--- a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Data Lake Analytics Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix
index ce4f623657eb..8af5fbd0c2e0 100644
--- a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Data Lake Management namespace package";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
index 4f985e37e6fa..b149584b6a99 100644
--- a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Data Lake Store Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
index 1162b0405a71..f8f0818598d3 100644
--- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Data Migration Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix
index 08cdcd721827..5ca30f45de29 100644
--- a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Dev Spaces Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
index 78f149e2f7da..7c5e6a1d7bab 100644
--- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure DevTestLabs Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix
index ce467dba31da..37511456fe6f 100644
--- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure DNS Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
index f5ddbf0fcc7c..df48be1281ce 100644
--- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure EventGrid Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
index 3aa02dd8831e..6b86973bccd9 100644
--- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure EventHub Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
index fd0c527344c0..9a23d31309b2 100644
--- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure SAP Hana on Azure Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
index 963d794d5505..b514488ff4a4 100644
--- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure IoTCentral Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
index 1e13919f340a..e36e30fc16e1 100644
--- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure IoTHub Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix
index c668e5ed4d66..3401ed898c8f 100644
--- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure IoTHub Provisioning Services Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
index 6ad96d60bc9c..10c4604ec186 100644
--- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Key Vault Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
index 95c1831f720e..d77f187d65e3 100644
--- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Log Analytics Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/pkgs/development/python-modules/azure-mgmt-logic/default.nix
index 345f11f86269..8c2b3c8fd8db 100644
--- a/pkgs/development/python-modules/azure-mgmt-logic/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-logic/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Logic Apps Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix
index 47e91ecf49f3..543589b7aecb 100644
--- a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Machine Learning Compute Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
index 080647bae96b..e09646373b6e 100644
--- a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Management Groups Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix
index c546a7eeba38..d42fb5b05c39 100644
--- a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure ManagementPartner Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix
index db87b81c8380..c0f418ed725c 100644
--- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Maps Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
index db30d30d7554..a8a138d27bde 100644
--- a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Market Place Ordering Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix
index 75d1159857e5..90effb44c69c 100644
--- a/pkgs/development/python-modules/azure-mgmt-media/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Media Services Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
index 3b85c9e9e834..742556ef34f6 100644
--- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Monitor Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix
index 2b1b65d60aec..4bd0a493ddae 100644
--- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure MSI Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index b08a729d5f46..da1ec78a8c9a 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
description = "Microsoft Azure SDK for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight jonringer ];
+ maintainers = with maintainers; [ olcai maxwilson jonringer ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
index a8ebba576485..7b4985c53331 100644
--- a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Notification Hubs Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
index fd2664b0ec0e..b3503e23d613 100644
--- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
description = "Microsoft Azure SDK for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight ];
+ maintainers = with maintainers; [ olcai maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
index b60cd66725c1..6522b3c8c435 100644
--- a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Policy Insights Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix
index 537e576b2b5a..24b446146856 100644
--- a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Power BI Embedded Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
index 7bee1f5856a7..0e96647f4925 100644
--- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure RDBMS Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
index 224f7971b352..7f4de1a463b7 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Recovery Services Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
index 75781dab8ed3..ed40cb69c721 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Recovery Services Backup Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix
index 9274bd53cf69..81b886bed226 100644
--- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Redis Cache Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix
index d3bf3f31fc20..46db2d3528cf 100644
--- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Relay Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
index d5e4226b5ccc..61ef82d74acc 100644
--- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Reservations Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index 5467537f08b8..bdba89498877 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "Microsoft Azure SDK for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight jonringer ];
+ maintainers = with maintainers; [ olcai maxwilson jonringer ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix
index 366e8df9a751..7fc7a152cb41 100644
--- a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Scheduler Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix
index 6f0fd6f3b368..c6c525176c77 100644
--- a/pkgs/development/python-modules/azure-mgmt-search/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Search Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
index e192a8f9d3e3..1c63c61e24e2 100644
--- a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Service Bus Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
index 60ffeae2b518..abb117d00466 100644
--- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Service Fabric Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
index 8192064626ea..4a452cb919cb 100644
--- a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure SignalR Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
index aa60cde71425..5fe942a220f6 100644
--- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure SQL Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index 71302be53d79..2f1032c2bb9b 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Storage Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer olcai mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer olcai maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
index ee6616272225..d0a5845d9055 100644
--- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Subscription Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
index 946be6f34cad..dd7ed3b19b21 100644
--- a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Traffic Manager Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix
index a99dd764c1a6..32c0542ca453 100644
--- a/pkgs/development/python-modules/azure-mgmt-web/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Web Apps Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-nspkg/default.nix b/pkgs/development/python-modules/azure-nspkg/default.nix
index 5be901941947..25636053a6b3 100644
--- a/pkgs/development/python-modules/azure-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-nspkg/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
description = "Microsoft Azure SDK for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight ];
+ maintainers = with maintainers; [ olcai maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix
index 2a3552d1fb5f..9c48f5b56c2d 100644
--- a/pkgs/development/python-modules/azure-servicebus/default.nix
+++ b/pkgs/development/python-modules/azure-servicebus/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Service Bus Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix
index f34d3d62ba3b..743f0abd9256 100644
--- a/pkgs/development/python-modules/azure-servicefabric/default.nix
+++ b/pkgs/development/python-modules/azure-servicefabric/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
description = "This project provides a client library in Python that makes it easy to consume Microsoft Azure Storage services";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
index 13d577362a36..b54e17db283e 100644
--- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
+++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Service Management Legacy Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight ];
+ maintainers = with maintainers; [ olcai maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix
index 20d0248cc416..dc955ff3799d 100644
--- a/pkgs/development/python-modules/azure-storage-blob/default.nix
+++ b/pkgs/development/python-modules/azure-storage-blob/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "Client library for Microsoft Azure Storage services containing the blob service APIs";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ cmcdragonkai mwilsoninsight ];
+ maintainers = with maintainers; [ cmcdragonkai maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
index 34a7ddefa47f..7fd9bca3a796 100644
--- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
+++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
@@ -30,6 +30,6 @@ if !(pythonOlder "3.3") then null else buildPythonPackage {
description = "A backport of the get_terminal_size function from Python 3.3’s shutil.";
homepage = "https://github.com/chrippa/backports.shutil_get_terminal_size";
license = with licenses; [ mit ];
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
};
}
diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix
index a1739bf4773e..c41181ca7b04 100644
--- a/pkgs/development/python-modules/bayesian-optimization/default.nix
+++ b/pkgs/development/python-modules/bayesian-optimization/default.nix
@@ -5,11 +5,13 @@
, scikitlearn
, scipy
, pytest
+, isPy27
}:
buildPythonPackage rec {
pname = "bayesian-optimization";
version = "1.2.0";
+ disabled = isPy27;
src = fetchFromGitHub {
owner = "fmfn";
diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index 9308a13fb503..1cef3514e90a 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Cython bindings for PARI";
license = licenses.gpl2;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
homepage = "https://github.com/defeo/cypari2";
};
}
diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix
index 137451b6b5cf..736afab4257c 100644
--- a/pkgs/development/python-modules/cysignals/default.nix
+++ b/pkgs/development/python-modules/cysignals/default.nix
@@ -42,10 +42,10 @@ buildPythonPackage rec {
enableParallelBuilding = true;
- meta = {
+ meta = with lib; {
description = "Interrupt and signal handling for Cython";
homepage = "https://github.com/sagemath/cysignals/";
- maintainers = with lib.maintainers; [ timokau ];
- license = lib.licenses.lgpl3Plus;
+ maintainers = teams.sage.members;
+ license = licenses.lgpl3Plus;
};
}
diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix
index 26b6977116fd..fff8859e86e0 100644
--- a/pkgs/development/python-modules/flask-autoindex/default.nix
+++ b/pkgs/development/python-modules/flask-autoindex/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
The result is just like mod_autoindex, but the look is more awesome!
'';
license = licenses.bsd2;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
homepage = "https://pythonhosted.org/Flask-AutoIndex/";
};
}
diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix
index 2d542411fa23..d052a7c51c1f 100644
--- a/pkgs/development/python-modules/flask-babel/default.nix
+++ b/pkgs/development/python-modules/flask-babel/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
installed automatically for you if you install this library.
'';
license = licenses.bsd2;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
homepage = "https://github.com/python-babel/flask-babel";
};
}
diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix
index 831eb03a09b0..fc8c57be99a4 100644
--- a/pkgs/development/python-modules/flask-silk/default.nix
+++ b/pkgs/development/python-modules/flask-silk/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage {
meta = with stdenv.lib; {
description = "Adds silk icons to your Flask application or module, or extension";
license = licenses.bsd3;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
homepage = "https://github.com/sublee/flask-silk";
};
}
diff --git a/pkgs/development/python-modules/flatbuffers/default.nix b/pkgs/development/python-modules/flatbuffers/default.nix
new file mode 100644
index 000000000000..065808dfe6ef
--- /dev/null
+++ b/pkgs/development/python-modules/flatbuffers/default.nix
@@ -0,0 +1,17 @@
+{ stdenv
+, buildPythonPackage
+, flatbuffers
+}:
+
+buildPythonPackage rec {
+ inherit (flatbuffers) pname version src;
+
+ sourceRoot = "source/python";
+
+ pythonImportsCheck = [ "flatbuffers" ];
+
+ meta = flatbuffers.meta // {
+ description = "Python runtime library for use with the Flatbuffers serialization format";
+ maintainers = with stdenv.lib.maintainers; [ wulfsta ];
+ };
+}
diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix
index 558765797237..da246966c932 100644
--- a/pkgs/development/python-modules/fpylll/default.nix
+++ b/pkgs/development/python-modules/fpylll/default.nix
@@ -67,11 +67,11 @@ buildPythonPackage rec {
PY_IGNORE_IMPORTMISMATCH=1 pytest
'';
- meta = {
+ meta = with lib; {
description = "A Python interface for fplll";
changelog = "https://github.com/fplll/fpylll/releases/tag/${version}";
homepage = "https://github.com/fplll/fpylll";
- maintainers = with lib.maintainers; [ timokau ];
- license = lib.licenses.gpl2Plus;
+ maintainers = teams.sage.members;
+ license = licenses.gpl2Plus;
};
}
diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index 6ecd91580931..1739183c3a81 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "hass-nabucasa";
- version = "0.37.1";
+ version = "0.37.2";
src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = version;
- sha256 = "/GFNrLi1I69gUDIwnHa2q/pxkiRl9PKxpKtb56JrmuA=";
+ sha256 = "0gv8p9nba7269qhc05ds0i79wz4419qjfhn7k9kcngfj1yngb6dm";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix
index 12b46be69b94..15fecba25890 100644
--- a/pkgs/development/python-modules/kaggle/default.nix
+++ b/pkgs/development/python-modules/kaggle/default.nix
@@ -20,10 +20,12 @@ buildPythonPackage rec {
};
# The version bounds in the setup.py file are unnecessarily restrictive.
+ # They have both python-slugify and slugify, don't know why
patchPhase = ''
substituteInPlace setup.py \
- --replace 'urllib3 >= 1.21.1, < 1.25' 'urllib3'
- '';
+ --replace 'urllib3 >= 1.21.1, < 1.25' 'urllib3' \
+ --replace " 'slugify'," " "
+ '';
propagatedBuildInputs = [
certifi
diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index b761b7168533..063a223cbd5a 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -6,6 +6,9 @@
, pillow
, rasterio
, shapely
+, ndjson
+, backoff
+, google_api_core
}:
buildPythonPackage rec {
@@ -17,11 +20,16 @@ buildPythonPackage rec {
sha256 = "2be6c03dafce0a786cfab5d120196efccaf300cab5aee4d2fdad644b7bee1aef";
};
- propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ];
+ propagatedBuildInputs = [
+ jinja2 requests pillow rasterio shapely ndjson backoff
+ google_api_core
+ ];
# Test cases are not running on pypi or GitHub
doCheck = false;
+ pythonImportsCheck = [ "labelbox" ];
+
meta = with lib; {
homepage = "https://github.com/Labelbox/Labelbox";
description = "Platform API for LabelBox";
diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix
index 14ed57457b29..1f21778f7db8 100644
--- a/pkgs/development/python-modules/msrest/default.nix
+++ b/pkgs/development/python-modules/msrest/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
description = "The runtime library 'msrest' for AutoRest generated Python clients.";
homepage = "https://github.com/Azure/msrest-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ bendlas jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ bendlas jonringer maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/ndjson/default.nix b/pkgs/development/python-modules/ndjson/default.nix
new file mode 100644
index 000000000000..175b04d31074
--- /dev/null
+++ b/pkgs/development/python-modules/ndjson/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, wheel, watchdog, flake8
+, pytest, pytestrunner, coverage, sphinx, twine }:
+
+buildPythonPackage rec {
+ pname = "ndjson";
+ version = "0.3.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY=";
+ };
+
+ checkInputs = [ pytest pytestrunner flake8 twine sphinx coverage watchdog ];
+
+ meta = with lib; {
+ homepage = "https://github.com/rhgrant10/ndjson";
+ description = "JsonDecoder";
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix
index 706c6251d3ac..de37c338bfa2 100644
--- a/pkgs/development/python-modules/pplpy/default.nix
+++ b/pkgs/development/python-modules/pplpy/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A Python wrapper for ppl";
homepage = "https://gitlab.com/videlec/pplpy";
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
license = licenses.gpl3;
};
}
diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index 604431612a09..4e0a2771e9a8 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -4,6 +4,8 @@ buildPythonPackage rec {
pname = "psycopg2";
version = "2.8.6";
+ # Extension modules don't work well with PyPy. Use psycopg2cffi instead.
+ # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892
disabled = isPyPy;
src = fetchPypi {
diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix
new file mode 100644
index 000000000000..1a4a5d5b77cc
--- /dev/null
+++ b/pkgs/development/python-modules/python-bidi/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, six }:
+
+buildPythonPackage rec {
+ pname = "python-bidi";
+ version = "0.4.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "U0f3HoKz6Zdtxlfwne0r/jm6jWd3yoGlssVsMBIcSW4=";
+ };
+
+ propagatedBuildInputs = [ six ];
+
+ meta = with lib; {
+ homepage = "https://github.com/MeirKriheli/python-bidi";
+ description = "Pure python implementation of the BiDi layout algorithm";
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/pkgs/development/python-modules/sockjs/default.nix b/pkgs/development/python-modules/sockjs/default.nix
new file mode 100644
index 000000000000..d589179338fd
--- /dev/null
+++ b/pkgs/development/python-modules/sockjs/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, aiohttp }:
+
+buildPythonPackage rec {
+ pname = "sockjs";
+ version = "0.11.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "A0fUBO2e8xllBnh+2AGPh+5OLQuupJ1CDN1TqWm+wik=";
+ };
+
+ propagatedBuildInputs = [ aiohttp ];
+
+ pythonImportsCheck = [ "sockjs" ];
+
+ meta = with lib; {
+ description = "Sockjs server";
+ homepage = "https://github.com/aio-libs/sockjs";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix
index 77bd9cdf5847..ee53af641a05 100644
--- a/pkgs/development/python-modules/srsly/default.nix
+++ b/pkgs/development/python-modules/srsly/default.nix
@@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "srsly";
- version = "2.3.1";
+ version = "2.3.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "3dcce93c69ff18e8a8d7decfdfdf8e1fd44c4446cdee8d0e5d545d6b172dc377";
+ sha256 = "f78eaef8d982e98921ce026d4205e652a9333137259f0b621f5c7b579e746e9d";
};
nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/sympy/1_5.nix b/pkgs/development/python-modules/sympy/1_5.nix
index 3a03fae154d7..00125f43bfc3 100644
--- a/pkgs/development/python-modules/sympy/1_5.nix
+++ b/pkgs/development/python-modules/sympy/1_5.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "sympy";
- version = "1.5.1"; # Upgrades may break sage. Please test or ping @timokau.
+ version = "1.5.1";
src = fetchPypi {
inherit pname version;
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "A Python library for symbolic mathematics";
homepage = "https://www.sympy.org/";
license = licenses.bsd3;
- maintainers = with maintainers; [ lovek323 timokau ];
+ maintainers = with maintainers; [ lovek323 ] ++ teams.sage.members;
};
}
diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix
index 52e2bb5af127..9c3353aa2e74 100644
--- a/pkgs/development/python-modules/sympy/default.nix
+++ b/pkgs/development/python-modules/sympy/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "sympy";
- version = "1.6.2"; # Upgrades may break sage. Please test or ping @timokau.
+ version = "1.6.2";
src = fetchPypi {
inherit pname version;
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "A Python library for symbolic mathematics";
homepage = "https://www.sympy.org/";
license = licenses.bsd3;
- maintainers = with maintainers; [ lovek323 timokau ];
+ maintainers = with maintainers; [ lovek323 ] ++ teams.sage.members;
};
}
diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix
index a8d00d075142..6300111e4ce2 100644
--- a/pkgs/development/python-modules/tld/default.nix
+++ b/pkgs/development/python-modules/tld/default.nix
@@ -33,7 +33,7 @@ python.pkgs.buildPythonPackage rec {
homepage = "https://github.com/barseghyanartur/tld";
description = "Extracts the top level domain (TLD) from the URL given";
license = licenses.lgpl21;
- maintainers = with maintainers; [ genesis ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix
index 47a0d6cc2699..a0d24785eb69 100644
--- a/pkgs/development/python-modules/uamqp/default.nix
+++ b/pkgs/development/python-modules/uamqp/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
description = "An AMQP 1.0 client library for Python";
homepage = "https://github.com/Azure/azure-uamqp-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix
index c35d0b484d37..88143b2193f4 100644
--- a/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/pkgs/development/python-modules/xhtml2pdf/default.nix
@@ -6,13 +6,19 @@
, pypdf2
, reportlab
, six
+, python-bidi
+, arabic-reshaper
+, setuptools
}:
buildPythonPackage rec {
pname = "xhtml2pdf";
version = "0.2.5";
- propagatedBuildInputs = [pillow html5lib pypdf2 reportlab six];
+ propagatedBuildInputs = [
+ pillow html5lib pypdf2 reportlab six
+ setuptools python-bidi arabic-reshaper
+ ];
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index a906ff4f4195..e07451c26334 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -4,6 +4,7 @@
, fetchFromGitHub
, pyserial
, pyserial-asyncio
+, pyusb
, pytest-asyncio
, pytestCheckHook
, pythonOlder
@@ -11,7 +12,7 @@
buildPythonPackage rec {
pname = "zigpy-zigate";
- version = "0.6.2";
+ version = "0.7.2";
# https://github.com/Martiusweb/asynctest/issues/152
# broken by upstream python bug with asynctest and
# is used exclusively by home-assistant with python 3.8
@@ -20,13 +21,14 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "zigpy";
repo = "zigpy-zigate";
- rev = version;
- sha256 = "EV6DV+BytUcPMtzYVKDnq/Uv2efg3stjL5uVlL62II4=";
+ rev = "v${version}";
+ sha256 = "0ycrsmp3n3awiyj0gbq6xnaa2s9mpc5l7mlmfc00rfnx7rr2z4ha";
};
buildInputs = [
pyserial
pyserial-asyncio
+ pyusb
zigpy
];
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 27675652eb87..23f35c2c7881 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.137.0";
+ version = "0.138.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
- sha256 = "1bwrm0jab3pjq1md584szdb3vk4r2cka49qn6f9znnb1ji589x5q";
+ sha256 = "08f7rihk663bwfxccl6fh6p5qn31025lhr5fmcxi3hl3jirwzb6n";
};
installPhase = ''
diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix
index 1cef52a34443..d4a102ac097b 100644
--- a/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/pkgs/development/tools/analysis/radare2/cutter.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ fetchFromGitHub, lib, mkDerivation
# nativeBuildInputs
, qmake, pkgconfig
# Qt
@@ -8,7 +8,7 @@
, python3
, wrapQtAppsHook }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "radare2-cutter";
version = "1.12.0";
@@ -30,21 +30,31 @@ stdenv.mkDerivation rec {
--replace "include(lib_radare2.pri)" ""
'';
- nativeBuildInputs = [ qmake pkgconfig ];
- buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 wrapQtAppsHook ];
+ nativeBuildInputs = [ qmake pkgconfig python3 wrapQtAppsHook ];
+ propagatedBuildInputs = [ python3.pkgs.pyside2 ];
+ buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ];
- qmakeFlags = [
+ qmakeFlags = with python3.pkgs; [
"CONFIG+=link_pkgconfig"
"PKGCONFIG+=r_core"
# Leaving this enabled doesn't break build but generates errors
# at runtime (to console) about being unable to load needed bits.
# Disable until can be looked at.
"CUTTER_ENABLE_JUPYTER=false"
+ # Enable support for Python plugins
+ "CUTTER_ENABLE_PYTHON=true"
+ "CUTTER_ENABLE_PYTHON_BINDINGS=true"
+ "SHIBOKEN_EXTRA_OPTIONS+=-I${r2-for-cutter}/include/libr"
];
+ preBuild = ''
+ export NIX_LDFLAGS="$NIX_LDFLAGS $(pkg-config --libs python3-embed)"
+ qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
+ '';
+
enableParallelBuilding = true;
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A Qt and C++ GUI for radare2 reverse engineering framework";
homepage = src.meta.homepage;
license = licenses.gpl3;
diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index ee048466a3d5..1f12afe3f748 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -2,26 +2,38 @@
buildGoModule rec {
pname = "conftest";
- version = "0.21.0";
+ version = "0.22.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "conftest";
rev = "v${version}";
- sha256 = "15xdsjv53hjgmdxzdakj07ggickw1jkcii31ycb3q8nh1ki05rhq";
+ sha256 = "1mjfb39h6z8dbrqxlvrvnzid7la6wj709kx7dva4126i84cmpyf1";
};
- vendorSha256 = "0795npr09680nmxiz9riq5v6rp91qgkvw1lc2mn9gzakv1ywl5rq";
+ vendorSha256 = "08c4brwvjp9f7cpzywxns6dkhl3jzq9ckyvphm2jnm2kxmkawbbn";
doCheck = false;
- buildFlagsArray = ''
- -ldflags=
- -X main.version=${version}
- '';
+ buildFlagsArray = [
+ "-ldflags="
+ "-s"
+ "-w"
+ "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}"
+ ];
meta = with lib; {
description = "Write tests against structured configuration data";
+ longDescription = ''
+ Conftest helps you write tests against structured configuration data.
+ Using Conftest you can write tests for your Kubernetes configuration,
+ Tekton pipeline definitions, Terraform code, Serverless configs or any
+ other config files.
+
+ Conftest uses the Rego language from Open Policy Agent for writing the
+ assertions. You can read more about Rego in 'How do I write policies' in
+ the Open Policy Agent documentation.
+ '';
inherit (src.meta) homepage;
license = licenses.asl20;
maintainers = with maintainers; [ yurrriq ];
diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix
index b5319493dad3..45e7b372e666 100644
--- a/pkgs/development/web/nodejs/v15.nix
+++ b/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "15.2.0";
- sha256 = "022kw29sjf46mgvwciihi2cmf9sfjpqi0xih8xpk7xiwfmx02ypn";
+ version = "15.2.1";
+ sha256 = "0gp8z68h888x2ql64aiicgs7k065lg755cbjlnkbzdih5bh32qjn";
}
diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix
index ff0484547fc2..d770fb627536 100644
--- a/pkgs/development/web/woff2/default.nix
+++ b/pkgs/development/web/woff2/default.nix
@@ -18,8 +18,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
- cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ]
- ++ stdenv.lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE";
+ cmakeFlags = [
+ "-DCANONICAL_PREFIXES=ON"
+ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
+ ] ++ stdenv.lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE";
propagatedBuildInputs = [ brotli ];
diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix
index 6c3a7f1168e6..423130a53561 100644
--- a/pkgs/games/assaultcube/default.nix
+++ b/pkgs/games/assaultcube/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
cp ${desktop}/share/applications/* $out/share/applications
install -Dpm644 packages/misc/icon.png $out/share/icons/assaultcube.png
install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png
-
+
makeWrapper $out/bin/ac_client $out/bin/${pname} \
--run "cd $out/$gamedatadir" --add-flags "--home=\$HOME/.assaultcube/v1.2next --init"
fi
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Fast and fun first-person-shooter based on the Cube fps";
homepage = "https://assault.cubers.net";
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux; # should work on darwin with a little effort.
license = stdenv.lib.licenses.zlib;
};
diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix
index 307c09dfa1b3..cab509a3e9a6 100644
--- a/pkgs/games/gscrabble/default.nix
+++ b/pkgs/games/gscrabble/default.nix
@@ -35,6 +35,6 @@ buildPythonApplication {
homepage = "https://github.com/RaaH/gscrabble/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix
index d5d4f5c40153..fce5ec09c79c 100644
--- a/pkgs/games/gweled/default.nix
+++ b/pkgs/games/gweled/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = "https://gweled.org";
license = licenses.gpl2;
platforms = platforms.linux;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/games/lugaru/default.nix b/pkgs/games/lugaru/default.nix
index d938c0316525..877a3880a00e 100644
--- a/pkgs/games/lugaru/default.nix
+++ b/pkgs/games/lugaru/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Third person ninja rabbit fighting game";
homepage = "https://osslugaru.gitlab.io";
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
license = stdenv.lib.licenses.gpl2Plus;
};
diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix
index 2b5a86ad52c9..f0f6ccb8a129 100644
--- a/pkgs/games/pentobi/default.nix
+++ b/pkgs/games/pentobi/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
description = "A computer opponent for the board game Blokus";
homepage = "https://pentobi.sourceforge.io";
license = licenses.gpl3;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix
index 5689edf4f4c4..31dbe7f6bbcc 100644
--- a/pkgs/games/pysolfc/default.nix
+++ b/pkgs/games/pysolfc/default.nix
@@ -43,6 +43,6 @@ buildPythonApplication rec {
description = "A collection of more than 1000 solitaire card games";
homepage = "https://pysolfc.sourceforge.io";
license = licenses.gpl3;
- maintainers = with maintainers; [ kierdavis genesis ];
+ maintainers = with maintainers; [ kierdavis ];
};
}
diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index ba6a3601328f..4cac596282e2 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Simon Tatham's portable puzzle collection";
license = licenses.mit;
- maintainers = [ maintainers.raskin maintainers.genesis ];
+ maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
homepage = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/";
};
diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix
index 10b5e570d0fa..20701c5cc4df 100644
--- a/pkgs/misc/drivers/utsushi/default.nix
+++ b/pkgs/misc/drivers/utsushi/default.nix
@@ -146,7 +146,7 @@ in stdenv.mkDerivation rec {
'';
homepage = "https://gitlab.com/utsushi/imagescan";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ wucke13 ];
+ maintainers = with maintainers; [ wucke13 maxwilson ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix
index 8694d4d2d5ae..4b2b6208bb40 100644
--- a/pkgs/misc/emulators/caprice32/default.nix
+++ b/pkgs/misc/emulators/caprice32/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
description = "A complete emulation of CPC464, CPC664 and CPC6128";
homepage = "https://github.com/ColinPitrat/caprice32";
license = licenses.gpl2;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix
index 6a2f94e77e6c..219875ba6fcb 100644
--- a/pkgs/misc/emulators/libdsk/default.nix
+++ b/pkgs/misc/emulators/libdsk/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
description = "A library for accessing discs and disc image files";
homepage = "http://www.seasip.info/Unix/LibDsk/";
license = licenses.gpl2Plus;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index e356e636c5a2..cb4b7997383f 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "mednafen";
- version = "1.24.3";
+ version = "1.26.1";
src = fetchurl {
url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz";
- sha256 = "03zplcfvmnnv7grhacmr1zy789pb2wda36wylmzmar23g0zqbsix";
+ sha256 = "1x7xhxjhwsdbak8l0iyb497f043xkhibk73w96xck4j2bk10fac4";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix
index 1242a1ef11ac..d089ddf2695b 100644
--- a/pkgs/misc/emulators/qmc2/default.nix
+++ b/pkgs/misc/emulators/qmc2/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${pname}-${version}.tar.gz";
sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns";
};
-
+
preBuild = ''
patchShebangs scripts
'';
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
description = "A Qt frontend for MAME/MESS";
homepage = "https://qmc2.batcom-it.net";
license = licenses.gpl2;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
broken = true;
};
diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/misc/emulators/xcpc/default.nix
index 3806d25e5d00..75c30280e21f 100644
--- a/pkgs/misc/emulators/xcpc/default.nix
+++ b/pkgs/misc/emulators/xcpc/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
description = "A portable Amstrad CPC 464/664/6128 emulator written in C";
homepage = "https://www.xcpc-emulator.net";
license = licenses.gpl2Plus;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 285819561bb4..def5fadba114 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -5617,6 +5617,19 @@ let
meta.homepage = "https://github.com/plasticboy/vim-markdown/";
};
+ vim-markdown-composer = buildVimPluginFrom2Nix {
+ pname = "vim-markdown-composer";
+ version = "2020-08-15";
+ src = fetchFromGitHub {
+ owner = "euclio";
+ repo = "vim-markdown-composer";
+ rev = "c0f98ec3d6c4cb49455c18f2aeb83c0dcbad1bc4";
+ sha256 = "10vb3p8gksjy8zfzlkhirdsjwgvh1yv19plxwr404x87j393rs7n";
+ fetchSubmodules = true;
+ };
+ meta.homepage = "https://github.com/euclio/vim-markdown-composer/";
+ };
+
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2020-09-07";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 88e535da5b03..0031b6e7dc72 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -468,6 +468,21 @@ self: super: {
'';
});
+ vim-markdown-composer =
+ let
+ vim-markdown-composer-bin = rustPlatform.buildRustPackage rec {
+ pname = "vim-markdown-composer-bin";
+ inherit (super.vim-markdown-composer) src version;
+ cargoSha256 = "iuhq2Zhdkib8hw4uvXBjwE5ZiN1kzairlzufaGuVkWc=";
+ };
+ in super.vim-markdown-composer.overrideAttrs(oldAttrs: rec {
+ preFixup = ''
+ substituteInPlace "$out"/share/vim-plugins/vim-markdown-composer/after/ftplugin/markdown/composer.vim \
+ --replace "let l:args = [s:plugin_root . '/target/release/markdown-composer']" \
+ "let l:args = ['${vim-markdown-composer-bin}/bin/markdown-composer']"
+ '';
+ });
+
vim-metamath = super.vim-metamath.overrideAttrs(old: {
preInstall = "cd vim";
});
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 86b39c7d7e34..db3a0e070d34 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -103,6 +103,7 @@ enricobacis/vim-airline-clock
ensime/ensime-vim
ervandew/supertab
esneider/YUNOcommit.vim
+euclio/vim-markdown-composer
fannheyward/coc-markdownlint
farmergreg/vim-lastplace
fatih/vim-go
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index fcebea126fe9..6938750dd649 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "firmware-linux-nonfree";
- version = "2020-10-22";
+ version = "2020-11-18";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
rev = lib.replaceStrings ["-"] [""] version;
- sha256 = "15l32993pfm0albx7ky64c5i60vph150hrdkg87md15919a6naia";
+ sha256 = "107p7h13gncsxqhixqq9zmmswvs910sck54ab10s4m5cafvnaf94";
};
installFlags = [ "DESTDIR=$(out)" ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "0y2dpp3gklzym2gr0w9wddf6cn6p0sv9n2xh401j1299sjsr57m9";
+ outputHash = "1319qr3mhbbvbnl8q151pgfpahwzfv9zg0fvpj34z5h0wnvmlr2v";
meta = with stdenv.lib; {
description = "Binary firmware collection packaged by kernel.org";
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 99f20985cddd..2ab56a3c9302 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.206";
+ version = "4.14.207";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1b46f0s15xnlam43cmw8w41rrvcwrhm6km0278lq6f86lpx3w8qw";
+ sha256 = "0a804hwh7cwbdd2gnr5n9i32b4s6gppd8iqihah4sn4q1nbm79vq";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 6458f02da664..1d3a837b1f14 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.157";
+ version = "4.19.158";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0mgpgv2ny49bb7kgaygy2ay6ckjgw7mg091viivi66jw4mjs7p3n";
+ sha256 = "0p5pim9izcscnk1a1kdlxbvyvxnnq9lqr1kwl86kfskr7yqy8n6n";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index ad34346b9139..67a5fcd341b7 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.243";
+ version = "4.4.244";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1daqbmj9ka9wdkkym625hqwqaxq5n11y7c4yc9ln3xkjpnv4dplm";
+ sha256 = "0brdj6z7flchig80ja0dhzcrpl743lh74s4r4r6prbgkksif9ahp";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 3682f6fd5ea8..ecedd3dc59f6 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.243";
+ version = "4.9.244";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "111rlzx6z4kf8zwxncib96d9wy6qmkbs0cq3dhnybipwlyf1iank";
+ sha256 = "02givxp0y04qma5nlqbpyxdcl7xdb41p3gw7kgj2rmwdanhzaylr";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 93f7fc599b73..25a5c05d8387 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.4.77";
+ version = "5.4.78";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1xyvml0mps7bsa11bgpa4l0w8x6pasdz9yab2z4ds394f1lkxq53";
+ sha256 = "0z8skj0w9jfrz9pfxaqfzqh82l13bz5lhza2wjsxk02cyhhnm226";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix
index 0f8143114756..95bb00a01427 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.9.8";
+ version = "5.9.9";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "19l67gzk97higd2cbggipcb0wi21pv0ag0mc4qh6cqk564xp6mkn";
+ sha256 = "1b8zysy0br131ydhc7ycxhh8d88r44xrmkf2q2lffy0jmy3d60m3";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index a6ef21fe917f..f0d362b02ce0 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
- rev = "17762";
- sha256 = "1fj77j9x20w8xwk2xmga625dv81c145gj01z8yxz8i3x2cxwccrs";
+ rev = "17768";
+ sha256 = "0j85bjxylvl88xzf3nji1xadz3ws1kfbyhbn47haipigncvccndj";
}
, ...
}:
diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix
index 34c77bc3e6a7..92da7f6fb828 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/pkgs/os-specific/linux/ndiswrapper/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, kernel, perl, kmod, libelf }:
+{ stdenv, fetchurl, kernel, perl, kmod, libelf }:
let
- version = "1.62-pre";
+ version = "1.63";
in
stdenv.mkDerivation {
name = "ndiswrapper-${version}-${kernel.version}";
@@ -14,7 +14,6 @@ stdenv.mkDerivation {
kernel = kernel.dev;
buildPhase = "
- cd ndiswrapper
echo make KBUILD=$(echo \$kernel/lib/modules/*/build);
echo -n $kernel/lib/modules/*/build > kbuild_path
export PATH=${kmod}/sbin:$PATH
@@ -30,12 +29,9 @@ stdenv.mkDerivation {
patchShebangs $out/sbin
'';
- # should we use unstable?
- src = fetchFromGitHub {
- owner = "pgiri";
- repo = "ndiswrapper";
- rev = "5e29f6a9d41df949b435066c173e3b1947f179d3";
- sha256 = "0sprrmxxkf170bmh1nz9xw00gs89dddr84djlf666bn5bhy6jffi";
+ src = fetchurl {
+ url = "mirror://sourceforge/ndiswrapper/files/stable/ndiswrapper-${version}.tar.gz";
+ sha256 = "1v6b66jhisl110jfl00hm43lmnrav32vs39d85gcbxrjqnmcx08g";
};
buildInputs = [ perl libelf ];
@@ -45,5 +41,6 @@ stdenv.mkDerivation {
homepage = "https://sourceforge.net/projects/ndiswrapper";
license = "GPL";
platforms = [ "i686-linux" "x86_64-linux" ];
+ broken = stdenv.lib.versionAtLeast kernel.version "5.8";
};
}
diff --git a/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch b/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch
index 34965540d248..373965fb0853 100644
--- a/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch
+++ b/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch
@@ -1,7 +1,5 @@
-diff --git a/ndiswrapper/driver/Makefile b/ndiswrapper/driver/Makefile
-index bf42f7bc..ad23aa2d 100644
---- a/ndiswrapper/driver/Makefile
-+++ b/ndiswrapper/driver/Makefile
+--- a/driver/Makefile
++++ b/driver/Makefile
@@ -191,7 +191,7 @@ clean:
rm -rf .tmp_versions
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index 2c0854d0a8b4..ef92ff9550ff 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -4,34 +4,18 @@ let
python = python3.override {
packageOverrides = self: super: {
bcrypt = super.bcrypt.overridePythonAttrs (oldAttrs: rec {
- version = "3.1.4";
+ version = "3.1.7";
src = oldAttrs.src.override {
inherit version;
- sha256 = "13cyrnqwkhc70rs6dg65z4yrrr3dc42fhk11804fqmci9hvimvb7";
+ sha256 = "CwBpx1LsFBcsX3ggjxhj161nVab65v527CyA0TvkHkI=";
};
});
yarl = super.yarl.overridePythonAttrs (oldAttrs: rec {
- version = "1.1.0";
+ version = "1.4.2";
src = oldAttrs.src.override {
inherit version;
- sha256 = "6af895b45bd49254cc309ac0fe6e1595636a024953d710e01114257736184698";
- };
- });
-
- jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec {
- version = "2.10.1";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013";
- };
- });
-
- aiohttp-jinja2 = super.aiohttp-jinja2.overridePythonAttrs (oldAttrs: rec {
- version = "0.15.0";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "0f390693f46173d8ffb95669acbb0e2a3ec54ecce676703510ad47f1a6d9dc83";
+ sha256 = "WM2cRp7O1VjNgao/SEspJOiJcEngaIno/yUQQ1t+90s=";
};
});
};
@@ -39,26 +23,43 @@ let
in python.pkgs.buildPythonApplication rec {
pname = "appdaemon";
- version = "4.0.1";
+ version = "4.0.5";
src = fetchFromGitHub {
owner = "home-assistant";
repo = "appdaemon";
rev = version;
- sha256 = "13qzjv11b0c7s1c66j70qmc222a78805n10lv2svj9yyk1v4xhjv";
+ sha256 = "7o6DrTufAC+qK3dDfpkuQMQWuduCZ6Say/knI4Y07QM=";
};
propagatedBuildInputs = with python.pkgs; [
daemonize astral requests websocket_client aiohttp yarl jinja2
aiohttp-jinja2 pyyaml voluptuous feedparser iso8601 bcrypt paho-mqtt setuptools
- deepdiff dateutil bcrypt python-socketio pid
+ deepdiff dateutil bcrypt python-socketio pid pytz sockjs pygments
+ azure-mgmt-compute azure-mgmt-storage azure-mgmt-resource azure-keyvault-secrets azure-storage-blob
];
# no tests implemented
doCheck = false;
postPatch = ''
- substituteInPlace requirements.txt --replace "pyyaml==5.1" "pyyaml"
+ substituteInPlace requirements.txt \
+ --replace "pyyaml==5.3" "pyyaml" \
+ --replace "pid==2.2.5" "pid" \
+ --replace "Jinja2==2.11.1" "Jinja2" \
+ --replace "pytz==2019.3" "pytz" \
+ --replace "aiohttp==3.6.2" "aiohttp>=3.6" \
+ --replace "iso8601==0.1.12" "iso8601>=0.1" \
+ --replace "azure==4.0.0" "azure-mgmt-compute
+ azure-mgmt-storage
+ azure-mgmt-resource
+ azure-keyvault-secrets
+ azure-storage-blob" \
+ --replace "sockjs==0.10.0" "sockjs" \
+ --replace "deepdiff==4.3.1" "deepdiff" \
+ --replace "voluptuous==0.11.7" "voluptuous" \
+ --replace "astral==1.10.1" "astral" \
+ --replace "python-socketio==4.4.0" "python-socketio"
'';
meta = with lib; {
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index fa54c2b5f265..52f114bfe7f5 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "0.117.6";
+ version = "0.118.0";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
@@ -85,6 +85,7 @@
"blinkt" = ps: with ps; [ ]; # missing inputs: blinkt
"blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api
"bloomsky" = ps: with ps; [ ];
+ "blueprint" = ps: with ps; [ ];
"bluesound" = ps: with ps; [ xmltodict ];
"bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
"bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez
@@ -126,6 +127,7 @@
"co2signal" = ps: with ps; [ ]; # missing inputs: co2signal
"coinbase" = ps: with ps; [ ]; # missing inputs: coinbase
"coinmarketcap" = ps: with ps; [ coinmarketcap ];
+ "color_extractor" = ps: with ps; [ ]; # missing inputs: colorthief
"comed_hourly_pricing" = ps: with ps; [ ];
"comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect
"command_line" = ps: with ps; [ ];
@@ -367,7 +369,6 @@
"hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti
"hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser
"hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py
- "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm
"iammeter" = ps: with ps; [ ]; # missing inputs: iammeter
"iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink
"icloud" = ps: with ps; [ pyicloud ];
@@ -528,7 +529,7 @@
"nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi
"nello" = ps: with ps; [ ]; # missing inputs: pynello
"ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient
- "nest" = ps: with ps; [ aiohttp-cors python-nest ]; # missing inputs: google-nest-sdm
+ "nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm
"netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ];
"netdata" = ps: with ps; [ ]; # missing inputs: netdata
"netgear" = ps: with ps; [ ]; # missing inputs: pynetgear
@@ -623,7 +624,7 @@
"point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint
"poolsense" = ps: with ps; [ ]; # missing inputs: poolsense
"powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall
- "profiler" = ps: with ps; [ pyprof2calltree ];
+ "profiler" = ps: with ps; [ objgraph pyprof2calltree ]; # missing inputs: guppy3
"progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw
"proliphix" = ps: with ps; [ ]; # missing inputs: proliphix
"prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];
@@ -659,7 +660,7 @@
"random" = ps: with ps; [ ];
"raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats
"raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client
- "recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste
+ "recollect_waste" = ps: with ps; [ ]; # missing inputs: aiorecollect
"recorder" = ps: with ps; [ sqlalchemy ];
"recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch
"reddit" = ps: with ps; [ praw ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 8e5435350eee..b7350a4efd27 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -24,11 +24,6 @@ let
(mkOverride "astral" "1.10.1"
"d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
- # Pinned due to an API change in pyowm>=3.0
- # Remove after https://github.com/home-assistant/core/pull/39839 gets merged
- (mkOverride "pyowm" "2.10.0"
- "1xvcv3sbcn9na8cwz21nnjlixysfk5lymnf65d1nqkbgacc1mm4g")
-
# Pinned, because v1.5.0 broke the google_translate integration
# https://github.com/home-assistant/core/pull/38428
(mkOverride "yarl" "1.4.2"
@@ -67,7 +62,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "0.117.6";
+ hassVersion = "0.118.0";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -83,7 +78,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- sha256 = "1f9w7migwmdvnbiv4bi0b31zdfrsg87zgiz2l3gymn6w89f3h8y1";
+ sha256 = "0q3kjsxp82r11gqsnwcw8rnqhgi46214hw84ibw8956w7h75ik5m";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@@ -91,9 +86,10 @@ in with py.pkgs; buildPythonApplication rec {
postPatch = ''
substituteInPlace setup.py \
- --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \
+ --replace "aiohttp==3.7.1" "aiohttp>=3.6.3" \
--replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \
--replace "cryptography==3.2" "cryptography" \
+ --replace "requests==2.25.0" "requests>=2.24.0" \
--replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100"
substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
'';
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index ce3403b8f537..825576e92ad1 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20201021.4";
+ version = "20201111.2";
src = fetchPypi {
inherit pname version;
- sha256 = "138h4cgvkn26xlr53ziz6d0zc00zw4wk40cpi4c4nia1lv6cqkxd";
+ sha256 = "1pk4l78j72zn6gxc0yr3azdlcqwkvf7ki0khm176qpvs34scs1l8";
};
# no Python tests implemented
diff --git a/pkgs/servers/http/showoff/default.nix b/pkgs/servers/http/showoff/default.nix
index 0a10c806e5ed..ecfd034e05b3 100644
--- a/pkgs/servers/http/showoff/default.nix
+++ b/pkgs/servers/http/showoff/default.nix
@@ -13,6 +13,6 @@ bundlerApp {
homepage = "https://puppetlabs.github.io/showoff/";
license = with licenses; mit;
platforms = platforms.unix;
- maintainers = with maintainers; [ mwilsoninsight nicknovitski ];
+ maintainers = with maintainers; [ maxwilson nicknovitski ];
};
}
diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index 6d75011575ad..fb86600eaa6a 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
- version = "0.37.0.2";
+ version = "0.37.1";
src = fetchurl {
url = "http://downloads.metabase.com/v${version}/metabase.jar";
- sha256 = "7f95f9823bdf567d4044925e9f14c820a6b4a176624ec027d911cac33813bf96";
+ sha256 = "1mqkaagd452kygch47jsqzcjcsian4pp5xcvr3nnm3p3mah79wyi";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 445872bbe5fb..6ab1c80ecedf 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,13 +1,13 @@
-{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }:
+{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }:
let
- version = "2.22.1";
+ version = "2.22.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "prometheus";
repo = "prometheus";
- sha256 = "0wilx675b0a8ww7bj36hzcaip0zqzndkzan04rjsjigz5bw6kba0";
+ sha256 = "04pf3shdfd25wf8snkan5hzv1gjzazjw06i11xaamnc8gfahnzdv";
};
webui = mkYarnPackage {
@@ -59,7 +59,7 @@ in buildGoPackage rec {
cp -a $src/console_libraries $src/consoles $out/etc/prometheus
'';
- doCheck = true;
+ doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1
passthru.tests = { inherit (nixosTests) prometheus; };
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index c025da8752de..c403d160e2bc 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -115,13 +115,13 @@ let
in stdenv.mkDerivation rec {
pname = "mpd";
- version = "0.22.2";
+ version = "0.22.3";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${version}";
- sha256 = "1pg3h3bvrsp24pv53yvwl5kr4m2csaxffdbrj5rm3b7w6pbqpfix";
+ sha256 = "0323zxmgyrkbklnqm8i6napz8pva50cw14mzr9bvmyg64x404jgj";
};
buildInputs = [
diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix
deleted file mode 100644
index 8835024c1df0..000000000000
--- a/pkgs/servers/openafs/1.6/default.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
-, glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43
-, ncurses # Extra ncurses utilities. Only needed for debugging.
-, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
-}:
-
-with (import ./srcs.nix { inherit fetchurl; });
-
-stdenv.mkDerivation {
- pname = "openafs";
- inherit version srcs;
-
- nativeBuildInputs = [ autoconf automake flex yacc perl which libxslt ];
-
- buildInputs = [ ncurses ];
-
- patches = stdenv.lib.optional (tsmbac != null) ./tsmbac.patch;
-
- outputs = [ "out" "dev" "man" "doc" ];
-
- preConfigure = ''
-
- patchShebangs .
- for i in `grep -l -R '/usr/\(include\|src\)' .`; do
- echo "Patch /usr/include and /usr/src in $i"
- substituteInPlace $i \
- --replace "/usr/include" "${glibc.dev}/include" \
- --replace "/usr/src" "$TMP"
- done
-
- for i in ./doc/xml/{AdminGuide,QuickStartUnix,UserGuide}/*.xml; do
- substituteInPlace "''${i}" --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
- "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
- done
-
- ./regen.sh
-
- ${stdenv.lib.optionalString (kerberos != null)
- "export KRB5_CONFIG=${kerberos.dev}/bin/krb5-config"}
-
- export AFS_SYSKVERS=26
-
- configureFlagsArray=(
- ${stdenv.lib.optionalString (kerberos != null) "--with-krb5"}
- "--sysconfdir=/etc"
- "--localstatedir=/var"
- "--disable-kernel-module"
- "--disable-fuse-client"
- "--with-html-xsl=${docbook_xsl}/share/xml/docbook-xsl/html/chunk.xsl"
- ${stdenv.lib.optionalString (tsmbac != null) "--enable-tivoli-tsm"}
- ${stdenv.lib.optionalString (ncurses == null) "--disable-gtx"}
- "--disable-linux-d_splice-alias-extra-iput"
- )
- '' + stdenv.lib.optionalString (tsmbac != null) ''
- export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
- export XBSA_XLIBS="-ldl"
- '';
-
- buildFlags = [ "all_nolibafs" ];
-
- postBuild = ''
- for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
- make -C "''${d}" html
- done
- '';
-
- postInstall = ''
- mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide}
- cp -r doc/{arch,examples,pdf,protocol,txt} README NEWS $doc/share/doc/openafs
- for d in AdminGuide QuickStartUnix UserGuide ; do
- cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}"
- done
-
- rm -r $out/lib/{openafs,afs,*.a}
- rm $out/bin/kpasswd
- rm $out/sbin/{kas,kdb,ka-forwarder,kadb_check}
- rm $out/libexec/openafs/kaserver
- rm $man/share/man/man{1/kpasswd*,5/kaserver*,8/{ka*,kdb*}}
- '';
-
- meta = with stdenv.lib; {
- outputsToInstall = [ "out" "doc" "man" ];
- description = "Open AFS client";
- homepage = "https://www.openafs.org";
- license = licenses.ipl10;
- platforms = platforms.linux;
- maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
- # Package will be removed in 21.03
- broken = true;
- };
-}
diff --git a/pkgs/servers/openafs/1.6/srcs.nix b/pkgs/servers/openafs/1.6/srcs.nix
deleted file mode 100644
index 888cef2f1eaa..000000000000
--- a/pkgs/servers/openafs/1.6/srcs.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ fetchurl }:
-rec {
- version = "1.6.24";
- src = fetchurl {
- url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
- sha256 = "1dxzc1y5mmx3ap0m94sx80vfs3qxkckid3wc1xm0wr5i6fh7zn1h";
- };
-
- srcs = [ src
- (fetchurl {
- url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
- sha256 = "0aq9ipqpr2ksmk30h2dc4mlrkrqs16xnmspwfb6xj3rgr1pwszlx";
- })];
-}
diff --git a/pkgs/servers/openafs/1.6/tsmbac.patch b/pkgs/servers/openafs/1.6/tsmbac.patch
deleted file mode 100644
index 412765fe8a5b..000000000000
--- a/pkgs/servers/openafs/1.6/tsmbac.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ru3 openafs-1.6.18.1/acinclude.m4 openafs-1.6.18.1.new/acinclude.m4
---- openafs-1.6.18.1/acinclude.m4 2016-06-21 17:13:39.000000000 +0200
-+++ openafs-1.6.18.1.new/acinclude.m4 2016-11-02 18:44:30.423039662 +0100
-@@ -1373,45 +1373,7 @@
-
- dnl check for tivoli
- AC_MSG_CHECKING(for tivoli tsm butc support)
--XBSA_CFLAGS=""
--if test "$enable_tivoli_tsm" = "yes"; then
-- XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen
-- XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen
-- XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample
-- XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample
-- XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample
-- XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample
--
-- if test -r "$XBSADIR3/dsmapifp.h"; then
-- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3"
-- XBSA_XLIBS="-ldl"
-- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
-- elif test -r "$XBSADIR4/dsmapifp.h"; then
-- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4"
-- XBSA_XLIBS="-ldl"
-- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
-- elif test -r "$XBSADIR5/dsmapifp.h"; then
-- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5"
-- XBSA_XLIBS="-ldl"
-- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
-- elif test -r "$XBSADIR6/dsmapifp.h"; then
-- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6"
-- XBSA_XLIBS="-ldl"
-- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
-- elif test -r "$XBSADIR1/xbsa.h"; then
-- XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
-- XBSA_XLIBS=""
-- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
-- elif test -r "$XBSADIR2/xbsa.h"; then
-- XBSA_CFLAGS="-Dxbsa -I$XBSADIR2"
-- XBSA_XLIBS=""
-- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
-- else
-- AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files])
-- fi
--else
-- AC_MSG_RESULT([no])
--fi
-+AC_MSG_RESULT([yes])
- AC_SUBST(XBSA_CFLAGS)
- AC_SUBST(XBSA_XLIBS)
-
-diff -ru3 openafs-1.6.18.1/src/butc/afsxbsa.c openafs-1.6.18.1.new/src/butc/afsxbsa.c
---- openafs-1.6.18.1/src/butc/afsxbsa.c 2016-06-21 17:13:39.000000000 +0200
-+++ openafs-1.6.18.1.new/src/butc/afsxbsa.c 2016-11-02 18:45:10.734662987 +0100
-@@ -651,7 +651,7 @@
- #if defined(AFS_AIX_ENV)
- dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER);
- #elif defined (AFS_AMD64_LINUX26_ENV)
-- dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL);
-+ dynlib = dlopen(XBSA_TSMLIB, RTLD_NOW | RTLD_LOCAL);
- #elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV)
- dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL);
- #else
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 8cb04ea7cdb5..722e514ea016 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -75,7 +75,7 @@ in stdenv.mkDerivation {
license = licenses.ipl10;
platforms = platforms.linux;
maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
- broken = versionOlder kernel.version "3.18";
+ broken = versionOlder kernel.version "3.18" || kernel.isHardened;
};
}
diff --git a/pkgs/servers/openafs/1.9/bosserver.patch b/pkgs/servers/openafs/1.9/bosserver.patch
new file mode 100644
index 000000000000..094d9871f64f
--- /dev/null
+++ b/pkgs/servers/openafs/1.9/bosserver.patch
@@ -0,0 +1,30 @@
+diff -u openafs-1.8.0/src/bozo/bosserver.c /tmp/buffer-content-13110-gd
+--- openafs-1.8.0/src/bozo/bosserver.c
++++ #
+@@ -244,24 +244,6 @@
+ static int
+ CreateDirs(const char *coredir)
+ {
+- if ((!strncmp
+- (AFSDIR_USR_DIRPATH, AFSDIR_CLIENT_ETC_DIRPATH,
+- strlen(AFSDIR_USR_DIRPATH)))
+- ||
+- (!strncmp
+- (AFSDIR_USR_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH,
+- strlen(AFSDIR_USR_DIRPATH)))) {
+- if (MakeDir(AFSDIR_USR_DIRPATH))
+- return errno;
+- }
+- if (!strncmp
+- (AFSDIR_SERVER_AFS_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH,
+- strlen(AFSDIR_SERVER_AFS_DIRPATH))) {
+- if (MakeDir(AFSDIR_SERVER_AFS_DIRPATH))
+- return errno;
+- }
+- if (MakeDir(AFSDIR_SERVER_BIN_DIRPATH))
+- return errno;
+ if (MakeDir(AFSDIR_SERVER_ETC_DIRPATH))
+ return errno;
+ if (MakeDir(AFSDIR_SERVER_LOCAL_DIRPATH))
+
+Diff finished. Fri Jun 29 15:45:46 2018
diff --git a/pkgs/servers/openafs/1.9/cross-build.patch b/pkgs/servers/openafs/1.9/cross-build.patch
new file mode 100644
index 000000000000..62254164a1b1
--- /dev/null
+++ b/pkgs/servers/openafs/1.9/cross-build.patch
@@ -0,0 +1,223 @@
+diff -Nur --unidirectional-new-file openafs-1.8.2/configure.ac openafs-1.8.2.new/configure.ac
+--- openafs-1.8.2/configure.ac 2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/configure.ac 2018-10-16 15:56:36.512277860 +0200
+@@ -23,6 +23,7 @@
+ AFS_LT_INIT
+
+ AC_PROG_CC
++AX_PROG_CC_FOR_BUILD
+
+ AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib])
+ AC_SUBST([PATH_CPP])
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4
+--- openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 1970-01-01 01:00:00.000000000 +0100
++++ openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4 2018-10-16 16:20:40.278641658 +0200
+@@ -0,0 +1,125 @@
++# ===========================================================================
++# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++# AX_PROG_CC_FOR_BUILD
++#
++# DESCRIPTION
++#
++# This macro searches for a C compiler that generates native executables,
++# that is a C compiler that surely is not a cross-compiler. This can be
++# useful if you have to generate source code at compile-time like for
++# example GCC does.
++#
++# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
++# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
++# The value of these variables can be overridden by the user by specifying
++# a compiler with an environment variable (like you do for standard CC).
++#
++# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
++# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
++# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
++# substituted in the Makefile.
++#
++# LICENSE
++#
++# Copyright (c) 2008 Paolo Bonzini
++#
++# Copying and distribution of this file, with or without modification, are
++# permitted in any medium without royalty provided the copyright notice
++# and this notice are preserved. This file is offered as-is, without any
++# warranty.
++
++#serial 9
++
++AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
++AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_CPP])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++
++dnl Use the standard macros, but make them use other variable names
++dnl
++pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
++pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
++pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
++pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
++pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
++pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
++pushdef([ac_cv_objext], ac_cv_build_objext)dnl
++pushdef([ac_exeext], ac_build_exeext)dnl
++pushdef([ac_objext], ac_build_objext)dnl
++pushdef([CC], CC_FOR_BUILD)dnl
++pushdef([CPP], CPP_FOR_BUILD)dnl
++pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
++pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
++pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
++pushdef([host], build)dnl
++pushdef([host_alias], build_alias)dnl
++pushdef([host_cpu], build_cpu)dnl
++pushdef([host_vendor], build_vendor)dnl
++pushdef([host_os], build_os)dnl
++pushdef([ac_cv_host], ac_cv_build)dnl
++pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
++pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
++pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
++pushdef([ac_cv_host_os], ac_cv_build_os)dnl
++pushdef([ac_cpp], ac_build_cpp)dnl
++pushdef([ac_compile], ac_build_compile)dnl
++pushdef([ac_link], ac_build_link)dnl
++
++save_cross_compiling=$cross_compiling
++save_ac_tool_prefix=$ac_tool_prefix
++cross_compiling=no
++ac_tool_prefix=
++
++AC_PROG_CC
++AC_PROG_CPP
++AC_EXEEXT
++
++ac_tool_prefix=$save_ac_tool_prefix
++cross_compiling=$save_cross_compiling
++
++dnl Restore the old definitions
++dnl
++popdef([ac_link])dnl
++popdef([ac_compile])dnl
++popdef([ac_cpp])dnl
++popdef([ac_cv_host_os])dnl
++popdef([ac_cv_host_vendor])dnl
++popdef([ac_cv_host_cpu])dnl
++popdef([ac_cv_host_alias])dnl
++popdef([ac_cv_host])dnl
++popdef([host_os])dnl
++popdef([host_vendor])dnl
++popdef([host_cpu])dnl
++popdef([host_alias])dnl
++popdef([host])dnl
++popdef([LDFLAGS])dnl
++popdef([CPPFLAGS])dnl
++popdef([CFLAGS])dnl
++popdef([CPP])dnl
++popdef([CC])dnl
++popdef([ac_objext])dnl
++popdef([ac_exeext])dnl
++popdef([ac_cv_objext])dnl
++popdef([ac_cv_exeext])dnl
++popdef([ac_cv_prog_cc_g])dnl
++popdef([ac_cv_prog_cc_cross])dnl
++popdef([ac_cv_prog_cc_works])dnl
++popdef([ac_cv_prog_gcc])dnl
++popdef([ac_cv_prog_CPP])dnl
++
++dnl Finally, set Makefile variables
++dnl
++BUILD_EXEEXT=$ac_build_exeext
++BUILD_OBJEXT=$ac_build_objext
++AC_SUBST(BUILD_EXEEXT)dnl
++AC_SUBST(BUILD_OBJEXT)dnl
++AC_SUBST([CFLAGS_FOR_BUILD])dnl
++AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
++AC_SUBST([LDFLAGS_FOR_BUILD])dnl
++])
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/comerr/Makefile.in openafs-1.8.2.new/src/comerr/Makefile.in
+--- openafs-1.8.2/src/comerr/Makefile.in 2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/src/comerr/Makefile.in 2018-10-16 15:48:19.678898925 +0200
+@@ -38,11 +38,14 @@
+ compile_et: compile_et.o error_table.o
+ $(Q)case $(SYS_NAME) in \
+ *_linux* | *_umlinux* | *_darwin* ) \
+- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr $(buildtool_roken) $(MT_LIBS);; \
++ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build $(buildtool_roken) $(MT_LIBS);; \
+ * ) \
+- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr -ll $(buildtool_roken) $(MT_LIBS);; \
++ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build -ll $(buildtool_roken) $(MT_LIBS);; \
+ esac
+
++compile_et compile_et.o error_table.o: CC=$(CC_FOR_BUILD)
++compile_et compile_et.o error_table.o: LD=$(CC_FOR_BUILD)
++
+ libafscom_err.a: $(LT_objs)
+ $(LT_LDLIB_lwp) $(LT_objs)
+
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/config/Makefile.in openafs-1.8.2.new/src/config/Makefile.in
+--- openafs-1.8.2/src/config/Makefile.in 2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/src/config/Makefile.in 2018-10-16 15:48:19.677898926 +0200
+@@ -54,6 +54,8 @@
+
+ config.o: config.c AFS_component_version_number.c
+
++config mkvers config.o mc.o: CC=$(CC_FOR_BUILD)
++
+ #
+ # Include installation targets
+ #
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/opr/Makefile.in openafs-1.8.2.new/src/opr/Makefile.in
+--- openafs-1.8.2/src/opr/Makefile.in 2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/src/opr/Makefile.in 2018-10-16 15:48:19.678898925 +0200
+@@ -21,7 +21,7 @@
+ $(TOP_INCDIR)/opr/time.h \
+ $(TOP_INCDIR)/opr/uuid.h
+
+-all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a
++all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a $(TOP_LIBDIR)/libopr_build.a
+
+ liboafs_opr.la: liboafs_opr.la.sym $(LT_objs) $(LT_deps)
+ $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
+@@ -29,12 +29,26 @@
+ libopr.a: $(LT_objs)
+ $(LT_LDLIB_static) $(LT_objs)
+
++LT_objs_build = $(patsubst %.lo, %_build.lo, $(LT_objs))
++
++%_build.lo: %.c
++ $(LT_CCRULE) $<
++
++libopr_build.a: $(LT_objs_build)
++ $(LT_LDLIB_static) $(LT_objs_build)
++
++libopr_build.a $(LT_objs_build): CC=$(CC_FOR_BUILD)
++libopr_build.a $(LT_objs_build): LD=$(CC_FOR_BUILD)
++
+ libopr_pic.la: $(LT_objs)
+ $(LT_LDLIB_pic) $(LT_objs)
+
+ $(TOP_LIBDIR)/libopr.a: libopr.a
+ $(INSTALL_DATA) libopr.a $@
+
++$(TOP_LIBDIR)/libopr_build.a: libopr_build.a
++ $(INSTALL_DATA) libopr_build.a $@
++
+ $(TOP_LIBDIR)/libopr_pic.a: libopr_pic.la
+ $(INSTALL_DATA) .libs/libopr_pic.a $@
+
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/rxgen/Makefile.in openafs-1.8.2.new/src/rxgen/Makefile.in
+--- openafs-1.8.2/src/rxgen/Makefile.in 2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/src/rxgen/Makefile.in 2018-10-16 15:48:19.677898926 +0200
+@@ -25,6 +25,8 @@
+
+ CFLAGS_rpc_main.o= -DPATH_CPP="\"$(PATH_CPP)\""
+
++rxgen $(OBJS): CC=$(CC_FOR_BUILD)
++
+ #
+ # Install targets
+ #
diff --git a/pkgs/servers/openafs/1.9/default.nix b/pkgs/servers/openafs/1.9/default.nix
new file mode 100644
index 000000000000..c26f8d3a23c5
--- /dev/null
+++ b/pkgs/servers/openafs/1.9/default.nix
@@ -0,0 +1,105 @@
+{ stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
+, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file
+, docbook_xml_dtd_43, libtool_2
+, withDevdoc ? false, doxygen, dblatex # Extra developer documentation
+, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
+, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
+}:
+
+with (import ./srcs.nix { inherit fetchurl; });
+let
+ inherit (stdenv.lib) optional optionalString optionals;
+
+in stdenv.mkDerivation {
+ pname = "openafs";
+ inherit version srcs;
+
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
+ which yacc ] ++ optionals withDevdoc [ doxygen dblatex ];
+
+ buildInputs = [ kerberos ncurses ];
+
+ patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch;
+
+ outputs = [ "out" "dev" "man" "doc" ] ++ optional withDevdoc "devdoc";
+
+ enableParallelBuilding = false;
+
+ setOutputFlags = false;
+
+ # Makefiles don't include install targets for all new shared libs, yet.
+ dontDisableStatic = true;
+
+ preConfigure = ''
+ patchShebangs .
+ for i in `grep -l -R '/usr/\(include\|src\)' .`; do
+ echo "Patch /usr/include and /usr/src in $i"
+ substituteInPlace $i \
+ --replace "/usr/include" "${glibc.dev}/include" \
+ --replace "/usr/src" "$TMP"
+ done
+
+ for i in ./doc/xml/{AdminGuide,QuickStartUnix,UserGuide}/*.xml; do
+ substituteInPlace "''${i}" --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
+ "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
+ done
+
+ ./regen.sh
+
+
+ configureFlagsArray=(
+ "--with-gssapi"
+ "--sysconfdir=/etc"
+ "--localstatedir=/var"
+ "--disable-kernel-module"
+ "--disable-fuse-client"
+ "--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl"
+ ${optionalString (tsmbac != null) "--enable-tivoli-tsm"}
+ ${optionalString (ncurses == null) "--disable-gtx"}
+ "--disable-linux-d_splice-alias-extra-iput"
+ )
+ '' + optionalString (tsmbac != null) ''
+ export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
+ export XBSA_XLIBS="-ldl"
+ '';
+
+ buildFlags = [ "all_nolibafs" ];
+
+ postBuild = ''
+ for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
+ make -C "''${d}" index.html
+ done
+ '' + optionalString withDevdoc ''
+ make dox
+ '';
+
+ postInstall = ''
+ mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide}
+ cp -r doc/txt README LICENSE $doc/share/doc/openafs
+ for d in AdminGuide QuickStartUnix UserGuide ; do
+ cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}"
+ done
+
+ rm -r $out/lib/openafs
+ '' + optionalString withDevdoc ''
+ mkdir -p $devdoc/share/devhelp/openafs/doxygen
+ cp -r doc/{pdf,protocol} $devdoc/share/devhelp/openafs
+ cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen
+ '';
+
+ # Avoid references to $TMPDIR by removing it and let patchelf cleanup the
+ # binaries.
+ preFixup = ''
+ rm -rf "$(pwd)" && mkdir "$(pwd)"
+ '';
+
+ meta = with stdenv.lib; {
+ outputsToInstall = [ "out" "doc" "man" ];
+ description = "Open AFS client";
+ homepage = "https://www.openafs.org";
+ license = licenses.ipl10;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
+ };
+}
diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.9/module.nix
similarity index 53%
rename from pkgs/servers/openafs/1.6/module.nix
rename to pkgs/servers/openafs/1.9/module.nix
index 3354d8508efa..547134726221 100644
--- a/pkgs/servers/openafs/1.6/module.nix
+++ b/pkgs/servers/openafs/1.9/module.nix
@@ -1,7 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, which, autoconf, automake, flex, bison
-, kernel, glibc, perl }:
+{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
+, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }:
-with (import ./srcs.nix { inherit fetchurl; });
+with (import ./srcs.nix {
+ inherit fetchurl;
+});
let
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
@@ -11,26 +13,12 @@ in stdenv.mkDerivation {
name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src;
- patches = [
- # Linux 4.20
- (fetchpatch {
- name = "openafs_1_6-current_kernel_time.patch";
- url = "http://git.openafs.org/?p=openafs.git;a=patch;h=b9936e944a2b4f5773d66864cbb297993b050e65";
- sha256 = "16fl9kp0l95dqm166jx3x4ijbzhf2bc9ilnipn3k1j00mfy4lnia";
- })
- (fetchpatch {
- name = "openafs_1_6-do_settimeofday.patch";
- url = "http://git.openafs.org/?p=openafs.git;a=patch;h=fe6fb38b3d4095351955b9872d0fd6cba64f8784";
- sha256 = "0k6kgk1ybhm9xx2l0wbcyv7jimkr9mfs2ywvxy8hpyhcm7rbwjkp";
- })
- # Linux 5.0
- (fetchpatch {
- name = "openafs_1_6-super_block.patch";
- url = "http://git.openafs.org/?p=openafs.git;a=patch;h=61db15f1badabd83e289efd622e274c47f0aefda";
- sha256 = "0cdd76s1h1bhxj0hl7r6mcha1jcy5vhlvc5dc8m2i83a6281yjsa";
- })
- ];
- nativeBuildInputs = [ autoconf automake flex perl bison which ] ++ kernel.moduleBuildDependencies;
+ nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]
+ ++ kernel.moduleBuildDependencies;
+
+ buildInputs = [ kerberos ];
+
+ patches = [];
hardeningDisable = [ "pic" ];
@@ -38,6 +26,7 @@ in stdenv.mkDerivation {
"--with-linux-kernel-build=${kernelBuildDir}"
"--sysconfdir=/etc"
"--localstatedir=/var"
+ "--with-gssapi"
"--disable-linux-d_splice-alias-extra-iput"
];
@@ -51,7 +40,6 @@ in stdenv.mkDerivation {
done
./regen.sh -q
-
'';
buildPhase = ''
@@ -70,8 +58,7 @@ in stdenv.mkDerivation {
license = licenses.ipl10;
platforms = platforms.linux;
maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
- # Package will be removed in 21.03
- broken = true;
+ broken = versionOlder kernel.version "3.18" || kernel.isHardened;
};
}
diff --git a/pkgs/servers/openafs/1.9/srcs.nix b/pkgs/servers/openafs/1.9/srcs.nix
new file mode 100644
index 000000000000..8c5f63cac111
--- /dev/null
+++ b/pkgs/servers/openafs/1.9/srcs.nix
@@ -0,0 +1,14 @@
+{ fetchurl }:
+rec {
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
+ sha256 = "1jw99zwisq25l0smdm8f0gfwhynk532s2ch44blrvxyd7all8kcd";
+ };
+
+ srcs = [ src
+ (fetchurl {
+ url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
+ sha256 = "03x1pv8l4bv2fdns1l4sfy200nggy0a4b1f7qd0mnggdaj12c4jp";
+ })];
+}
diff --git a/pkgs/servers/openafs/1.9/tsmbac.patch b/pkgs/servers/openafs/1.9/tsmbac.patch
new file mode 100644
index 000000000000..f68c777b6f09
--- /dev/null
+++ b/pkgs/servers/openafs/1.9/tsmbac.patch
@@ -0,0 +1,62 @@
+diff -ru openafs-1.8.0/src/butc/afsxbsa.c openafs-1.8.0.new/src/butc/afsxbsa.c
+--- openafs-1.8.0/src/butc/afsxbsa.c 2018-04-06 03:21:12.000000000 +0200
++++ openafs-1.8.0.new/src/butc/afsxbsa.c 2018-06-12 16:26:26.272522305 +0200
+@@ -651,7 +651,7 @@
+ #if defined(AFS_AIX_ENV)
+ dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER);
+ #elif defined (AFS_AMD64_LINUX26_ENV)
+- dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL);
++ dynlib = dlopen(XBSA_TSMLIB, RTLD_NOW | RTLD_LOCAL);
+ #elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV)
+ dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL);
+ #else
+diff -ru openafs-1.8.0/src/cf/tivoli.m4 openafs-1.8.0.new/src/cf/tivoli.m4
+--- openafs-1.8.0/src/cf/tivoli.m4 2018-04-06 03:21:12.000000000 +0200
++++ openafs-1.8.0.new/src/cf/tivoli.m4 2018-06-12 16:26:26.072522485 +0200
+@@ -1,45 +1,7 @@
+ AC_DEFUN([OPENAFS_TIVOLI_TESTS],[
+ dnl check for tivoli
+ AC_MSG_CHECKING(for tivoli tsm butc support)
+-XBSA_CFLAGS=""
+-if test "$enable_tivoli_tsm" = "yes"; then
+- XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen
+- XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen
+- XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample
+- XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample
+- XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample
+- XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample
+-
+- if test -r "$XBSADIR3/dsmapifp.h"; then
+- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3"
+- XBSA_XLIBS="-ldl"
+- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+- elif test -r "$XBSADIR4/dsmapifp.h"; then
+- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4"
+- XBSA_XLIBS="-ldl"
+- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+- elif test -r "$XBSADIR5/dsmapifp.h"; then
+- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5"
+- XBSA_XLIBS="-ldl"
+- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+- elif test -r "$XBSADIR6/dsmapifp.h"; then
+- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6"
+- XBSA_XLIBS="-ldl"
+- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+- elif test -r "$XBSADIR1/xbsa.h"; then
+- XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
+- XBSA_XLIBS=""
+- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+- elif test -r "$XBSADIR2/xbsa.h"; then
+- XBSA_CFLAGS="-Dxbsa -I$XBSADIR2"
+- XBSA_XLIBS=""
+- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+- else
+- AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files])
+- fi
+-else
+- AC_MSG_RESULT([no])
+-fi
++AC_MSG_RESULT([yes])
+ AC_SUBST(XBSA_CFLAGS)
+ AC_SUBST(XBSA_XLIBS)
+ XLIBS="$XBSA_XLIBS $XLIBS"
diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index f06b0a486985..925c22091356 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,13 +8,13 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
- version = "1.20.3.3483-211702a9f";
+ version = "1.20.5.3600-47c0d9038";
pname = "plexmediaserver";
# Fetch the source
src = fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
- sha256 = "0b05mxmvjn2sr0aqy8s2c41gz0vlpmwjwx42jpqddk3qzidvwkbd";
+ sha256 = "0vqsmmgqcvvhxiqaw87qz9fdisyf9smp6ab069dz3nq39x7n9na0";
};
outputs = [ "out" "basedb" ];
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [
+ badmutex
colemickens
forkk
lnl7
diff --git a/pkgs/servers/sip/freeswitch/modules.nix b/pkgs/servers/sip/freeswitch/modules.nix
index 226ad90ee1f5..202461d2cf9f 100644
--- a/pkgs/servers/sip/freeswitch/modules.nix
+++ b/pkgs/servers/sip/freeswitch/modules.nix
@@ -9,7 +9,7 @@
, ffmpeg
, libmysqlclient
, postgresql
-, spandsp
+, spandsp3
, sofia_sip
}:
@@ -70,7 +70,7 @@ in
snom = mk "applications/mod_snom" [];
sonar = mk "applications/mod_sonar" [];
soundtouch = mk "applications/mod_soundtouch" [];
- spandsp = mk "applications/mod_spandsp" [ spandsp ];
+ spandsp = mk "applications/mod_spandsp" [ spandsp3 ];
spy = mk "applications/mod_spy" [];
stress = mk "applications/mod_stress" [];
translate = mk "applications/mod_translate" [];
diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 7b41791be322..2254cb4038e9 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "ckbcomp";
- version = "1.197";
+ version = "1.198";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "console-setup";
rev = version;
- sha256 = "0m2q30f94vd1wb2zqpiyplpgfchjlm8j41xiyxcqdjzdgqbs7l27";
+ sha256 = "04ahnn8gi24x9kjz6q4nm6gswc4gcav87rvq9sajj4g2hkrxfn0c";
};
buildInputs = [ perl ];
diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix
index 111d064ad887..9d10dd478818 100644
--- a/pkgs/tools/X11/grobi/default.nix
+++ b/pkgs/tools/X11/grobi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, fetchpatch }:
buildGoModule rec {
version = "0.6.0";
@@ -13,6 +13,14 @@ buildGoModule rec {
vendorSha256 = "1ibwx5rbxkygfx78j3g364dmbwwa5b34qmzq3sqcbrsnv8rzrwvj";
+ patches = [
+ # fix failing test on go 1.15
+ (fetchpatch {
+ url = "https://github.com/fd0/grobi/commit/176988ab087ff92d1408fbc454c77263457f3d7e.patch";
+ sha256 = "0j8y3gns4lm0qxqxzmdn2ll0kq34mmfhf83lvsq13iqhp5bx3y31";
+ })
+ ];
+
meta = with stdenv.lib; {
homepage = "https://github.com/fd0/grobi";
description = "Automatically configure monitors/outputs for Xorg via RANDR";
diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix
index 03fa9156aad2..1d4275c65cbd 100644
--- a/pkgs/tools/admin/ssmsh/default.nix
+++ b/pkgs/tools/admin/ssmsh/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ssmsh";
- version = "1.4.3";
+ version = "1.4.4";
src = fetchFromGitHub {
owner = "bwhaley";
repo = pname;
rev = "v${version}";
- sha256 = "0rvvawn4cavqhbrrp616mi5ipn4q6j22227h4rbjh0zxdlna23gm";
+ sha256 = "0mgx4q21f6rxih79l0hwgzwafxviz5a33dpvc5k0z172sfw0dmj1";
};
- vendorSha256 = "127xni0i7w42075bspmm5r61j858i1p59jr2ib8f9r1pbizh63xw";
+ vendorSha256 = "147f02bl3sf073dy2ximbavdcbphdn7djgisla1cyyy4ng6dhf7f";
doCheck = true;
diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix
index 46635aa67412..1c639dfc29ec 100644
--- a/pkgs/tools/filesystems/cpcfs/default.nix
+++ b/pkgs/tools/filesystems/cpcfs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "cpcfs";
version = "0.85.4";
-
+
src = fetchFromGitHub {
owner = "derikz";
repo = "cpcfs";
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
description = "Manipulating CPC dsk images and files";
homepage = "https://github.com/derikz/cpcfs/" ;
license = licenses.bsd2;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix
index 6de0d586ad94..a8e2cc3f0974 100644
--- a/pkgs/tools/filesystems/idsk/default.nix
+++ b/pkgs/tools/filesystems/idsk/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
description = "Manipulating CPC dsk images and files";
homepage = "https://github.com/cpcsdk/idsk" ;
license = licenses.mit;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix
index 96389214c7e0..040889903480 100644
--- a/pkgs/tools/filesystems/romdirfs/default.nix
+++ b/pkgs/tools/filesystems/romdirfs/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/mlafeldt/romdirfs";
license = licenses.gpl3;
platforms = platforms.linux;
- maintainers = with maintainers; [ genesis ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix
index 27335a9cf5da..9f9c4a605c6a 100644
--- a/pkgs/tools/filesystems/squashfuse/default.nix
+++ b/pkgs/tools/filesystems/squashfuse/default.nix
@@ -8,14 +8,6 @@ stdenv.mkDerivation rec {
pname = "squashfuse";
version = "0.1.103";
- meta = {
- description = "FUSE filesystem to mount squashfs archives";
- homepage = "https://github.com/vasi/squashfuse";
- maintainers = [ maintainers.genesis ];
- platforms = platforms.linux;
- license = "BSD-2-Clause";
- };
-
# platforms.darwin should be supported : see PLATFORMS file in src.
# we could use a nix fuseProvider, and let the derivation choose the OS
# specific implementation.
@@ -29,4 +21,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook libtool pkgconfig ];
buildInputs = [ lz4 xz zlib lzo zstd fuse ];
+
+ meta = {
+ description = "FUSE filesystem to mount squashfs archives";
+ homepage = "https://github.com/vasi/squashfuse";
+ maintainers = [ ];
+ platforms = platforms.linux;
+ license = "BSD-2-Clause";
+ };
}
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index ccc4a23cb558..435cafe001d1 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "gmic";
- version = "2.9.2";
+ version = "2.9.3";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
- sha256 = "14acph914a8lp6qqfmp319ggqjg3i3hmalmnpk3mp07m7vpv2p9q";
+ sha256 = "1pj3rwycwnspw2lm5j0w4647677y6s3446zsx9s6br9bc7v7w5s6";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix
index dba42e4bfea8..2856bc2f1e0c 100644
--- a/pkgs/tools/misc/cpuminer-multi/default.nix
+++ b/pkgs/tools/misc/cpuminer-multi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, curl, jansson, autoconf, automake
+{ stdenv, fetchFromGitHub, curl, jansson, autoconf, automake
, aesni ? stdenv.hostPlatform.aesSupport }:
let
@@ -8,9 +8,10 @@ in
stdenv.mkDerivation {
name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}";
- src = fetchgit {
+ src = fetchFromGitHub {
+ owner = "hyc";
+ repo = "cpuminer-multi";
inherit rev;
- url = "https://github.com/wolf9466/cpuminer-multi.git";
sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v";
};
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index a659c576d8fb..f84a51486d98 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "direnv";
- version = "2.23.1";
+ version = "2.24.0";
vendorSha256 = null;
@@ -10,7 +10,7 @@ buildGoModule rec {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
- sha256 = "02b27imda9pg65z5xw2q398p2281d5d46vgs3i9mrwcfsbpl5s6d";
+ sha256 = "1hgivmz6f5knpchkyi3njj1h81hixm77ad5g2v0m9bid09b97nh8";
};
# we have no bash at the moment for windows
diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 7616e6a5b304..f787ab1ef0ba 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fluent-bit";
- version = "1.6.3";
+ version = "1.6.4";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${version}";
- sha256 = "0c8b5xg1shdncw24jsnzwk96ln4qmw1h2qlxv6467lf083kz0azw";
+ sha256 = "1hfkix5pjcrm68bm4k71dlkkdlnwffzlw4kxhiq9pmg09z8s6kq3";
};
nativeBuildInputs = [ cmake flex bison ];
diff --git a/pkgs/tools/misc/mons/default.nix b/pkgs/tools/misc/mons/default.nix
index c1dbfa0aa49a..71a12c887968 100644
--- a/pkgs/tools/misc/mons/default.nix
+++ b/pkgs/tools/misc/mons/default.nix
@@ -2,21 +2,21 @@
stdenv.mkDerivation rec {
pname = "mons";
- version = "20200107";
+ version = "20200320";
src = fetchFromGitHub {
owner = "Ventto";
repo = pname;
- rev = "0c9e1a1dddff23a0525ed8e4ec9af8f9dd8cad4c";
- sha256 = "02c41mw3g1mgl91hhpz1n45iaqk9s7mdk1ixm8yv6sv17hy8rr4w";
+ rev = "375bbba3aa700c8b3b33645a7fb70605c8b0ff0c";
+ sha256 = "19r5y721yrxhd9jp99s29jjvm0p87vl6xfjlcj38bljq903f21cl";
fetchSubmodules = true;
};
- # PR: https://github.com/Ventto/mons/pull/36
- preConfigure = ''sed -i 's/usr\///' Makefile'';
-
nativeBuildInputs = [ help2man ];
- makeFlags = [ "DESTDIR=$(out)" ];
+ makeFlags = [
+ "DESTDIR=$(out)"
+ "PREFIX="
+ ];
meta = with lib; {
description = "POSIX Shell script to quickly manage 2-monitors display";
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 701e86dbf901..1525d3a22963 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -8,6 +8,8 @@
then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])
++
+ (lib.optional stdenv.targetPlatform.isUnix "unix")
+ ++
[ "sinks" "sources" "transforms" ])
, coreutils
, CoreServices
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index d3d6118a9668..a2a316a575cf 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2020.11.12";
+ version = "2020.11.19";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "0c98sjaj6mvxnjp0qnwqbr6fibgb4dlizad2xvkiswf4g4h0pc5f";
+ sha256 = "17my2k6ksj2gch2j85laa5y8c448j4n6zfg85ljfg3zxnag4vhgq";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix
index 22da1320803e..db6917ef0b76 100644
--- a/pkgs/tools/networking/photon/default.nix
+++ b/pkgs/tools/networking/photon/default.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
installPhase = ''
mkdir -p "$out"/{bin,share/photon}
cp -R photon.py core plugins $out/share/photon
-
+
makeWrapper ${python3Packages.python.interpreter} $out/bin/photon \
--set PYTHONPATH "$PYTHONPATH:$out/share/photon" \
--add-flags "-O $out/share/photon/photon.py"
@@ -29,6 +29,6 @@ python3Packages.buildPythonApplication rec {
description = "a lightning fast web crawler which extracts URLs, files, intel & endpoints from a target";
homepage = "https://github.com/s0md3v/Photon";
license = licenses.gpl3;
- maintainers = with maintainers; [ genesis ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix
index 62baff512bb2..66ea91a56d41 100644
--- a/pkgs/tools/package-management/nfpm/default.nix
+++ b/pkgs/tools/package-management/nfpm/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nfpm";
- version = "1.10.0";
+ version = "1.10.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "1pgdajbphqfn430jwm052czz1d4ynl6n4z2wjzmblv7lwkbh9j3d";
+ sha256 = "1j9b6kkhlw2sx6qwnxkhsk7bj9vm2vr0z1hj1jf257fxw9m2q6mz";
};
vendorSha256 = "0x7r7qn4852q57fx5mcrw3aqdydmidk9g0hvj6apj81q77k5svqs";
diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix
index 48db0094db94..d45e35d9bbc0 100644
--- a/pkgs/tools/security/pass/extensions/genphrase.nix
+++ b/pkgs/tools/security/pass/extensions/genphrase.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pass-genphrase";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "congma";
repo = "pass-genphrase";
rev = version;
- sha256 = "1sdkmz5s6wdx4vdlgqf5kmyrm17zwzy3n52s13qpx32bnnajap1h";
+ sha256 = "01dff2jlp111y7vlmp1wbgijzphhlzc19m02fs8nzmn5vxyffanx";
};
dontBuild = true;
diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix
index 05241033c6af..9ece11c74260 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/pkgs/tools/text/poedit/default.nix
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0pvd903j2x3h9wh38fhlcn23d0jkjlqnfbdpbvnbhy6al1ngx72w";
};
- nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
+ nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
libxslt xmlto boost libtool pkgconfig ];
buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ];
propagatedBuildInputs = [ gettext ];
-
+
preConfigure = "
patchShebangs bootstrap
./bootstrap
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
"--with-boost-libdir=${boost.out}/lib"
"CPPFLAGS=-I${nlohmann_json}/include/nlohmann/"
];
-
+
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ gettext ]}")
'';
-
+
enableParallelBuilding = true;
meta = with stdenv.lib; {
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.poedit.net/";
license = licenses.mit;
platforms = platforms.unix;
- maintainers = with maintainers; [ domenkozar genesis ];
+ maintainers = with maintainers; [ domenkozar ];
};
}
diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix
index ae7a45b562d9..ae300f47b19e 100644
--- a/pkgs/tools/video/rav1e/default.nix
+++ b/pkgs/tools/video/rav1e/default.nix
@@ -1,18 +1,32 @@
-{ rustPlatform, fetchFromGitHub, lib, nasm, cargo-c }:
+{ stdenv, rustPlatform, fetchurl, fetchFromGitHub, lib, nasm, cargo-c }:
rustPlatform.buildRustPackage rec {
pname = "rav1e";
- version = "0.3.4";
+ version = "0.4.0-alpha";
- src = fetchFromGitHub {
- owner = "xiph";
- repo = "rav1e";
- rev = "v${version}";
- sha256 = "0zwjg0sv504i1ahzfy2jgng6qwmyvcrvdrp4n3s90r4kvwjkv8xs";
+ src = stdenv.mkDerivation rec {
+ name = "${pname}-${version}-source";
+
+ src = fetchFromGitHub {
+ owner = "xiph";
+ repo = "rav1e";
+ rev = "v${version}";
+ sha256 = "1fw1gxi8330kfhl9hfzpn0lcmyn5604lc74d6g6iadzz2hmv4mb9";
+ };
+
+ cargoLock = fetchurl {
+ url = "https://github.com/xiph/rav1e/releases/download/v0.4.0-alpha/Cargo.lock";
+ sha256 = "002s2wlzpifn5p2ahdrjdkjl48c1wr6fslg0if4gf9qpl8qj05fl";
+ };
+
+ installPhase = ''
+ mkdir -p $out
+ cp -r ./* $out/
+ cp ${cargoLock} $out/Cargo.lock
+ '';
};
- cargoSha256 = "1mfzshcbxky27nskxhcyrj99wd3v5f597ymgv7nb67lzp5lsyb24";
-
+ cargoSha256 = "1i5ldqb77rrhfxxf9krp7f6yj3h6rsqak6hf23fd2znhgmi7psb1";
nativeBuildInputs = [ nasm cargo-c ];
postBuild = ''
@@ -31,7 +45,7 @@ rustPlatform.buildRustPackage rec {
libaom (the reference encoder) is too slow.
Features: https://github.com/xiph/rav1e#features
'';
- inherit (src.meta) homepage;
+ homepage = "https://github.com/xiph/rav1e";
changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}";
license = licenses.bsd2;
maintainers = [ maintainers.primeos ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 467fa9df2cac..449d15769087 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1056,6 +1056,8 @@ in
container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
+ fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { };
+
fedora-coreos-config-transpiler = callPackage ../development/tools/fedora-coreos-config-transpiler { };
ccextractor = callPackage ../applications/video/ccextractor { };
@@ -2234,9 +2236,7 @@ in
gringo = callPackage ../tools/misc/gringo { };
- grobi = callPackage ../tools/X11/grobi {
- buildGoModule = buildGo114Module;
- };
+ grobi = callPackage ../tools/X11/grobi { };
gscan2pdf = callPackage ../applications/graphics/gscan2pdf { };
@@ -5242,9 +5242,9 @@ in
nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { };
- nodejs = hiPrio nodejs-12_x;
+ nodejs = hiPrio nodejs-14_x;
- nodejs-slim = nodejs-slim-12_x;
+ nodejs-slim = nodejs-slim-14_x;
nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { };
@@ -9533,14 +9533,12 @@ in
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
};
-julia_15 = callPackage ../development/compilers/julia/1.5.nix {
+ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
};
-
-
julia_1 = julia_10;
- julia = julia_1;
+ julia = julia_15;
jwasm = callPackage ../development/compilers/jwasm { };
@@ -11736,7 +11734,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
lua = lua5;
} // (config.radare or {}))) radare2 r2-for-cutter;
- radare2-cutter = libsForQt514.callPackage ../development/tools/analysis/radare2/cutter.nix { };
+ radare2-cutter = libsForQt515.callPackage ../development/tools/analysis/radare2/cutter.nix { };
ragel = ragelStable;
@@ -12640,7 +12638,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
openal = if stdenv.isDarwin then null else openal;
libmfx = if stdenv.isDarwin then null else intel-media-sdk;
libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
- rav1e = null;
+ rav1e = if stdenv.isDarwin then null else rav1e;
samba = if stdenv.isDarwin then null else samba;
vid-stab = if stdenv.isDarwin then null else vid-stab;
x265 = if stdenv.isDarwin then null else x265;
@@ -14895,6 +14893,9 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
nss_3_44 = lowPrio (callPackage ../development/libraries/nss/3.44.nix { });
nssTools = nss.tools;
+ # required for stable thunderbird and firefox-esr-78
+ nss_3_53 = lowPrio (callPackage ../development/libraries/nss/3.53.nix { });
+
nss_wrapper = callPackage ../development/libraries/nss_wrapper { };
nsss = skawarePackages.nsss;
@@ -15794,6 +15795,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
soundtouch = callPackage ../development/libraries/soundtouch {};
spandsp = callPackage ../development/libraries/spandsp {};
+ spandsp3 = callPackage ../development/libraries/spandsp/3.nix {};
spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt {};
@@ -17026,8 +17028,10 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
openbgpd = callPackage ../servers/openbgpd { };
- openafs = callPackage ../servers/openafs/1.6 { tsmbac = null; ncurses = null; };
openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; };
+ openafs_1_9 = callPackage ../servers/openafs/1.9 { tsmbac = null; ncurses = null; };
+ # Current stable release; don't backport release updates!
+ openafs = openafs_1_8;
openresty = callPackage ../servers/http/openresty {
withPerl = false;
@@ -17290,10 +17294,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
- prometheus = callPackage ../servers/monitoring/prometheus {
- buildGoPackage = buildGo114Package;
- go = go_1_14;
- };
+ prometheus = callPackage ../servers/monitoring/prometheus { };
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { };
@@ -18278,8 +18279,10 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { };
- openafs = callPackage ../servers/openafs/1.6/module.nix { };
openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { };
+ openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { };
+ # Current stable release; don't backport release updates!
+ openafs = openafs_1_8;
facetimehd = callPackage ../os-specific/linux/facetimehd { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9cc95dd4f56b..235ffb67c9b0 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -531,8 +531,12 @@ let
metrics = callPackage ../development/ocaml-modules/metrics { };
+ metrics-influx = callPackage ../development/ocaml-modules/metrics/influx.nix { };
+
metrics-lwt = callPackage ../development/ocaml-modules/metrics/lwt.nix { };
+ metrics-mirage = callPackage ../development/ocaml-modules/metrics/mirage.nix { };
+
metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix {
inherit (pkgs) gnuplot;
};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ae79ca29f696..d74d95f17f4c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9,19 +9,16 @@
{ pkgs
, stdenv
, python
-, overrides ? (self: super: {})
}:
with pkgs.lib;
-let
- packages = ( self:
+self:
let
+ inherit (self) callPackage;
inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder;
- callPackage = pkgs.newScope self;
-
namePrefix = python.libPrefix + "-";
bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { };
@@ -102,7 +99,7 @@ in {
inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder;
inherit python bootstrapped-pip buildPythonPackage buildPythonApplication;
- inherit fetchPypi callPackage;
+ inherit fetchPypi;
inherit hasPythonModule requiredPythonModules makePythonPath disabledIf;
inherit toPythonModule toPythonApplication;
inherit buildSetupcfg;
@@ -202,6 +199,8 @@ in {
aioeventlet = callPackage ../development/python-modules/aioeventlet { };
+ aioextensions = callPackage ../development/python-modules/aioextensions { };
+
aiofiles = callPackage ../development/python-modules/aiofiles { };
aioftp = callPackage ../development/python-modules/aioftp { };
@@ -356,6 +355,8 @@ in {
apsw = callPackage ../development/python-modules/apsw { };
+ arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { };
+
area = callPackage ../development/python-modules/area { };
arelle = callPackage ../development/python-modules/arelle { gui = true; };
@@ -2195,6 +2196,10 @@ in {
flask_wtf = callPackage ../development/python-modules/flask-wtf { };
+ flatbuffers = callPackage ../development/python-modules/flatbuffers {
+ inherit (pkgs) flatbuffers;
+ };
+
flexmock = callPackage ../development/python-modules/flexmock { };
flickrapi = callPackage ../development/python-modules/flickrapi { };
@@ -4018,6 +4023,8 @@ in {
ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { };
+ ndjson = callPackage ../development/python-modules/ndjson { };
+
ndtypes = callPackage ../development/python-modules/ndtypes { };
neo = callPackage ../development/python-modules/neo { };
@@ -5768,6 +5775,8 @@ in {
python-baseconv = callPackage ../development/python-modules/python-baseconv { };
+ python-bidi = callPackage ../development/python-modules/python-bidi { };
+
python-binance = callPackage ../development/python-modules/python-binance { };
python-constraint = callPackage ../development/python-modules/python-constraint { };
@@ -6737,6 +6746,8 @@ in {
usePython = true;
});
+ sockjs = callPackage ../development/python-modules/sockjs { };
+
sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { };
socksipy-branch = callPackage ../development/python-modules/socksipy-branch { };
@@ -7079,6 +7090,7 @@ in {
nccl = pkgs.nccl_cudatoolkit_10;
openssl = pkgs.openssl_1_1;
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
+ inherit (pkgs) flatbuffers;
};
tensorflow-build_2 = callPackage ../development/python-modules/tensorflow/2 {
@@ -7088,6 +7100,7 @@ in {
nccl = pkgs.nccl_cudatoolkit_11;
openssl = pkgs.openssl_1_1;
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
+ inherit (pkgs) flatbuffers;
};
tensorflow-build = self.tensorflow-build_1;
@@ -7960,6 +7973,4 @@ in {
zxcvbn = callPackage ../development/python-modules/zxcvbn { };
-});
-
-in fix' (extends overrides packages)
+}