diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS
index 7d0681a720..048218a6d4 100644
--- a/third_party/nixpkgs/.github/CODEOWNERS
+++ b/third_party/nixpkgs/.github/CODEOWNERS
@@ -100,7 +100,7 @@
# Rust
/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq
-/pkgs/build-support/rust @andir @zowoq
+/pkgs/build-support/rust @andir @danieldk @zowoq
# Darwin-related
/pkgs/stdenv/darwin @NixOS/darwin-maintainers
diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
index 8f6db28ab4..18d3cd9c92 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
@@ -80,6 +80,33 @@ The fetcher will verify that the `Cargo.lock` file is in sync with the `src`
attribute, and fail the build if not. It will also will compress the vendor
directory into a tar.gz archive.
+The tarball with vendored dependencies contains a directory with the
+package's `name`, which is normally composed of `pname` and
+`version`. This means that the vendored dependencies hash
+(`cargoSha256`/`cargoHash`) is dependent on the package name and
+version. The `cargoDepsName` attribute can be used to use another name
+for the directory of vendored dependencies. For example, the hash can
+be made invariant to the version by setting `cargoDepsName` to
+`pname`:
+
+```nix
+rustPlatform.buildRustPackage rec {
+ pname = "broot";
+ version = "1.2.0";
+
+ src = fetchCrate {
+ inherit pname version;
+ sha256 = "1mqaynrqaas82f5957lx31x80v74zwmwmjxxlbywajb61vh00d38";
+ };
+
+ cargoHash = "sha256-JmBZcDVYJaK1cK05cxx5BrnGWp4t8ca6FLUbvIot67s=";
+ cargoDepsName = pname;
+
+ # ...
+}
+```
+
+
### Cross compilation
By default, Rust packages are compiled for the host platform, just like any
diff --git a/third_party/nixpkgs/doc/using/configuration.xml b/third_party/nixpkgs/doc/using/configuration.xml
index 2cd2615f54..8e63e0072c 100644
--- a/third_party/nixpkgs/doc/using/configuration.xml
+++ b/third_party/nixpkgs/doc/using/configuration.xml
@@ -151,26 +151,26 @@
- It is also possible to whitelist and blacklist licenses that are specifically acceptable or not acceptable, using whitelistedLicenses and blacklistedLicenses, respectively.
+ It is also possible to allow and block licenses that are specifically acceptable or not acceptable, using allowlistedLicenses and blocklistedLicenses, respectively.
- The following example configuration whitelists the licenses amd and wtfpl:
+ The following example configuration allowlists the licenses amd and wtfpl:
{
- whitelistedLicenses = with lib.licenses; [ amd wtfpl ];
+ allowlistedLicenses = with lib.licenses; [ amd wtfpl ];
}
- The following example configuration blacklists the gpl3Only and agpl3Only licenses:
+ The following example configuration blocklists the gpl3Only and agpl3Only licenses:
{
- blacklistedLicenses = with lib.licenses; [ agpl3Only gpl3Only ];
+ blocklistedLicenses = with lib.licenses; [ agpl3Only gpl3Only ];
}
- Note that whitelistedLicenses only applies to unfree licenses unless allowUnfree is enabled. It is not a generic whitelist for all types of licenses. blacklistedLicenses applies to all licenses.
+ Note that allowlistedLicenses only applies to unfree licenses unless allowUnfree is enabled. It is not a generic allowlist for all types of licenses. blocklistedLicenses applies to all licenses.
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml
index ca4b468e35..302a6d3f37 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml
@@ -100,6 +100,12 @@
Assigning custom names section
of the NixOS manual for an example using networkd links.
+
+
+
+ The module has been removed.
+ It was broken since the switch to cgroups-v2.
+
diff --git a/third_party/nixpkgs/nixos/modules/config/console.nix b/third_party/nixpkgs/nixos/modules/config/console.nix
index 1339227f1e..84ad76246f 100644
--- a/third_party/nixpkgs/nixos/modules/config/console.nix
+++ b/third_party/nixpkgs/nixos/modules/config/console.nix
@@ -144,11 +144,16 @@ in
''}
'';
- systemd.services.systemd-vconsole-setup =
- {
- before = optional config.services.xserver.enable "display-manager.service";
- after = [ "systemd-udev-settle.service" ];
+ systemd.services.reload-systemd-vconsole-setup =
+ { description = "Reset console on configuration changes";
+ wantedBy = [ "multi-user.target" ];
restartTriggers = [ vconsoleConf consoleEnv ];
+ reloadIfChanged = true;
+ serviceConfig =
+ { RemainAfterExit = true;
+ ExecStart = "${pkgs.coreutils}/bin/true";
+ ExecReload = "/run/current-system/systemd/bin/systemctl restart systemd-vconsole-setup";
+ };
};
}
diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix
index 644229627b..44b30d0e6c 100644
--- a/third_party/nixpkgs/nixos/modules/module-list.nix
+++ b/third_party/nixpkgs/nixos/modules/module-list.nix
@@ -207,7 +207,6 @@
./security/dhparams.nix
./security/duosec.nix
./security/google_oslogin.nix
- ./security/hidepid.nix
./security/lock-kernel-modules.nix
./security/misc.nix
./security/oath.nix
@@ -257,6 +256,7 @@
./services/backup/tsm.nix
./services/backup/zfs-replication.nix
./services/backup/znapzend.nix
+ ./services/blockchain/ethereum/geth.nix
./services/cluster/hadoop/default.nix
./services/cluster/k3s/default.nix
./services/cluster/kubernetes/addons/dns.nix
diff --git a/third_party/nixpkgs/nixos/modules/profiles/hardened.nix b/third_party/nixpkgs/nixos/modules/profiles/hardened.nix
index 680fa40b91..00aafc6831 100644
--- a/third_party/nixpkgs/nixos/modules/profiles/hardened.nix
+++ b/third_party/nixpkgs/nixos/modules/profiles/hardened.nix
@@ -22,8 +22,6 @@ with lib;
environment.memoryAllocator.provider = mkDefault "scudo";
environment.variables.SCUDO_OPTIONS = mkDefault "ZeroContents=1";
- security.hideProcessInformation = mkDefault true;
-
security.lockKernelModules = mkDefault true;
security.protectKernelImage = mkDefault true;
diff --git a/third_party/nixpkgs/nixos/modules/programs/steam.nix b/third_party/nixpkgs/nixos/modules/programs/steam.nix
index 3c919c47a0..6e9b7729ad 100644
--- a/third_party/nixpkgs/nixos/modules/programs/steam.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/steam.nix
@@ -4,6 +4,13 @@ with lib;
let
cfg = config.programs.steam;
+
+ steam = pkgs.steam.override {
+ extraLibraries = pkgs: with config.hardware.opengl;
+ if pkgs.hostPlatform.is64bit
+ then [ package ] ++ extraPackages
+ else [ package32 ] ++ extraPackages32;
+ };
in {
options.programs.steam.enable = mkEnableOption "steam";
@@ -18,7 +25,7 @@ in {
hardware.steam-hardware.enable = true;
- environment.systemPackages = [ pkgs.steam ];
+ environment.systemPackages = [ steam steam.run ];
};
meta.maintainers = with maintainers; [ mkg20001 ];
diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix
index 2d07e421ef..9f1efc4627 100644
--- a/third_party/nixpkgs/nixos/modules/rename.nix
+++ b/third_party/nixpkgs/nixos/modules/rename.nix
@@ -73,6 +73,11 @@ with lib;
(mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.")
+ (mkRemovedOptionModule [ "security" "hideProcessInformation" ] ''
+ The hidepid module was removed, since the underlying machinery
+ is broken when using cgroups-v2.
+ '')
+
# Do NOT add any option renames here, see top of the file
];
}
diff --git a/third_party/nixpkgs/nixos/modules/security/hidepid.nix b/third_party/nixpkgs/nixos/modules/security/hidepid.nix
deleted file mode 100644
index 4953f517e9..0000000000
--- a/third_party/nixpkgs/nixos/modules/security/hidepid.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ config, lib, ... }:
-with lib;
-
-{
- meta = {
- maintainers = [ maintainers.joachifm ];
- doc = ./hidepid.xml;
- };
-
- options = {
- security.hideProcessInformation = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Restrict process information to the owning user.
- '';
- };
- };
-
- config = mkIf config.security.hideProcessInformation {
- users.groups.proc.gid = config.ids.gids.proc;
- users.groups.proc.members = [ "polkituser" ];
-
- boot.specialFileSystems."/proc".options = [ "hidepid=2" "gid=${toString config.ids.gids.proc}" ];
- systemd.services.systemd-logind.serviceConfig.SupplementaryGroups = [ "proc" ];
-
- # Disable cgroupsv2, which doesn't work with hidepid.
- # https://github.com/NixOS/nixpkgs/pull/104094#issuecomment-729996203
- systemd.enableUnifiedCgroupHierarchy = false;
- };
-}
diff --git a/third_party/nixpkgs/nixos/modules/security/hidepid.xml b/third_party/nixpkgs/nixos/modules/security/hidepid.xml
deleted file mode 100644
index 5a17cb1da4..0000000000
--- a/third_party/nixpkgs/nixos/modules/security/hidepid.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
- Hiding process information
-
- Setting
-
- = true;
-
- ensures that access to process information is restricted to the owning user.
- This implies, among other things, that command-line arguments remain private.
- Unless your deployment relies on unprivileged users being able to inspect the
- process information of other users, this option should be safe to enable.
-
-
- Members of the proc group are exempt from process
- information hiding.
-
-
- To allow a service foo to run without process
- information hiding, set
-
-systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ];
-
-
-
diff --git a/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix b/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix
new file mode 100644
index 0000000000..be3f40f6bd
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix
@@ -0,0 +1,178 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ eachGeth = config.services.geth;
+
+ gethOpts = { config, lib, name, ...}: {
+
+ options = {
+
+ enable = lib.mkEnableOption "Go Ethereum Node";
+
+ port = mkOption {
+ type = types.port;
+ default = 30303;
+ description = "Port number Go Ethereum will be listening on, both TCP and UDP.";
+ };
+
+ http = {
+ enable = lib.mkEnableOption "Go Ethereum HTTP API";
+ address = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = "Listen address of Go Ethereum HTTP API.";
+ };
+
+ port = mkOption {
+ type = types.port;
+ default = 8545;
+ description = "Port number of Go Ethereum HTTP API.";
+ };
+
+ apis = mkOption {
+ type = types.nullOr (types.listOf types.str);
+ default = null;
+ description = "APIs to enable over WebSocket";
+ example = ["net" "eth"];
+ };
+ };
+
+ websocket = {
+ enable = lib.mkEnableOption "Go Ethereum WebSocket API";
+ address = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = "Listen address of Go Ethereum WebSocket API.";
+ };
+
+ port = mkOption {
+ type = types.port;
+ default = 8546;
+ description = "Port number of Go Ethereum WebSocket API.";
+ };
+
+ apis = mkOption {
+ type = types.nullOr (types.listOf types.str);
+ default = null;
+ description = "APIs to enable over WebSocket";
+ example = ["net" "eth"];
+ };
+ };
+
+ metrics = {
+ enable = lib.mkEnableOption "Go Ethereum prometheus metrics";
+ address = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = "Listen address of Go Ethereum metrics service.";
+ };
+
+ port = mkOption {
+ type = types.port;
+ default = 6060;
+ description = "Port number of Go Ethereum metrics service.";
+ };
+ };
+
+ network = mkOption {
+ type = types.nullOr (types.enum [ "goerli" "rinkeby" "yolov2" "ropsten" ]);
+ default = null;
+ description = "The network to connect to. Mainnet (null) is the default ethereum network.";
+ };
+
+ syncmode = mkOption {
+ type = types.enum [ "fast" "full" "light" ];
+ default = "fast";
+ description = "Blockchain sync mode.";
+ };
+
+ gcmode = mkOption {
+ type = types.enum [ "full" "archive" ];
+ default = "full";
+ description = "Blockchain garbage collection mode.";
+ };
+
+ maxpeers = mkOption {
+ type = types.int;
+ default = 50;
+ description = "Maximum peers to connect to.";
+ };
+
+ extraArgs = mkOption {
+ type = types.listOf types.str;
+ description = "Additional arguments passed to Go Ethereum.";
+ default = [];
+ };
+
+ package = mkOption {
+ default = pkgs.go-ethereum.geth;
+ type = types.package;
+ description = "Package to use as Go Ethereum node.";
+ };
+ };
+ };
+in
+
+{
+
+ ###### interface
+
+ options = {
+ services.geth = mkOption {
+ type = types.attrsOf (types.submodule gethOpts);
+ default = {};
+ description = "Specification of one or more geth instances.";
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf (eachGeth != {}) {
+
+ environment.systemPackages = flatten (mapAttrsToList (gethName: cfg: [
+ cfg.package
+ ]) eachGeth);
+
+ systemd.services = mapAttrs' (gethName: cfg: (
+ nameValuePair "geth-${gethName}" (mkIf cfg.enable {
+ description = "Go Ethereum node (${gethName})";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ serviceConfig = {
+ DynamicUser = true;
+ Restart = "always";
+ StateDirectory = "goethereum/${gethName}/${if (cfg.network == null) then "mainnet" else cfg.network}";
+
+ # Hardening measures
+ PrivateTmp = "true";
+ ProtectSystem = "full";
+ NoNewPrivileges = "true";
+ PrivateDevices = "true";
+ MemoryDenyWriteExecute = "true";
+ };
+
+ script = ''
+ ${cfg.package}/bin/geth \
+ --nousb \
+ --ipcdisable \
+ ${optionalString (cfg.network != null) ''--${cfg.network}''} \
+ --syncmode ${cfg.syncmode} \
+ --gcmode ${cfg.gcmode} \
+ --port ${toString cfg.port} \
+ --maxpeers ${toString cfg.maxpeers} \
+ ${if cfg.http.enable then ''--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}'' else ""} \
+ ${optionalString (cfg.http.apis != null) ''--http.api ${lib.concatStringsSep "," cfg.http.apis}''} \
+ ${if cfg.websocket.enable then ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}'' else ""} \
+ ${optionalString (cfg.websocket.apis != null) ''--ws.api ${lib.concatStringsSep "," cfg.websocket.apis}''} \
+ ${optionalString cfg.metrics.enable ''--metrics --metrics.addr ${cfg.metrics.address} --metrics.port ${toString cfg.metrics.port}''} \
+ ${lib.escapeShellArgs cfg.extraArgs} \
+ --datadir /var/lib/goethereum/${gethName}/${if (cfg.network == null) then "mainnet" else cfg.network}
+ '';
+ }))) eachGeth;
+
+ };
+
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix b/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix
index 7d0a3f9afc..cf105daeb0 100644
--- a/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix
+++ b/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix
@@ -375,6 +375,18 @@ in
fi
'';
+ script = ''
+ # https://mariadb.com/kb/en/getting-started-with-mariadb-galera-cluster/#systemd-and-galera-recovery
+ if test -n "''${_WSREP_START_POSITION}"; then
+ if test -e "${cfg.package}/bin/galera_recovery"; then
+ VAR=$(cd ${cfg.package}/bin/..; ${cfg.package}/bin/galera_recovery); [[ $? -eq 0 ]] && export _WSREP_START_POSITION=$VAR || exit 1
+ fi
+ fi
+
+ # The last two environment variables are used for starting Galera clusters
+ exec ${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION
+ '';
+
postStart = let
# The super user account to use on *first* run of MySQL server
superUser = if isMariaDB then cfg.user else "root";
@@ -481,8 +493,7 @@ in
Type = if hasNotify then "notify" else "simple";
Restart = "on-abort";
RestartSec = "5s";
- # The last two environment variables are used for starting Galera clusters
- ExecStart = "${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION";
+
# User and group
User = cfg.user;
Group = cfg.group;
diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix
index fc95a30776..bcf2003fc5 100644
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/nixos/tests/all-tests.nix
@@ -183,7 +183,6 @@ in
jenkins = handleTest ./jenkins.nix {};
jirafeau = handleTest ./jirafeau.nix {};
jitsi-meet = handleTest ./jitsi-meet.nix {};
- jq = handleTest ./jq.nix {};
k3s = handleTest ./k3s.nix {};
kafka = handleTest ./kafka.nix {};
keepalived = handleTest ./keepalived.nix {};
@@ -345,7 +344,6 @@ in
samba = handleTest ./samba.nix {};
samba-wsdd = handleTest ./samba-wsdd.nix {};
sanoid = handleTest ./sanoid.nix {};
- sbt = handleTest ./sbt.nix {};
sddm = handleTest ./sddm.nix {};
searx = handleTest ./searx.nix {};
service-runner = handleTest ./service-runner.nix {};
diff --git a/third_party/nixpkgs/nixos/tests/geth.nix b/third_party/nixpkgs/nixos/tests/geth.nix
new file mode 100644
index 0000000000..10cbd6d903
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/geth.nix
@@ -0,0 +1,41 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+ name = "geth";
+ meta = with pkgs.lib; {
+ maintainers = with maintainers; [bachp ];
+ };
+
+ machine = { ... }: {
+ services.geth."mainnet" = {
+ enable = true;
+ http = {
+ enable = true;
+ };
+ };
+ services.geth."testnet" = {
+ enable = true;
+ port = 30304;
+ network = "goerli";
+ http = {
+ enable = true;
+ port = 18545;
+ };
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ machine.wait_for_unit("geth-mainnet.service")
+ machine.wait_for_unit("geth-testnet.service")
+ machine.wait_for_open_port(8545)
+ machine.wait_for_open_port(18545)
+
+ machine.succeed(
+ 'geth attach --exec "eth.chainId()" http://localhost:8545 | grep \'"0x0"\' '
+ )
+
+ machine.succeed(
+ 'geth attach --exec "eth.chainId()" http://localhost:18545 | grep \'"0x5"\' '
+ )
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/hardened.nix b/third_party/nixpkgs/nixos/tests/hardened.nix
index 0c26eaa310..485efc0fb7 100644
--- a/third_party/nixpkgs/nixos/tests/hardened.nix
+++ b/third_party/nixpkgs/nixos/tests/hardened.nix
@@ -65,17 +65,6 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : {
machine.succeed("grep -Fq wireguard /proc/modules")
- # Test hidepid
- with subtest("hidepid=2 option is applied and works"):
- # Linux >= 5.8 shows "invisible"
- machine.succeed(
- "grep -Fq hidepid=2 /proc/mounts || grep -Fq hidepid=invisible /proc/mounts"
- )
- # cannot use pgrep -u here, it segfaults when access to process info is denied
- machine.succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]")
- machine.succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]")
-
-
# Test kernel module hardening
with subtest("No more kernel modules can be loaded"):
# note: this better a be module we normally wouldn't load ...
diff --git a/third_party/nixpkgs/nixos/tests/jq.nix b/third_party/nixpkgs/nixos/tests/jq.nix
deleted file mode 100644
index 075e6c43c0..0000000000
--- a/third_party/nixpkgs/nixos/tests/jq.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-import ./make-test-python.nix ({ pkgs, ... }: {
- name = "jq";
- meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
-
- nodes.jq = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; };
-
- testScript = ''
- assert "world" in jq.succeed('echo \'{"values":["hello","world"]}\'| jq \'.values[1]\''')
- '';
-})
diff --git a/third_party/nixpkgs/nixos/tests/sbt.nix b/third_party/nixpkgs/nixos/tests/sbt.nix
deleted file mode 100644
index 22541232ba..0000000000
--- a/third_party/nixpkgs/nixos/tests/sbt.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-import ./make-test-python.nix ({ pkgs, ...} : {
- name = "sbt";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ nequissimus ];
- };
-
- machine = { pkgs, ... }:
- {
- environment.systemPackages = [ pkgs.sbt ];
- };
-
- testScript =
- ''
- machine.succeed(
- "(sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${pkgs.sbt.version} (this may take some time)'"
- )
- '';
-})
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bslizr/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bslizr/default.nix
index d307307fd1..2a4e717e1b 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/bslizr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/bslizr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BSlizr";
- version = "1.2.8";
+ version = "1.2.10";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = version;
- sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0";
+ sha256 = "sha256-tEGJrVg8dN9Torybx02qIpXsGOuCgn/Wb+jemfCjiK4=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ebumeter/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ebumeter/default.nix
new file mode 100644
index 0000000000..9ebcbec001
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/ebumeter/default.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, fetchurl
+, libX11, libXft, libclthreads, libclxclient, libjack2, libpng, libsndfile, zita-resampler
+}:
+
+stdenv.mkDerivation rec {
+ pname = "ebumeter";
+ version = "0.4.2";
+
+ src = fetchurl {
+ url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
+ sha256 = "1wm9j1phmpicrp7jdsvdbc3mghdd92l61yl9qbps0brq2ljjyd5s";
+ };
+
+ buildInputs = [
+ libX11 libXft libclthreads libclxclient libjack2 libpng libsndfile zita-resampler
+ ];
+
+ preConfigure = ''
+ cd source
+ '';
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ description = "Level metering according to the EBU R-128 recommendation";
+ homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ orivej ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
index 1733aef417..fbd94ebd3d 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -1,7 +1,6 @@
{ lib
, rustPlatform
, fetchFromGitLab
-, fetchpatch
, meson
, ninja
, gettext
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix
index a4a32be41d..e397534d12 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix
@@ -18,13 +18,13 @@ assert pcreSupport -> pcre != null;
stdenv.mkDerivation rec {
pname = "ncmpc";
- version = "0.44";
+ version = "0.45";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "ncmpc";
rev = "v${version}";
- sha256 = "sha256-Qu41TL8KSKC9L25D6Z8bEbJUJQ9QI08grTGZ+0qGdUQ=";
+ sha256 = "sha256-KDSHbEZ2PJLEIlXqPvBQ2ZPWno+IoajTjkl9faAXIko=";
};
buildInputs = [ glib ncurses libmpdclient boost ]
diff --git a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix
index 200e457c56..785c334e15 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix
@@ -40,11 +40,6 @@ in pythonPackages.buildPythonApplication rec {
dateutil
];
- prePatch = ''
- # Pesky unicode punctuation.
- substituteInPlace setup.cfg --replace "‘" "'"
- '';
-
# In order to spare double wrapping, we use:
preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
diff --git a/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix b/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix
index a503d3b344..96433221e9 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix
@@ -14,7 +14,6 @@
, openssl
, pkg-config
, python3
-, rust
, rustc
, rustPlatform
, sqlite
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tuijam/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tuijam/default.nix
index 8a08b64508..4a215528b7 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/tuijam/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/tuijam/default.nix
@@ -2,7 +2,6 @@
, fetchFromGitHub
, lib
, python3Packages
-, youtube-dl
}:
buildPythonApplication rec {
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix
index 3c5bc5ea5c..2599eb43b1 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
- version = "3.3.6";
+ version = "4.0.0";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
- sha256 = "1zi559ixjxxsrpvvjbxa1d0g96px3h9amjvy149sfhp7b8w5hhk3";
+ sha256 = "sha256-M0kgd/txqc04WNLNZiq+imHMM9YGFd12jMWJyY2ExrY=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
index 776253ac9c..dd3904b27c 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
@@ -1,6 +1,12 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }:
-buildGoModule rec {
+let
+ # A list of binaries to put into separate outputs
+ bins = [
+ "geth"
+ ];
+
+in buildGoModule rec {
pname = "go-ethereum";
version = "1.9.25";
@@ -16,6 +22,13 @@ buildGoModule rec {
doCheck = false;
+ outputs = [ "out" ] ++ bins;
+
+ # Move binaries to separate outputs and symlink them back to $out
+ postInstall = lib.concatStringsSep "\n" (
+ builtins.map (bin: "mkdir -p \$${bin}/bin && mv $out/bin/${bin} \$${bin}/bin/ && ln -s \$${bin}/bin/${bin} $out/bin/") bins
+ );
+
subPackages = [
"cmd/abidump"
"cmd/abigen"
@@ -40,7 +53,7 @@ buildGoModule rec {
meta = with lib; {
homepage = "https://geth.ethereum.org/";
description = "Official golang implementation of the Ethereum protocol";
- license = with licenses; [ lgpl3 gpl3 ];
+ license = with licenses; [ lgpl3Plus gpl3Plus ];
maintainers = with maintainers; [ adisbladis lionello xrelkd RaghavSood ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix
index d684c1ef94..a2963f1922 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix
@@ -1,4 +1,4 @@
-{ lib, external, pkgs }: self: with self; with lib.licenses; {
+{ lib, pkgs }: self: with self; with lib.licenses; {
elisp-ffi = melpaBuild rec {
pname = "elisp-ffi";
@@ -9,7 +9,7 @@
rev = version;
sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22";
};
- buildInputs = [ external.libffi ];
+ buildInputs = [ pkgs.libffi ];
preBuild = "make";
recipe = pkgs.writeText "recipe" ''
(elisp-ffi
@@ -29,15 +29,15 @@
};
};
- agda2-mode = with external; trivialBuild {
+ agda2-mode = trivialBuild {
pname = "agda-mode";
- version = Agda.version;
+ version = pkgs.haskellPackages.Agda.version;
phases = [ "buildPhase" "installPhase" ];
# already byte-compiled by Agda builder
buildPhase = ''
- agda=`${Agda}/bin/agda-mode locate`
+ agda=`${pkgs.haskellPackages.Agda}/bin/agda-mode locate`
cp `dirname $agda`/*.el* .
'';
@@ -47,21 +47,21 @@
Wrapper packages that liberates init.el from `agda-mode locate` magic.
Simply add this to user profile or systemPackages and do `(require 'agda2)` in init.el.
'';
- homepage = Agda.meta.homepage;
- license = Agda.meta.license;
+ homepage = pkgs.haskellPackages.Agda.meta.homepage;
+ license = pkgs.haskellPackages.Agda.meta.license;
};
};
agda-input = self.trivialBuild {
pname = "agda-input";
- inherit (external.Agda) src version;
+ inherit (pkgs.haskellPackages.Agda) src version;
postUnpack = "mv $sourceRoot/src/data/emacs-mode/agda-input.el $sourceRoot";
meta = {
description = "Standalone package providing the agda-input method without building Agda.";
- inherit (external.Agda.meta) homepage license;
+ inherit (pkgs.haskellPackages.Agda.meta) homepage license;
};
};
@@ -74,10 +74,10 @@
ghc-mod = melpaBuild {
pname = "ghc";
- version = external.ghc-mod.version;
- src = external.ghc-mod.src;
+ version = pkgs.haskellPackages.ghc-mod.version;
+ src = pkgs.haskellPackages.ghc-mod.src;
packageRequires = [ haskell-mode ];
- propagatedUserEnvPkgs = [ external.ghc-mod ];
+ propagatedUserEnvPkgs = [ pkgs.haskellPackages.ghc-mod ];
recipe = pkgs.writeText "recipe" ''
(ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el"))
'';
@@ -115,7 +115,7 @@
llvm-mode = trivialBuild {
pname = "llvm-mode";
- inherit (external.llvmPackages.llvm) src version;
+ inherit (pkgs.llvmPackages.llvm) src version;
dontConfigure = true;
buildPhase = ''
@@ -123,7 +123,7 @@
'';
meta = {
- inherit (external.llvmPackages.llvm.meta) homepage license;
+ inherit (pkgs.llvmPackages.llvm.meta) homepage license;
description = "Major mode for the LLVM assembler language.";
};
};
@@ -134,13 +134,13 @@
ott-mode = self.trivialBuild {
pname = "ott-mod";
- inherit (external.ott) src version;
+ inherit (pkgs.ott) src version;
postUnpack = "mv $sourceRoot/emacs/ott-mode.el $sourceRoot";
meta = {
description = "Standalone package providing ott-mode without building ott and with compiled bytecode.";
- inherit (external.Agda.meta) homepage license;
+ inherit (pkgs.haskellPackages.Agda.meta) homepage license;
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 305d60aa30..06480f8ce2 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -22,7 +22,7 @@ instantenous and formats commits for you.
*/
-{ lib, external, pkgs }: variant: self:
+{ lib, pkgs }: variant: self:
let
dontConfigure = pkg:
if pkg != null then pkg.override (args: {
@@ -53,7 +53,7 @@ let
});
fix-rtags = pkg:
- if pkg != null then dontConfigure (externalSrc pkg external.rtags)
+ if pkg != null then dontConfigure (externalSrc pkg pkgs.rtags)
else null;
generateMelpa = lib.makeOverridable ({ archiveJson ? ./recipes-archive-melpa.json
@@ -79,9 +79,9 @@ let
};
auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs (old: {
- buildInputs = old.buildInputs ++ [ external.llvmPackages.llvm ];
- CFLAGS = "-I${external.llvmPackages.clang}/include";
- LDFLAGS = "-L${external.llvmPackages.clang}/lib";
+ buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.llvm ];
+ CFLAGS = "-I${pkgs.llvmPackages.clang}/include";
+ LDFLAGS = "-L${pkgs.llvmPackages.clang}/lib";
});
# part of a larger package
@@ -132,8 +132,8 @@ let
flycheck-rtags = fix-rtags super.flycheck-rtags;
pdf-tools = super.pdf-tools.overrideAttrs (old: {
- nativeBuildInputs = [ external.pkg-config ];
- buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ];
+ nativeBuildInputs = [ pkgs.pkg-config ];
+ buildInputs = with pkgs; old.buildInputs ++ [ autoconf automake libpng zlib poppler ];
preBuild = "make server/epdfinfo";
recipe = pkgs.writeText "recipe" ''
(pdf-tools
@@ -143,7 +143,7 @@ let
});
# Build same version as Haskell package
- hindent = (externalSrc super.hindent external.hindent).overrideAttrs (attrs: {
+ hindent = (externalSrc super.hindent pkgs.haskellPackages.hindent).overrideAttrs (attrs: {
packageRequires = [ self.haskell-mode ];
});
@@ -169,7 +169,7 @@ let
dontUseCmakeBuildDir = true;
doCheck = true;
packageRequires = [ self.emacs ];
- nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ];
+ nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm pkgs.llvmPackages.clang ];
});
# tries to write a log file to $HOME
@@ -286,18 +286,18 @@ let
# part of a larger package
notmuch = dontConfigure super.notmuch;
- rtags = dontConfigure (externalSrc super.rtags external.rtags);
+ rtags = dontConfigure (externalSrc super.rtags pkgs.rtags);
rtags-xref = dontConfigure super.rtags;
shm = super.shm.overrideAttrs (attrs: {
- propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
+ propagatedUserEnvPkgs = [ pkgs.haskellPackages.structured-haskell-mode ];
});
# Telega has a server portion for it's network protocol
telega = super.telega.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
- nativeBuildInputs = [ external.pkg-config ];
+ nativeBuildInputs = [ pkgs.pkg-config ];
postBuild = ''
cd source/server
@@ -314,12 +314,12 @@ let
treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
- (attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
+ (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ];
});
vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: {
nativeBuildInputs =
- (attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
+ (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ];
});
zmq = super.zmq.overrideAttrs (old: {
@@ -328,11 +328,11 @@ let
make
'';
nativeBuildInputs = [
- external.autoconf
- external.automake
- external.pkg-config
- external.libtool
- (external.zeromq.override { enableDrafts = true; })
+ pkgs.autoconf
+ pkgs.automake
+ pkgs.pkg-config
+ pkgs.libtool
+ (pkgs.zeromq.override { enableDrafts = true; })
];
postInstall = ''
mv $out/share/emacs/site-lisp/elpa/zmq-*/src/.libs/emacs-zmq.so $out/share/emacs/site-lisp/elpa/zmq-*
@@ -415,7 +415,7 @@ let
window-numbering = markBroken super.window-numbering;
editorconfig = super.editorconfig.overrideAttrs (attrs: {
- propagatedUserEnvPkgs = [ external.editorconfig-core-c ];
+ propagatedUserEnvPkgs = [ pkgs.editorconfig-core-c ];
});
# missing dependencies
@@ -433,7 +433,7 @@ let
racer = super.racer.overrideAttrs (attrs: {
postPatch = attrs.postPatch or "" + ''
substituteInPlace racer.el \
- --replace /usr/local/src/rust/src ${external.rustPlatform.rustcSrc}
+ --replace /usr/local/src/rust/src ${pkgs.rustPlatform.rustcSrc}
'';
});
@@ -462,7 +462,7 @@ let
w3m = super.w3m.override (args: {
melpaBuild = drv: args.melpaBuild (drv // {
prePatch =
- let w3m = "${lib.getBin external.w3m}/bin/w3m"; in
+ let w3m = "${lib.getBin pkgs.w3m}/bin/w3m"; in
''
substituteInPlace w3m.el \
--replace 'defcustom w3m-command nil' \
diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix
index 67cb0028ae..da7b70cecd 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix
@@ -35,7 +35,6 @@
, wrapGAppsHook
, dbus
, xvfb_run
-, glib
}:
stdenv.mkDerivation rec {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix
index af98580a8b..12b9c638c4 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "texstudio";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "${pname}-org";
repo = pname;
rev = version;
- sha256 = "sha256-40VgWfSjyERHJapiIXSk89O3X1V8rb8JEWqfnAyf1Sc=";
+ sha256 = "sha256-MFCQwhdF+WCTqDt4q5qw431y/zqEy9vHudcUYb4BYNQ=";
};
nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/xed-editor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/xed-editor/default.nix
new file mode 100644
index 0000000000..d7b0703b8d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/xed-editor/default.nix
@@ -0,0 +1,71 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, libxml2
+, libpeas
+, glib
+, gtk3
+, gtksourceview4
+, gspell
+, xapps
+, pkg-config
+, meson
+, ninja
+, wrapGAppsHook
+, intltool
+, itstool }:
+
+stdenv.mkDerivation rec {
+ pname = "xed-editor";
+ version = "2.8.4";
+
+ src = fetchFromGitHub {
+ owner = "linuxmint";
+ repo = "xed";
+ rev = version;
+ sha256 = "1hqr4157kp110p01jygqnnzj86zxlfiq4b53j345vqpx0f80c340";
+ };
+
+ nativeBuildInputs = [
+ meson
+ cmake
+ pkg-config
+ intltool
+ itstool
+ ninja
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ libxml2
+ glib
+ gtk3
+ gtksourceview4
+ libpeas
+ gspell
+ xapps
+ ];
+
+ postInstall = ''
+ glib-compile-schemas $out/share/glib-2.0/schemas
+ '';
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ if [[ "$($out/bin/xed --version)" == "xed - Version ${version}" ]] ; then
+ echo "${pname} smoke test passed"
+ else
+ echo "${pname} smoke test failed"
+ return 1
+ fi
+ '';
+
+ meta = with lib; {
+ description = "Light weight text editor from Linux Mint";
+ homepage = "https://github.com/linuxmint/xed";
+ license = licenses.gpl2Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ tu-maurice ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix
index faa25f4aef..26de91ee22 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchurl
-, fetchpatch
, gnome3
, pkg-config
, meson
diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
index 3103ace802..db5a5d00fc 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "1password";
- version = "0.9.13";
+ version = "0.9.14-4";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
- hash = "sha256-VdbdmpLiQGVFH3q6baE2yuuKz11Tn0gMpkGDI9KI3HQ=";
+ hash = "sha256-ZEpHeBeP2LpjABWD1eQxUORUKsRWvZ8WYa5IxSRLeXc=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix
index f3fec316bf..8646a6716a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix
@@ -5,11 +5,11 @@ watchdog, wtforms, html2text, flask-compress }:
python3.pkgs.buildPythonApplication rec {
pname = "archivy";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "53a43e26e9081ac266412d8643c66c07c289c4639bbaec374fd5147441253a4f";
+ sha256 = "6f706b925175852d8101a4afe2304ab7ee7d56e9658538b9a8e49e925978b87e";
};
# Relax some dependencies
diff --git a/third_party/nixpkgs/pkgs/applications/misc/caerbannog/default.nix b/third_party/nixpkgs/pkgs/applications/misc/caerbannog/default.nix
new file mode 100644
index 0000000000..451980352c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/caerbannog/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, fetchgit
+, python3
+, glib
+, gobject-introspection
+, meson
+, ninja
+, pkg-config
+, wrapGAppsHook
+, atk
+, libhandy
+, libnotify
+, pango
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "caerbannog";
+ version = "0.3";
+ format = "other";
+
+ src = fetchgit {
+ url = "https://git.sr.ht/~craftyguy/caerbannog";
+ rev = version;
+ sha256 = "0wqkb9zcllxm3fdsr5lphknkzy8r1cr80f84q200hbi99qql1dxh";
+ };
+
+ nativeBuildInputs = [
+ glib
+ gobject-introspection
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ atk
+ gobject-introspection
+ libhandy
+ libnotify
+ pango
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ anytree
+ fuzzyfinder
+ gpgme
+ pygobject3
+ ];
+
+ meta = with lib; {
+ description = "Mobile-friendly Gtk frontend for password-store";
+ homepage = "https://sr.ht/~craftyguy/caerbannog/";
+ changelog = "https://git.sr.ht/~craftyguy/caerbannog/refs/${version}";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix
index 5eebda9610..6ccc31ef9b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "gallery_dl";
- version = "1.16.4";
+ version = "1.16.5";
src = fetchPypi {
inherit pname version;
- sha256 = "744deddf22fdbc51d1d89776c41b0f1127d2b4d212bd092718fad2c0dc7f160f";
+ sha256 = "fb8c927630b292abf5052f8f75c3eebccbdffa609566768d4dc4d9665df91e68";
};
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/lscolors/cargo.lock.patch b/third_party/nixpkgs/pkgs/applications/misc/lscolors/cargo.lock.patch
new file mode 100644
index 0000000000..2f233a0667
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/lscolors/cargo.lock.patch
@@ -0,0 +1,159 @@
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 0000000..3528c6c
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,153 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "ansi_term"
++version = "0.12.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
++dependencies = [
++ "winapi",
++]
++
++[[package]]
++name = "bitflags"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++
++[[package]]
++name = "cfg-if"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
++name = "getrandom"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "wasi",
++]
++
++[[package]]
++name = "libc"
++version = "0.2.86"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
++
++[[package]]
++name = "lscolors"
++version = "0.7.1"
++dependencies = [
++ "ansi_term",
++ "tempfile",
++]
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
++
++[[package]]
++name = "rand"
++version = "0.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
++dependencies = [
++ "libc",
++ "rand_chacha",
++ "rand_core",
++ "rand_hc",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
++dependencies = [
++ "ppv-lite86",
++ "rand_core",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
++dependencies = [
++ "getrandom",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
++dependencies = [
++ "rand_core",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
++dependencies = [
++ "bitflags",
++]
++
++[[package]]
++name = "remove_dir_all"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
++dependencies = [
++ "winapi",
++]
++
++[[package]]
++name = "tempfile"
++version = "3.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "rand",
++ "redox_syscall",
++ "remove_dir_all",
++ "winapi",
++]
++
++[[package]]
++name = "wasi"
++version = "0.10.2+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
++
++[[package]]
++name = "winapi"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
++dependencies = [
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
++]
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/third_party/nixpkgs/pkgs/applications/misc/lscolors/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lscolors/default.nix
new file mode 100644
index 0000000000..76e4792ab1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/lscolors/default.nix
@@ -0,0 +1,26 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "lscolors";
+ version = "0.7.1";
+
+ src = fetchFromGitHub {
+ owner = "sharkdp";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0av3v31fvanvn59bdm9d0v9zh5lzrq0f4vqhg6xlvabkgsa8jk04";
+ };
+
+ cargoPatches = [
+ ./cargo.lock.patch
+ ];
+
+ cargoSha256 = "02k23idwy0sb4lnjrwnyah3qp22zj161ilbc13p75k0hdijfaxl5";
+
+ meta = with lib; {
+ description = "Rust library and tool to colorize paths using LS_COLORS";
+ homepage = "https://github.com/sharkdp/lscolors";
+ license = with licenses; [ asl20 mit ];
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix
index cb8494e1c4..bacaf88e5c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonApplication, lib, fetchFromGitHub, fetchpatch
+{ buildPythonApplication, lib, fetchFromGitHub
# build inputs
, atk
diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
index b64654ad67..76009b96a3 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
@@ -30,12 +30,12 @@ let
in stdenv.mkDerivation rec {
pname = "obsidian";
- version = "0.10.13";
+ version = "0.11.0";
src = fetchurl {
url =
"https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";
- sha256 = "J4kaNtB6DVivNDhrGwrRZJBvu4Bpzl0jY1ZtlAtQiZE=";
+ sha256 = "AkPx7X00kEds7B1syXJPSV1+TJlqQ7NnR6w9wSG2BRw=";
};
nativeBuildInputs = [ makeWrapper graphicsmagick ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix
index d52120e0fb..745d03bb18 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix
@@ -6,7 +6,6 @@
, atspiSupport ? true
, bash
, glib
-, glibcLocales
, dconf
, gobject-introspection
, gsettings-desktop-schemas
@@ -130,8 +129,7 @@ python3.pkgs.buildPythonApplication rec {
--replace "/etc" "$out/etc"
substituteInPlace ./Onboard/LanguageSupport.py \
- --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \
- --replace "/usr/bin/yelp" "${yelp}/bin/yelp"
+ --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes"
substituteInPlace ./Onboard/Indicator.py \
--replace "/usr/bin/yelp" "${yelp}/bin/yelp"
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix
index 84ba3ced8f..ec78c43dbe 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee, fetchpatch
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook
, webkitgtk, discount, json-glib }:
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix
index 97b27d5ff1..e42d48c8f0 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ticker";
- version = "3.1.7";
+ version = "3.1.8";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = "ticker";
rev = "v${version}";
- sha256 = "sha256-OA01GYp6E0zsEwkUUtvpmvl0y/YTXChl0pwIKozB4Qg=";
+ sha256 = "sha256-U2TYUB4RHUBPoXe/te+QpXglbVcrT6SItiDrA7ODX6w=";
};
vendorSha256 = "sha256-aUBj7ZGWBeWc71y1CWm/KCw+El5TwH29S+KxyZGH1Zo=";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix
index 214d2775c0..114b146408 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tickrs";
- version = "0.13.0";
+ version = "0.13.1";
src = fetchFromGitHub {
owner = "tarkah";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Gxrz0RNv7sEIfl0Ac5eLVXvbbxIWIL31mDOZrgY88ps=";
+ sha256 = "sha256-PGJztoGVIjUwx4x42LdpxJQMZH60x6JWY+yTHQgjHWM=";
};
- cargoSha256 = "sha256-9UlEmc9gbZDWelOPD3jZAIkVKNk9jMq5Ljzwur1UiGs=";
+ cargoSha256 = "sha256-0NNdo28fLoqwKXBQ1fBTKPGE/zE7pnWnIjgCITsaGJc=";
nativeBuildInputs = [ perl ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/bee/bee-clef.nix b/third_party/nixpkgs/pkgs/applications/networking/bee/bee-clef.nix
index a94386ea3f..9e36f8670d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/bee/bee-clef.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/bee/bee-clef.nix
@@ -1,4 +1,4 @@
-{ version ? "release", stdenv, lib, substituteAll, fetchFromGitHub, go-ethereum }:
+{ version ? "release", stdenv, lib, fetchFromGitHub, go-ethereum }:
stdenv.mkDerivation rec {
pname = "bee-clef";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix
index 12adbc0a9b..e5282d79a2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix
@@ -13,13 +13,13 @@ assert enablePython -> python != null;
stdenv.mkDerivation rec {
pname = "elinks";
- version = "0.13.5";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "rkd77";
repo = "felinks";
rev = "v${version}";
- sha256 = "067l9m47j40039q8mvvnxd1amwrac3x6vv0c0svimfpvj4ammgkg";
+ sha256 = "sha256-LxJJ0yBlw9hJ/agyL9dbVe4STKdXE8rtk1mMFqe1fFI=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 4d72f21061..07a2caca85 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,965 @@
{
- version = "85.0.2";
+ version = "86.0";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ach/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ach/firefox-86.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "24a938fb96347b938db028452e5a1b9f6c63c43f1e9b7ff0bf2a43f92d1df45c";
+ sha256 = "96cf6afb631f36dd18f0d109bfc31abbff5960e7972b59e4fa51ac0c2c81f9ed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/af/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/af/firefox-86.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "5799e2c1c5408da29f9922cd1a694a0ef7d4250b504dd827d5cdeeb41bc7de6e";
+ sha256 = "38d4588b8498917717ea58419a35751c6c3ae987372ee6a37590a7630eb68c35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/an/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/an/firefox-86.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "04ee06350b7cc1f1ab808e8cff3d02060effbb9fa656c2f687b7cbe9d18b9c2b";
+ sha256 = "942c9cf4dc6f5baa6c5225a15a2856bd72c7366bcb6224b8ba5a1428cfd974f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ar/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ar/firefox-86.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "a92dbd6c4253a8ded0cf4681a6c165e6809e495d1aba84d2158b80d571c1c660";
+ sha256 = "a616e3dfac2bcae832bc6538692a9d811604aadb71079641f77f9b3db105fabd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ast/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ast/firefox-86.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "eeee2c9a00ab94630f331d7f1e781ba5085415d816d403e14f356717cf5fa967";
+ sha256 = "0e026de4affddbdf9e5915818c02acb018b214cd005c5122593e86e821919016";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/az/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/az/firefox-86.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "107fab10c5ac5947676509fce31dec23e70b4cc2f1467e914157fab0555dbada";
+ sha256 = "761e129a070f017b28ce51c1f96fa95be8d98e687b44e9e97d95d18db85ad9aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/be/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/be/firefox-86.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "a04273533574232e0b2c370e2d48ab2206b53b45743543fe0efeea8bd51988cc";
+ sha256 = "9e80115c8a78ab5ff3eec38e31c1ec29decba3660ebc95cb909aedf3db4390ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bg/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bg/firefox-86.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "0b18c8862ce9c26cb63919c3bd3aa911b6179eebcbc9a38001953b49dd09ad36";
+ sha256 = "b5149b21a8ae9b08ee3abfa2fdb894582e620464af36037c43c2cd0b6667c174";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bn/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bn/firefox-86.0.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "8aa13bccd6fcd9f9c91a18dae807394dc46ea32103608c829d4dd073861b95f3";
+ sha256 = "0b5ed8e2859e54ce7d64ac8b0626c69229209cfadf14e8d55225272f702a6f8f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/br/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/br/firefox-86.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "121f9474e56deb5f2a606aa153c8f3c6b857f0966c9843257d22a8be01b609a6";
+ sha256 = "7fb1cdb85510bb8e41f2ce5e856a0ef93c83c430bbe64079a2e3c362bd557ab0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bs/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bs/firefox-86.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "c4781d938cd86988edc31674a46acb0120209b101d9b563c20ec6a213d161a03";
+ sha256 = "2259ddd7f35d5a8d8830a429f0dec92da5ee101d5c42ff5d9f8ff003f76e5b8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ca-valencia/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ca-valencia/firefox-86.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "f0b0e35ae0ba98d0585c45a660c85345b71f834e61875f923713f0c05a78509d";
+ sha256 = "5214a48525eabc0ae4cda08e70ceba59b0e9fd51976d578f512b02fefbf48b8c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ca/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ca/firefox-86.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "1208d84a85694ce1327c9a8ab6cdb6aeb45b990704bbb9fef9b1edd664597fbb";
+ sha256 = "250f4bf5659a04dfb20a651899a92bccd9d24c2e9d3186bb17acc4f452b0b648";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cak/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cak/firefox-86.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "ddbc3a5d3283994b7408fd8970023b71178c83db12ba8be54553395791bc9ace";
+ sha256 = "959c3cf7aace0b80adc6ae2bedc578b74de66adf261de7b67654e0c57e6ee2f5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cs/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cs/firefox-86.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "c02faaf56a820c45bb38119c03becc53cd2ae25e93bed3ad93cc88f091b00a2d";
+ sha256 = "aaed7891e891ba8926ed5904a798e6201cbc355ba11c341546f779e0f2815abc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cy/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cy/firefox-86.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "1d206ea516202af87511d13cbd8482b9dcbeca2447ac8b684937668afac68439";
+ sha256 = "064c2419e8fd43e350e055d7bcd4ae1689c4f7667b51996be9037bc4d1c529a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/da/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/da/firefox-86.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "68976d8cd0ce910c6b8155a68a955f4dfd182fe7625ea3386f083fff27f216a9";
+ sha256 = "484f1bdd24689a7a7dd7a8b4556b2f32aeb50509aa3f9d645e151dbfaab9e71b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/de/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/de/firefox-86.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "6510c8105420027f1632da15060d332f9ec93353c03111a592477bf45dae5925";
+ sha256 = "12670011be25e5420a5721e23d1e37592e4d1ca9a2efac85db02545398454e65";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/dsb/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/dsb/firefox-86.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "736a478e15f11126ad5dbdca66cd8938d72602041ff0c1f5f78101d4f62b1aa3";
+ sha256 = "2851664d7d9dd90f8e444e13b5c9f20bd6271b6e77ae857db1e3aa55429b8b83";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/el/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/el/firefox-86.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "d0c2f1c156d239c2c410d15216a8d331cde8cdb7d54bdf40aa6519f582b93bbf";
+ sha256 = "ec24c6634f20da95f820623c32d92f492f2b939280a49e327a1f465b0046632f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-CA/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-CA/firefox-86.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "0b68ac180a828a94743349cb53f64224d0013de610a5c9cffed9a9242caadab1";
+ sha256 = "6c5a19ac4ac5f174569483ee5c1f053e692efc189edfca7e78f9428f05454338";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-GB/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-GB/firefox-86.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "978397ce347115b87ac24c174ac4363bd345ef8471d25bfc4a639722ed7098e1";
+ sha256 = "919d6e6c731d53ade97bbb330cd2e425f70565c330233a86ffe9295ff3692001";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-US/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-US/firefox-86.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "98763f4b1526811967d71e1bbb9552a9a3fd877321ecb497083b9e313b528c31";
+ sha256 = "c643dd519fe8b0b6d2d2241b5c241aa1b43ece397f49268865b4d1888c19173e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/eo/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/eo/firefox-86.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "a44c9b60e0e8342dcff31ab0bc2776680b9a94bea51ef237fc4b1f013fea6ab6";
+ sha256 = "d20b007ba86bdfdd7aa4bdaae08b283107a4464d88a4a9fc34bd4c95781f48d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-AR/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-AR/firefox-86.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "3229e32a2db2f5a7638a734c538fbaf1b83f9dd203bb67008460783239da04c8";
+ sha256 = "3d4ed05801d31a92c072384e660d7b874be835edd3b6b37741b71bec32a0fa6f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-CL/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-CL/firefox-86.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "574c90358de584b2bf4ec874a8f5a22fd777ceeca92c2894fe978a793faea7c2";
+ sha256 = "8ec51d79baefe2808024c33105fd4c1a8e4f5061b72530a4c01bc8a23d6b6cd5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-ES/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-ES/firefox-86.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "1e92995900cfdbb94d673d5efb02e84321dc8917edab1ce6c86b98f860f483a8";
+ sha256 = "38781952508f86d9b4aa7a0c4fae927494e207970e54ba1070943008283c2e23";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-MX/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-MX/firefox-86.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "56de604e9b32c7552825d87c0c2802bff66d72faad5d173fc71388118a47c046";
+ sha256 = "29817ccf3aad1e38f195f18ab628bca8f9bc4dcd931919cdd9d5d22c6461ce87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/et/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/et/firefox-86.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "53297a8e1f8c5d3ac05d44c3aac1f886d7065cec6666548c3a571ec06702eb63";
+ sha256 = "d4ddde9103e9355a91186e0343315f99bf0eb53b2502abb80b8fcb1056ea82e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/eu/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/eu/firefox-86.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "3b392831ee487279ffbc2156421243990a2abe94cdcf233c375f7949c28571a1";
+ sha256 = "85744b3d7e3bcd5de92ca4ec5a0ade8421689dda5a3c53e361656f3de3178a91";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fa/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fa/firefox-86.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "bdaf06e327bc17ff05d82e27d85d4ff747b8af58e8a0b95599d4af0068c6948c";
+ sha256 = "60e6ebb40f1e11a61ad63d2543acd7d83cef58c0fd4dc22f1c553749a36e3fb8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ff/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ff/firefox-86.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "8e029e2f755f107bbdaf4833332f94b062284529230ef148ec404d9954da5b83";
+ sha256 = "878d7155fe73ff6585e8566399416361a39080cb54afd61448e1bd0e191046a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fi/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fi/firefox-86.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "b1cf30bbd4046c3f6b200b876bfa022b34771d1aebb48a56b35817d5d0f46d18";
+ sha256 = "d02f24944f5bbd57273e05aa4fe701b375ad8d8905d0070ec9396a55d104203d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fr/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fr/firefox-86.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "95f5265e9e7be13a8d50ff4e0c45f1247531fc78076081cf7045ffcf5e366846";
+ sha256 = "ac6497f8a4bfa4e37798840bf4dc9b84463bf095074d2ba3c931e89a402a3fc8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fy-NL/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fy-NL/firefox-86.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "f22756db0256f2d7b3ccb15c15f1006834e8a53251ba8a315f0d72365d7140e3";
+ sha256 = "456ff8a1bed8769cd9fc05b29ed23edd29c48514dda4e73ac8e8663593cc3b4b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ga-IE/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ga-IE/firefox-86.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "7c67dc57553eca0c59293cff6f3097e56719d3c6b67d6599ea56ef799992e566";
+ sha256 = "b0778c1217f9ee6e631c62ef024991212cb679a43394e07401a5f61ca2b88459";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gd/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gd/firefox-86.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "a1a4ceefc1f83454280e70316fcc9d0c2bb635a77596bafeed2f06d3cb133340";
+ sha256 = "37eba79d0db2bf84faa2d89efa0c5b9b34f7fc732636f4b436a3e118792ba610";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gl/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gl/firefox-86.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "02afd3809826d41a75f6554cc7f49eb65725df2721f16484907eb0ad3cb172c4";
+ sha256 = "ef06e70653f712c4ab594a00c4d571ba098db740ff508cf78e08e859123096dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gn/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gn/firefox-86.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "dc4de709435a0015d3c4fcb615cf8ed96814b2f6038c37ee5045e632891f8719";
+ sha256 = "c7bbe33c8f839b24ee6928d74d5b0cff18918ab5f2a55e4b3bc1319049b19e4b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gu-IN/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gu-IN/firefox-86.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "f9a66be242916abf1576397204c8fd0c88574fcc68fb06480d82a6d7008f1f67";
+ sha256 = "71ceee81509cb6d505b836dd494eb9dba73857aa2c976ec1aab2fa57a50f1519";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/he/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/he/firefox-86.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "8739ec72ada89c64be8ebf692734a80f7a825c7201b4f7d43c3b0b8e18f8edba";
+ sha256 = "cca354d947d83c616035fdd64019b50d1bb86c3d01e05090eae2d07953ae566b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hi-IN/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hi-IN/firefox-86.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "db9f6f97951291d86f8406d919377ef1121195665734edcb4ae731ebb15efa12";
+ sha256 = "a151d3a3d85f0cf96837f51b2a0df9a0a9652148dbcb53733025e15686451669";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hr/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hr/firefox-86.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "b8fe4cf3e7c9d30c377504d58ae11c612cf74f0a02c3b25d4efe3ed6ee7365f6";
+ sha256 = "00e3301bef430e243c6516d5c94e0b5fe6e27ca58fd0192955423956395fb2d4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hsb/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hsb/firefox-86.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "73207d15a6146e4bfe5b2324421993382a41f8648c0fe5e4f2ef72ed5182fc74";
+ sha256 = "34c2666668499c8034e732565b244fc5b0cc7b0f544296be1e86942aa62b9167";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hu/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hu/firefox-86.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "d57ac494fa650d1f0d46f9109952c1493ed476dcf26fbe843c3e9c5a722eac3a";
+ sha256 = "d33f5467d9be5a2c6317a10fbd5285c4db7ed4191ceddc317d4ec923bd6ef7df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hy-AM/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hy-AM/firefox-86.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "58ea459134ccddc63156161300f075cb747125a16aeeb8f616662783b2a8be73";
+ sha256 = "a008343614e5fa43d8ce90ac5f2afc0bec98419d28efc191b836ce835b6f48a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ia/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ia/firefox-86.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "d0e4ab532d39eb094de62ae41fb40055e8dc20f2b69856f0ff28633f3c2a5139";
+ sha256 = "9140874f06ed6e135ae70fa40600b4e1e570b6dc6901191658870916f73d1c17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/id/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/id/firefox-86.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "f60c707585e197263fd64a85a120cd4c52da17194d54a2fc538bdface62b1c08";
+ sha256 = "c1dea9043a7f06708498acfda90a7b166b1f7bf839bf86dc2fbb90cf7a00269f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/is/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/is/firefox-86.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "f0d2a9052ebefee0f7774e47fe13de41ba8c2b7cba5ca784d6d218fbb2549a75";
+ sha256 = "50a804f9b7dd594b8c449ce6dd137b5f2bce41ab29baa35f6a14977a5c7af486";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/it/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/it/firefox-86.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "4946d59a1b5fe36ddeacb371efe2072f66623d82eb4f26cf0fe6b96e8dd54203";
+ sha256 = "3ea5e01722a7a03a5dc498977410fd2cde90352b026489669bcb7ebaa571ffdf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ja/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ja/firefox-86.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "2a9f7705b5ef1258f925a6e48ccd99243003cb429bef9bba4ad56dfbd294ce11";
+ sha256 = "efac929a1ace0484b5bce056bbd3d3ff4f26f897d4b1739f128d1dfd91c3c375";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ka/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ka/firefox-86.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "443b974d1631602734402a2a6dedaec8a7cc017e1abbb768ceb5e767978c36af";
+ sha256 = "95261b88327b5b20739d8adb2a99bb0de5d1311099e2d3fc0999405fbc918ae6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kab/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kab/firefox-86.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "8f8283696206450cf21a4c88384ca915030a1dd7df9e93911b620dc9375e5db6";
+ sha256 = "f7b4f440f27ab9141b24f2673e4b850193744d1fc03451c2134a6890b4884f37";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kk/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kk/firefox-86.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "c9d78fdd7ac9d79dbb713a7130baceb4f19aca6bf8e7218950190ff95d921b6d";
+ sha256 = "652aeb8d66ffb884983a043ff1d2ba10ff3a03aafe8cd55217a8f6a8068a3e59";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/km/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/km/firefox-86.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "1fb2612268f53fe300955daadae60be238070dae35555707027a8a62ce4ec3f7";
+ sha256 = "39deb82ca935780959e4a0f71d85cee3b90c6228237a508b239ad2a1f5a35a07";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kn/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kn/firefox-86.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "86208426d917883c2eb6ea9248feead33d4115093bddf5f1c690ed176adb9c84";
+ sha256 = "886370871c27c6637a74e4d8ced9ef2a9ec5062a8aae45fad5fea1dc358e38f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ko/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ko/firefox-86.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "b8057874e199124ebf283ab67e184dd2fed016b1bcb31a2f220e2e5d38d4f438";
+ sha256 = "9acea882760a961e228344c2cac9dfdb8d40c6c4c874744a4f2fffc356f6499c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lij/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lij/firefox-86.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "2e5bdea7a0f68efb0e6bdbe64a1df287644e14ce5fbb896040f3315c6412fc43";
+ sha256 = "fd76e82cda32813d43d80ae4acaed5610882162d68e98b4ae47dd1ddc8487d82";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lt/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lt/firefox-86.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "e1f79eba23036cdee87b9a5a2f48284bc006a191644d26e50a7ec61cb26d26c4";
+ sha256 = "afcc203f0d080560364277e7cca0f4080c74011dfc0fe07c751124e341e5b729";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lv/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lv/firefox-86.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "4d8f26a3b6211799a87dbbab6692f4a00c81b1d70c6af990a684b1b65c255482";
+ sha256 = "1b8a5cc4941d669f12593dc078d6658751609bd094a3704e9a9949341413ba9d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/mk/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/mk/firefox-86.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "3e5741eee9b27aa91827ef19e9b2b0200719120d07dccd37f5752ba1b746e29b";
+ sha256 = "72d374b828e3316f119d592bde6ebfe91ac4907d63cde43f6391d4be81119bc4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/mr/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/mr/firefox-86.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "247a11da64a28084d68d450cfa92ba66868891796d60a09ff9bf28d2af347a05";
+ sha256 = "17a2dec82a1d89fe74e71f924a21bb175cdb89d801ba50e5f0f0b4625fdabc1d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ms/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ms/firefox-86.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "79e1823ce9d454d70660464776f1d492f67c3489f7e9ed20fef5a7331def0cf2";
+ sha256 = "9af2d0b5f81d573c8fed4ff54446b2f3a77080ccec5138b1d0e707fb1c37e164";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/my/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/my/firefox-86.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "ebe50de263127be29aecc611c2e4b5c60068245fe64ee0a72beb2680253f85dc";
+ sha256 = "3a2815eed7a1288991c769045614cc50ec3fed2810ff143652092cd32aef5e1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nb-NO/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nb-NO/firefox-86.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "7e5f1266acf220fa8db165c3cc3ed2bf287ca809e3dce9b74e6284a8a3bd9e63";
+ sha256 = "a8255d1dffb5dcba012a15d5b0f62b9e6e4e60720ae6dc139c23f77aaf6ea99e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ne-NP/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ne-NP/firefox-86.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "0b7fecf7497937709d83e002951ec4425b080fe4a6f6cc967a3eab65db93a212";
+ sha256 = "e1c563748ae230a44939d27d7fa246e63ad49d242df236082af2eb0c38af8046";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nl/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nl/firefox-86.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "7125adcabd21b4edb2828b295713b3a35cd174abea748d5d4f8456c3e18e5707";
+ sha256 = "56ab4fedc5c3a71b91693d33eb70f79ba3f0095dda66eae44e3e15f885491d5c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nn-NO/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nn-NO/firefox-86.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "560d195e6b472228403b2fd5651c7a61e84491e788faafb77af511e3c74e7fb5";
+ sha256 = "216e2d4434c66fd4361114467ed5e4635342ed53b74eae287d1d69ba63ac85d6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/oc/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/oc/firefox-86.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "ae15b401c284e5e68819e68b0e9e76ca909ff167f2d15b3d77b546708a7e7369";
+ sha256 = "0f6822824131d1709c09de64643a9f6e3b03e30741d079f66229efdfb5096e21";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pa-IN/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pa-IN/firefox-86.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "32d9ef570e718ef79b004fcbb9a7e212d06e8171c0056f90709423495c3c7bdd";
+ sha256 = "9a15f3ea177314500e72ef123ed9dc36bfb9e10b92e5ab20cdaa6e7e1fa3367f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pl/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pl/firefox-86.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "2201fb7b8edb8ce2b3446a4accf3f0ace2b1a18a7690a20b6e64ecb5ee1a61e2";
+ sha256 = "18d19ed1597d3862d08d6daf52dd1bfb8f21c005f7cc44ce4d2e8177b4509aee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pt-BR/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pt-BR/firefox-86.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "f80d4d45078bb3884d8302913ac738f33cd984709e95e279d341284b9c29749c";
+ sha256 = "287c3c117532b23e45d726d4541ee726056139e976bf43210f35b529834c3884";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pt-PT/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pt-PT/firefox-86.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "aba0a4166f0b815e1bc96c4faca818e82adc4b4d1bb8d26cd1f086de681eb56b";
+ sha256 = "26915b7725a325db052cbc165454c34f19e7a1346aa400b1306234707bccdf9b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/rm/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/rm/firefox-86.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "450640a39b0773a255c97d884d51f7dd0de04da523e28dcfb9680e750b68e965";
+ sha256 = "4d5c14e2607efc653f5cae75290332229286b5ee606da635871dc04e20495fc3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ro/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ro/firefox-86.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "eb20d1a28f510ca98baf24c10feb186d21900690d9f0c8be5c180b72c9d3408d";
+ sha256 = "a41bab63866e22712861a825aae272e3468470783f92c23117e1c116b9d66771";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ru/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ru/firefox-86.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "7b0c8c5b5cdbb66b36366289f7b65263abb19c174ac89cbb2970a5742eec2d66";
+ sha256 = "edec67a8079f55c5f22b6928bf1d55a2e1d31aff931c9e41e503ff1b7acf2ecf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/si/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/si/firefox-86.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "1f2e5c35d9766cb46c9c5ce5ff0f6c95ca12d0c14d12cc29d098562b8f35e9b1";
+ sha256 = "0357b913e6528214f30ff5ffd4a0f1c0e26bf079d3afdc166a82ee24e8c099ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sk/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sk/firefox-86.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "528d3270d9bd722545fb57ab09059e0f43c0f605e479c0869cbe0757d1f38d8e";
+ sha256 = "5a38f953d93cf4cb8b4e2dbb0206fc0a9fa3262c55d91fa4cfc3a8605098403e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sl/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sl/firefox-86.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "d4948a03a97424c7b499e339a509b2ebba9b716c84e4713b140576bd787178ca";
+ sha256 = "0c2c41f6d7c3f72e56cb84c921207a606f959993ec6a3cc5619bbb894ce6ef8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/son/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/son/firefox-86.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "34a841faec9720c9ec32d6e00ca775d266f47ca3b660876cbd4a1d7c9d7b87af";
+ sha256 = "cfdedeaacf244b3bc63343f76ed817a165a15b2a727f04327581cd373e76ac86";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sq/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sq/firefox-86.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "aa5688e676bbb8ae87f089d78d4d6cb2a9c3393bf252a7c277ab6a8c97a80951";
+ sha256 = "daac917a1e105b7871a0361db364558251b931898e08c36515c64269c760d6b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sr/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sr/firefox-86.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "882263a340ef6b11b35e91262620218078c87b193f3d0ca8eb3a9365dfb98d60";
+ sha256 = "c1993cabde0e7df92e45101bd62cd14a86d023763c48c18a7e00018dcfea282f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sv-SE/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sv-SE/firefox-86.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "5b8baf5ee22e5da51040afb4cbdb4a6f165aecb117d181561c97903a0e63b74d";
+ sha256 = "eb04be61ab3d029437f57dedbf1b66d0bfc6c0a9b29e41fe4fb7aec7b5ab47b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ta/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ta/firefox-86.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "14a00497f7a4f27680e95126b4584a13d3376b8d4f39fe0a0de9a7356bd8dca2";
+ sha256 = "fbd105183afb74dc7887dfe5cc0e518e96cb8bf79c53fc502d154bbaededacd7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/te/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/te/firefox-86.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "0de38fdd91056121d68734c76b799534921e8adf37566465a72b4fce9d5af693";
+ sha256 = "e049b79ce8a81749caa83d6b42ae710414fe08ae2f28a2c1af7c7d47f83b24e0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/th/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/th/firefox-86.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "80aff43b79ab4343d6b9bb2a5eebada3ef376313fe47cb2d1d7ad51f2f2a57ad";
+ sha256 = "2b3ca062e1e53d5fca726e5c5a9eb7a3a639e4f6e7f5b455bf33e305eda475cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/tl/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/tl/firefox-86.0.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "acdcbb66a68421030634bf1ea1c265ff38e84dbe010aa41058da64ce966d1e57";
+ sha256 = "0fce4ea1fc379ab87c0f565c12f8ee16205108048d7fe89d7850802653247c16";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/tr/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/tr/firefox-86.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "a3365e32fb78743ae45f89ae1740a7c51cd11e927454cc836bac4e9f62cd9abe";
+ sha256 = "e0a1c0a5d31225fb6af2b5b2c4d7386dc10d9c5c56081c1282615cc8d5da51ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/trs/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/trs/firefox-86.0.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "a9da73cdade15ce508678c8347c6bf03c2d93578cfd095e0c586682efba7f2fd";
+ sha256 = "129d9b5d54cc807664a27fba1fd4f003430bdccf0385cbb53ea77517ce30879f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/uk/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/uk/firefox-86.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "05ebea023813ea0755e105f6f1451ee0d85bba5e52660230f25487bb9d997bd0";
+ sha256 = "d50f3c3f21af6c805bc8c86f886af9f1be2b2d5cb5ad061a000633fa9b7e2641";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ur/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ur/firefox-86.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "ee4cda80858fc6ab33996a546be8de565a5d4d969ce26d0d1aa70ba7a923e496";
+ sha256 = "ac9240e7896f695f48526ad275d887ddef7eb98aa3dd94800a1b4da081110876";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/uz/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/uz/firefox-86.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "7be525a02c9bbd4beee8678eb8488f50337aaf16883ebd41f5b2f67586b4e57d";
+ sha256 = "94bd2d3f2f95e32381f6b945f4b1149f355dffcc27ec829fd0849ec4895a6da7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/vi/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/vi/firefox-86.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "cc6a9d73810294f3261aaf26d4678c4a49b88375f48321384443f027a5a0b5ba";
+ sha256 = "e7c8034074e6d1f8f6987321e24dffdbe8acfa11d6784b8c8d033e690a5ed145";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/xh/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/xh/firefox-86.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "5eee0a8b232448992ab37546d698d4f212df53c562f29261023e64cf5762138c";
+ sha256 = "b8f0f3ee8aeeec6fdac5ee15cf688735809994c71cbe4f01b238a3cc1386006a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/zh-CN/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/zh-CN/firefox-86.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "94ac5a87b53fc8aa6769a4f6faf56d0089965514d8e811ca94ce2cd996e536e2";
+ sha256 = "47b4f3411306839882f5755b3eb2038f9c7bfd1c2ae72927db54c4816c97217d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/zh-TW/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/zh-TW/firefox-86.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "025c04100a427e231db031aa43694a51191ded2c31f22913bcd694c734bd516d";
+ sha256 = "5fb11410c30a813fd0db58c928fb07c488405776308eacf64b238daa0fbffbc1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ach/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ach/firefox-86.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "9f770cc6655b31ee907f949e0ba2f197d0d6fb3ae33ec1fcab311ffb7b109fb2";
+ sha256 = "06d2dbe0f799d22e98b715528b54566b167a22db4d16d3ad60d84a6e6a8b9e5e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/af/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/af/firefox-86.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "7ecd58201a5f3eb6fce474bdcbb0f672c8f492f30de3ec4f8f3cc48c2c967313";
+ sha256 = "536fdd221aa5f872cc8028f39fcfa7b9eecfe09a215da3d50fbfa9e256a1394d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/an/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/an/firefox-86.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "362d8bf290f67ea40c93fa058813c073a51911940b916595c0a8f1599ef46713";
+ sha256 = "ba6eff6a355361862fc78879264965f5f1c0adebefe934d1b6d51994023d3bc4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ar/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ar/firefox-86.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "6b66c3f25eeea055e42a74ce6c327f09e8fe4f18acb1f947deee351d2cdda1da";
+ sha256 = "0b465097dcfd4f2a50eba984b0bb30fedceb1a409e2a98f22c45709cdd1117ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ast/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ast/firefox-86.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "0efef2406fe4d8093a1ce6bb56d1a54eaef5bb429b6fa560fff7373a7435cb3d";
+ sha256 = "614241f31f38a71782faf76f0a31cd81d2520523ff85d8a5dfee32a77e48829b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/az/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/az/firefox-86.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "bb0dc33a53a2f871b9743f17a36f50fabed87c137521404675e69df69f121350";
+ sha256 = "4fd682f83c0eee3031c6e452d1c7cde3e54d0e52bb8316b0e2224360665d4fc4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/be/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/be/firefox-86.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "7459818c037c45ff2969998b8d3f481eb8384802e5444e2f3c58340f316aec14";
+ sha256 = "c15417c21f42212337bd921c869b05124a720c6d8730e4a16d30ddd9c10aca97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bg/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bg/firefox-86.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "55f10b4a5cc1d06dcb81aca68c59a0aa64d7934e01c3f5f3dbcc27dd7497e3a5";
+ sha256 = "fda51760d2dfa07d559673605120a34706f8a6546dc4e673dab55b71cbc501ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bn/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bn/firefox-86.0.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "6491efbf19bdf11b877d04dc22707864c07e9b52452408cf386bcb7bda3cf840";
+ sha256 = "f61419c6dd7b20cbdc48cb0faf51cc831fa90f37a721a162bf32753d85a40aff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/br/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/br/firefox-86.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "4ae74e5843edbb01d35b7564b1e998f58fc1c50d849fca9a9e97e540abe6f140";
+ sha256 = "7d60c5f6be2270e9b40612dfb1072ab5d29bd02d070f463f1df915f8d13873d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bs/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bs/firefox-86.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "c796121189e7bcf5ec5a90218db35fb34393d4e70ab7100567b3f7aa43daaea4";
+ sha256 = "4707568c61df2d2050e3f1c18d3a2dee1c5bcfd091f32bd615f2e75ed06949fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ca-valencia/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ca-valencia/firefox-86.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "a2097281cb1d5191992399686c26754a57d0a3bf241961374e335c225c4f7324";
+ sha256 = "fe52cf8f5f531143ef28e728753610b442443de53f34a4a8d6318d5124a10caf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ca/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ca/firefox-86.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "4135f8421b6594a468dad1057d2684cc8c5e3fee1b095653d42c86c6b4b62ab2";
+ sha256 = "8e6baa8ac94878448f65598042d47b9789352fba55d4e4f91cbe319f9676780e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cak/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cak/firefox-86.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "93799eaee71f6e1914c9161d075163bbc7c42d85b196301eb6891bb7c3debba6";
+ sha256 = "006a887bfaea07c40ee0f67ebccb1aa538f56e28f625cf2b085242c26ebe7bf0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cs/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cs/firefox-86.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "25678ecf83437174adca71c682ff36145b0f68e45cdaec515fda671907c21133";
+ sha256 = "27f1c5634e101d3681885a8d2d572b73f8c9db2215e4836a6cd71fbcd0a5b8dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cy/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cy/firefox-86.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "85b571e0fe4f0bdedb8b433f8363a7649a1c5fdfeba40b35f069ef1518a28600";
+ sha256 = "9e56e8f88baae2a4c99ae12041ed9c766dedc99b7ffd75bffbba92a7c19d98b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/da/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/da/firefox-86.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "d998daa0d89d7d4a632c576f9d81d5fe7af3c0e54332968d593d88e5f81fa246";
+ sha256 = "eb317f12d74ac8b636c87dfe9c1cb0ce267a15ffeedb79956e1c15e971d1b7e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/de/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/de/firefox-86.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "a84adef78975397d45941ced4b17abfacc2a26a0b758336c99eb174b33f51c89";
+ sha256 = "8a736a3a9c257f2b4509e3ec2f74259f655369159981cfedf8468de9cb1fb22a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/dsb/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/dsb/firefox-86.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "6647771748299fe56d9f023e612de6c3dfcd1b711cdcde74ea39bafb957deb5c";
+ sha256 = "a8fbd4dd6d1172f67744e9283efb6cb644421cb07e3568cae0d3c68c479d653b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/el/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/el/firefox-86.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "73a7a168b65362901a4b198200e2a5167244e886131203543bcf83f2998261cc";
+ sha256 = "59baec30ea1d8e30982f52279003b6e1be0148c02f38fdf283325c53ad900ee5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-CA/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-CA/firefox-86.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "d47e5707ab2ea2e369adffaaa49c52f461d3c01b6b28b31b0876bc5284d2de66";
+ sha256 = "a4e0ea60acf339a61c19272170d2efdb4f519325bf2f71bcbf82af70ca304af0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-GB/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-GB/firefox-86.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "6a50517b8ecd2fdbb897dca8de5a948214180fcb25ba3654faee7bb563d049d9";
+ sha256 = "6c82da02a7560977faad1ca3d4c3973d08583fc0ce75e1de6e5aee2c9d372b38";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-US/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-US/firefox-86.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "83ace0384a14e383e65716ef9305d72e39832b855ebecf2035e6267b4c9a97a5";
+ sha256 = "eeec3b446c30c65d4af72d04d58c6d5ddb04c13e871a5351921a737f7e1cf234";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/eo/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/eo/firefox-86.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "2e8b25943115edae1dda4265aa3fd1edd8683318e47aa3b11f9e2f3d6f89a372";
+ sha256 = "4cbb1144cadfd901082829f8e67e311c51df96ecd08aa2082772421d6445f2fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-AR/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-AR/firefox-86.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "559b0de8d0d846f58e15675e31e0db57ba00ad2b98d3a042c1d6d25a9727e1a0";
+ sha256 = "c875473caefc7e18a4f7a0a3e7d44ce659a2271fc1b21d435a70c921092b8af4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-CL/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-CL/firefox-86.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "3297f38424fc6cdf2ddefa72732f977cb1ba1b309dbd3d845b63a038d748359c";
+ sha256 = "d1bf9c2a1df028b5d6eca5b41c975afc6378701c6f33d888b46511da5ce5e498";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-ES/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-ES/firefox-86.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "614e69e978f0e814b54150a013872081d6365d9e5bb03ee1147c5310d6315dff";
+ sha256 = "5ee1967bc61259869441f61061fec2f24ee3a4179c64b245768387e94acafdce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-MX/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-MX/firefox-86.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "765d1ca2685a462f173d7ba1863a2263008cba71738548dcdab83f6c010b7dc9";
+ sha256 = "6b4669581f26a18fbd0bda8d605b9d22b3aa98eb193ea81f7ebce1db4d39a263";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/et/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/et/firefox-86.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "1465b6447bd476f98060321562ec0ab47b117f1271dc97f9924da573c77b5a3d";
+ sha256 = "0c41ec2c1df4cbd295d349a7b6ad7a7e974662319d4a1d458e9f6bd31c4830c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/eu/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/eu/firefox-86.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "4f25ccef829ad465d62676aec9c6daff9e5910cdb5447c0d9b5befee89b7e4f7";
+ sha256 = "e7bb380e013f5cf35edba5b698a5e3fafd7af63593c663e0029e2754f6854b4f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fa/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fa/firefox-86.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "c2bed62b36d648133edd1541799b231dbfb1c0c5fb6213ac28c3abc0a38ee66d";
+ sha256 = "d2601f3b84b31d9852a3f2ec35ae8b43f8640da18976f5f4c8a77cf7ad360a22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ff/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ff/firefox-86.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "527591e25cd83c6ba7fe443dd40ad6963dd1b7f69a693e76cd1e18a2bf74c082";
+ sha256 = "a13ee0463fc23cff51f88072d527a6b758fd313276cc7e5f3c8a0c4c8d5f5404";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fi/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fi/firefox-86.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "3c89fb2c42b854fa800c47e5c91d19defe56be5f6474c500bab309eb84df0a74";
+ sha256 = "76a153c9e398eb259c69b30d15782b7d7a9ebd156283f1034c20182cd72e13f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fr/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fr/firefox-86.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "a7b033c9df0e11abb6dae08f62dbfb34f740fb9d849e0bd8a027ecf0461ff5ac";
+ sha256 = "6f5d6e07251f75d6355f52558f2734d2788bb87e1e53ccfb800e03173094f765";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fy-NL/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fy-NL/firefox-86.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "d162a3c113182178a7de0c5f3dab907badf9625ab50e8a922ceb4c34c4616c31";
+ sha256 = "785a30a785e55158c7251e623683350ed4840bb4b6f002d34cdee82d91b33d10";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ga-IE/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ga-IE/firefox-86.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "637d65856d46474d51cff1da13b9b1e74984cb646cc5a6a643fcbc7fc1ec37fe";
+ sha256 = "f32f8a0e5f0b5fd2a1dd147b32880605186a4b9435e39a53fc87f42eb8706979";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gd/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gd/firefox-86.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "aab2f06d6ed6108fe48350ce0275d3d244f175e6c2427f54b403d6bd6ddc18cd";
+ sha256 = "2893dd13353b3504a00e02f65f0b2a0a72dd43771148d45cca271aa752a0c520";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gl/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gl/firefox-86.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "a5945bf732fc6e3edddb0e7bb9067c591f4fc347f56a35c8622311706d8c135b";
+ sha256 = "b5bcf0eff53f6bda0e394be3e483c3f314d962a919473492a7d1005b6976b861";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gn/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gn/firefox-86.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "6036a369187f5e30322d140e1add09cc0a51e5d092693a5acb65176c872bf53b";
+ sha256 = "c979d766174b2e4df72de6a375084b509e879f11a13c1972c97b5ba0accb67d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gu-IN/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gu-IN/firefox-86.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "2b6d3c13a44b1234f591536c8f7f3cf5d1b56af53f366150e0565a36d4fa678e";
+ sha256 = "0e053f93d56a8fd9c07bfef4e93f1f338f951f519be669f5ff18157ca4216025";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/he/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/he/firefox-86.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "c3d01e14f24de5635a9c0d3c7625fcb9b84129ce9505d2601390f2d40fff5a3a";
+ sha256 = "05435889024f622f69d82a0007c19b50b1842f2cfa558748b39859a94a7addaf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hi-IN/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hi-IN/firefox-86.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "23f1dd3a9603d797abf6a1411c7b6e44d4fb2dc7b26294670ce4c63cb859e42f";
+ sha256 = "7fb87408064c024305295c38938c42b34a0c627b177cacb00ed9e79a0ff974c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hr/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hr/firefox-86.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "e30d8a599b28b05a3f83692dbadeb9185829b1a87c84ab5449f142ad1a7a8a44";
+ sha256 = "924141a867793aa4fb3d2b87b75c1d60cc39bb3a3591eaaf6ee3381fcf28fcc6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hsb/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hsb/firefox-86.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "1a6cb70573e9e0356e18a18d1a0a4d2f7188549c19cbed7e28d3b801915c22ca";
+ sha256 = "7ce0f09c144462f9c94dc6805165543d12afbf0e44e327dae4554fecf272601e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hu/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hu/firefox-86.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "c2cc048b05e197e028606535fdeb62a205c037eb5823560f187ec4152be41d97";
+ sha256 = "8997e6d5620e0f565939cd8f127c4e86da0c46828c66fab7333073c3cbb8054e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hy-AM/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hy-AM/firefox-86.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "a4b6b0d0f05ce86d13dbf08448724106278891cb79387e29f9ba3874c1aa6ec7";
+ sha256 = "aeff6c4b8c7d164b63bf22808ea234236f893e6da2b3d9142f95d89e9ec7178e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ia/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ia/firefox-86.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "f7d761ea9ee5d6037886a9aa8eb93747ae9f943957a296cdcca0dbbb0e7a2b38";
+ sha256 = "0590e0469ac2e562325d786dcb68e2ca2111aa8ae1ff3717ef8db2259e6ec149";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/id/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/id/firefox-86.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "1599cd0ea460ee1280753bea5d5c84419506f72f8d87818114665ced3237407f";
+ sha256 = "ef8dc62e52df3e6b1d37aea5f9b9a214a26e51ef9fd378f56ac8b2245de54613";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/is/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/is/firefox-86.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "ec9b790cc55ed72fcd79afb6502db207906f89aff4053d62efa12a37bbe85b93";
+ sha256 = "aeabfd51aa160ba259850b7fac88829f81bcc0dd8ccc9168c7add07ce0d4efc3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/it/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/it/firefox-86.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "97c625e01e9a565ef10079ae980cd2ee45761f428594158f6c05fb4a3f1142c9";
+ sha256 = "c6069c0a86344af00150be03cb0f2c26984b713ad386352f5a10b39b79b13cac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ja/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ja/firefox-86.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "625dc84ed56bb46032eae0087ae96d17127594efd99e4aeea410d4c8bef93819";
+ sha256 = "9be7b40e66723583b17657ea805919955dda703957ba21d541baa22390a1befe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ka/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ka/firefox-86.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "45a00fe06fc302d59744b8c9dfc9d7a4e27ed4ac3727848f52597208020ce16a";
+ sha256 = "2e8a57b44b3bec627793f46df84f7f25ab0aedd0f8b1f08202c75cc58d7e14c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kab/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kab/firefox-86.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "32b8ce9f195ecc610e3327402953609eb8621cbe116e22bba76131c9dd1b9738";
+ sha256 = "5777a6b5eb3055ab2c93f98bc597343f13bff7d0a846809d24c97e9ba1a0ca7d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kk/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kk/firefox-86.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "651f3c7314b919af1348771ef7c5ea986fe3d9d7e42e056172fa55d675e17e3e";
+ sha256 = "84a8fbf2a859d81aae2aae6bc95f12a8e2982cff77090072a01d28daccbf21f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/km/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/km/firefox-86.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "1a62be10235639a7c2256521838fee8637ebd575cee39c5744a65ef057afe1b8";
+ sha256 = "55982f15b467ddea6203fbcf98081496d0e313d3cd281f807d2bb75b4e79077e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kn/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kn/firefox-86.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "1cdb648165896ccda8da7ef6862605723089cbd8e3c9e6b8692ffeb2d28f9593";
+ sha256 = "18aedab4f324448da412ddebd1da9b01be51edcd5052c9455672a763ae1f673b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ko/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ko/firefox-86.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "70781041791a7c64e518de27955cf2b57ce3d3ee7afad36737f62783b5255d64";
+ sha256 = "5baa361fb97a76d12bfbf5b87c092cbe8079d34dd08842dae9def133383f587a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lij/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lij/firefox-86.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "ea44fdf528da53d7f2ba9d447c70079873f802647ee708f6580447af6adc1834";
+ sha256 = "35bf3aeba596135231b1ddff2e2550ab2a3e0c5bc796d7b628c5f78ac46ce40f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lt/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lt/firefox-86.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "ffca3845c97f4d87e0d601c483e2bde8fa8f7f59b44ee85259fc70b1dcfb727f";
+ sha256 = "eedf7ba2cf4634ab18c2f2926266845a29c9bce8ba747554d413b276445b9eb1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lv/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lv/firefox-86.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "b513e100141d1df78de9f05dac72da91c6cf65a8fcc22b9091ec00e6c6ee21ef";
+ sha256 = "a1c5f04c16f6d50a0797e466d6a8836de40219567f04928cda7f64d967d8afa7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/mk/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/mk/firefox-86.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "c65febe8a9f9b59ecdc61880a5c1a5b2b29fc53ffbc8d968f1773fe60adb082e";
+ sha256 = "8de29502640b51ac9f586ae7713903612911cf01cd7aecb6d74175a816cce6a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/mr/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/mr/firefox-86.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "b4d3b6758c67f72e8f8c9dbb0e32fcd7b527b701e41d3d492e3e7ba7817cc544";
+ sha256 = "f4cb4ddcac3b5ede422e54c69c05902506be788b45a79cfee6e21a0b7b8c3ca5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ms/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ms/firefox-86.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "2fe81086a7a15bb29b909987063c058c1826bee6c0c645cae1e7a0907207d1ae";
+ sha256 = "aa09b472e21b453f6875e25dc7922ca062934527a306f3b338cd32636076c021";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/my/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/my/firefox-86.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "40661cc4fa51c2782bd0da0d6f460c3a5fbfaab72e91b15c77f9b7b537484ab8";
+ sha256 = "4a4ad99aac0614aa25fd77c4c740c49f509db2333c37f797018362b15f38d1d4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nb-NO/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nb-NO/firefox-86.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "9ce253d8bc316fb976c4f64135f7767060aed90111b54dac687011a772e650ab";
+ sha256 = "45814c2d731cd8435a92c31e9311c333d4357dc38e9196fbc24358289004df8b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ne-NP/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ne-NP/firefox-86.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "7fb96857d5da6726e68038a9659ac7c18b8e746d0dd5e4823655c8fd093238a4";
+ sha256 = "008ecc3d7bf7932a320b6ec12404a5259032930539a65e60f8aa2f98f9018524";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nl/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nl/firefox-86.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "1d03b2eb31dca3cfbfb38af4e59d3eb84845b8fdaf488b76949a98f744253935";
+ sha256 = "0202adc844602502b48d078a665b1e9012c65172deda406ac9db972e05456fc7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nn-NO/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nn-NO/firefox-86.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "64fdf6e8e8086c04c53c84f792382c32579b43548f9410dc074b2aff95165d88";
+ sha256 = "28f34c957628178a112ad6a7c16d9dd20e58bc3a9068fb1e59ef5e656ac8f02f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/oc/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/oc/firefox-86.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "6db5c30ca7d449534289f5b84e328484edd5d04512cde11f097f28f5ffb986bb";
+ sha256 = "4645cc6de115ff73444dfa4165a82b3ba1b0adbe3c4eff6fd854c9ec594a7bbb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pa-IN/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pa-IN/firefox-86.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "102ac2026af2d21f27502f190dfeb0f39b148ce39324e480f653f6868df770d3";
+ sha256 = "3fbe8e5c7b4fb420a6a6c62475bd01fead342d7431578b96f391a829cf184be4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pl/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pl/firefox-86.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "f0a03e6a95a67af8e6949f5b6ad32179f7bf4978f050ca3c453287bdfaca6252";
+ sha256 = "6850d14c02c152fb6252b08a111ff6bccbaee6a6ff76a99c018b497a8a014ab0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pt-BR/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pt-BR/firefox-86.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "7177392c8f0c049ad685676aa6aab258274b7d5871c06467f7e87292779b7575";
+ sha256 = "a0aac09a39302df30a48c54e64ae422166eb781ef349dbc58927e077310fae5f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pt-PT/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pt-PT/firefox-86.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "1fcae4be8cb31d30b1187b7d94fde71c41eb95c858467136af32fd7ad1117147";
+ sha256 = "e577444bd6ef376b0277cc2181bf50bc1ac3e377bed171f30616f536fa2d516b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/rm/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/rm/firefox-86.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "86f801260baccff9e8d9036dae46b0796edc8d90c9a2238da1e1547ac2684da9";
+ sha256 = "2a4f5f35caa3ec5b9f20c1160dd038ce3d689593650771c3e63246cc53b23cfe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ro/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ro/firefox-86.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "c1b02e43cc649acef6cdc9498814a4582b46b42de96dc48fcbac4d83b44ba35b";
+ sha256 = "c68f195f10bcd7d19aa76084450419008068ee5d30c34acc02d7621ea250211a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ru/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ru/firefox-86.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "c067538578c2891f062716f56f3ae057ef8db2814a03ec7f1eb8855b95f9ace0";
+ sha256 = "e6e7dcc74dac1c331d3202a141df71dbe2e5a398e2b97c9da1358707823d76b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/si/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/si/firefox-86.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "8131b12c390e31c06752115abf62426565433261e73ffa37a8389b102ccd06bf";
+ sha256 = "1bf321805bd46e0214568921b89eaf5ea4d394e43fb1d475ee61c7de8439d997";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sk/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sk/firefox-86.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "f45f32063d34930b7e0ba4c087e97a78af642a59270c62fbea86b0bd87e06171";
+ sha256 = "221667dd6eead982d13e911e0ee9d6fb0e6288d689c59c7adc403e8eeab6fd4f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sl/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sl/firefox-86.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "df8602e60a895887170ff2d18aae487730ef8e0bcfe08010fbe0da30f05af91e";
+ sha256 = "5df6f40394d0c2561c5103cb0600d3566b2bf42dca4d6a3194bee725577f1dad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/son/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/son/firefox-86.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "3dd3bb220c4cfeee6ecd79977e1a619470a2504a4597f314286497164984cd9f";
+ sha256 = "8ce2f3d67ea7e1889fce2f534e90320403350b27bd63e97263a9c14544d7f212";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sq/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sq/firefox-86.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "cc04ff65bb4fbc714e21a416af26256d4b203f327e5678c71378fa507242ec6e";
+ sha256 = "a4f403eefa8da37d7308bda7a10cf62dbe9ff74f848e9e3603d9b787c1629b05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sr/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sr/firefox-86.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "abb30a4c0eb7ea9910b21c0f10cace395f9d413ce39051494c97ddd1e18e2c10";
+ sha256 = "7f3d5fb8cb77c2405403f9899257d41f4e9fcdb45a1af945e337228d7648f79d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sv-SE/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sv-SE/firefox-86.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "76ae51342d5b8a93ae5f3927a69b9b1a6cd4877b98a7a103f8250bbe105ecf6a";
+ sha256 = "261886fc3f3c9c40123a6b6ae0040fffb281d90cbc34506f85bcd73cb94276f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ta/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ta/firefox-86.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "1e9866ac793705555c15ae4d0e16753e90e8deae19e6694ce9f85e8dfa6ee476";
+ sha256 = "3df7b4c5eb395b123d8c9a67d58e2eda268bd931394e38941545cded144b97e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/te/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/te/firefox-86.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "66dcd400f89054f194f1a794c8731c7344b04f97209023559bfcd0f008e005c8";
+ sha256 = "b27fe9f6d6e4920e5714a74f439900238900e164cce584f1a1548a02105caa10";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/th/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/th/firefox-86.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "adef4cf7769510a8b47628eff5ee0f3b00c23862634fd8f6975daf599cf7b056";
+ sha256 = "e4eadb2885d09a082c40e27eb41e5a8f721ddd45ef79ed0ccba02f18d7fc3d6a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/tl/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/tl/firefox-86.0.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "465d089eb0c68d8279e3cc7f8ceb5c08527fc48b0292cc8ce523879c4643fbb1";
+ sha256 = "392368f316cf89668e2ff9a42e0b170b55bfc610c84b0a605866914a39273fce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/tr/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/tr/firefox-86.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "00d75ff3605672f6704fb600208872e536f76907ed25a4f90325cabc1924f991";
+ sha256 = "e9c7f55b656860dc6d2b28fcca66dbc6e7290d2f418da238ca06ccfe68fdd579";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/trs/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/trs/firefox-86.0.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "299be659a464911dd27d92c36f567f675a26aa6d92af63deb002e172ba6b40e0";
+ sha256 = "9cd24da9a1dbc0665b589ea8d1f5e5a3546a8b7babbd0f9f2f27641d5c81eeaf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/uk/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/uk/firefox-86.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "49c2084ec32c03fd2821c8f1220bbbf954b98705e44a6a7fa65ec6f1abb12c02";
+ sha256 = "0bbd4c03dd422901bf2ff1a6e000ec4c6ed798bfa66ade8db03551f5509efc40";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ur/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ur/firefox-86.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "d703344d8f03186b0fb246108892432f137cc033ae66bef395e7216cfa7bbdd3";
+ sha256 = "c0f807c2c7365f281d921fd347a173ce2538fce79b1e74beedf928f392422236";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/uz/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/uz/firefox-86.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "02379c1fd1766eb15d9e99f8a6f08074df943c49ecf6b50a6b29ae8e922bf347";
+ sha256 = "f561501fdf1a0edf9f58289fe608b9d47c00ef666c7f980972f0f3112470ad27";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/vi/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/vi/firefox-86.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "0577b4c2891ba646a67a93b4d6373095b98466e32b95993abc79e7bfd240f7d5";
+ sha256 = "12ce7eae83ef3100039871e82784ba7a63742ef8f132c48ceccac22641074c1e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/xh/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/xh/firefox-86.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "83e40e1b33b2782d5dc68d32286da290188e8b5c3d689e5352d53411f95bed4c";
+ sha256 = "9def9420b6e6e252839268167e978cc357add46e54e77a0f5bf8e03a2183a855";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/zh-CN/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/zh-CN/firefox-86.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "695e647135b911a5e60374595197cd096b7bc180e63ee3069e4550a612354369";
+ sha256 = "03cea12f34a9eb22e730d6b28f294bc2a1578e9c357a15bcf189ab1fb925e337";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/zh-TW/firefox-85.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/zh-TW/firefox-86.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "5dcc5aa463f3c2325dcc7f4f768580dca6adf66e052470ec932bfabe9b3f8f29";
+ sha256 = "cf5e5cdf7230bf231f63750b3747b625d64026194c29b36c3d00ff9851960745";
}
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
index bbc3f7308f..86d91d21e3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -32,10 +32,10 @@ rec {
firefox-esr-78 = common rec {
pname = "firefox-esr";
- ffversion = "78.7.1esr";
+ ffversion = "78.8.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "138dcfpdkp78yqgygac212vg5fm5ich2a82p7258ch8hk6bpvpdxbws4sdqwljs92x831dblcsshwkl06vh48899489gx87mdkqd0nm";
+ sha512 = "0160aa6c408c2af66d24b74cf98e1a07ab1604e7b93ffcde79201f9d68e41e896ef965f1904de52d5dd82ffedae33ac96e93b871727bf5dd5983c5af2f1f439f";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix
index 64f4c27c96..78eef77555 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
- version = "1.1.1";
+ version = "1.1.4";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
- sha256 = "0c7w4a19cwx3bkmbhc9c1wx0zmqd3a1grrj4ffifdic95wdihv7x";
+ sha256 = "sha256-EN0fQ5Scwrd7Tv31upQVbuqoNCoYudtruwtPR1IKTzE=";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix
index b4bec6ead3..861b5a15ee 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, lispPackages, sbcl
+{ stdenv, lib, lispPackages
, makeWrapper, wrapGAppsHook, gst_all_1
, glib, gdk-pixbuf, cairo
, mime-types, pango, gtk3
diff --git a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix
index 01797397f4..fcd27eceaa 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix
@@ -19,9 +19,7 @@
, dbus
, vala
, wrapGAppsHook
-, xorg
, xvfb_run
-, libxml2
}:
stdenv.mkDerivation rec {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
index e369fec213..f1fb506ee9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "argocd";
- version = "1.8.4";
+ version = "1.8.5";
commit = "28aea3dfdede00443b52cc584814d80e8f896200";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
- sha256 = "sha256:155396rnihha31jxy0zk1jykiirpv4dhc69w45y6nx3nx4k0gwhk";
+ sha256 = "sha256-JjxibnGSDTjd0E9L3X2wnl9G713IYBs+O449RdrT19w=";
};
- vendorSha256 = "sha256-6DOay+aeXz7EQKe5SzQSmg/5KyUI0g6wzPgx/+F2RW4=";
+ vendorSha256 = "sha256-rZ/ox180h9scocheYtMmKkoHY2/jH+I++vYX8R0fdlA=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix
index 8e20093f5b..586fc6cf80 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "kube-router";
- version = "1.1.0";
+ version = "1.1.1";
goPackagePath = "github.com/cloudnativelabs/kube-router";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "cloudnativelabs";
repo = pname;
rev = "v${version}";
- sha256 = "0nsd371w667qhgiygxcg4kmynwldb0pbip6x03rc7j854hg8l7k0";
+ sha256 = "sha256-U7vjWtVXmyEPYFS1fAPOgV3WILGPhWsmoawV7B0pZaE=";
};
buildFlagsArray = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix
index f2071494f1..cf0c845142 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubeseal";
- version = "0.14.1";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "bitnami-labs";
repo = "sealed-secrets";
rev = "v${version}";
- sha256 = "sha256-sUeXzmgSOkpqzqrX9+wNGj2X7gcf5QSpavXK4MJe8qE=";
+ sha256 = "sha256-wzaNFM/4V2mWqhkqeT70ieQuhgNK79U2b7PhxKqn/X0=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix
index 23f4dfe14c..b16d0448ca 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "nerdctl";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "AkihiroSuda";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-QhAN30ge0dbC9dGT1yP4o0VgrcS9+g+r6YJ07ZjPJtg=";
+ sha256 = "sha256-zexvTPEQw7iW1d3ahHmqTn+UaT/bJMlr1sVlWErc2ck=";
};
vendorSha256 = "sha256-bX1GfKbAbdEAnW3kPNsbF/cJWufxvuhm//G88qJ3u08=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
index 4004402475..6bf2e47616 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
- version = "0.28.6";
+ version = "0.28.7";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-DzC/HNwFNNEJhic/8KpHchrBmsSbrn7xf1DjY0JTH08=";
+ sha256 = "sha256-pM3R85gdP2eVoXx//2tKePNAi14eM8Ut+eXR+vB0Ukk=";
};
vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4=";
@@ -22,6 +22,14 @@ buildGoModule rec {
"-X main.VERSION=v${version}"
];
+ doInstallCheck = true;
+ installCheckPhase = ''
+ runHook preInstallCheck
+ $out/bin/terragrunt --help
+ $out/bin/terragrunt --version | grep "v${version}"
+ runHook postInstallCheck
+ '';
+
meta = with lib; {
homepage = "https://terragrunt.gruntwork.io";
changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${version}";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
index f7b526f29b..748d3c89ae 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
@@ -21,11 +21,11 @@ let
in
stdenv.mkDerivation rec {
pname = "zeek";
- version = "3.2.3";
+ version = "3.2.4";
src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz";
- sha256 = "1in25clpbb2vdhms3iypj6r5sp8d1dxjcfn85c272sh7shnmqagr";
+ sha256 = "11dy4w810jms75nrr3n3dy5anrl5ksb5pmnk31z37k60hg9q9afm";
};
nativeBuildInputs = [ cmake flex bison file ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
index a18a5198d0..bb5776b65e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
@@ -1,13 +1,14 @@
-{ lib, fetchurl, appimageTools }:
+{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
+
let
pname = "deltachat-electron";
- version = "1.14.1";
+ version = "1.15.1";
name = "${pname}-${version}";
src = fetchurl {
url =
"https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
- sha256 = "0w00qr8wwrxwa2g71biyz42k8y5y766m6k876bnzq927vcjilq6b";
+ sha256 = "sha256-lItI1aIFHYQ3wGRVn4Yw0nA7qgfhyHT/43kKbY/1cgI=";
};
appimageContents = appimageTools.extract { inherit name src; };
@@ -16,6 +17,10 @@ in
appimageTools.wrapType2 {
inherit name src;
+ profile = ''
+ export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
+ '';
+
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D \
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix
index cd456b336d..c0e0c80b45 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix
@@ -3,8 +3,6 @@
, fetchFromGitLab
, pkg-config
, cmake
-, qtbase
-, qttools
, qtquickcontrols2
, qtmultimedia
, qtgraphicaleffects
@@ -26,14 +24,14 @@
mkDerivation rec {
pname = "neochat";
- version = "1.0.1";
+ version = "1.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "network";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-xGqGFJHyoZXHLv/n3UGr/KVbgs5Gc9kKKWIuKMr9DtQ=";
+ sha256 = "sha256-HvLPsU+fxlyPDP7i9OSnZ/C1RjouOQCp+4WCl6FlFJo=";
};
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 57db6a0750..927f89c949 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -23,6 +23,9 @@
, olm
, pkg-config
, nlohmann_json
+, voipSupport ? true
+, gst_all_1
+, libnice
}:
mkDerivation rec {
@@ -59,12 +62,24 @@ mkDerivation rec {
qtquickcontrols2
qtgraphicaleffects
qtkeychain
- ] ++ lib.optional stdenv.isDarwin qtmacextras;
+ ] ++ lib.optional stdenv.isDarwin qtmacextras
+ ++ lib.optionals voipSupport (with gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ (gst-plugins-good.override { qt5Support = true; })
+ gst-plugins-bad
+ libnice
+ ]);
cmakeFlags = [
"-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
];
+ preFixup = lib.optionalString voipSupport ''
+ # add gstreamer plugins path to the wrapper
+ qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+ '';
+
meta = with lib; {
description = "Desktop client for the Matrix protocol";
homepage = "https://github.com/Nheko-Reborn/nheko";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 03ef4abc2d..e821e182cd 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
- version = "1.40.0"; # Please backport all updates to the stable channel.
+ version = "1.40.1"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "1xd38a9mi23c4r873k37rzip68hfk3a4bk9j4j24v2kb3yvixrpp";
+ sha256 = "0k57r1x64w38n0295qdrf3p19d3z8m530h46ps0j2x0krhah47w7";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 7cbcc2392c..2c7efe42a8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -3,8 +3,9 @@
, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
, tl-expected, hunspell
-# TODO: Shouldn't be required:
-, pcre, xorg, util-linux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
+# Transitive dependencies:
+, pcre, xorg, util-linux, libselinux, libsepol, epoxy
+, at-spi2-core, libXtst, libthai, libdatrie
, xdg-utils
}:
@@ -22,12 +23,12 @@ let
in mkDerivation rec {
pname = "telegram-desktop";
- version = "2.5.9";
+ version = "2.6.0";
# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
- sha256 = "1311dab9cil8hl1qlh01ynrczyjbldcsq1l6ibh818wb5lsgvvl2";
+ sha256 = "18ifmvll0nnmjf8ba6r23ri9i4fggy7k2dqs3qf4f52cklmlfj06";
};
postPatch = ''
@@ -48,8 +49,9 @@ in mkDerivation rec {
dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
tl-expected hunspell
tg_owt
- # TODO: Shouldn't be required:
- pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy at-spi2-core libXtst
+ # Transitive dependencies:
+ pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy
+ at-spi2-core libXtst libthai libdatrie
];
cmakeFlags = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix
index 2eeb151beb..4432d9ddee 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix
@@ -1,22 +1,15 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkg-config, qt5
+{ lib, stdenv, fetchFromGitHub, pkg-config, qt5
, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
, alsaLib, python3
, rnnoise
-, jackSupport ? false, libjack2 ? null
-, speechdSupport ? false, speechd ? null
-, pulseSupport ? false, libpulseaudio ? null
-, iceSupport ? false, zeroc-ice ? null
-, grpcSupport ? false, grpc ? null, c-ares ? null, abseil-cpp ? null, which ? null
+, jackSupport ? false, libjack2
+, speechdSupport ? false, speechd
+, pulseSupport ? false, libpulseaudio
+, iceSupport ? false, zeroc-ice
+, grpcSupport ? false, grpc, c-ares, abseil-cpp, which
, nixosTests
}:
-assert jackSupport -> libjack2 != null;
-assert speechdSupport -> speechd != null;
-assert pulseSupport -> libpulseaudio != null;
-assert iceSupport -> zeroc-ice != null;
-assert grpcSupport -> (grpc != null && c-ares != null && abseil-cpp != null && which != null);
-
-with lib;
let
generic = overrides: source: qt5.mkDerivation (source // overrides // {
pname = overrides.type;
@@ -42,8 +35,8 @@ let
"CONFIG+=no-bundled-opus"
"CONFIG+=no-bundled-speex"
"DEFINES+=PLUGIN_PATH=${placeholder "out"}/lib/mumble"
- ] ++ optional (!speechdSupport) "CONFIG+=no-speechd"
- ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"
+ ] ++ lib.optional (!speechdSupport) "CONFIG+=no-speechd"
+ ++ lib.optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"
++ (overrides.configureFlags or [ ]);
preConfigure = ''
@@ -64,11 +57,9 @@ let
runHook postInstall
'';
- enableParallelBuilding = true;
-
passthru.tests.connectivity = nixosTests.mumble;
- meta = {
+ meta = with lib; {
description = "Low-latency, high quality voice chat software";
homepage = "https://mumble.info";
license = licenses.bsd3;
@@ -82,16 +73,16 @@ let
nativeBuildInputs = [ qt5.qttools ];
buildInputs = [ libopus libsndfile speex qt5.qtsvg rnnoise ]
- ++ optional stdenv.isLinux alsaLib
- ++ optional jackSupport libjack2
- ++ optional speechdSupport speechd
- ++ optional pulseSupport libpulseaudio;
+ ++ lib.optional stdenv.isLinux alsaLib
+ ++ lib.optional jackSupport libjack2
+ ++ lib.optional speechdSupport speechd
+ ++ lib.optional pulseSupport libpulseaudio;
configureFlags = [
"CONFIG+=no-server"
];
- NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher";
+ NIX_CFLAGS_COMPILE = lib.optional speechdSupport "-I${speechd}/include/speech-dispatcher";
installPhase = ''
# bin stuff
@@ -113,18 +104,18 @@ let
server = source: generic {
type = "murmur";
- postPatch = optional iceSupport ''
+ postPatch = lib.optional iceSupport ''
grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc-ice.dev}/share/ice/,g'
'';
configureFlags = [
"CONFIG+=no-client"
- ] ++ optional (!iceSupport) "CONFIG+=no-ice"
- ++ optional grpcSupport "CONFIG+=grpc";
+ ] ++ lib.optional (!iceSupport) "CONFIG+=no-ice"
+ ++ lib.optional grpcSupport "CONFIG+=grpc";
buildInputs = [ libcap ]
- ++ optional iceSupport zeroc-ice
- ++ optionals grpcSupport [ grpc c-ares abseil-cpp which ];
+ ++ lib.optional iceSupport zeroc-ice
+ ++ lib.optionals grpcSupport [ grpc c-ares abseil-cpp which ];
installPhase = ''
# bin stuff
diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix
index 42486458b2..163faf02af 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix
@@ -12,6 +12,7 @@
, qtkeychain
, qttools
, qtwebengine
+, qtwebsockets
, qtquickcontrols2
, qtgraphicaleffects
, sqlite
@@ -19,16 +20,17 @@
mkDerivation rec {
pname = "nextcloud-client";
- version = "3.0.3";
+ version = "3.1.3";
src = fetchFromGitHub {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
- sha256 = "0idh8i71jivdjjs2y62l22yl3qxwgcr0hf53dad587bzgkkkr223";
+ sha256 = "sha256-8Ql6tOvWOjAvMJA87WlT9TbpnbciBsjDxRuYlMVi/m8=";
};
patches = [
+ # Explicitly move dbus configuration files to the store path rather than `/etc/dbus-1/services`.
./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
];
@@ -40,6 +42,7 @@ mkDerivation rec {
buildInputs = [
inotify-tools
libcloudproviders
+ libsecret
openssl
pcre
qtbase
@@ -48,13 +51,10 @@ mkDerivation rec {
qtwebengine
qtquickcontrols2
qtgraphicaleffects
+ qtwebsockets
sqlite
];
- qtWrapperArgs = [
- "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"
- ];
-
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH
"-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit
@@ -63,7 +63,7 @@ mkDerivation rec {
meta = with lib; {
description = "Nextcloud themed desktop client";
homepage = "https://nextcloud.com";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ caugner ];
platforms = platforms.linux;
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix
index ff504aa7c0..3e5a23a3f3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "seaweedfs";
- version = "2.26";
+ version = "2.27";
src = fetchFromGitHub {
owner = "chrislusf";
repo = "seaweedfs";
rev = version;
- sha256 = "sha256-l3lgN5x7bBUP9WwDkuHRJEjhL7wr2tZmpxr6MqHoUYw=";
+ sha256 = "sha256-0KT/5seJs8GkatL4BsZ+r71t6AJrpHB6Q92sCvplKcQ=";
};
vendorSha256 = "sha256-uT/Y/TfpqDyOUElc4M/w/v77bWF3tTJz+Yu0KRMcxk4=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/websocketd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/websocketd/default.nix
index c287abb0de..636443c9b8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/websocketd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/websocketd/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "websocketd";
- version = "0.3.1";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "joewalnes";
repo = pname;
rev = "v${version}";
- sha256 = "1qc4yi4kwy7bfi3fb17w58ff0i95yi6m4syldh8j79930syr5y8q";
+ sha256 = "sha256-cp4iBSQ6Cd0+NPZ2i79Mulg1z17u//OCm3yoArbZEHs=";
};
- vendorSha256 = "05k31z4h3b327mh940zh52im4xfk7kf5phb8b7xp4l9bgckhz4lb";
+ vendorSha256 = "sha256-i5IPJ3srUXL7WWjBW9w803VSoyjwA5JgPWKsAckPYxY=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix b/third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix
index 8ea277e1af..8bd1d8f974 100644
--- a/third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee
+{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, glib, webkitgtk, libgee
, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook
, appstream, desktop-file-utils }:
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
index c917c43969..c9b1099f8b 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext
+{ stdenv, fetchurl, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
, libxml2, db, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix
index 3ed6234b4f..1a5c0de5fb 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv
-, fetchFromGitLab
+{ lib
+, stdenv
, cmake
, libGLU
, libGL
@@ -18,9 +18,7 @@
, pcre
, libpthreadstubs
, libXdmcp
-, fetchpatch
, lndir
-, callPackage
, stable
, baseName
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix
index 88bb797888..dcf51e657c 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix
@@ -15,19 +15,15 @@
, stable ? true
, oceSupport ? false
, withOCE ? false
-, opencascade
, withOCCT ? false
, withOCC ? true
-, opencascade-occt
, ngspiceSupport ? false
, withNgspice ? true
, libngspice
, scriptingSupport ? false
, withScripting ? true
-, swig
, python3
, debug ? false
-, valgrind
, with3d ? true
, withI18n ? true
, srcs ? { }
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix
index f8fbdffc63..0eed8b1692 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "ngspice";
- version = "33";
+ version = "34";
src = fetchurl {
url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz";
- sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr";
+ sha256 = "sha256-ImP//GaUdUlyr3By7wHP5irHkIANrWUbwpC/yueb17U=";
};
nativeBuildInputs = [ flex bison ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix
index 13364beed5..1cf0874120 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix
@@ -1,20 +1,20 @@
-{ lib, stdenv, fetchurl, dune, ocamlPackages }:
+{ lib, stdenv, fetchurl, dune_2, ocamlPackages }:
stdenv.mkDerivation {
pname = "acgtk";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchurl {
- url = "https://acg.loria.fr/software/acg-1.5.1-20191113.tar.gz";
- sha256 = "17595qfwhzz5q091ak6i6bg5wlppbn8zfn58x3hmmmjvx2yfajn1";
+ url = "https://acg.loria.fr/software/acg-1.5.2-20201204.tar.gz";
+ sha256 = "09yax7dyw8kgwzlb69r9d20y7rrymzwi3bbq2dh0qdq01vjz2xwq";
};
- buildInputs = [ dune ] ++ (with ocamlPackages; [
+ buildInputs = [ dune_2 ] ++ (with ocamlPackages; [
ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir mtime yojson
]);
- buildPhase = "dune build";
+ buildPhase = "dune build --profile=release";
installPhase = ''
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix
index 519b1f9813..dd72d148e2 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -9,20 +9,22 @@ let
sha256 = "124k2a4ikk4wdpmvgjpgl97x9skvr9qznk8m68dzsynzpv6yksaj";
};
+ useDune2 = true;
+
nativeBuildInputs = [ which ];
in
let alt-ergo-lib = ocamlPackages.buildDunePackage rec {
pname = "alt-ergo-lib";
- inherit version src nativeBuildInputs;
+ inherit version src useDune2 nativeBuildInputs;
configureFlags = pname;
propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ];
}; in
let alt-ergo-parsers = ocamlPackages.buildDunePackage rec {
pname = "alt-ergo-parsers";
- inherit version src nativeBuildInputs;
+ inherit version src useDune2 nativeBuildInputs;
configureFlags = pname;
buildInputs = with ocamlPackages; [ menhir ];
propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]);
@@ -30,7 +32,7 @@ let alt-ergo-parsers = ocamlPackages.buildDunePackage rec {
ocamlPackages.buildDunePackage {
- inherit pname version src nativeBuildInputs;
+ inherit pname version src useDune2 nativeBuildInputs;
configureFlags = pname;
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/hol/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/hol/default.nix
index 6fc7286154..569c455e65 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/hol/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/hol/default.nix
@@ -3,14 +3,14 @@
let
pname = "hol4";
- vnum = "10";
+ vnum = "14";
in
let
version = "k.${vnum}";
longVersion = "kananaskis-${vnum}";
holsubdir = "hol-${longVersion}";
- kernelFlag = if experimentalKernel then "-expk" else "-stdknl";
+ kernelFlag = if experimentalKernel then "--expk" else "--stdknl";
in
let
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/hol/hol/${longVersion}/${holsubdir}.tar.gz";
- sha256 = "0x2wxksr305h1lrbklf6p42lp09rbhb4rsh74g0l70sgapyiac9b";
+ sha256 = "6Mc/qsEjzxGqzt6yP6x/1Tmqpwc1UDGlwV1Gl+4pMsY=";
};
buildInputs = [polymlEnableShared graphviz fontconfig liberation_ttf];
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
cd ${holsubdir}
substituteInPlace tools/Holmake/Holmake_types.sml \
- --replace "\"/bin/mv\"" "\"mv\"" \
- --replace "\"/bin/cp\"" "\"cp\""
+ --replace "\"/bin/" "\"" \
+
for f in tools/buildutils.sml help/src-sml/DOT;
do
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
poly < tools/smart-configure.sml
- bin/build ${kernelFlag} -symlink
+ bin/build ${kernelFlag}
mkdir -p "$out/bin"
ln -st $out/bin $out/src/${holsubdir}/bin/*
@@ -81,8 +81,7 @@ stdenv.mkDerivation {
'';
homepage = "http://hol.sourceforge.net/";
license = licenses.bsd3;
+ platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ mudri ];
- platforms = with platforms; linux;
- broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix
index 931e83defd..b55e4047fe 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix
@@ -9,7 +9,6 @@
, gtk3
, glib
, pantheon
-, libsoup
, gtksourceview
, libgee
, nix-update-script
diff --git a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix
index 26ca10e3f3..e41d9bee5b 100644
--- a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib
+{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib
, future, psutil, setuptools
# Optional dependencies:
, bottle, pysnmp
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix
index a4080fbdac..a52b11bff9 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gh";
- version = "1.6.1";
+ version = "1.6.2";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
- sha256 = "03bsramq75i5sw08gdmjh94n1xh743mq6h4dzaix78i531x7y34i";
+ sha256 = "1wq8k626w3w2cnqp9gqdk7g4pjnqjjybkjgbfq5cvqsql3jdjg65";
};
vendorSha256 = "0nk5axyr3nd9cbk8wswfhqf25dks22mky3rdn6ba9s0fpxhhkr5g";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix
index 41c4e653a6..a9138fa0c8 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "lab";
- version = "0.19.0";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "zaquestion";
repo = "lab";
rev = "v${version}";
- sha256 = "1l6xsikd1113qd4y0mvjsl64gbi4327m9v4d593f27fxink39j8s";
+ sha256 = "sha256-EQqbWM/4CInFNndfD+k7embPUFLXgxRT44e/+Ik2TDs=";
};
subPackages = [ "." ];
- vendorSha256 = "07zl5xhzgrgr5skba6cds5nal58pllf10gak0ap62j1k9gk2ych2";
+ vendorSha256 = "sha256-T6kGhje3K2HnR8xRuio6AsYbSwIdbWvAk3ZSnbm1NsA=";
doCheck = false;
@@ -33,6 +33,6 @@ buildGoModule rec {
description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab";
homepage = "https://zaquestion.github.io/lab";
license = licenses.cc0;
- maintainers = with maintainers; [ marsam dtzWill ];
+ maintainers = with maintainers; [ marsam dtzWill SuperSandro2000 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix b/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix
index 1c3432b911..a9d56cc910 100644
--- a/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
- sha256 = "sha256-R1FnHgSziJ7eGL8GrUmheVZxOnUgn9TK6gObSSKe9j0=";
+ sha256 = "sha256-xgdCjo2RLp+EtUTfSiys7PURhnC00R9IOLPtz3427pA=";
};
unpackPhase = "tar xvf $src";
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix
index f060a7b2e5..2de5899aa3 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, lib, fetchpatch, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
-, pkg-config, cmake, gnumake, yasm, python2Packages
+{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
+, pkg-config, cmake, gnumake, yasm, python3Packages
, libgcrypt, libgpgerror, libunistring
-, boost, avahi, lame, autoreconfHook
+, boost, avahi, lame
, gettext, pcre-cpp, yajl, fribidi, which
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless
+, gtest, ncurses, spdlog
, libxml2, systemd
-, alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl
+, alsaLib, libGLU, libGL, fontconfig, freetype, ftgl
, libjpeg, libpng, libtiff
, libmpeg2, libsamplerate, libmad
, libogg, libvorbis, flac, libxslt
@@ -42,17 +43,18 @@ assert udevSupport -> udev != null;
assert usbSupport -> libusb-compat-0_1 != null && ! udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable
assert vdpauSupport -> libvdpau != null;
assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null;
+assert useGbm || useWayland || x11Support;
let
- kodiReleaseDate = "20200728";
- kodiVersion = "18.9";
- rel = "Leia";
+ kodiReleaseDate = "20210219";
+ kodiVersion = "19.0";
+ rel = "Matrix";
kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${kodiVersion}-${rel}";
- sha256 = "0nnf7823pixj6n2fkjc8rbdjwayvhlbglij2by4rnjzzfgmqmw20";
+ sha256 = "097dg6a7v4ia85jx1pmlpwzdpqcqxlrmniqd005q73zvgj67zc2p";
};
cmakeProto = fetchurl {
@@ -87,9 +89,9 @@ let
ffmpeg = kodiDependency rec {
name = "FFmpeg";
- version = "4.0.3";
- rev = "${version}-${rel}-18.2";
- sha256 = "1krsjlr949iy5l6ljxancza1yi6w1annxc5s6k283i9mb15qy8cy";
+ version = "4.3.1";
+ rev = "${version}-${rel}-Beta1";
+ sha256 = "1c5rwlxn6xj501iw7masdv2p6wb9rkmd299lmlkx97sw1kvxvg2w";
preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt
@@ -151,6 +153,12 @@ let
postPatch = cmakeProtoPatch;
};
+ kodi_platforms =
+ lib.optional useGbm "gbm" ++
+ lib.optional useWayland "wayland" ++
+ lib.optional x11Support "x11"
+ ;
+
in stdenv.mkDerivation {
name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}";
@@ -158,10 +166,11 @@ in stdenv.mkDerivation {
buildInputs = [
gnutls libidn libtasn1 nasm p11-kit
- libxml2 python2Packages.python
+ libxml2 python3Packages.python
boost libmicrohttpd
gettext pcre-cpp yajl fribidi libva libdrm
openssl gperf tinyxml2 taglib libssh
+ gtest ncurses spdlog
alsaLib libGL libGLU fontconfig freetype ftgl
libjpeg libpng libtiff
libmpeg2 libsamplerate libmad
@@ -210,7 +219,7 @@ in stdenv.mkDerivation {
which
pkg-config gnumake
autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
- jre_headless yasm gettext python2Packages.python flatbuffers
+ jre_headless yasm gettext python3Packages.python flatbuffers
# for TexturePacker
giflib zlib libpng libjpeg lzo
@@ -221,6 +230,8 @@ in stdenv.mkDerivation {
];
cmakeFlags = [
+ "-DAPP_RENDER_SYSTEM=${if useGbm then "gles" else "gl"}"
+ "-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}"
"-Dlibdvdcss_URL=${libdvdcss.src}"
"-Dlibdvdnav_URL=${libdvdnav.src}"
"-Dlibdvdread_URL=${libdvdread.src}"
@@ -231,14 +242,9 @@ in stdenv.mkDerivation {
"-DLIRC_DEVICE=/run/lirc/lircd"
"-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"
"-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"
- "-DPYTHON_EXECUTABLE=${buildPackages.python2Packages.python}/bin/python"
+ "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"
] ++ lib.optional useWayland [
- "-DCORE_PLATFORM_NAME=wayland"
- "-DWAYLAND_RENDER_SYSTEM=gl"
"-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++"
- ] ++ lib.optional useGbm [
- "-DCORE_PLATFORM_NAME=gbm"
- "-DGBM_RENDER_SYSTEM=gles"
];
# 14 tests fail but the biggest issue is that every test takes 30 seconds -
@@ -256,14 +262,14 @@ in stdenv.mkDerivation {
'';
postPatch = ''
- substituteInPlace xbmc/platform/linux/LinuxTimezone.cpp \
+ substituteInPlace xbmc/platform/posix/PosixTimezone.cpp \
--replace 'usr/share/zoneinfo' 'etc/zoneinfo'
'';
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
- --prefix PATH ":" "${lib.makeBinPath ([ python2Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo)}" \
+ --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo)}" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
([ curl systemd libmad libvdpau libcec libcec_platform libass ]
++ lib.optional nfsSupport libnfs
@@ -279,7 +285,7 @@ in stdenv.mkDerivation {
installCheckPhase = "$out/bin/kodi --version";
passthru = {
- pythonPackages = python2Packages;
+ pythonPackages = python3Packages;
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix
index 7d9fdcc3d0..44e5dec6b7 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, callPackage, fetchFromGitHub
-, cmake, kodiPlain, libcec_platform, tinyxml, rapidxml
+, cmake, kodiPlain, libcec_platform, tinyxml, pugixml
, steam, udev, libusb1, jsoncpp, libhdhomerun, zlib
-, python2Packages, expat, glib, nspr, nss, openssl
+, python3Packages, expat, glib, nspr, nss, openssl
, libssh, libarchive, lzma, bzip2, lz4, lzo }:
with lib;
@@ -9,7 +9,7 @@ with lib;
let self = rec {
pluginDir = "/share/kodi/addons";
- rel = "Leia";
+ rel = "Matrix";
kodi = kodiPlain;
@@ -122,6 +122,7 @@ let self = rec {
'';
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo ];
+ broken = true; # requires port to python3
};
};
@@ -151,6 +152,7 @@ let self = rec {
'';
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo ];
+ broken = true; # requires port to python3
};
};
@@ -204,6 +206,7 @@ let self = rec {
homepage = "https://forum.kodi.tv/showthread.php?tid=258159";
description = "A ROM launcher for Kodi that uses HyperSpin assets.";
maintainers = with maintainers; [ edwtjo ];
+ broken = true; # requires port to python3
};
in {
service = mkKodiPlugin {
@@ -221,14 +224,14 @@ let self = rec {
joystick = mkKodiABIPlugin rec {
namespace = "peripheral.joystick";
- version = "1.4.7";
+ version = "1.7.1";
plugin = namespace;
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
- rev = "v${version}";
- sha256 = "03gsp4kg41s3n4ib4wsv7m3krfipgwc2z07i4mnd5zvg0c4xrmap";
+ rev = "${version}-${rel}";
+ sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914";
};
meta = {
@@ -237,7 +240,7 @@ let self = rec {
maintainers = with maintainers; [ edwtjo ];
};
- extraBuildInputs = [ udev ];
+ extraBuildInputs = [ tinyxml udev ];
};
simpleplugin = mkKodiPlugin rec {
@@ -256,6 +259,7 @@ let self = rec {
homepage = src.meta.homepage;
description = "Simpleplugin API";
license = licenses.gpl3;
+ broken = true; # requires port to python3
};
};
@@ -263,14 +267,14 @@ let self = rec {
plugin = "svtplay";
namespace = "plugin.video.svtplay";
- version = "4.0.48";
+ version = "5.1.12";
src = fetchFromGitHub {
name = plugin + "-" + version + ".tar.gz";
owner = "nilzen";
repo = "xbmc-" + plugin;
- rev = "dc18ad002cd69257611d0032fba91f57bb199165";
- sha256 = "0klk1jpjc243ak306k94mag4b4s17w68v69yb8lzzydszqkaqa7x";
+ rev = "v${version}";
+ sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6";
};
meta = {
@@ -290,14 +294,14 @@ let self = rec {
steam-controller = mkKodiABIPlugin rec {
namespace = "peripheral.steamcontroller";
- version = "0.10.0";
+ version = "0.11.0";
plugin = namespace;
src = fetchFromGitHub {
owner = "kodi-game";
repo = namespace;
- rev = "ea345392ab5aa4485f3a48d2037fa8a8e8ab82de";
- sha256 = "1hbd8fdvn7xkr9csz1g9wah78nhnq1rkazl4zwa31y70830k3279";
+ rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb";
+ sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg";
};
extraBuildInputs = [ libusb1 ];
@@ -314,13 +318,13 @@ let self = rec {
plugin = "steam-launcher";
namespace = "script.steam.launcher";
- version = "3.1.4";
+ version = "3.5.1";
src = fetchFromGitHub rec {
owner = "teeedubb";
repo = owner + "-xbmc-repo";
- rev = "db67704c3e16bdcdd3bdfe2926c609f1f6bdc4fb";
- sha256 = "001a7zs3a4jfzj8ylxv2klc33mipmqsd5aqax7q81fbgwdlndvbm";
+ rev = "8260bf9b464846a1f1965da495d2f2b7ceb81d55";
+ sha256 = "1fj3ry5s44nf1jzxk4bmnpa4b9p23nrpmpj2a4i6xf94h7jl7p5k";
};
propagatedBuildInputs = [ steam ];
@@ -356,6 +360,7 @@ let self = rec {
homepage = "https://forum.kodi.tv/showthread.php?tid=187421";
description = "A comic book reader";
maintainers = with maintainers; [ edwtjo ];
+ broken = true; # requires port to python3
};
};
@@ -363,13 +368,13 @@ let self = rec {
plugin = "pvr-hts";
namespace = "pvr.hts";
- version = "4.4.14";
+ version = "8.2.2";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hts";
rev = "${version}-${rel}";
- sha256 = "1bcwcwd2yjhw85yk6lyhf0iqiclrsz7r7vpbxgc650fwqbb146gr";
+ sha256 = "0jnn9gfjl556acqjf92wzzn371gxymhbbi665nqgg2gjcan0a49q";
};
meta = {
@@ -385,13 +390,13 @@ let self = rec {
plugin = "pvr-hdhomerun";
namespace = "pvr.hdhomerun";
- version = "3.5.0";
+ version = "7.1.0";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hdhomerun";
rev = "${version}-${rel}";
- sha256 = "1zrkvfn0im2qmvqm93pa3cg8xkxv61sxlj8nsz4r5z9v9nhqadf6";
+ sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm";
};
meta = {
@@ -409,13 +414,13 @@ let self = rec {
plugin = "pvr-iptvsimple";
namespace = "pvr.iptvsimple";
- version = "3.5.7";
+ version = "7.4.2";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.iptvsimple";
rev = "${version}-${rel}";
- sha256 = "17znib7c491h2ii4gagxradh0jyvgga0d548gbk4yjj2nc9qqc6d";
+ sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr";
};
meta = {
@@ -426,7 +431,7 @@ let self = rec {
license = licenses.gpl2Plus;
};
- extraBuildInputs = [ zlib rapidxml ];
+ extraBuildInputs = [ zlib pugixml ];
};
osmc-skin = mkKodiPlugin rec {
@@ -451,7 +456,7 @@ let self = rec {
};
};
- yatp = python2Packages.toPythonModule (mkKodiPlugin rec {
+ yatp = python3Packages.toPythonModule (mkKodiPlugin rec {
plugin = "yatp";
namespace = "plugin.video.yatp";
version = "3.3.2";
@@ -467,14 +472,15 @@ let self = rec {
propagatedBuildInputs = [
simpleplugin
- python2Packages.requests
- python2Packages.libtorrent-rasterbar
+ python3Packages.requests
+ python3Packages.libtorrent-rasterbar
];
meta = {
homepage = src.meta.homepage;
description = "Yet Another Torrent Player: libtorrent-based torrent streaming for Kodi";
license = licenses.gpl3;
+ broken = true; # requires port to python3
};
});
@@ -482,13 +488,13 @@ let self = rec {
plugin = "inputstream-adaptive";
namespace = "inputstream.adaptive";
- version = "2.4.6";
+ version = "2.6.7";
src = fetchFromGitHub {
owner = "peak3d";
repo = "inputstream.adaptive";
rev = "${version}-${rel}";
- sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z";
+ sha256 = "1pwqmbr78wp12jn6rwv63npdfc456adwz0amlxf6gvgg43li6p7s";
};
extraBuildInputs = [ expat ];
@@ -509,14 +515,14 @@ let self = rec {
vfs-sftp = mkKodiABIPlugin rec {
namespace = "vfs.sftp";
- version = "1.0.6";
+ version = "2.0.0";
plugin = namespace;
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
- sha256 = "044kkzcpzvbyih4vys33r4hqw38xa82snmvl4qj1r80wnszc8af1";
+ sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk";
};
meta = with lib; {
@@ -531,14 +537,14 @@ let self = rec {
vfs-libarchive = mkKodiABIPlugin rec {
namespace = "vfs.libarchive";
- version = "1.0.7";
+ version = "2.0.0";
plugin = namespace;
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
- sha256 = "01qhv095h5j67ispm4iw18pd3kl7a0mnjkgm92al9qqiyif8lzgh";
+ sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix
index e388d5a67f..45c96fb180 100644
--- a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix
@@ -1,5 +1,4 @@
{ lib
-, fetchFromGitHub
, fetchurl
, pkg-config
, gettext
diff --git a/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix
new file mode 100644
index 0000000000..d3f87f879c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix
@@ -0,0 +1,103 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, autoreconfHook
+, autoconf-archive
+, clutter-gst
+, clutter-gtk
+, gettext
+, glib
+, gobject-introspection
+, gst-plugins-bad
+, gst-plugins-base
+, gst-plugins-good
+, gstreamer
+, gtk-doc
+, gtk3
+, intltool
+, itstool
+, libpeas
+, libxml2
+, libxplayer-plparser
+, pkg-config
+, python3
+, wrapGAppsHook
+, xapps
+, yelp-tools }:
+
+let
+ pythonenv = python3.withPackages (ps: [
+ ps.pygobject3
+ ps.dbus-python # For one plugin
+ ]);
+in
+
+stdenv.mkDerivation rec {
+ pname = "xplayer";
+ version = "2.4.0";
+
+ src = fetchFromGitHub {
+ owner = "linuxmint";
+ repo = pname;
+ rev = version;
+ sha256 = "1xcv6nr2gc0vji5afwy283v7bgx46kzgrq79hl8q9pz995qq2kbp";
+ };
+
+ # configure wants to find gst-inspect-1.0 via pkgconfig but
+ # the gstreamer toolsdir points to the wrong derivation output
+ postPatch = ''
+ substituteInPlace configure.ac \
+ --replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer.dev}/bin/gst-inspect-1.0' \
+ '';
+
+ preBuild = ''
+ makeFlagsArray+=(
+ "INCLUDES=-I${glib.dev}/include/gio-unix-2.0"
+ "CFLAGS=-Wno-error" # Otherwise a lot of deprecated warnings are treated as error
+ )
+ '';
+
+ nativeBuildInputs = [
+ autoreconfHook
+ wrapGAppsHook
+ autoconf-archive
+ gettext
+ gtk-doc
+ intltool
+ itstool
+ pkg-config
+ yelp-tools
+ ];
+
+ buildInputs = [
+ clutter-gst
+ clutter-gtk
+ glib
+ gobject-introspection
+ gst-plugins-bad
+ gst-plugins-base
+ gst-plugins-good
+ gstreamer
+ gtk3
+ libpeas
+ libxml2
+ libxplayer-plparser
+ pythonenv
+ xapps
+ # to satisfy configure script
+ pythonenv.pkgs.pygobject3
+ ];
+
+ postInstall = ''
+ wrapProgram $out/bin/xplayer \
+ --prefix PATH : ${lib.makeBinPath [ pythonenv ]}
+ '';
+
+ meta = with lib; {
+ description = "A generic media player from Linux Mint";
+ license = with licenses; [ gpl2Plus lgpl21Plus ];
+ homepage = "https://github.com/linuxmint/xplayer";
+ maintainers = with maintainers; [ tu-maurice ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/xplayer/plparser.nix b/third_party/nixpkgs/pkgs/applications/video/xplayer/plparser.nix
new file mode 100644
index 0000000000..da3daa445f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/xplayer/plparser.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, intltool
+, gobject-introspection
+, gmime
+, libxml2
+, libsoup
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+ pname = "xplayer-plparser";
+ version = "1.0.2";
+
+ src = fetchFromGitHub {
+ owner = "linuxmint";
+ repo = pname;
+ rev = version;
+ sha256 = "1i7sld8am6b1wwbpfb18v7qp17vk2a5p8xcfds50yznr30lddsb2";
+ };
+
+ nativeBuildInputs = [
+ intltool
+ pkg-config
+ gobject-introspection
+ ];
+
+ buildInputs = [
+ gmime
+ libxml2
+ libsoup
+ ];
+
+ meta = with lib; {
+ description = "Playlist parsing library for xplayer";
+ homepage = "https://github.com/linuxmint/xplayer-plparser";
+ maintainers = with maintainers; [ tu-maurice ];
+ license = licenses.lgpl2Plus;
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix
index 93f5f56ac5..885a48fd7c 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix
@@ -8,12 +8,12 @@
}:
buildPythonApplication rec {
- version = "1.28.2";
+ version = "1.28.3";
pname = "docker-compose";
src = fetchPypi {
inherit pname version;
- sha256 = "2f148b590414915d029dad7551f4cdf0b03a774dc9baa674480217236d260cc1";
+ sha256 = "78a48ef8ff4fed092261ecb1a60d9b28b7776e72ed6df591a900008039308b0f";
};
# lots of networking and other fails
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
index 6592621570..3985eca424 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
@@ -1,4 +1,6 @@
-{ lib, callPackage, runCommandLocal, writeShellScriptBin, coreutils, bubblewrap }:
+{ lib, callPackage, runCommandLocal, writeShellScriptBin, glibc, pkgsi686Linux, coreutils, bubblewrap }:
+
+let buildFHSEnv = callPackage ./env.nix { }; in
args @ {
name
@@ -60,29 +62,53 @@ let
in concatStringsSep "\n "
(map (file: "--ro-bind-try /etc/${file} /etc/${file}") files);
+ # Create this on the fly instead of linking from /nix
+ # The container might have to modify it and re-run ldconfig if there are
+ # issues running some binary with LD_LIBRARY_PATH
+ createLdConfCache = ''
+ cat > /etc/ld.so.conf < /dev/null
+ '';
init = run: writeShellScriptBin "${name}-init" ''
source /etc/profile
+ ${createLdConfCache}
exec ${run} "$@"
'';
bwrapCmd = { initArgs ? "" }: ''
blacklist=(/nix /dev /proc /etc)
ro_mounts=()
+ symlinks=()
for i in ${env}/*; do
path="/''${i##*/}"
if [[ $path == '/etc' ]]; then
- continue
+ :
+ elif [[ -L $i ]]; then
+ symlinks+=(--symlink "$(readlink "$i")" "$path")
+ blacklist+=("$path")
+ else
+ ro_mounts+=(--ro-bind "$i" "$path")
+ blacklist+=("$path")
fi
- ro_mounts+=(--ro-bind "$i" "$path")
- blacklist+=("$path")
done
if [[ -d ${env}/etc ]]; then
for i in ${env}/etc/*; do
path="/''${i##*/}"
- # NOTE: we're binding /etc/fonts from the host so we don't want to
- # override it with a path from the FHS environment.
- if [[ $path == '/fonts' ]]; then
+ # NOTE: we're binding /etc/fonts and /etc/ssl/certs from the host so we
+ # don't want to override it with a path from the FHS environment.
+ if [[ $path == '/fonts' || $path == '/ssl' ]]; then
continue
fi
ro_mounts+=(--ro-bind "$i" "/etc$path")
@@ -112,8 +138,26 @@ let
${lib.optionalString unshareCgroup "--unshare-cgroup"}
--die-with-parent
--ro-bind /nix /nix
+ # Our glibc will look for the cache in its own path in `/nix/store`.
+ # As such, we need a cache to exist there, because pressure-vessel
+ # depends on the existence of an ld cache. However, adding one
+ # globally proved to be a bad idea (see #100655), the solution we
+ # settled on being mounting one via bwrap.
+ # Also, the cache needs to go to both 32 and 64 bit glibcs, for games
+ # of both architectures to work.
+ --tmpfs ${glibc}/etc \
+ --symlink /etc/ld.so.conf ${glibc}/etc/ld.so.conf \
+ --symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \
+ --ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \
+ --remount-ro ${glibc}/etc \
+ --tmpfs ${pkgsi686Linux.glibc}/etc \
+ --symlink /etc/ld.so.conf ${pkgsi686Linux.glibc}/etc/ld.so.conf \
+ --symlink /etc/ld.so.cache ${pkgsi686Linux.glibc}/etc/ld.so.cache \
+ --ro-bind ${pkgsi686Linux.glibc}/etc/rpc ${pkgsi686Linux.glibc}/etc/rpc \
+ --remount-ro ${pkgsi686Linux.glibc}/etc \
${etcBindFlags}
"''${ro_mounts[@]}"
+ "''${symlinks[@]}"
"''${auto_mounts[@]}"
${init runScript}/bin/${name}-init ${initArgs}
)
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix
index 8b2d46c4ae..b9c719a4c7 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix
+++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }:
+{ stdenv, lib, buildEnv, writeText, writeShellScriptBin, pkgs, pkgsi686Linux }:
{ name, profile ? ""
, targetPkgs ? pkgs: [], multiPkgs ? pkgs: []
@@ -49,6 +49,9 @@ let
[ (toString gcc.cc.lib)
];
+ ldconfig = writeShellScriptBin "ldconfig" ''
+ exec ${pkgs.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@"
+ '';
etcProfile = writeText "profile" ''
export PS1='${name}-chrootenv:\u@\h:\w\$ '
export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
@@ -86,7 +89,8 @@ let
# Composes a /usr-like directory structure
staticUsrProfileTarget = buildEnv {
name = "${name}-usr-target";
- paths = [ etcPkg ] ++ basePkgs ++ targetPaths;
+ # ldconfig wrapper must come first so it overrides the original ldconfig
+ paths = [ etcPkg ldconfig ] ++ basePkgs ++ targetPaths;
extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall;
ignoreCollisions = true;
};
@@ -132,7 +136,20 @@ let
mkdir -m0755 usr
cd usr
${setupLibDirs}
- for i in bin sbin share include; do
+ ${lib.optionalString isMultiBuild ''
+ if [ -d "${staticUsrProfileMulti}/share" ]; then
+ cp -rLf ${staticUsrProfileMulti}/share share
+ fi
+ ''}
+ if [ -d "${staticUsrProfileTarget}/share" ]; then
+ if [ -d share ]; then
+ chmod -R 755 share
+ cp -rLTf ${staticUsrProfileTarget}/share share
+ else
+ cp -rLf ${staticUsrProfileTarget}/share share
+ fi
+ fi
+ for i in bin sbin include; do
if [ -d "${staticUsrProfileTarget}/$i" ]; then
cp -rsHf "${staticUsrProfileTarget}/$i" "$i"
fi
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/default.nix
index dc86a7dc58..4213598b8a 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/rust/default.nix
@@ -23,6 +23,9 @@
# Legacy hash
, cargoSha256 ? ""
+ # Name for the vendored dependencies tarball
+, cargoDepsName ? name
+
, src ? null
, srcs ? null
, unpackPhase ? null
@@ -60,7 +63,8 @@ let
cargoDeps = if cargoVendorDir == null
then fetchCargoTarball ({
- inherit name src srcs sourceRoot unpackPhase cargoUpdateHook;
+ inherit src srcs sourceRoot unpackPhase cargoUpdateHook;
+ name = cargoDepsName;
hash = cargoHash;
patches = cargoPatches;
sha256 = cargoSha256;
diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
index f8afc557cb..95c223f31f 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
@@ -10,7 +10,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec {
pname = "${name}-bin";
- version = "5.0.2";
+ version = "5.0.3";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
index d9d988cdfb..77c9a7f1d7 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
@@ -1,26 +1,26 @@
# This file was autogenerated. DO NOT EDIT!
{
- iosevka = "069qy5mnrp61da7b5yy79s9d0s3cwn5mqkqkysv8lccr91qnjgdc";
- iosevka-aile = "1b9zh017wdxlk9dlick6qwx8f2vqsrsaq5yjr79iinirc417ri67";
- iosevka-curly = "155faw2nlczp3ic2y9ck2vm21rfa1zaiswc0mfgmd3b2r6wimjrj";
- iosevka-curly-slab = "1axzan1p9slfskg8nshz4hrmw24vmbcsxf7kpz70xjs98w7wh6lh";
- iosevka-etoile = "00w4r660qaydygqvfv03i77h1q6wk8xbvrvh4wsnifl7li4xax4w";
- iosevka-slab = "0a7ndr3c0sldn902d9c50l63xrvranclsvwnj4py2m6w32s8i9nx";
- iosevka-ss01 = "0q5bh511z6qdvagk831sb1nrp9gawsjv904106clkqwak3k55v54";
- iosevka-ss02 = "1qk250yydi3ff5z3s1099xrdzpwg62lr39wxl9539a2rl0awdw3w";
- iosevka-ss03 = "02rblgk9j0bz7pyag3a8p4by76zj0z4gg8iignfff7j3yfszgfhp";
- iosevka-ss04 = "0z9aj5ll5mdgfm8brgwhwabbq31ws8qqzdyyf9s8mq30l0js2wd6";
- iosevka-ss05 = "00sclgj25vp3frk1wvlwb83z33xy45171m76jr5x9jspq5nr02fa";
- iosevka-ss06 = "1r9da69k47kiag7ba47panyj5sxgz6icpynbrnz7d7kvqwal842k";
- iosevka-ss07 = "0lvdzfha27158bs5p3njyw6gnrm53mpdacaln1bh37mwd967b689";
- iosevka-ss08 = "1l60yz475m780k6ds5h4n36p82av8ag28l1yr8z8gl7yznf2sf7b";
- iosevka-ss09 = "058ln47yv5015c4xnhmyglvdqndbdp0v8n5w73cd73nzfb4y035j";
- iosevka-ss10 = "0966wrbamjkyrjkirv2jzw86yr9l3d5vnb0azi93y0amcrkksmrw";
- iosevka-ss11 = "0y3nhjn38jvcf4ngwgir5hg4vx9fsrfxzlshmynlf7bb6krvfnaq";
- iosevka-ss12 = "09hccisb2lrakjh7fnk43znixly7qbqclmsvhp9mlbpjvlzzq03j";
- iosevka-ss13 = "117712kys0fihadpzrwqm3z25z390qjnhligr5k0wx8h0la9nwq3";
- iosevka-ss14 = "0iy4m64jnsi2b74hcmwxk0qabzgza08v9s56blg4i9mfmp8xvzlp";
- iosevka-ss15 = "0mdqfal48sfq5n3a88cgsaddcc07qwqynr662zqqpjqy98kvaz62";
- iosevka-ss16 = "0dkv3mzhl9vl7x9x0g6hc7j1mp9mnnyx7iamkvm8wcqjhwnvy0r6";
- iosevka-ss17 = "1adb1z468wfa1b707kr0ycv5d5nxpmcx44q0dizik5zyx26aq10p";
+ iosevka = "1w1y543iypvhwx27qswkvhhiwzd3ik2jklapz2g497f3ppj834g4";
+ iosevka-aile = "12dybqmcpq83xiw4k9m9fmkhj204sxb9hnqndb212vvgj3vbl0fm";
+ iosevka-curly = "09rl8l9jkqhq811h35x15s4gssig0xrzvas154gg5igrdqha5kk8";
+ iosevka-curly-slab = "19l13inmnaysz2mp7x4rh4zffa5n8qd3n727j54dd2581g9f0n9c";
+ iosevka-etoile = "0flsdjdq0jsfblnazdw82kflzwvjvqaxzsyifgbn4flgjwy46mhm";
+ iosevka-slab = "04wg7aklybwrbali53c22fs5xfgacyfkxw20bhnxqbfcsykriz11";
+ iosevka-ss01 = "07a6ghjzk8kf266bgqv8khx54cxl2hfkqnjq6n5s3bbahbs3fh4x";
+ iosevka-ss02 = "06prf0jigh1xi00lg46qw4kp416psv1xkijdpbvjkmxgmcbnqx2s";
+ iosevka-ss03 = "03ga07y7nmcky3dschlk4cjg3lcxjqra6wvsb8q9vc39qz01cnxr";
+ iosevka-ss04 = "0d17p18kbh78f4w0pvslh3r0a52d207dyp4njrqxnpzjn2w8w1kg";
+ iosevka-ss05 = "1qh1z1kffid718h2mc0f6wygkwkpc1rlj29h2ljigv8kdp4kcik6";
+ iosevka-ss06 = "0b6gn7j5qa23qpay08ri6z9jrqkcsb8m67d84bqs419rw0wdhmfr";
+ iosevka-ss07 = "0f5bj8vn9frmmhg5b971gav7379xwlg439sm2vi79vjqlp5ls5gy";
+ iosevka-ss08 = "0vqhywgly5w2j0nwmspa2ba7rk1n4jsb3lidngnpkpvpkr2w1n7z";
+ iosevka-ss09 = "1ysb28qwqjkxissqsiz67l3fj5kflf94baxwjjvqqi67f72kq8m4";
+ iosevka-ss10 = "11sdzyplb1bf8blzmj40brdnvy6z6yghvh91k27bf73rgdby7svk";
+ iosevka-ss11 = "0jrn998c8jrkjw7sa429kkgpfp897gdbikr0j9sc5b0fyjci0qdx";
+ iosevka-ss12 = "1qrnp3s3abxryi2nf8x4m5l7z83iklksr8mgwcxi07cfi8ix87jr";
+ iosevka-ss13 = "0hs3m1vc3l54xj4flgyr8m4mklgqlzf3ffcvwlp8i4a5b9cdxczh";
+ iosevka-ss14 = "112l7skaplmrn16h8lw5288ivcw1wm7mvilqrmdgswmvyxkpqdzg";
+ iosevka-ss15 = "13bbgjmw20d1dr6h8ckc2zaq0bilx494g5p94a2ighdm5d4sbk4y";
+ iosevka-ss16 = "180qfpp9ixjznk7srijbj1l2dzshb9wayqgvfmgqhl94fif23bja";
+ iosevka-ss17 = "0f1r0zad32mdqgd0ik08q07ni46w6dm93npz633azn3l9ch6hd41";
}
diff --git a/third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix b/third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix
index 82dd336e5e..7ab25da3cc 100644
--- a/third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
preInstall = ''
mv zic.o zic.o.orig
mv zic zic.orig
- make $makeFlags cc=${stdenv.cc.targetPrefix}cc AR=${stdenv.cc.targetPrefix}ar zic
+ make $makeFlags cc=${stdenv.cc.nativePrefix}cc AR=${stdenv.cc.nativePrefix}ar zic
mv zic zic-native
mv zic.o.orig zic.o
mv zic.orig zic
diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
index 198cfe40a6..4e951bfcc5 100644
--- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
@@ -8,18 +8,11 @@
, intltool
, gtk3
, libnotify
-, gnome-menus
, libxml2
-, systemd
-, upower
, gnome-online-accounts
, cinnamon-settings-daemon
, colord
, polkit
-, ibus
-, libpulseaudio
-, isocodes
-, kerberos
, libxkbfile
, cinnamon-menus
, dbus-glib
@@ -27,7 +20,6 @@
, libxklavier
, networkmanager
, libwacom
-, gnome3
, libtool
, wrapGAppsHook
, tzdata
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index f0972f8d6f..60ec6792e5 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchurl
-, fetchpatch
, vala
, meson
, ninja
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix
index 3ca257db49..a209f2d2d9 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchurl
-, fetchpatch
, pkg-config
, gtk3
, vala
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
index e20983380a..efc94e4baf 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "adoptopenjdk-icedtea-web";
- version = "1.8.4";
+ version = "1.8.5";
src = fetchFromGitHub {
owner = "AdoptOpenJDK";
repo = "IcedTea-Web";
rev = "icedtea-web-${version}";
- sha256 = "0pxijw9v5k4j840jczglx9qyfd57df390g5jdaz3qafblfg0k10n";
+ sha256 = "sha256-AC6D6n8jLdATXIXrDTHhs2QFnIZNaaZvJyFEqfxCxYQ=";
};
nativeBuildInputs = [ autoreconfHook pkg-config bc ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix
index defe78d7c3..cfbec681e8 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix
@@ -27,13 +27,13 @@ let
ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb split ]));
in stdenv.mkDerivation rec {
pname = "bluespec";
- version = "unstable-2020.11.04";
+ version = "unstable-2021.02.14";
src = fetchFromGitHub {
owner = "B-Lang-org";
repo = "bsc";
- rev = "103357f32cf63f2ca2b16ebc8e2c675ec5562464";
- sha256 = "0iikzx0fxky0fmc31lyxfldy1wixr2mayzcn24b8d76wd4ix1vk3";
+ rev = "c085ecd807d85f31d102d8bec71f5c28dc96b31d";
+ sha256 = "0c86gwhrarw78cr9c9slb9vij6kcwx3x281kbqji96qqzs0dfb32";
};
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix
index 6465435188..069380802a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix
@@ -7,11 +7,11 @@ let
};
jdk = stdenv.mkDerivation rec {
- name = "zulu11.2.3-jdk11.0.1";
+ name = "zulu11.43.21-ca-jdk11.0.9";
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz";
- sha256 = "1jxnxmy79inwf3146ygry1mzv3dj6yrzqll16j7dpr91x1p3dpqy";
+ sha256 = "1j19fb5mwdkfn6y8wfsnvxsz6wfpcab4xv439fqssxy520n6q4zs";
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-mac/";
};
diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix
index d3fa31ddd9..93eff278dc 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils, nixosTests
+{ stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils
, writeScript, common-updater-scripts, git, gnused, nix, nixfmt, majorVersion }:
with lib;
@@ -26,8 +26,8 @@ let
};
"2.13" = {
- version = "2.13.4";
- sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw";
+ version = "2.13.5";
+ sha256 = "1ah5rw6xqksiayi5i95r3pcff961q71ilishzn2kmg673z0j2b7d";
pname = "scala_2_13";
};
};
@@ -49,20 +49,22 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper ];
installPhase = ''
- mkdir -p $out
- rm bin/*.bat
- mv * $out
- # put docs in correct subdirectory
- mkdir -p $out/share/doc
- mv $out/doc $out/share/doc/${name}
- mv $out/man $out/share/man
+ runHook preInstall
+ mkdir -p $out
+ rm bin/*.bat
+ mv * $out
+ # put docs in correct subdirectory
+ mkdir -p $out/share/doc
+ mv $out/doc $out/share/doc/${name}
+ mv $out/man $out/share/man
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
--prefix PATH ":" ${coreutils}/bin \
--prefix PATH ":" ${gnugrep}/bin \
--prefix PATH ":" ${jre}/bin \
--set JAVA_HOME ${jre}
- done
+ done
+ runHook postInstall
'';
doInstallCheck = true;
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/guile/1.8.nix b/third_party/nixpkgs/pkgs/development/interpreters/guile/1.8.nix
index 93eca9a73f..6277312acc 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/guile/1.8.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/guile/1.8.nix
@@ -37,7 +37,10 @@ stdenv.mkDerivation rec {
libtool
];
- patches = [ ./cpp-4.5.patch ];
+ patches = [
+ ./cpp-4.5.patch
+ ./CVE-2016-8605.patch
+ ];
preBuild = ''
sed -e '/lt_dlinit/a lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/guile/CVE-2016-8605.patch b/third_party/nixpkgs/pkgs/development/interpreters/guile/CVE-2016-8605.patch
new file mode 100644
index 0000000000..2fc281357c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/guile/CVE-2016-8605.patch
@@ -0,0 +1,59 @@
+commit d514e3fc42eb14a1bc5846b27ef89f50ba3a5d48
+Author: Ludovic Courtès
+Date: Tue Oct 11 10:14:26 2016 +0200
+
+ Remove 'umask' calls from 'mkdir'.
+
+ Fixes .
+
+ * libguile/filesys.c (SCM_DEFINE): Remove calls to 'umask' when MODE is
+ unbound; instead, use 0777 as the mode. Update docstring to clarify
+ this.
+
+diff --git a/libguile/filesys.c b/libguile/filesys.c
+index c8acb13ef..921f765f1 100644
+--- a/libguile/filesys.c
++++ b/libguile/filesys.c
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2002, 2004, 2006, 2008 Free Software Foundation, Inc.
++/* Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2006,
++ * 2009, 2010, 2011, 2012, 2013, 2014, 2016 Free Software Foundation, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+@@ -791,26 +792,21 @@ SCM_DEFINE (scm_delete_file, "delete-file", 1, 0, 0,
+ SCM_DEFINE (scm_mkdir, "mkdir", 1, 1, 0,
+ (SCM path, SCM mode),
+ "Create a new directory named by @var{path}. If @var{mode} is omitted\n"
+- "then the permissions of the directory file are set using the current\n"
+- "umask. Otherwise they are set to the decimal value specified with\n"
+- "@var{mode}. The return value is unspecified.")
++ "then the permissions of the directory are set to @code{#o777}\n"
++ "masked with the current umask (@pxref{Processes, @code{umask}}).\n"
++ "Otherwise they are set to the value specified with @var{mode}.\n"
++ "The return value is unspecified.")
+ #define FUNC_NAME s_scm_mkdir
+ {
+ int rv;
+- mode_t mask;
++ mode_t c_mode;
+
+- if (SCM_UNBNDP (mode))
+- {
+- mask = umask (0);
+- umask (mask);
+- STRING_SYSCALL (path, c_path, rv = mkdir (c_path, 0777 ^ mask));
+- }
+- else
+- {
+- STRING_SYSCALL (path, c_path, rv = mkdir (c_path, scm_to_uint (mode)));
+- }
++ c_mode = SCM_UNBNDP (mode) ? 0777 : scm_to_uint (mode);
++
++ STRING_SYSCALL (path, c_path, rv = mkdir (c_path, c_mode));
+ if (rv != 0)
+ SCM_SYSERROR;
++
+ return SCM_UNSPECIFIED;
+ }
+ #undef FUNC_NAME
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
index 23d7f9d862..937eef2d0d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
@@ -26,5 +26,7 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ orivej eelco ];
+ # https://github.com/awslabs/aws-c-common/issues/754
+ broken = stdenv.hostPlatform.isMusl;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/entt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/entt/default.nix
index 955dd2eeb3..7f98a9f112 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/entt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/entt/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "entt";
- version = "3.5.2";
+ version = "3.6.0";
src = fetchFromGitHub {
owner = "skypjack";
repo = "entt";
rev = "v${version}";
- sha256 = "1p09p1wn8cbj17z83iyyy2498wy1gzyi2mmqi5i2cxglslbm6hy0";
+ sha256 = "sha256-XaQQOt3UekjE4QUUW6+W5M4tkTqeGjZDExJB1U1/gJ8=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
index 313a063cae..178bf64f5c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,10 +1,8 @@
{ lib, stdenv
, fetchurl
-, fetchpatch
, meson
, ninja
, gettext
-, config
, pkg-config
, python3
, gst-plugins-base
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
index a032f5f5b5..3ab25863a8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
@@ -30,6 +30,7 @@
, mpg123
, twolame
, gtkSupport ? false, gtk3 ? null
+, qt5Support ? false, qt5 ? null
, raspiCameraSupport ? false, libraspberrypi ? null
, enableJack ? true, libjack2
, libXdamage
@@ -102,7 +103,12 @@ stdenv.mkDerivation rec {
] ++ optionals gtkSupport [
# for gtksink
gtk3
- ] ++ optionals stdenv.isDarwin [
+ ] ++ optionals qt5Support (with qt5; [
+ qtbase
+ qtdeclarative
+ qtwayland
+ qtx11extras
+ ]) ++ optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Cocoa
] ++ optionals stdenv.isLinux [
libv4l
@@ -118,7 +124,8 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
- "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps
+ ] ++ optionals (!qt5Support) [
+ "-Dqt5=disabled"
] ++ optionals (!gtkSupport) [
"-Dgtk3=disabled"
] ++ optionals (!enableJack) [
@@ -131,7 +138,6 @@ stdenv.mkDerivation rec {
"-Dv4l2-gudev=disabled" # Linux-only
"-Dv4l2=disabled" # Linux-only
"-Dximagesrc=disabled" # Linux-only
- "-Dpulse=disabled" # TODO check if we can keep this enabled
] ++ optionals (!raspiCameraSupport) [
"-Drpicamsrc=disabled"
];
@@ -150,6 +156,9 @@ stdenv.mkDerivation rec {
# fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''"
doCheck = false;
+ # must be explicitely set since 5590e365
+ dontWrapQtApps = true;
+
meta = with lib; {
description = "GStreamer Good Plugins";
homepage = "https://gstreamer.freedesktop.org";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix
index 8c33e6f1b6..173422fa71 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "libavif";
- version = "0.8.4";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "AOMediaCodec";
repo = pname;
rev = "v${version}";
- sha256 = "1qvjd3xi9r89pcblxdgz4c6hqp67ss53b1x9zkg7lrik7g3lwq8d";
+ sha256 = "sha256-7p0w94Od33vjTI5wGLxmDC5P2hebAl7OwJPl1lANhKs=";
};
# reco: encode libaom slowest but best, decode dav1d fastest
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
index 170bb116a8..27487c6a31 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libfaketime";
- version = "0.9.8";
+ version = "0.9.9";
src = fetchurl {
url = "https://github.com/wolfcw/libfaketime/archive/v${version}.tar.gz";
- sha256 = "18s2hjm4sbrlg6sby944z87yslnq9s85p7j892hyr42qrlvq4a06";
+ sha256 = "sha256-V9AYEVA2HAqbXI7vBbETkvYTStosLZmOkuY9rtY5ZHw=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix
index 5ab6dde09d..43092f71c5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix
@@ -9,7 +9,6 @@
, docbook_xsl
, docbook_xml_dtd_43
, gtk3
-, gnome3
, glade
, dbus
, xvfb_run
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix
index 078865198a..05ae1af2e2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libmaxminddb";
- version = "1.5.0";
+ version = "1.5.2";
src = fetchurl {
url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "sha256-fFbnkf8qZVIV5+04ZLH/3X00o4g1d57+1WpC8Fa9WKo=";
+ sha256 = "sha256-UjcHbSUKX3wpfjMcNaQz7qrw3CBeBw5Ns1PJuhDzQKI=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix
index a5b6e3b117..8bd187b530 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libqalculate";
- version = "3.16.1";
+ version = "3.17.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "libqalculate";
rev = "v${version}";
- sha256 = "sha256-mTxxiyN4t84BD4bBysvsrvP7L+DNbP6sMlcNFg4eMF8=";
+ sha256 = "sha256-VlKJrGZOMmnWFmdwV3SchBfyRsHM78eNV+uWONLZbJI=";
};
outputs = [ "out" "dev" "doc" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix
index 10b2451e7c..24cd29dcb1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "libquotient";
- version = "0.6.4";
+ version = "0.6.5";
src = fetchFromGitHub {
owner = "quotient-im";
repo = "libQuotient";
rev = version;
- sha256 = "sha256-bWqZiRv/mJzw+WY+7dLIzYBu8jhglBqgTjiXyQ1y6IQ=";
+ sha256 = "sha256-TAfo4BkNHE8r32FPT2iDjddq2lk1yC9DrRGZurSO48c=";
};
buildInputs = [ qtbase qtmultimedia ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwnck/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwnck/default.nix
index c0019ee268..fd7d80574a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libwnck/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libwnck/default.nix
@@ -23,5 +23,8 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.gnome.org/GNOME/libwnck";
license = lib.licenses.lgpl21;
maintainers = with lib.maintainers; [ johnazoidberg ];
+ # ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found
+ # #include
+ broken = stdenv.isDarwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/log4cplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/log4cplus/default.nix
index 1e16ee96ae..e9ef841b65 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/log4cplus/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/log4cplus/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchurl }:
let
- name = "log4cplus-2.0.5";
+ name = "log4cplus-2.0.6";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/log4cplus/${name}.tar.bz2";
- sha256 = "05gb0crf440da3vcaxavglzvsldw8hsvxq3xvvj73mzniv3bz3dk";
+ sha256 = "sha256-GpY6/Q+IPWLelGsYkn0jgFH9R5NuQV6r7/4rE5fxbso=";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix
index 4fbc34bcce..ca3a081aee 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix
@@ -1,22 +1,25 @@
-{ lib, stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchFromGitLab, cmake }:
stdenv.mkDerivation rec {
pname = "olm";
- version = "3.2.1";
+ version = "3.2.2";
- src = fetchurl {
- url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz";
- sha256 = "0iacbi9iibhzifh1bk6bi5xin557lvqmbf4ccsb8drj50dbxjiyr";
+ src = fetchFromGitLab {
+ domain = "gitlab.matrix.org";
+ owner = "matrix-org";
+ repo = pname;
+ rev = version;
+ sha256 = "0qji25wiwmkxyfpraxj96c54hyayqmjkvwh0gsy5gb5pz5bp4mcy";
};
nativeBuildInputs = [ cmake ];
doCheck = true;
- meta = {
+ meta = with lib; {
description = "Implements double cryptographic ratchet and Megolm ratchet";
- license = lib.licenses.asl20;
homepage = "https://gitlab.matrix.org/matrix-org/olm";
- platforms = with lib.platforms; darwin ++ linux;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ tilpner oxzi ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix
index 5bfef9e8ba..34ebc36ebb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "openlibm";
- version = "0.7.4";
+ version = "0.7.5";
src = fetchurl {
url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
- sha256 = "sha256-61hSBNbJlWkeVUXqT/y4h8FZvwXMXuG7+Spvzd4vzK4=";
+ sha256 = "sha256-vpg7nh5A5pbou7frj2N208oK5nWubYKTZUA4Ww7uwVs=";
};
makeFlags = [ "prefix=$(out)" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix
index 448270183a..37ea3b6572 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "simdjson";
- version = "0.8.1";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "simdjson";
repo = "simdjson";
rev = "v${version}";
- sha256 = "1x5f8b5s67kf9sjx04rp81q0f3dlnqfngn3h0lrfnphipald5fji";
+ sha256 = "sha256-azRuLB03NvW+brw7A/kbgkjoDUlk1p7Ch4zZD55QiMQ=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix
index f61811428c..dbbaca7e11 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus
-, telepathy-farstream, telepathy-glib, fetchpatch }:
+, telepathy-farstream, telepathy-glib }:
let
inherit (python3Packages) python dbus-python;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix
index 85eaa1ae80..f4d1f3c407 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix
@@ -93,5 +93,7 @@ in stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ];
platforms = with platforms; unix;
+ # /nix/store/xxxxxxx-apple-framework-Security/Library/Frameworks/Security.framework/Headers/Authorization.h:192:7: error: variably modified 'bytes' at file scope
+ broken = if stdenv.isDarwin && (majorVersion == 7 || majorVersion == 8) then true else false;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
index 30fb5de7cb..dbdf3970f6 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
@@ -1,35 +1,27 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, ocaml, findlib, menhir }:
+{ lib, fetchFromGitHub, buildDunePackage, menhir }:
-if !lib.versionAtLeast ocaml.version "4.03"
-then throw "psmt2-frontend is not available for OCaml ${ocaml.version}"
-else
-
-stdenv.mkDerivation rec {
- version = "0.2";
- name = "ocaml${ocaml.version}-psmt2-frontend-${version}";
+buildDunePackage rec {
+ version = "0.3.1";
+ pname = "psmt2-frontend";
src = fetchFromGitHub {
- owner = "Coquera";
- repo = "psmt2-frontend";
+ owner = "ACoquereau";
+ repo = pname;
rev = version;
- sha256 = "097zmbrx4gp2gnrxdmsm9lkkp5450gwi0blpxqy3833m6k5brx3n";
+ sha256 = "038jrfsq09nhnzpjiishg4adk09w3aw1bpczgbj66lqqilkd6gci";
};
- prefixKey = "-prefix ";
+ useDune2 = true;
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ ocaml findlib menhir ];
+ minimumOCamlVersion = "4.03";
- createFindlibDestdir = true;
-
- installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ];
+ buildInputs = [ menhir ];
meta = {
description = "A simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
- inherit (ocaml.meta) platforms;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix
index 648cd9c203..d8c49c99eb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix
@@ -36,7 +36,7 @@
buildPythonPackage rec {
pname = "Nikola";
- version = "8.1.2";
+ version = "8.1.3";
# Nix contains only Python 3 supported version of doit, which is a dependency
# of Nikola. Python 2 support would require older doit 0.29.0 (which on the
@@ -55,7 +55,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "26f4fb1a2b0105cf0f71187c6c1eb54283767a883d1c8f4ca8c8039033217d27";
+ sha256 = "05eac356bb4273cdd05d2dd6ad676226133496c457af91987c3f0d40e2fe57ef";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix
index ca44e5a80f..cfbf3be1c4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "PyRMVtransport";
- version = "0.3.0";
+ version = "0.3.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "cgtobi";
repo = pname;
rev = "v${version}";
- sha256 = "1y412xmdskf13673igzsqsglpdc3d5r6pbm8j85csax0blv7rn1m";
+ sha256 = "1savzndg8l7rrc5dgzgsrdz9hnnjfv6qs5drznqmdw4f2rq84ypa";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/addic7ed-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/addic7ed-cli/default.nix
index bdf6aab3db..3ee3a897a9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/addic7ed-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/addic7ed-cli/default.nix
@@ -1,4 +1,6 @@
-{ lib, python3Packages, }:
+{ lib
+, python3Packages
+}:
python3Packages.buildPythonApplication rec {
pname = "addic7ed-cli";
@@ -14,6 +16,10 @@ python3Packages.buildPythonApplication rec {
pyquery
];
+ # Tests require network access
+ doCheck = false;
+ pythonImportsCheck = [ "addic7ed_cli" ];
+
meta = with lib; {
description = "A commandline access to addic7ed subtitles";
homepage = "https://github.com/BenoitZugmeyer/addic7ed-cli";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix
index 2e7c9c2401..5d9c3fe166 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix
@@ -1,10 +1,7 @@
{ lib
-
, buildPythonPackage
, fetchPypi
, pythonOlder
-, pytestrunner
-, typing-extensions
, wrapt
, aioitertools
, aiohttp
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix
index f6822ede08..8d3de12cd9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix
@@ -4,7 +4,6 @@
, asyncio-dgram
, asynctest
, buildPythonPackage
-, cryptography
, fetchFromGitHub
, poetry
, pytest-aiohttp
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix
index aae46e4e32..98ab09fd8e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "androidtv";
- version = "0.0.57";
+ version = "0.0.58";
# pypi does not contain tests, using github sources instead
src = fetchFromGitHub {
owner = "JeffLIrion";
repo = "python-androidtv";
rev = "v${version}";
- sha256 = "sha256-xOLMUf72VHeBzbMnhJGOnUIKkflnY4rV9NS/P1aYLJc=";
+ sha256 = "sha256-/5sYiYRFa8XJJ4QSxLzJBHaKfAKsGETiVDHerNQ79U8=";
};
propagatedBuildInputs = [ adb-shell pure-python-adb ]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix
index 85c6c4b638..eec01adfeb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "argon2_cffi";
- version = "19.2.0";
+ version = "20.1.0";
src = fetchPypi {
pname = "argon2-cffi";
inherit version;
- sha256 = "ffaa623eea77b497ffbdd1a51e941b33d3bf552c60f14dbee274c4070677bda3";
+ sha256 = "0zgr4mnnm0p4i99023safb0qb8cgvl202nly1rvylk2b7qnrn0nq";
};
propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
index cfc222d2d2..2b256b07f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.17.5"; # N.B: if you change this, change botocore too
+ version = "1.17.12"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-1qr7gE/KK2fGXdp4rYtK/tkB4AQHEgi4TIBNNFrZ67o=";
+ sha256 = "sha256-YvBs0eenjYqqTlJ8MnZT6abBr0FbWYNgSKkMKKJ+Xwk=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
index 05c333d939..635203f94c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.20.5"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.20.12"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-BKHfdZaB9fFxrMs1TYY7/tB3TWSk6O41/0mDV1VmCk4=";
+ sha256 = "sha256-OakjFaF6b4vBkU27Ag9S6SnxjluZpPocXYeF+RNCftg=";
};
propagatedBuildInputs = [
@@ -28,10 +28,6 @@ buildPythonPackage rec {
urllib3
];
- postPatch = ''
- substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10"
- '';
-
checkInputs = [ mock nose ];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix
index 8925c1cc8a..51a6d0d11c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "canopen";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "15d49f1f71e9989dde6e3b75fb8445c76bd223064dfc0ac629fe9ecb0e21fba9";
+ sha256 = "18d01d56ff0023795cb336cafd4810a76cf402b98b42139b201fa8c5d4ba8c06";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix
index 5445157b85..9115b1d57c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix
@@ -52,8 +52,7 @@ buildPythonPackage rec {
postPatch = ''
sed -i setup.py -e "/pip>=/c\'pip',"
substituteInPlace setup.py \
- --replace 'typing==3.6.4' 'typing' \
- --replace 'attrs>=19.3.0,<20.3.0' 'attrs'
+ --replace 'typing==3.6.4' 'typing'
'';
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix
index 83deaed67a..2228919565 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "desktop-notifier";
- version = "3.2.0";
+ version = "3.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-D8/amC6SwXkm8Ao8G2Vn9FNpbqyFJFBUVcngkW5g8k0=";
+ sha256 = "0b333594af6e54677f9620480226dbc88ec6dd7c004352de9268d01aa49467f4";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix
index abc07346ef..a9c2e4e823 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix
@@ -8,11 +8,12 @@
, numpy
, pydicom
, scipy
+, setuptools
}:
buildPythonPackage rec {
pname = "dicom2nifti";
- version = "2.2.8";
+ version = "2.2.12";
disabled = isPy27;
# no tests in PyPI dist
@@ -20,10 +21,10 @@ buildPythonPackage rec {
owner = "icometrix";
repo = pname;
rev = version;
- sha256 = "1qi2map6f4pa1l8wsif7ff7rhja6ynrjlm7w306dzvi9l25mia34";
+ sha256 = "0ddzaw0yasyi2wsh7a6r73cdcmdfbb0nh0k0n4yxp9vnkw1ag5z4";
};
- propagatedBuildInputs = [ gdcm nibabel numpy pydicom scipy ];
+ propagatedBuildInputs = [ nibabel numpy pydicom scipy setuptools ];
checkInputs = [ nose gdcm ];
checkPhase = "nosetests tests";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fuzzyfinder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fuzzyfinder/default.nix
new file mode 100644
index 0000000000..a422e5606b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fuzzyfinder/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "fuzzyfinder";
+ version = "2.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "c56d86f110866becad6690c7518f7036c20831c0f82fc87eba8fdb943132f04b";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "fuzzyfinder" ];
+
+ meta = with lib; {
+ description = "Fuzzy Finder implemented in Python";
+ homepage = "https://github.com/amjith/fuzzyfinder";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix
index 1797f1d426..c9fc464f06 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix
@@ -29,6 +29,9 @@ buildPythonPackage rec {
propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ];
+ doCheck = false;
+ pythonImportsCheck = [ "gmusicapi" ];
+
meta = with lib; {
description = "An unofficial API for Google Play Music";
homepage = "https://pypi.python.org/pypi/gmusicapi/";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix
index 1ad50642e2..3caa89d06f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix
@@ -26,6 +26,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodomex requests six ];
+ # no tests executed
+ doCheck = false;
+
+ pythonImportsCheck = [ "gpsoauth" ];
+
meta = with lib; {
description = "A python client library for Google Play Services OAuth";
homepage = "https://github.com/simon-weber/gpsoauth";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
index 107febe404..2f87f24639 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
- version = "0.37.0";
+ version = "0.38.1";
disabled = isPy27;
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "v${version}";
- sha256 = "1501lk3fjxqmzxffahbj33y795gwl96yqvk3fs86cchm6vz2gnkk";
+ sha256 = "0b2gnym7p6cwgviwdq8pg2dy28pm5535f8kkc8rzc50knqdifl7g";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix
new file mode 100644
index 0000000000..a623c859e1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, decorator
+, fetchFromGitHub
+, ply
+, pytestCheckHook
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "jsonpath-ng";
+ version = "1.5.2";
+
+ src = fetchFromGitHub {
+ owner = "h2non";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1cxjwhx0nj85a3awnl7j6afnk07awzv45qfwxl5jqbbc9cxh5bd6";
+ };
+
+ propagatedBuildInputs = [
+ decorator
+ ply
+ six
+ ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ disabledTestFiles = [
+ # Exclude tests that require oslotest
+ "tests/test_jsonpath_rw_ext.py"
+ ];
+
+ pythonImportsCheck = [ "jsonpath_ng" ];
+
+ meta = with lib; {
+ description = "JSONPath implementation for Python";
+ homepage = "https://github.com/h2non/jsonpath-ng";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix
index 1aa22a62e1..a5ca1a7ab2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix
@@ -22,8 +22,6 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements/test.txt \
--replace "pytest-sugar" ""
- substituteInPlace requirements/default.txt \
- --replace "amqp==2.5.1" "amqp~=2.5"
'';
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
index 0446299fd1..cc0ba39e64 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "libusb1";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchPypi {
inherit pname version;
- sha256 = "14ljk7rywy3fiv23dpayvk14y1ywma729r3b1x2cxf68919g2gnh";
+ sha256 = "17hqck808m59jv6m2g4hasnay44pycy3y0im01fq9jpr3ymcdbi7";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix
index 6b1d5ec2bb..ad9d09b326 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix
@@ -4,7 +4,6 @@
, impacket
, netaddr
, pypykatz
-, pytestCheckHook
}:
buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix
index a66c4077c3..50b62503ff 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix
@@ -16,7 +16,6 @@
, Kajiki
, mock
, sqlalchemy
-, uwsgi
, virtualenv
}:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix
index c51f8cb54e..7645fdaec8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix
@@ -11,6 +11,8 @@ buildPythonPackage rec {
sha256 = "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx";
};
+ dontUseCmakeConfigure = true;
+
nativeBuildInputs = with pkgs; [
swig qmake cmake
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
index 4e9f07e2cc..cfed6dd74c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "psautohint";
- version = "2.2.0";
+ version = "2.3.0";
disabled = pythonOlder "3.6";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "adobe-type-tools";
repo = pname;
rev = "v${version}";
- sha256 = "0gsgfr190xy2rnjf1gf7688xrh13ihgq10s19s4rv5hp6pmg9iaa";
+ sha256 = "1y7mqc2myn1gfzg4h018f8xza0q535shnqg6snnaqynz20i8jcfh";
fetchSubmodules = true; # data dir for tests
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix
index e4bab25fd9..8c9c0ea004 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix
@@ -5,7 +5,6 @@
, fetchFromGitHub
, pycryptodomex
, pytestCheckHook
-, pyyaml
, pytest-vcr
, pytest-asyncio
, requests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix
index de208c7a9d..bf9a9eecfb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix
@@ -1,16 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }:
buildPythonPackage rec {
pname = "pynmea2";
- version = "1.15.0";
+ version = "1.16.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8b83fa7e3e668af5e182ef1c2fd4a535433ecadf60d7b627280172d695a1646b";
+ sha256 = "0w9g5qh573276404f04b46684ydlakv30ds0x0r4kcl370ljmfsg";
};
- checkInputs = [ pytest ];
- checkPhase = "pytest";
+ checkInputs = [ pytestCheckHook ];
meta = {
homepage = "https://github.com/Knio/pynmea2";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyquery/default.nix
index 2bb2eb1c6f..40139c7956 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyquery/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyquery/default.nix
@@ -1,14 +1,15 @@
{ lib
, buildPythonPackage
-, fetchPypi
, cssselect
+, fetchPypi
, lxml
-, webob
+, pythonOlder
}:
buildPythonPackage rec {
pname = "pyquery";
- version = "1.2.9";
+ version = "1.4.3";
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
@@ -16,15 +17,19 @@ buildPythonPackage rec {
sha256 = "00p6f1dfma65192hc72dxd506491lsq3g5wgxqafi1xpg2w1xia6";
};
- propagatedBuildInputs = [ cssselect lxml webob ];
+ propagatedBuildInputs = [
+ cssselect
+ lxml
+ ];
# circular dependency on webtest
doCheck = false;
+ pythonImportsCheck = [ "pyquery" ];
meta = with lib; {
+ description = "A jquery-like library for Python";
homepage = "https://github.com/gawel/pyquery";
- description = "A jquery-like library for python";
+ changelog = "https://github.com/gawel/pyquery/blob/${version}/CHANGES.rst";
license = licenses.bsd0;
};
-
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix
new file mode 100644
index 0000000000..ceba7489e8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, cachetools
+, paho-mqtt
+, pytz
+, requests
+, requests_oauthlib
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "pysmappee";
+ version = "0.2.17";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "smappee";
+ repo = pname;
+ rev = version;
+ sha256 = "00274fbclj5kmwxi2bfx4913r4l0y8qvkfcc9d7ryalvf8jq24k6";
+ };
+
+ propagatedBuildInputs = [
+ cachetools
+ paho-mqtt
+ pytz
+ requests
+ requests_oauthlib
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "pysmappee" ];
+
+ meta = with lib; {
+ description = "Python Library for the Smappee dev API";
+ homepage = "https://github.com/smappee/pysmappee";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-olm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-olm/default.nix
index b1e01f7f4a..2a8295a65b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-olm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-olm/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonPackage, olm,
- cffi, future, isPy3k, typing }:
+{ lib, buildPythonPackage, isPy3k, olm
+, cffi, future, typing }:
buildPythonPackage {
pname = "python-olm";
inherit (olm) src version;
- sourceRoot = "${olm.name}/python";
+ sourceRoot = "source/python";
buildInputs = [ olm ];
preBuild = ''
@@ -17,12 +17,13 @@ buildPythonPackage {
future
] ++ lib.optionals (!isPy3k) [ typing ];
+ # Some required libraries for testing are not packaged yet.
doCheck = false;
+ pythonImportsCheck = [ "olm" ];
- meta = with lib; {
+ meta = {
+ inherit (olm.meta) license maintainers;
description = "Python bindings for Olm";
homepage = "https://gitlab.matrix.org/matrix-org/olm/tree/master/python";
- license = olm.meta.license;
- maintainers = [ maintainers.tilpner ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
index 6b73642aea..5df445f299 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
@@ -9,6 +9,7 @@
, protobuf
, protobuf3-to-dict
, smdebug-rulesconfig
+, pandas
}:
buildPythonPackage rec {
@@ -20,9 +21,10 @@ buildPythonPackage rec {
sha256 = "sha256-xQ1nt8FcjuoilzM5PbU8KHgirPyj9us+ykyjfgEqZhg=";
};
- doCheck = false;
-
- pythonImportsCheck = [ "sagemaker" ];
+ pythonImportsCheck = [
+ "sagemaker"
+ "sagemaker.lineage.visualizer"
+ ];
propagatedBuildInputs = [
attrs
@@ -33,8 +35,15 @@ buildPythonPackage rec {
protobuf
protobuf3-to-dict
smdebug-rulesconfig
+ pandas
];
+ doCheck = false;
+
+ postFixup = ''
+ [ "$($out/bin/sagemaker-upgrade-v2 --help 2>&1 | grep -cim1 'pandas failed to import')" -eq "0" ]
+ '';
+
meta = with lib; {
description = "Library for training and deploying machine learning models on Amazon SageMaker";
homepage = "https://github.com/aws/sagemaker-python-sdk/";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix
index 77cd359386..704549e987 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "sendgrid";
- version = "6.5.0";
+ version = "6.6.0";
src = fetchFromGitHub {
owner = pname;
repo = "sendgrid-python";
rev = version;
- sha256 = "14kqjdv49486ksc1s0m0hc4k5nf9vn1v1g489mpib01hiiqxjp1b";
+ sha256 = "sha256-R9ASHDIGuPRh4yf0FAlpjUZ6QAakYs35EFSqAPc02Q8=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix
index 1e6f8307fb..2a8267710a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix
@@ -29,10 +29,6 @@ buildPythonPackage rec {
pytest tests/unit
'';
- postPatch = ''
- substituteInPlace setup.py --replace "pyyaml~=3.12" "pyyaml~=5.1"
- '';
-
meta = with lib; {
homepage = "https://github.com/awslabs/aws-serverlessrepo-python";
description = "Helpers for working with the AWS Serverless Application Repository";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix
index b5875818b9..91c34734a8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, pythonOlder
-, geos, pytest, cython
+, geos, pytestCheckHook, cython
, numpy
}:
@@ -18,10 +18,10 @@ buildPythonPackage rec {
cython
];
- checkInputs = [ pytest ];
-
propagatedBuildInputs = [ numpy ];
+ checkInputs = [ pytestCheckHook ];
+
# environment variable used in shapely/_buildcfg.py
GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}";
@@ -38,12 +38,14 @@ buildPythonPackage rec {
})
];
- # Disable the tests that improperly try to use the built extensions
- checkPhase = ''
+ preCheck = ''
rm -r shapely # prevent import of local shapely
- py.test tests
'';
+ disabledTests = [
+ "test_collection"
+ ];
+
meta = with lib; {
description = "Geometric objects, predicates, and operations";
maintainers = with maintainers; [ knedlsepp ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix
index 3a1c890f04..389feef2b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix
@@ -21,11 +21,6 @@ buildPythonPackage rec {
sha256 = "26af5c1a3f2b76aab8c3200310f0fc783790ec5a231ffeec102e620acdd6262e";
};
- # nixpkgs version of moto is >=1.2.0, remove version pin to fix build
- postPatch = ''
- substituteInPlace ./setup.py --replace "moto==0.4.31" "moto"
- '';
-
# moto>=1.0.0 is backwards-incompatible and some tests fail with it,
# so disable tests for now
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
index 96f489ec6e..a2f6a7aae9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -57,11 +57,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
- --replace "'boto3>=1.4.4,<1.16'," "'boto3~=1.16'," \
- --replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \
- --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," \
- --replace "'idna<2.10'," "'idna'," \
- --replace "'requests<2.24.0'," "'requests',"
+ --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL',"
'';
# tests require encrypted secrets, see
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiros/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiros/default.nix
deleted file mode 100644
index edc4bbdebb..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/tiros/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ fetchPypi, buildPythonPackage
-, semantic-version, boto3, flask, docutils, requests
-}:
-
-buildPythonPackage rec {
- pname = "tiros";
- version = "1.0.44";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "d6bf7410967554ec283f9d4eabc0ce6821d6e6d36001afbdb7fe0826423d4f37";
- };
-
- patchPhase = ''
- sed -E -i "s/'([[:alnum:].-_]+)[=><]{2}[[:digit:].]*'/'\\1'/g" setup.py
- sed -i "s/'datetime',//" setup.py
- '';
-
- propagatedBuildInputs = [ semantic-version boto3 flask docutils requests ];
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix
new file mode 100644
index 0000000000..fb56173217
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, aiohttp
+, yarl
+, aresponses
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "twentemilieu";
+ version = "0.3.0";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "frenck";
+ repo = "python-twentemilieu";
+ rev = "v${version}";
+ sha256 = "1ff35sh73m2s7fh4d8p2pjwdbfljswr8b8lpcjybz8nsh0286xph";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ yarl
+ ];
+
+ checkInputs = [
+ aresponses
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "twentemilieu" ];
+
+ meta = with lib; {
+ description = "Python client for Twente Milieu";
+ homepage = "https://github.com/frenck/python-twentemilieu";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix
new file mode 100644
index 0000000000..f7c5d4d2e8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+, requests_oauthlib
+}:
+
+buildPythonPackage rec {
+ pname = "twitterapi";
+ version = "2.6.6";
+
+ src = fetchFromGitHub {
+ owner = "geduldig";
+ repo = "TwitterAPI";
+ rev = "v${version}";
+ sha256 = "0ib4yggigpkn8rp71j94xyxl20smh3d04xsa9fhyh0mws4ri33j8";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ requests_oauthlib
+ ];
+
+ # Tests are interacting with the Twitter API
+ doCheck = false;
+ pythonImportsCheck = [ "TwitterAPI" ];
+
+ meta = with lib; {
+ description = "Python wrapper for Twitter's REST and Streaming APIs";
+ homepage = "https://github.com/geduldig/TwitterAPI";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix
new file mode 100644
index 0000000000..713059ad90
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "venstarcolortouch";
+ version = "0.13";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "04y9gmxb0vsmc5c930x9ziis5v83b29kfzsgjlww3pssj69lmw1s";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "venstarcolortouch" ];
+
+ meta = with lib; {
+ description = "Python interface for Venstar ColorTouch thermostats Resources";
+ homepage = "https://github.com/hpeyerl/venstar_colortouch";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix b/third_party/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix
index d72d4aa35d..2fc9a98a26 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix
@@ -10,9 +10,6 @@
, doxygen
, ncurses
, libintl
-, numpy
-, pillow
-, six
, wxGTK
, wxmac
, IOKit
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix b/third_party/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix
index e4cb6ec79e..a86e07729d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix
@@ -6,7 +6,6 @@
, pkg-config
, python
, isPy27
-, pyopengl
, doxygen
, cairo
, ncurses
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
index 5578e03dc9..5c6fd8e3b9 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.144.0";
+ version = "0.145.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
- sha256 = "sha256-Qr/fizCV+t6SbETEqns72Xv24ucLcqi1JRXF8SAtQRU=";
+ sha256 = "sha256-6fRKXKh+hB/d2CcmZYYSlMzP1IGCl7fLdXCQ1M0wuY4=";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
index 8401e4b7ee..1c26f64b21 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "tfsec";
- version = "0.38.3";
+ version = "0.38.4";
src = fetchFromGitHub {
owner = "tfsec";
repo = pname;
rev = "v${version}";
- sha256 = "0vw62cagggqpv3q68ypz3wykhyghz6dzl59hxsahy8lr9b1npy8a";
+ sha256 = "sha256-BWWW54AXj/aV+Yar0EVZPl9fN2l29SgzpRDin1Y76BA=";
};
goPackagePath = "github.com/tfsec/tfsec";
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix
index 12fd01e5e4..1b4f74f91d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "bloop";
- version = "1.4.6";
+ version = "1.4.8";
bloop-coursier-channel = fetchurl {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json";
- sha256 = "1fx80yrf03llhxcd8az5vzralz01wdfk7000q8l04rj1ax3daqia";
+ sha256 = "1hfd5gc98bp4p4m85jva2mlkh10q10n9s5136z8620mmjq93rx70";
};
bloop-bash = fetchurl {
@@ -54,9 +54,9 @@ stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1hg02a3ildgqv8864zg08hvk4y0kmsxsg7ncbsl933rclhk2lybd"
- else if stdenv.isDarwin && stdenv.isx86_64 then "1i9kh4h5w3gr4w6rf5m7xpfqwps91mfddl1zk25v7f6vsraayam0"
- else throw "unsupported platform";
+ outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1cs3ng6bj9s7xf6c4xaiqgg5qr34abnipfgc44sy2ljklr7x0jwa"
+ else if stdenv.isDarwin && stdenv.isx86_64 then "0l9vqvzcmxya1s04cps96skw4dslh3i3ks73dl53ing50zb0ga9r"
+ else throw "unsupported platform";
};
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
index d314064904..93935e47b3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
@@ -54,12 +54,12 @@ rec {
gradle_latest = gradle_6_8;
gradle_6_8 = gradleGen rec {
- name = "gradle-6.8.1";
+ name = "gradle-6.8.3";
nativeVersion = "0.22-milestone-9";
src = fetchurl {
url = "https://services.gradle.org/distributions/${name}-bin.zip";
- sha256 = "1zfn7400k39qbiidd5zxay6v5f5xz8x4g7rrf04p71bkmws1lngx";
+ sha256 = "01fjrk5nfdp6mldyblfmnkq2gv1rz1818kzgr0k2i1wzfsc73akz";
};
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
index 9e45c3e8b9..c9518d685b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
@@ -1,5 +1,10 @@
-{ lib, stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript
-, common-updater-scripts, git, nixfmt, nix, coreutils, gnused, nixosTests }:
+{ lib
+, stdenv
+, fetchurl
+, jre
+, autoPatchelfHook
+, zlib
+}:
stdenv.mkDerivation rec {
pname = "sbt";
@@ -28,6 +33,11 @@ stdenv.mkDerivation rec {
} $out/bin/sbtn
'';
+ doInstallCheck = true;
+ installCheckPhase = ''
+ ($out/bin/sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${version} (this may take some time)'
+ '';
+
meta = with lib; {
homepage = "https://www.scala-sbt.org/";
license = licenses.bsd3;
@@ -35,35 +45,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nequissimus ];
platforms = platforms.unix;
};
-
- passthru = {
- tests = { inherit (nixosTests) sbt; };
-
- updateScript = writeScript "update.sh" ''
- #!${stdenv.shell}
- set -o errexit
- PATH=${
- lib.makeBinPath [
- common-updater-scripts
- git
- nixfmt
- nix
- coreutils
- gnused
- ]
- }
-
- oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion sbt" | tr -d '"')"
- latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:sbt/sbt.git '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
-
- if [ ! "$oldVersion" = "$latestTag" ]; then
- update-source-version sbt "$latestTag" --version-key=version --print-changes
- nixpkgs="$(git rev-parse --show-toplevel)"
- default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix"
- nixfmt "$default_nix"
- else
- echo "sbt is already up-to-date"
- fi
- '';
- };
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 20cb953ede..ad886e0c3c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
- version = "13.8.0";
+ version = "13.9.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
- sha256 = "15pf6mxma8gkzyxkzm1rjwa514p7gzabn3c474lcvsjpmp76wv68";
+ sha256 = "0zgnp6l0p1i7x6lppd24nfb6kqa8mw7rnr2p5gmwbmjv9i9zkycs";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
- sha256 = "1c4lpy7nc62rqk8bfwiy5pcgvcwx70qkz3lv9w512fr3n5hjd4c0";
+ sha256 = "06b5p9ygcnrjrisp6bcgw9s3j2zlycp8jsri259bjf7rrfbwpkma";
};
in
buildGoPackage rec {
@@ -30,7 +30,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
- sha256 = "0v0iqpllzaabkahlc5pidzzw0bjlli984pdna3f3bbg67lm5a421";
+ sha256 = "0wzqrfjg43wnf9lr34jn3ydlxi7vsnqs55pm5igba592q8ykfbxk";
};
patches = [ ./fix-shell-path.patch ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
index eacd35ed76..32c606e0e2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
@@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "liquibase";
- version = "4.3.0";
+ version = "4.3.1";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "sha256-Zwh8baMD8jt+yfsK0jpsTEU32rT+IAQGwavVT3rpRsU=";
+ sha256 = "sha256-hOemDLfkjjPXQErKKCIMl8c5EPZe40B1HlNfvg7IZKU=";
};
buildInputs = [ jre makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix
index 4d05bd3ed1..a1759df945 100644
--- a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
- version = "1.55.0";
+ version = "1.56.0";
vendorSha256 = null;
@@ -32,7 +32,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
- sha256 = "sha256-vhg5X8H4VegSDORtj1rgNKlWQo1H1e/vvO01LJkVK+A=";
+ sha256 = "sha256-rBUao5j4Bofn6uSB20TTN7G1JgKu3mQpISJp+hX28mw=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix b/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix
index 3d420bf190..7f439d9b59 100644
--- a/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "dtschema";
- version = "2020.12";
+ version = "2021.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "01de2598075909f2afb2d45277d0358645066f5bbb1770fca5f1d6f399846924";
+ sha256 = "d9f88f069068dc5dc7e895785d7172d260cbbc34cab3b52704b20e89b80c6de8";
};
nativeBuildInputs = [ setuptools_scm git ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix b/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix
index 633e13d25f..4f475440b0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix
@@ -1,5 +1,4 @@
-{ buildEnv
-, fetchurl
+{ fetchurl
, fontconfig
, freetype
, glib
diff --git a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix
index 4f2bd80526..0fd9cf1f06 100644
--- a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
let
- version = "7.5.2";
+ version = "7.5.3";
in
stdenv.mkDerivation {
pname = "flyway";
inherit version;
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
- sha256 = "sha256-oO7k6JOKUm11OYNN+tH/zqF9ucgrsnF4PcphT8+xnS8=";
+ sha256 = "sha256-XDfY/OnXSmgF2u8DMr+WgzNJD3VYw/hQ8v3cr4/jhVY=";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix b/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix
index 78038440a9..460f59dc3d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "gllvm";
- version = "1.2.9";
+ version = "1.3.0";
goPackagePath = "github.com/SRI-CSL/gllvm";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "SRI-CSL";
repo = "gllvm";
rev = "v${version}";
- sha256 = "15cgngvd9mg057iz32fk5kcprcvvavahbvfvl5ds8x7shbm60g7s";
+ sha256 = "sha256-nu6PRFk+GoN1gT1RTbX6mTPZByAGf0bSsj2C5YriGp8=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix
index 57e836d8f4..8e58a81130 100644
--- a/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "go-tools";
- version = "2020.2.1";
+ version = "2020.2.2";
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-tools";
rev = version;
- sha256 = "0a1a4dhz33grwg892436bjhgp8sygrg8yhdhy8dh6i3l6n9dalfh";
+ sha256 = "1vk9c4hsv8i3zhkyrsd0cb5mscxl35ws5bykpp5h6g366rpl0dy1";
};
vendorSha256 = "081p008sb3lkc8j6sa6n42qi04za4a631kihrd4ca6aigwkgl3ak";
diff --git a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix
index 435edd6162..d75dae12bc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gotestsum";
- version = "1.6.1";
+ version = "1.6.2";
src = fetchFromGitHub {
owner = "gotestyourself";
repo = "gotestsum";
rev = "v${version}";
- sha256 = "sha256-eJxrdR3JYqF+GexcwnyHV4xO75stEDNFzxDtky7PVc8=";
+ sha256 = "sha256-/DpsB3MS0iPYFSug3RTWOprB8tclVP6v3dbS3mC3S+g=";
};
- vendorSha256 = "sha256-VQ3/VkxoYtY71xJQj6/XAoIEH4jr4Rq4hFqFnwxzkSU=";
+ vendorSha256 = "sha256-AOdWv0PkDi8o5V71DVzAd/sRibbMf3CkqmJGmuxHtuc=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix
index e8fe27aae0..ad4304fc6e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix
@@ -28,10 +28,9 @@ stdenv.mkDerivation rec {
postInstallCheck = ''
$bin/bin/jq --help >/dev/null
+ $bin/bin/jq -r '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null
'';
- passthru.tests = { inherit (nixosTests) jq; };
-
meta = with lib; {
description = "A lightweight and flexible command-line JSON processor";
license = licenses.mit;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix
index 40b53ca693..218a396490 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "ccls";
- version = "0.20201025";
+ version = "0.20201219";
src = fetchFromGitHub {
owner = "MaskRay";
repo = "ccls";
rev = version;
- sha256 = "13v00q1bz8g0ckw1sv0zyicbc44irc00vhwxdv3vvwlvylm7s21p";
+ sha256 = "sha256-qCZYSzUh5WBQxMX6LtWRBz0VWnZVNR4v06aH9bJIb1o=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
index 2ce779be56..6f92377897 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
@@ -82,7 +82,8 @@ stdenv.mkDerivation rec {
"--with-mpfr=${mpfr.dev}"
"--with-expat" "--with-libexpat-prefix=${expat.dev}"
"--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}"
- ] ++ lib.optional (!pythonSupport) "--without-python";
+ ] ++ lib.optional (!pythonSupport) "--without-python"
+ ++ lib.optional stdenv.hostPlatform.isMusl "--disable-nls";
postInstall =
'' # Remove Info files already provided by Binutils and other packages.
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix
new file mode 100644
index 0000000000..5e0f54b2fe
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix
@@ -0,0 +1,42 @@
+{ fetchFromGitHub
+, freetype
+, gtk3
+, lib
+, meson
+, ninja
+, pkg-config
+, SDL2
+, stdenv
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gpuvis";
+ version = "20210220";
+
+ src = fetchFromGitHub {
+ owner = "mikesart";
+ repo = pname;
+ rev = "216f7d810e182a89fd96ab9fad2a5c2b1e425ea9";
+ sha256 = "15pj7gy0irlp849a85z68n184jksjri0xhihgh56rs15kq333mwz";
+ };
+
+ # patch dlopen path for gtk3
+ # python2 is wrongly added in the meson file, upstream PR: https://github.com/mikesart/gpuvis/pull/62
+ postPatch = ''
+ substituteInPlace src/hook_gtk3.h \
+ --replace "libgtk-3.so" "${lib.getLib gtk3}/lib/libgtk-3.so"
+ '';
+
+ nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook ];
+
+ buildInputs = [ SDL2 gtk3 freetype ];
+
+ meta = with lib; {
+ description = "GPU Trace Visualizer";
+ homepage = "https://github.com/mikesart/gpuvis";
+ license = licenses.mit;
+ maintainers = with maintainers; [ emantor ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix
index f444f86dbf..2db336a499 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix
@@ -1,15 +1,15 @@
-{ lib, stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }:
+{ lib, stdenv, fetchurl, bison, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }:
stdenv.mkDerivation rec {
pname = "msitools";
- version = "0.98";
+ version = "0.99";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac";
+ sha256 = "sha256-1HWTml4zayBesxN7rHM96Ambx0gpBA4GWwGxX2yLNjU=";
};
- nativeBuildInputs = [ intltool pkg-config ];
+ nativeBuildInputs = [ bison intltool pkg-config ];
buildInputs = [ glib libgsf libuuid gcab bzip2 ];
passthru = {
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
description = "Set of programs to inspect and build Windows Installer (.MSI) files";
homepage = "https://wiki.gnome.org/msitools";
license = [ licenses.gpl2 licenses.lgpl21 ];
+ maintainers = with maintainers; [ PlushBeaver ];
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix
index 47c9c15a0c..60124ef44c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terraformer";
- version = "0.8.10";
+ version = "0.8.11";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = pname;
rev = version;
- sha256 = "005i66d2gkyixqh9sk452la7z86d5x9q3njngjf4z9slcbpgk7bl";
+ sha256 = "sha256-y6cgBYiqy+M8dfcNS6iDohqyip6xAs222MJHJFhloiI=";
};
- vendorSha256 = "02i1q11nivdlkhf9chpi03p8jpa0fx9wbf79j834qv4fqy7jqf6l";
+ vendorSha256 = "sha256-PQj3+qcmN/raDrAbufAcVT+vSumGuOY47i7ZYfvx3yk=";
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix
index e3c16b09ef..8638bb5844 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-crev";
- version = "0.18.1";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "crev-dev";
repo = "cargo-crev";
rev = "v${version}";
- sha256 = "sha256-qoN9pTpmXfwaJ37MqAggiPsH4cPr+nsT6NhAUOVclSw=";
+ sha256 = "sha256-+CqWPgdPuTE9TRwQJYibRCtdyAr25sJ2sXCUEoI0VtM=";
};
- cargoSha256 = "sha256-mmd9Ds37ST+OuCt506/YbdpOOJBp7WIVZBq+bQ2SR3U=";
+ cargoSha256 = "sha256-cBuAVU/fS2HQohjDyzrhDEsgWD5CxTrTCsQeZll90IQ=";
nativeBuildInputs = [ perl pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix
index 0fbd3362b4..0f4f1740fa 100644
--- a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "sd-local";
- version = "1.0.23";
+ version = "1.0.24";
src = fetchFromGitHub {
owner = "screwdriver-cd";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-oOLNLyQjuLhSfIaiIavuJ1qWWLI0RWp7L9c0m6m5owY=";
+ sha256 = "sha256-dqjZQyh7SWkD2dBcB32pR3PgWPMGQYPo7AkOQURt0hs=";
};
vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20=";
diff --git a/third_party/nixpkgs/pkgs/development/web/cog/default.nix b/third_party/nixpkgs/pkgs/development/web/cog/default.nix
index a3639e559f..5344c1b833 100644
--- a/third_party/nixpkgs/pkgs/development/web/cog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/cog/default.nix
@@ -1,6 +1,5 @@
{ stdenv
, lib
-, fetchpatch
, fetchFromGitHub
, cmake
, pkg-config
@@ -8,7 +7,6 @@
, wayland-protocols
, libwpe
, libwpe-fdo
-, glib
, glib-networking
, webkitgtk
, makeWrapper
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v10.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v10.nix
index 495ac311b8..abb10aa444 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/v10.nix
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v10.nix
@@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "10.23.3";
- sha256 = "13za06bz17k71gcxyrx41l2j8al1kr3j627b8m7kqrf3l7rdfnsi";
+ version = "10.24.0";
+ sha256 = "1k1srdis23782hnd1ymgczs78x9gqhv77v0am7yb54gqcspp70hm";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix
index 9c5975a6e4..08b8025f9b 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix
@@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "12.20.2";
- sha256 = "0g3dxip7b5j7fzkw4b82ln93fphxn1zpdizbj1ikjv3hy00dc6ln";
+ version = "12.21.0";
+ sha256 = "17cp3sv6smpig5xq0z3xgnqdii6k8lm4n5d1nl9vasgmwsn3fbq5";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix
index ee8ea72c05..9a40bf8654 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix
@@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "14.15.5";
- sha256 = "0nv576mlmnf8pfs6yn7vsvwyg0a0xvs7m9pm4k131zjqx501v6z1";
+ version = "14.16.0";
+ sha256 = "19nz2mhmn6ikahxqyna1dn25pb5v3z9vsz9zb2flb6zp2yk4hxjf";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix
index 2c2634959b..050e752ed0 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "15.8.0";
- sha256 = "1a9h88zdzk98k618jascfrivq3v51viw60sfyxn0ci0l33vf4fp2";
+ version = "15.10.0";
+ sha256 = "1i7fdlkkyh5ssncbvxmiz894a12mww4cmj7y4qzm9ddbbvqxhj3p";
}
diff --git a/third_party/nixpkgs/pkgs/games/minecraft/default.nix b/third_party/nixpkgs/pkgs/games/minecraft/default.nix
index 3d0b53035e..c2b9718cd2 100644
--- a/third_party/nixpkgs/pkgs/games/minecraft/default.nix
+++ b/third_party/nixpkgs/pkgs/games/minecraft/default.nix
@@ -88,11 +88,11 @@ in
stdenv.mkDerivation rec {
pname = "minecraft-launcher";
- version = "2.2.1441";
+ version = "2.2.1867";
src = fetchurl {
url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
- sha256 = "03q579hvxnsh7d00j6lmfh53rixdpf33xb5zlz7659pvb9j5w0cm";
+ sha256 = "1gpagrinam595153jbxwagcq20ij2dk8nn6zajy2iyqmj12y66ay";
};
icon = fetchurl {
diff --git a/third_party/nixpkgs/pkgs/games/papermc/default.nix b/third_party/nixpkgs/pkgs/games/papermc/default.nix
index e32ec946b2..f5bf9573e6 100644
--- a/third_party/nixpkgs/pkgs/games/papermc/default.nix
+++ b/third_party/nixpkgs/pkgs/games/papermc/default.nix
@@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, bash, jre }:
let
mcVersion = "1.16.5";
- buildNum = "457";
+ buildNum = "488";
jar = fetchurl {
- url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download";
- sha256 = "1xkjaj5wgm9rmzk8mz20n9vd674fynvdgqsy96c9bfifa03lsnmc";
+ url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download";
+ sha256 = "07zgq6pfgwd9a9daqv1dab0q8cwgidsn6sszn7bpr37y457a4ka8";
};
in stdenv.mkDerivation {
pname = "papermc";
diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix
index 924714d802..42faaf287d 100644
--- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix
+++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix
@@ -134,6 +134,20 @@ in buildFHSUserEnv rec {
libuuid
libbsd
alsaLib
+
+ # needed by getcap for vr startup
+ libcap
+
+ # dependencies for mesa drivers, needed inside pressure-vessel
+ mesa.drivers
+ expat
+ wayland
+ xlibs.libxcb
+ xlibs.libXdamage
+ xlibs.libxshmfence
+ xlibs.libXxf86vm
+ llvm_11.lib
+ libelf
] ++ (if (!nativeOnly) then [
(steamPackages.steam-runtime-wrapped.override {
inherit runtimeOnly;
@@ -251,6 +265,8 @@ in buildFHSUserEnv rec {
fi
export STEAM_RUNTIME=${if nativeOnly then "0" else "/steamrt"}
+
+ export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/intel_icd.x86_64.json:/usr/share/vulkan/icd.d/intel_icd.i686.json:/usr/share/vulkan/icd.d/lvp_icd.x86_64.json:/usr/share/vulkan/icd.d/lvp_icd.i686.json:/usr/share/vulkan/icd.d/nvidia_icd.json:/usr/share/vulkan/icd.d/nvidia_icd32.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json:/usr/share/vulkan/icd.d/radeon_icd.i686.json
'' + extraProfile;
runScript = writeScript "steam-wrapper.sh" ''
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/yuzu/base.nix b/third_party/nixpkgs/pkgs/misc/emulators/yuzu/base.nix
index 89c8f2cd94..a4bb3addf8 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/yuzu/base.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/yuzu/base.nix
@@ -1,5 +1,5 @@
{ pname, version, src, branchName
-, stdenv, lib, fetchFromGitHub, wrapQtAppsHook
+, stdenv, lib, fetchFromGitHub, fetchpatch, wrapQtAppsHook
, cmake, pkg-config
, libpulseaudio, libjack2, alsaLib, sndio, ecasound
, vulkan-loader, vulkan-headers
@@ -36,15 +36,31 @@ stdenv.mkDerivation rec {
ffmpeg
];
+ patches = [
+ (fetchpatch { # Without this, yuzu tries to read version info from .git which is not present.
+ url = "https://raw.githubusercontent.com/pineappleEA/Pineapple-Linux/28cbf656e3188b80eda0031d0b2713708ecd630f/inject-git-info.patch";
+ sha256 = "1zxh5fwdr7jl0aagb3yfwd0995vyyk54f0f748f7c4rqvg6867fd";
+ })
+ ];
+
cmakeFlags = [
"-DENABLE_QT_TRANSLATION=ON"
"-DYUZU_USE_QT_WEB_ENGINE=ON"
"-DUSE_DISCORD_PRESENCE=ON"
+ # Shows errors about not being able to find .git at runtime if you do not set these
+ "-DGIT_BRANCH=\"\""
+ "-DGIT_DESC=\"\""
];
- # Trick the configure system. This prevents a check for submodule directories.
preConfigure = ''
+ # Trick the configure system. This prevents a check for submodule directories.
rm -f .gitmodules
+
+ # see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work.
+ cmakeFlagsArray+=(
+ "-DTITLE_BAR_FORMAT_IDLE=\"yuzu ${branchName} ${version}\""
+ "-DTITLE_BAR_FORMAT_RUNNING=\"yuzu ${branchName} ${version} \| \{3\}\""
+ )
'';
# Fix vulkan detection
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix
index 89a500bb31..cce501aa94 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix
@@ -4,25 +4,25 @@ let
in {
mainline = libsForQt5.callPackage ./base.nix rec {
pname = "yuzu-mainline";
- version = "517";
+ version = "546";
branchName = branch;
src = fetchFromGitHub {
owner = "yuzu-emu";
repo = "yuzu-mainline";
rev = "mainline-0-${version}";
- sha256 = "0i73yl2ycs8p9cqn25rw35cll0l6l68605f1mc1qvf4zy82jggbb";
+ sha256 = "0d6cbhp877xyjac1flkyjf6g6igzmvjlk6gcph4m04i4zivb9kf2";
fetchSubmodules = true;
};
};
early-access = libsForQt5.callPackage ./base.nix rec {
pname = "yuzu-ea";
- version = "1377";
+ version = "1480";
branchName = branch;
src = fetchFromGitHub {
owner = "pineappleEA";
repo = "pineapple-src";
rev = "EA-${version}";
- sha256 = "0jjddmcqbkns5iqjwqh51hpjviw5j12n49jwfq7xwrsns6vbpqkf";
+ sha256 = "0flc5mckmnr9gj8f78nh9nys96inlkqk3rvpgbpl0mhcg6lmlb2g";
};
};
}.${branch}
diff --git a/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix
index 20d928d944..ef8caccbc3 100644
--- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/uboot/default.nix
@@ -178,6 +178,27 @@ in {
'';
};
+ ubootNanoPCT4 = buildUBoot rec {
+ rkbin = fetchFromGitHub {
+ owner = "armbian";
+ repo = "rkbin";
+ rev = "3bd0321cae5ef881a6005fb470009ad5a5d1462d";
+ sha256 = "09r4dzxsbs3pff4sh70qnyp30s3rc7pkc46v1m3152s7jqjasp31";
+ };
+
+ defconfig = "nanopc-t4-rk3399_defconfig";
+
+ extraMeta = {
+ platforms = ["aarch64-linux"];
+ license = lib.licenses.unfreeRedistributableFirmware;
+ };
+ filesToInstall = ["u-boot.itb" "idbloader.img"];
+ postBuild = ''
+ ./tools/mkimage -n rk3399 -T rksd -d ${rkbin}/rk33/rk3399_ddr_800MHz_v1.24.bin idbloader.img
+ cat ${rkbin}/rk33/rk3399_miniloader_v1.19.bin >> idbloader.img
+ '';
+ };
+
ubootNovena = buildUBoot {
defconfig = "novena_defconfig";
extraMeta.platforms = ["armv7l-linux"];
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
index 12561880c6..1ca828fc37 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2021-02-18";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "1ee7f6c97bb73bb6e12f00e527b664c5ea0df167";
- sha256 = "1z05wvbrsjlqxaw1p4c3d16jj3g43ril56w51ld78wzkc9xh5hh9";
+ rev = "76965615558e9398ef4cc79991632a7b68a6c7bc";
+ sha256 = "06djm6di95sci45gwm1mrvd8hhiwxh59lix1p34ky0k7yjb6vygk";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -101,12 +101,12 @@ let
ansible-vim = buildVimPluginFrom2Nix {
pname = "ansible-vim";
- version = "2021-02-18";
+ version = "2021-02-20";
src = fetchFromGitHub {
owner = "pearofducks";
repo = "ansible-vim";
- rev = "70c97fab3ba6be835aa502642bdd8621b8595713";
- sha256 = "00kmjnr7sbkidcy66b60k409ggwn4rwnyx2lc4bp2cwg4d0f9rcb";
+ rev = "de933417e5d37b10d1834095fcd0a1c8c360d34a";
+ sha256 = "1fwjpkzkpwy808949iqbsgi6kxyglfyzr1d5hc1911vbayn8wyjy";
};
meta.homepage = "https://github.com/pearofducks/ansible-vim/";
};
@@ -233,12 +233,12 @@ let
awesome-vim-colorschemes = buildVimPluginFrom2Nix {
pname = "awesome-vim-colorschemes";
- version = "2021-01-29";
+ version = "2021-02-21";
src = fetchFromGitHub {
owner = "rafi";
repo = "awesome-vim-colorschemes";
- rev = "8f437c8960abbd4b29c05a19eaad8c3e792ace05";
- sha256 = "039xln6bwxa6mbwvzdfk32b3v8p4glghb3104nydscy9zbsmpick";
+ rev = "d41cf6a68af44dd74bd4a1af0b2c7f33f4475730";
+ sha256 = "1ibj1drcj56gjsqhkid3la58jj7y32ygiib3sjsw35091yamcqc2";
};
meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/";
};
@@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-02-18";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "0663608e29fda10526af83152840ca549c80e053";
- sha256 = "1h1ghwmqyss2bvz99c6cyjzi7xf8lhqlqnwxdd84d74zj2d446gv";
+ rev = "30b987585d83389e05fde6443160f570aa39e1e7";
+ sha256 = "1snz1wskla014cxk3dw290bpd0krznhwpm341a9v5vcidhciaprx";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -425,12 +425,12 @@ let
ci_dark = buildVimPluginFrom2Nix {
pname = "ci_dark";
- version = "2021-02-13";
+ version = "2021-02-21";
src = fetchFromGitHub {
owner = "chuling";
repo = "ci_dark";
- rev = "a98f31d7ab86d4886d72f50064fb85d86c6843eb";
- sha256 = "0s2mgxyzhaj9hvdinkal608yrxyigm7al22cwif6f9ls7aik20zs";
+ rev = "29eee5e5c23b3fde59192df92baf7ba775867092";
+ sha256 = "0plq37r00d5sn6hci7wn8df09dca3cigvd80pq08pcngbm4h19wl";
};
meta.homepage = "https://github.com/chuling/ci_dark/";
};
@@ -485,36 +485,36 @@ let
coc-explorer = buildVimPluginFrom2Nix {
pname = "coc-explorer";
- version = "2021-02-07";
+ version = "2021-02-19";
src = fetchFromGitHub {
owner = "weirongxu";
repo = "coc-explorer";
- rev = "8c839426885e290ff5f63d87778f6325339ecf1f";
- sha256 = "03ssv8b5pq44dnj9iplpc76js5mpwg0l77wg4zal5gx0ashgm39p";
+ rev = "e4409b415a7c299282556422c71a070ad33c8c71";
+ sha256 = "19j0p6ar0kr97xw5sxyywhy4r3wgyzplb482s23rglgxzcdfvp4c";
};
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
};
coc-fzf = buildVimPluginFrom2Nix {
pname = "coc-fzf";
- version = "2021-02-15";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "antoinemadec";
repo = "coc-fzf";
- rev = "633cf6e4564a31f970dc924338e393ca79149209";
- sha256 = "10yvw128zibyp9z49p1mpf3sbj9qgzw3831hh254f6sr9ri69vz1";
+ rev = "087ab5582607fca8e35e8afd5121b3b39b7cdb32";
+ sha256 = "0vpzhhnyybyq90c525263dan2mha64hwrmbc22kw6rwm1n9smxx8";
};
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
};
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
- version = "2021-02-09";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
- rev = "9fd7f97b9696e53066a8e62f528f26b6bc1858b0";
- sha256 = "0lnkz1janblic4a15lr9fm6r62691wpgggdq8hyc5dz0m32jr0hn";
+ rev = "228e27dd3118703b4d169b134b458635a3043918";
+ sha256 = "1wxz1bljg7p1gyasf71gm3953pkrmaafw84bmwghfgrp8l3914h2";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@@ -545,12 +545,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2021-01-28";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "a336a8bc251702d9526a6818ae56e86d92fafc0c";
- sha256 = "0jh5ik1w6qyp9scr9qxi47n7b8xgznknhsriwcpw2axs9ff00zz8";
+ rev = "2bec473a4d8eab4b6a933fc4d2c564a323fb34f8";
+ sha256 = "1a6i7mlylpbvj7dbqpd6mcfw8r7cjdjb1mdvk7snaizh7ahl2cc9";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -616,14 +616,26 @@ let
meta.homepage = "https://github.com/rhysd/committia.vim/";
};
+ compe-conjure = buildVimPluginFrom2Nix {
+ pname = "compe-conjure";
+ version = "2021-02-23";
+ src = fetchFromGitHub {
+ owner = "tami5";
+ repo = "compe-conjure";
+ rev = "809853ff8098dffcf8ba5ac89bcf07806eb8f981";
+ sha256 = "0p7p4bgkh05zy0gzmq0g9nn9npykh1l17cvfzjyhcb3n1sczpjzf";
+ };
+ meta.homepage = "https://github.com/tami5/compe-conjure";
+ };
+
compe-tabnine = buildVimPluginFrom2Nix {
pname = "compe-tabnine";
- version = "2021-02-17";
+ version = "2021-02-21";
src = fetchFromGitHub {
owner = "tzachar";
repo = "compe-tabnine";
- rev = "481cfc3bb7fa66a8fdcf4a8a2e8e226634b5f2dc";
- sha256 = "152z0ixvz89n7wfhr41fipx7mmhjkwx8r50r1mf6ik36gicw0szf";
+ rev = "d717a953dbb745289ea794e86e32deb3750a3a18";
+ sha256 = "1d8nqcfarcwxyz7cwn200g118v0gky0snvzhc22xl766pacgvslk";
};
meta.homepage = "https://github.com/tzachar/compe-tabnine/";
};
@@ -844,6 +856,18 @@ let
meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
};
+ dashboard-nvim = buildVimPluginFrom2Nix {
+ pname = "dashboard-nvim";
+ version = "2021-02-23";
+ src = fetchFromGitHub {
+ owner = "glepnir";
+ repo = "dashboard-nvim";
+ rev = "7cdd2288d5aaf986f6f23c58fa27c50311636142";
+ sha256 = "1rg63sl4q4qlxdllmrmi3x54zz2xqgf6l56zi3wv83x3zd5lj2c9";
+ };
+ meta.homepage = "https://github.com/glepnir/dashboard-nvim";
+ };
+
defx-git = buildVimPluginFrom2Nix {
pname = "defx-git";
version = "2021-01-01";
@@ -918,24 +942,24 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2021-02-17";
+ version = "2021-02-20";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "972ba554fea50378b34a6711f6d0a0e2904c6a0b";
- sha256 = "0rmknirs5a0rkcpprd7wrf5fq85590aj5wdnrmr5vp59wg8677gm";
+ rev = "2b5360f3f2965ee5a6f82e09648d0c18e78142f3";
+ sha256 = "09bya9rqzk809s5i1xda94f64jnzm3vkh8kiziclgyg42sv6in9b";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim";
- version = "2021-02-09";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
- rev = "907cf91cc491348bf383f3eb447c1be2a9330cb4";
- sha256 = "1xsri4chlzfr0zc93wl96fpy381maygc3dlvy58nz2yswdr0g103";
+ rev = "d66c706c9788aa47399485a3ec29a2a76711a188";
+ sha256 = "09bj5442xln6a98ncnq1lxkyrl8c973p9sfd02zl1a3f16sms415";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@@ -1136,12 +1160,12 @@ let
deoplete-vim-lsp = buildVimPluginFrom2Nix {
pname = "deoplete-vim-lsp";
- version = "2021-02-06";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "lighttiger2505";
repo = "deoplete-vim-lsp";
- rev = "fd80985bfd9f140c8e38b303ab325ec86c05b976";
- sha256 = "1h9xprfqrfnfs50hgiah0c2y9lafhc2lldvmc7cl8xa5p9bslxj3";
+ rev = "af5432f1e063fd4c3a5879aa8c2afe82c17dc1c9";
+ sha256 = "1s6fw6vkpl0yiya22g13v4i14w3n1ds2zr8zdlwpkk44bf0225px";
};
meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/";
};
@@ -1342,12 +1366,12 @@ let
far-vim = buildVimPluginFrom2Nix {
pname = "far-vim";
- version = "2021-01-21";
+ version = "2021-02-19";
src = fetchFromGitHub {
owner = "brooth";
repo = "far.vim";
- rev = "b3e7b62ef6820ccdcbdc6070f3573b658aafba43";
- sha256 = "0lf2vlsyk4ymhyscnpla417hvh6qdi8cablammnc5vsk1hmqvc3i";
+ rev = "e67b1dbe5842b709687c214fea38ca00f0ffe6c6";
+ sha256 = "1ljvl7p2k3bgl54srf6kvshqq16qwfa34ppj982fp2bzzal819l1";
};
meta.homepage = "https://github.com/brooth/far.vim/";
};
@@ -1511,12 +1535,12 @@ let
galaxyline-nvim = buildVimPluginFrom2Nix {
pname = "galaxyline-nvim";
- version = "2021-02-17";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "glepnir";
repo = "galaxyline.nvim";
- rev = "daf37458d9bf02783f0a0246a7d76247d60e9aac";
- sha256 = "1d53274h7465w4dxjgqmdj9c60m5yzvf92gw7h9w6hnfchin2bd4";
+ rev = "916c00d6a53ab492a46b1f8aa3e052136e804483";
+ sha256 = "18yvbxa5rc2s1qyv94d7y6jd2b10ivcv01i42w80gp2kbipp9nay";
};
meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
};
@@ -1571,12 +1595,12 @@ let
git-messenger-vim = buildVimPluginFrom2Nix {
pname = "git-messenger-vim";
- version = "2021-02-16";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "rhysd";
repo = "git-messenger.vim";
- rev = "aae5f492786aba161138fa1bce9ba42964363ad9";
- sha256 = "063j3h6jy5hi1mj9bjkg627gmk1f6x2axbj07gjg3kal2d1iy90s";
+ rev = "bac4f07c9c70aeed25d2a3f5173b782f4efe7c17";
+ sha256 = "00m9j6lvg96xaxnzg0vwridhk1m9zaxna2qcki4y2cr083bsc0vd";
};
meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
};
@@ -1691,12 +1715,12 @@ let
gundo-vim = buildVimPluginFrom2Nix {
pname = "gundo-vim";
- version = "2020-01-15";
+ version = "2021-02-21";
src = fetchFromGitHub {
owner = "sjl";
repo = "gundo.vim";
- rev = "99e6240340d9ba07b66c544daf44fa7caffbf7e7";
- sha256 = "0py35mmwnfl581isnbh33j3bjgghq17jnamdi1bg3akwyn1jyhqb";
+ rev = "c5efef192b975b8e7d5fa3c6db932648d3b76323";
+ sha256 = "1smavxh0nmx4la75b1fjh8cs2x8p8ahxls034254vnm05wiwvghh";
};
meta.homepage = "https://github.com/sjl/gundo.vim/";
};
@@ -1761,6 +1785,18 @@ let
meta.homepage = "https://github.com/urbit/hoon.vim/";
};
+ hop-nvim = buildVimPluginFrom2Nix {
+ pname = "hop-nvim";
+ version = "2021-02-23";
+ src = fetchFromGitHub {
+ owner = "phaazon";
+ repo = "hop.nvim";
+ rev = "be919d61d4136d2092f42c922f545bb8c8723fb8";
+ sha256 = "0swslw4g7i8xzzcnz5rxdr0a2g3wm471vg35drynr2r18q2hqqd1";
+ };
+ meta.homepage = "https://github.com/phaazon/hop.nvim";
+ };
+
i3config-vim = buildVimPluginFrom2Nix {
pname = "i3config-vim";
version = "2020-03-28";
@@ -2004,12 +2040,12 @@ let
julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim";
- version = "2021-02-03";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "JuliaEditorSupport";
repo = "julia-vim";
- rev = "e16cb07240903999e8c62e6d27b4aee8146d29fc";
- sha256 = "10ms35xl218kr5n02y353kg535icj0zzyrsxzzlmn99w90hbnkl7";
+ rev = "b2bda998c0e141ee9215ccc123fb7d8ddc8c9d16";
+ sha256 = "1lrhydjjriczcf05sj1gzs8yasnixar40mlbzph5fnx4d044jsk4";
};
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
};
@@ -2220,12 +2256,12 @@ let
lispdocs-nvim = buildVimPluginFrom2Nix {
pname = "lispdocs-nvim";
- version = "2021-01-27";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "tami5";
repo = "lispdocs.nvim";
- rev = "0c45512ffabc6997f74c26b9c87d4b3cb021ab19";
- sha256 = "0m4iscxwdglvlkxhzs9gzx1iqvnvgknqxgss5k00wr0nrax8q3pl";
+ rev = "2410236d448aa8f407f6a203d90282c34d48b52a";
+ sha256 = "0kkg7nbnqj1v46bqq73l58m743p0p7jcbgpscjb16n9ab0n8jqns";
};
meta.homepage = "https://github.com/tami5/lispdocs.nvim/";
};
@@ -2268,24 +2304,24 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim";
- version = "2021-02-18";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
- rev = "ef1997dea263b7043d424034e9c4f5150105b911";
- sha256 = "113y7mbvcqc13ffxcaj468ldfrxq6p3jifv5cjgf33wkjjd1hclf";
+ rev = "1fb30cb0334a0b12aa1dbf40a00e7a06c9539f44";
+ sha256 = "0kvfbcck0f3nj5fb08yr2yfpp0cszxxp556jix59g3y6drah6bnn";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
- version = "2021-02-17";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
- rev = "0dd0a23cac1adeaa4dbfc15b4a5cabe44ed59401";
- sha256 = "11bl6gs63wkvb0pjxpx03ls8s27z1rn9llbrrcaf3fbkff2qbrsy";
+ rev = "e59ac51ca90fe1b914e94be2f38292c81388912c";
+ sha256 = "0v1ijxmqyjk05xzcx2nycrpqbyahai8y380qd9xyl4gmgyfmhvs9";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@@ -2352,12 +2388,12 @@ let
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap-vim";
- version = "2021-02-11";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
- rev = "05a9ef7981ff6438e3de5e30323474092badccb8";
- sha256 = "1nr40222fcf1zfacwn2qdzzr074kvcp0p50ii8s6na99qp00nq78";
+ rev = "fcf8aa05f3a3c128011236147b4cd1ced718b671";
+ sha256 = "1ya5scd3rwiypiwj3xgwr153n3a1d4mg9r5m1wbj3cb7x0s6ddjk";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@@ -2580,12 +2616,12 @@ let
neco-ghc = buildVimPluginFrom2Nix {
pname = "neco-ghc";
- version = "2020-12-19";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "eagletmt";
repo = "neco-ghc";
- rev = "ba23875fadc5e9022acb9d746b99f6fe5155d586";
- sha256 = "08q3wlaq6a8acfcbhh3gdhzwn5rr7w18aqqww0z76hgblav11a4k";
+ rev = "699897c2f4ba82c4fd2be6b93c9a2e8e548efe4e";
+ sha256 = "03g2mky83a5zd54wzjhc1cv4pwkzcadskjm1c7b36k85yw35v88a";
};
meta.homepage = "https://github.com/eagletmt/neco-ghc/";
};
@@ -2916,12 +2952,12 @@ let
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
- version = "2021-02-15";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
- rev = "3ce7f98158e604d4578f44ed4181b6f9a4d37900";
- sha256 = "0plkpb1rk82q5plsjnqkwwpdp4knbn93ai6b2c83kwbfiqrka31i";
+ rev = "c1764beef2ceba2adb62de5ed89475c71f183a57";
+ sha256 = "0h8b2hnqn21lyzla8w79sl8r702702dyi0q8jr1kpqny0s57s0jg";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@@ -2964,12 +3000,12 @@ let
nvim-gdb = buildVimPluginFrom2Nix {
pname = "nvim-gdb";
- version = "2021-02-15";
+ version = "2021-02-20";
src = fetchFromGitHub {
owner = "sakhnik";
repo = "nvim-gdb";
- rev = "53fc0cee121ef05e719b1df1beacfe0dc07c4520";
- sha256 = "0ldyr1s5zr67viywkwzmjvrb8fi4il00w6ps4kddw2g4fp8ilk8n";
+ rev = "b70aa802940db871b6a6b1e9668c5a3052327134";
+ sha256 = "0ihij29p38669bdkc5mpbrdszs6iijsbm835n5qp6gj16768jasw";
};
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
};
@@ -3036,12 +3072,12 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-02-17";
+ version = "2021-02-20";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "443d7552aca03c03a59e2c084c2e851c281e51de";
- sha256 = "0rh3c52wpgqsvhnsfmp8764d92lckz2c9bzi7kgpjmya4ynr5gzj";
+ rev = "a21a509417aa530fb7b54020f590fa5ccc67de77";
+ sha256 = "1xlksbcv6va3ih9zg6yw5x6q2d76pr5cs942lh5gcypkx9m2f6r5";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -3060,24 +3096,24 @@ let
nvim-peekup = buildVimPluginFrom2Nix {
pname = "nvim-peekup";
- version = "2021-02-17";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "gennaro-tedesco";
repo = "nvim-peekup";
- rev = "a89aed9833e71d9065ba80c4237a8e4dec2034b1";
- sha256 = "1jsphd9ghwzfzl8plxjvra2b5q3zxlv1679r9mxsp9nz33h1jblr";
+ rev = "dde78e4adba0192c3986b20de28d26eca315dec6";
+ sha256 = "1hmdrw60glr0lgixwblns73xzc6l5i1yfl7g64lp9plm8gkzb48b";
};
meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/";
};
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
- version = "2021-01-09";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
- rev = "426fc6549aff1d5a1b84127dd80807a4f134d4ab";
- sha256 = "0yadrawg9q49fiizn4k8ng9hsp9vi2l0bw73s6ib0szg641k1w42";
+ rev = "ae7b979a87ff284c2381e6b6d36ac35ac0bbfd84";
+ sha256 = "0dh2wspygagcxzscl2626nhb8pnwqyjzsgivy162xmmy3g0sbppw";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@@ -3096,24 +3132,24 @@ let
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
- version = "2021-02-16";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "58a5e4ab48f201a80d58af965cbaa8468ad64144";
- sha256 = "12dz1x36dwr0wfilb5va42mmqvdar4ibgzanqf80myv0zjg1wc03";
+ rev = "905afba20900caea1e6f0f541c2ed7302de9f598";
+ sha256 = "1hcqplvlk2cymxv7lx0yv7m5gc8p4281q1s3rhizvf4jvv973g59";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-02-17";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "5757f8a50d5d26b8c184b3a51713db763cdd9702";
- sha256 = "077h9j4rk4fckr3zw61hvyp0b22z0wlpdysjl8dc7f69cfxa42ix";
+ rev = "2d82a7fe07f3e4959219e231a58e0707d577262e";
+ sha256 = "0qzv0vr89mj58aas30bqh3w479njd84qw7c965f9489p5sg9wg8x";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -3288,12 +3324,12 @@ let
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
- version = "2021-02-15";
+ version = "2021-02-18";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "19d24934cf6f132e84a03e722eb20458c4061870";
- sha256 = "0gq2xznchnb2wqqz79qdvv2cfn1adrgy8n8drq5p7cxs067nx4bl";
+ rev = "e6b4bacf355c9ef2daed4ff40887f949da9da019";
+ sha256 = "1x7m2pw2klk4m4hv0h5cjxzr46ljiyxrmwq4c38zbk2x5mncy5jr";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -3384,12 +3420,12 @@ let
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
- version = "2021-02-12";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "877f7997c61bba8efa55950761dd23403ca3bc1e";
- sha256 = "11z44n8f2jmzi6m88g6r9zvgszkbnjrm9y7a247imcfq40p7yyma";
+ rev = "116aedc7fb327eda6e7c05915f3d97088569c0e8";
+ sha256 = "1mnf12bzdcpy0sgwl45sjxvzzifyy9k8mx7ffr7q8ddxwvbmmakp";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -3757,12 +3793,12 @@ let
sideways-vim = buildVimPluginFrom2Nix {
pname = "sideways-vim";
- version = "2021-02-13";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "sideways.vim";
- rev = "3cb3b47646c95316a739e660d1501d7a85d7f2e5";
- sha256 = "0a9d4m2gjn9kajfl3dzdxxahly5lrfn46wj0nyfscx0ypz38fr7a";
+ rev = "1a7f12cb1f878063d675924ac97f242950805541";
+ sha256 = "1nmicnq2b6n8a9zmgqqkzd9y47x2d11n75ix114qv3xyin0vqnqc";
};
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
};
@@ -3815,6 +3851,18 @@ let
meta.homepage = "https://github.com/gorkunov/smartpairs.vim/";
};
+ snippets-nvim = buildVimPluginFrom2Nix {
+ pname = "snippets-nvim";
+ version = "2021-02-23";
+ src = fetchFromGitHub {
+ owner = "norcalli";
+ repo = "snippets.nvim";
+ rev = "7b5fd8071d4fb6fa981a899aae56b55897c079fd";
+ sha256 = "1fdsx7d5nyhhklwidgh387ijd485g2836rwd5i1r0di777mp7w80";
+ };
+ meta.homepage = "https://github.com/norcalli/snippets.nvim";
+ };
+
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
version = "2021-02-14";
@@ -3913,12 +3961,12 @@ let
splitjoin-vim = buildVimPluginFrom2Nix {
pname = "splitjoin-vim";
- version = "2021-02-13";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "splitjoin.vim";
- rev = "966a3123a7d80333878443c0011e451c29f157cb";
- sha256 = "19kjvx49vpnl5xs5bib7xqrl5vnqqzavndkwl3cg34mnhnjfzka3";
+ rev = "df823938421e66adbd6c570bacdc3ce85d6c776c";
+ sha256 = "02hcdsdvbdybcpamj304jld4sh3mxp3j78idzv7ybkizvp8wjlpd";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -3948,6 +3996,18 @@ let
meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
};
+ stan-vim = buildVimPluginFrom2Nix {
+ pname = "stan-vim";
+ version = "2020-08-05";
+ src = fetchFromGitHub {
+ owner = "eigenfoo";
+ repo = "stan-vim";
+ rev = "9d3b6ec149f9559bd9bd021dfa827c29c5d1dc38";
+ sha256 = "0qv748m1vrp1qcl41y7fj2jm8cac9b01ljq6ydq3z4syxdf7yzcc";
+ };
+ meta.homepage = "https://github.com/eigenfoo/stan-vim/";
+ };
+
starsearch-vim = buildVimPluginFrom2Nix {
pname = "starsearch-vim";
version = "2014-09-21";
@@ -4106,12 +4166,12 @@ let
telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency-nvim";
- version = "2021-02-10";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-frecency.nvim";
- rev = "ffa2027102f75e28dd8d8c2a97f3b9163dd80b56";
- sha256 = "1ipxqkfaqc75qzpj7vg3gr44r8fcx979pyf84wibxic3kby9qp7y";
+ rev = "8b584bd88fbbeac0ce5c52af1ce7c1fecb7155b6";
+ sha256 = "0a6sz6gx1qnr0ka9510mchca3b94553liw8ng386h60kh6lbc1k5";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
};
@@ -4143,12 +4203,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
- version = "2021-02-12";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "1c5e42a6a5a6d29be8fbf8dcefb0d8da535eac9a";
- sha256 = "088scjf7iz4j3l0zl3sn4db6w6h456wrlz1g30fgz378cs022d35";
+ rev = "d7c02e3b52b5a13265e071d0de2d6a989110a515";
+ sha256 = "1xd080ysfi9mvxhv717cgsah7qk5z7ci0gxmq9sls6rsjrk8dykv";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -4924,12 +4984,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-02-16";
+ version = "2021-02-19";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "3985754b78d05858ec24538a708a6fcaed0ea2ad";
- sha256 = "1zsh1h6abrcry32hcrkxys182g098vrs4k74wisk5mcwd3wvgarx";
+ rev = "b6d82bc748a80577a31f2a40eb36947d70197a67";
+ sha256 = "0w7yhqzdiknqm2y2cyx04sqmyr0sixfk1lrxbmra01d4sv4p7lis";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -5200,12 +5260,12 @@ let
vim-devicons = buildVimPluginFrom2Nix {
pname = "vim-devicons";
- version = "2021-02-02";
+ version = "2021-02-19";
src = fetchFromGitHub {
owner = "ryanoasis";
repo = "vim-devicons";
- rev = "0329d89c5114dc285939050fd5777dbcc450ddd7";
- sha256 = "0g8pipayg643xjs3dmpbwp91ycyg8b20qgr0mnmxzll0nan8zjny";
+ rev = "4d14cb82cf7381c2f8eca284d1a757faaa73b159";
+ sha256 = "1wwqchf50c19a5d5g037rjjpskn7dpsq9alhzim2x6bgffb5yamd";
};
meta.homepage = "https://github.com/ryanoasis/vim-devicons/";
};
@@ -5428,12 +5488,12 @@ let
vim-erlang-tags = buildVimPluginFrom2Nix {
pname = "vim-erlang-tags";
- version = "2021-02-03";
+ version = "2021-02-19";
src = fetchFromGitHub {
owner = "vim-erlang";
repo = "vim-erlang-tags";
- rev = "125d494953da1746bc16cb716019a3d855fd3536";
- sha256 = "1kaihn3bnw9pdr18vg09ya4ijjv0an6jzzva96v06lid2i66i9wi";
+ rev = "d7eaa8f6986de0f266dac48b7dcfbf41d67ce611";
+ sha256 = "03wxy29z0rjnf3hilap7c86di7dkjwb8sdlfh74ch8vhan8h6rv0";
};
meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/";
};
@@ -5560,12 +5620,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
- version = "2021-02-18";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
- rev = "c831ca0d8918fc7dcee78c9d3cce60ed926b88e9";
- sha256 = "0gd3qsfdmamvd7arlg8b364hzyhph8ci7n9vf3rl4g70lyk7zlm1";
+ rev = "c66412d238bd2e6c7b84c01a7e92b399bfbf1915";
+ sha256 = "0mlvm6x754251pcd9hdwwnjfbwnvkbpywfnyp090dkvhlx19rm0w";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@@ -5608,12 +5668,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2021-02-16";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "c63bc47c44f4ad259300549fc02939ab2401ba79";
- sha256 = "1kmxm6spwzgyskdk8s32k93v8k0njfka3gq28wxnbswydnzszgrz";
+ rev = "6c4c7c9aebc4c65c13f94597e4c9352dbba21fa5";
+ sha256 = "09q6ijr3f6aaki17cpidn02lxk00gficsclg1zcprxcq8fp8v8d1";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -5680,12 +5740,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2021-02-16";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "b90aad666aa7163b08d744d4585eefa4eaabb6ad";
- sha256 = "1jz9rvkyd05jw6mwcp96j0wscxnkm95g55pvzkidfn2fcjnl9ab6";
+ rev = "1283ec1670d1f4fce37213c5d66924088b2e730c";
+ sha256 = "1h5jh38ihbyy95cm57ppb6m871010pk521ygss2drcriwnx4agd2";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@@ -5728,12 +5788,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2021-02-14";
+ version = "2021-02-20";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "08615366d82d0ceaee73a995e8dab75df63e2897";
- sha256 = "0fn0hi0irmb4ri4skdandahzl6zn916fxi31f8mhcrws72izqxzj";
+ rev = "755b498c7604e7aee4d001d2a78c2d1e079eb8d5";
+ sha256 = "048xqia30alvcshvmbqlqvvslk19zvqmsdy50ww8rzz9yzhff5bw";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -6354,12 +6414,12 @@ let
vim-localvimrc = buildVimPluginFrom2Nix {
pname = "vim-localvimrc";
- version = "2020-06-30";
+ version = "2021-02-18";
src = fetchFromGitHub {
owner = "embear";
repo = "vim-localvimrc";
- rev = "ac6444afb5fd11e3f7750f696a0c6b8b0b6ec116";
- sha256 = "182fvmfnpcqda0cm878lk79iprxsd7nb9r97jmr7lx5agdcvzaqb";
+ rev = "0206f5f5a8721cc8c5c84ebb8ab2886e9afcd0ac";
+ sha256 = "1zin6pk581cnkivm2kgks0wrvpxjcl1y3x46wpkzdqg1hhif2129";
};
meta.homepage = "https://github.com/embear/vim-localvimrc/";
};
@@ -6390,12 +6450,12 @@ let
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2021-02-12";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "6f8dfe19d59041a606f30b7764ccd51d4299d0e5";
- sha256 = "0rqlzp5qbidd1f02yx1l1cf0a5bdl7ha4wsixakixdrsy4ws68fh";
+ rev = "a78536ad745852c73cdf2d0defffd6b81bc377f0";
+ sha256 = "06xpv6k80jyrd6psjhrwq84a4dm2kn7c1a89yhql7jqkrsx0iyy2";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@@ -6475,12 +6535,12 @@ let
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
- version = "2021-01-29";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
- rev = "52b3ec1ee8d0f78c69bae6cc32f3c2d1a023a8c8";
- sha256 = "1hn3w4hzx444cz5z7g2lkpzr90r9ngjpy5jirgs3c947njc24kr7";
+ rev = "b131a5b35707eb0bf0cf088d85a8f100b4609332";
+ sha256 = "0j8pryc4g0w329d27likagxg6ww9lll4fj653i3ka0cffb01jjri";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@@ -6715,12 +6775,12 @@ let
vim-ocaml = buildVimPluginFrom2Nix {
pname = "vim-ocaml";
- version = "2021-01-10";
+ version = "2021-02-19";
src = fetchFromGitHub {
owner = "ocaml";
repo = "vim-ocaml";
- rev = "f51b69f46d5eb0ebbdfcd39b5aa36bfd9454eafd";
- sha256 = "0fs5pn2hhi0mnjz0xpjl0sh4032s4n4afzjrnhygw9l9a5m51dm4";
+ rev = "ba6a32d0d079b3670cc3c02257dccea4808fdfa1";
+ sha256 = "0h4k9p5r7xwwwbi28p013dqhpl75k8458xiisl5ncswyw4wva75v";
};
meta.homepage = "https://github.com/ocaml/vim-ocaml/";
};
@@ -7183,12 +7243,12 @@ let
vim-ragtag = buildVimPluginFrom2Nix {
pname = "vim-ragtag";
- version = "2021-02-17";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-ragtag";
- rev = "703965fde904fbf29defed3b230e51ef60e9dc90";
- sha256 = "0vj2kqjr03hpgkmnkj1c2icsgli04993vjf56ncwhjg0p707v8v7";
+ rev = "b8966c4f6503a8baaec39e17bd0bf38b2aadc9b2";
+ sha256 = "0q4blsgnl4l2bkhgjry6xnszhsswdand52gc6gdjffwlzwa9jczy";
};
meta.homepage = "https://github.com/tpope/vim-ragtag/";
};
@@ -7591,12 +7651,12 @@ let
vim-startuptime = buildVimPluginFrom2Nix {
pname = "vim-startuptime";
- version = "2021-01-11";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "dstein64";
repo = "vim-startuptime";
- rev = "37ab78eb837e3004e3cfb3a8e5ed8f8740f27f13";
- sha256 = "0x3h47hdbg2gp0ahf0ixkj3nks7qbnm25bmd7hq9k3c7b6912b5a";
+ rev = "af70d17a863c9a33def9cafbb3911195a571c686";
+ sha256 = "078xq6bwkbwsjajyq3c9bn8b3r0da6j70vp1ba934a6jjdv6vrj4";
};
meta.homepage = "https://github.com/dstein64/vim-startuptime/";
};
@@ -7902,6 +7962,18 @@ let
meta.homepage = "https://github.com/cespare/vim-toml/";
};
+ vim-tpipeline = buildVimPluginFrom2Nix {
+ pname = "vim-tpipeline";
+ version = "2021-02-19";
+ src = fetchFromGitHub {
+ owner = "vimpostor";
+ repo = "vim-tpipeline";
+ rev = "753c64f356da0e1bed43ce0b9e8923b1e9fc0670";
+ sha256 = "06j03r6hqb72ahmdpwxxys9nw86b8c63zsxhrlngzqa5z02z6k9c";
+ };
+ meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
+ };
+
vim-trailing-whitespace = buildVimPluginFrom2Nix {
pname = "vim-trailing-whitespace";
version = "2020-11-18";
@@ -8288,12 +8360,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2021-02-16";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "85ca867cc25ab5e9ef9353158e8b786806ba005b";
- sha256 = "0zmy4dkc23i1lvdgjd4ras85q01pahfynajzf5v9lifn1dmyfrl3";
+ rev = "6fac220ee55af66c0c2ab3dae630086da5b0263f";
+ sha256 = "0q7zj8wmg88wzhjr4xz2rkcvw091jdi3mfyv8rn09plf2w4bkszy";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -8301,24 +8373,24 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-02-12";
+ version = "2021-02-22";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "4ff3e993ef17c7101d8db9de79674e320a20fcec";
- sha256 = "1zx45jyddxx0gqwgwf426ybv1dgghjls685ngsq3j8yhzj3mldfr";
+ rev = "d99f8ff57a13323d5d2fe7f3163679848bca334e";
+ sha256 = "12h180awhpaj6x0aq8vfzdxp5w474lgncb1yl0ccj6kblkr1pp32";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
vimux = buildVimPluginFrom2Nix {
pname = "vimux";
- version = "2021-02-18";
+ version = "2021-02-19";
src = fetchFromGitHub {
owner = "preservim";
repo = "vimux";
- rev = "9214bf95784d330fe7e076e26aee9e3048f99253";
- sha256 = "1hl8zlqvlxjv671ih7q0gvxsa3r1yq4c3zaizja2lbf7l57as071";
+ rev = "3bfe0ea285031f40f1a1e8e00f57a933eb8a8325";
+ sha256 = "1jl9a1fms4vaq5fhi40dvk5nwfy7n0gzj75dmfyfyb41j0c2a5hl";
};
meta.homepage = "https://github.com/preservim/vimux/";
};
@@ -8531,24 +8603,24 @@ let
zephyr-nvim = buildVimPluginFrom2Nix {
pname = "zephyr-nvim";
- version = "2021-02-08";
+ version = "2021-02-20";
src = fetchFromGitHub {
owner = "glepnir";
repo = "zephyr-nvim";
- rev = "e3646fc3124e33da4909e30caaad1167523e0c53";
- sha256 = "0a200497js325343prx638rkzg6544lxrrr3ij5g0i6dvazzwg21";
+ rev = "79c05946ade40f211ca058e5c4678b438f6242e1";
+ sha256 = "0p41dmhasl1xlsi2wvng35nb3rdz4yw36gdn5n6m744dha0z9khm";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
};
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
- version = "2021-01-19";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig.vim";
- rev = "17170fd1c31f00132a91fb1598d0f3df5927e28d";
- sha256 = "0k8s5via1frpgdb94kgsk29g7h6fjq3cazyfa8zww7vra418acsh";
+ rev = "fcafb4b64ffe6d308f5e312ddd1672e69e09fb1c";
+ sha256 = "0bsz046sbf5g6lkgcjyllc8knbiqdcglpkf1wbzn7zi7whdhjxdx";
};
meta.homepage = "https://github.com/ziglang/zig.vim/";
};
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
index c52fc140c9..bfe9006506 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
@@ -101,6 +101,7 @@ easymotion/vim-easymotion
editorconfig/editorconfig-vim
edwinb/idris2-vim
ehamberg/vim-cute-python
+eigenfoo/stan-vim
eikenb/acp
elixir-editors/vim-elixir
elmcast/elm-vim
@@ -135,6 +136,7 @@ GEverding/vim-hocon
gfanto/fzf-lsp.nvim@main
gibiansky/vim-textobj-haskell
gioele/vim-autoswap
+glepnir/dashboard-nvim
glepnir/galaxyline.nvim@main
glepnir/lspsaga.nvim@main
glepnir/oceanic-material
@@ -409,6 +411,7 @@ nixprime/cpsm
NLKNguyen/papercolor-theme
noc7c9/vim-iced-coffee-script
norcalli/nvim-terminal.lua
+norcalli/snippets.nvim
npxbr/glow.nvim
ntpeters/vim-better-whitespace
numirias/semshi
@@ -448,6 +451,7 @@ pearofducks/ansible-vim
peitalin/vim-jsx-typescript
peterbjorgensen/sved
peterhoeg/vim-qml
+phaazon/hop.nvim
phanviet/vim-monokai-pro
plasticboy/vim-markdown
ponko2/deoplete-fish
@@ -553,6 +557,7 @@ svermeulen/vim-subversive
t9md/vim-choosewin
t9md/vim-smalls
takac/vim-hardtime
+tami5/compe-conjure
tami5/lispdocs.nvim
tami5/sql.nvim
tbodt/deoplete-tabnine
@@ -678,6 +683,7 @@ vim-utils/vim-husk
Vimjas/vim-python-pep8-indent
vimlab/split-term.vim
vimoutliner/vimoutliner
+vimpostor/vim-tpipeline
vimwiki/vimwiki
vito-c/jq.vim
vmchale/ats-vim
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
index 8c8e646964..e7bb08865a 100644
--- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
@@ -276,6 +276,18 @@ let
};
};
+ formulahendry.code-runner = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "code-runner";
+ publisher = "formulahendry";
+ version = "0.11.2";
+ sha256 = "0qwcxr6m1xwhqmdl4pccjgpikpq1hgi2hgrva5abn8ixa2510hcy";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
freebroccolo.reasonml = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/freebroccolo.reasonml/changelog";
@@ -595,6 +607,18 @@ let
};
};
+ rubbersheep.gi = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "gi";
+ publisher = "rubbersheep";
+ version = "0.2.11";
+ sha256 = "0j9k6wm959sziky7fh55awspzidxrrxsdbpz1d79s5lr5r19rs6j";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
ryu1kn.partial-diff = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "partial-diff";
@@ -715,6 +739,18 @@ let
};
};
+ usernamehw.errorlens = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "errorlens";
+ publisher = "usernamehw";
+ version = "3.2.4";
+ sha256 = "0caxmf6v0s5kgp6cp3j1kk7slhspjv5kzhn4sq3miyl5jkrn95kx";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
vadimcn.vscode-lldb = callPackage ./vscode-lldb { };
vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension {
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix
index 16a3c7477c..39dd6f90b8 100644
--- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix
@@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
- version = "2.6.0";
+ version = "2.7.0";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix";
- sha256 = "1zg90x2asl6gakd2w8fn4imllqgrzdb1dn3728s63blmml42a1xp";
+ sha256 = "0lpsng7rd88ppjybmypzw42czr6swwin5cyl78v36z3wjwqx26xp";
};
patches = [ ./fix-terraform-ls.patch ];
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
index 84a626b17d..3d5cc51fe2 100644
--- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
@@ -1,8 +1,8 @@
diff --git a/out/extension.js b/out/extension.js
-index 1de8aab..e2b3a3e 100644
+index 375048c..fa5eff0 100644
--- a/out/extension.js
+++ b/out/extension.js
-@@ -204,19 +204,7 @@ function pathToBinary() {
+@@ -209,20 +209,7 @@ function pathToBinary() {
if (!_pathToBinaryPromise) {
let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary');
if (!command) { // Skip install/upgrade if user has set custom binary path
@@ -13,6 +13,7 @@ index 1de8aab..e2b3a3e 100644
- }
- catch (err) {
- vscode.window.showErrorMessage(err);
+- reporter.sendTelemetryException(err);
- throw err;
- }
- finally {
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix
index dc17f7f169..62f95ef532 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, kernel }:
stdenv.mkDerivation rec {
- version = "2.3.0";
+ version = "2.4.1";
name = "ena-${version}-${kernel.version}";
src = fetchFromGitHub {
owner = "amzn";
repo = "amzn-drivers";
rev = "ena_linux_${version}";
- sha256 = "sha256-ho6yKCgYo3p50leQUCmzNO/3wqzSzs27Eash3AWBaiE=";
+ sha256 = "0f3i878g11yfw6n68p3qf125jsnggy706jhc8sc0z1xgap6qgh09";
};
hardeningDisable = [ "pic" ];
@@ -19,23 +19,28 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
configurePhase = ''
+ runHook preConfigure
cd kernel/linux/ena
substituteInPlace Makefile --replace '/lib/modules/$(BUILD_KERNEL)' ${kernel.dev}/lib/modules/${kernel.modDirVersion}
+ runHook postConfigure
'';
installPhase = ''
+ runHook preInstall
strip -S ena.ko
dest=$out/lib/modules/${kernel.modDirVersion}/misc
mkdir -p $dest
cp ena.ko $dest/
xz $dest/ena.ko
+ runHook postInstall
'';
meta = with lib; {
description = "Amazon Elastic Network Adapter (ENA) driver for Linux";
homepage = "https://github.com/amzn/amzn-drivers";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
maintainers = [ maintainers.eelco ];
platforms = platforms.linux;
+ broken = kernel.kernelOlder "4.5";
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
index 17c865a6e0..4fb6c3e916 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -6,7 +6,7 @@
, ... } @ args:
let
- version = "5.10.16-rt30"; # updated by ./update-rt.sh
+ version = "5.10.17-rt32"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
- sha256 = "0dqa40yd1yf488pd5vv8c30wsnqazykv7lvi6lmwgz1v4zmf6vsk";
+ sha256 = "05289lr531piv1ncisbazfk0lj0q7gxflqkb0bn4c95vx0y64kp8";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
- sha256 = "152kcx7hxrg77wmrhmsi249y9p42y7hykamypfg25wllmz361azc";
+ sha256 = "1mffl1pvi7ijc3xws32bk8grs27ka2bd9bwl6h99vjn3dnkmkrfr";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix
index 12a92c36c6..f80b7425cd 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "powerstat";
- version = "0.02.24";
+ version = "0.02.25";
src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
- sha256 = "0yrc1xi9flxn2mvmzp0b0vd0md5z4p8fd4y8bszc67xy12qiqy0j";
+ sha256 = "sha256-C6MCOXnElDI69QkLKd2X2SLved8cRCN0Q6BhUvvqsTY=";
};
installFlags = [ "DESTDIR=${placeholder "out"}" ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix
index 3622356257..e6b7de29fd 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix
@@ -7,11 +7,11 @@ assert lib.versionOlder kernel.version "5.6";
stdenv.mkDerivation rec {
pname = "wireguard";
- version = "1.0.20210124";
+ version = "1.0.20210219";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
- sha256 = "sha256-ZiHnKDYziiNvNV1/HjEluC83600RYCvgbUuPiRATRYE=";
+ sha256 = "sha256-ZYZBnfX8DP0IV3VEBSzg7wnFCnlCzOT6Ql3kFZ0klfQ=";
};
hardeningDisable = [ "pic" ];
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
index febfc7fdea..ca2131709e 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
@@ -745,7 +745,7 @@
"sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq
"slide" = ps: with ps; [ ]; # missing inputs: goslide-api
"sma" = ps: with ps; [ pysma ];
- "smappee" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pysmappee
+ "smappee" = ps: with ps; [ aiohttp-cors pysmappee ];
"smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas
"smarthab" = ps: with ps; [ ]; # missing inputs: smarthab
"smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings
@@ -866,13 +866,13 @@
"trend" = ps: with ps; [ numpy ];
"tts" = ps: with ps; [ aiohttp-cors mutagen ];
"tuya" = ps: with ps; [ tuyaha ];
- "twentemilieu" = ps: with ps; [ ]; # missing inputs: twentemilieu
+ "twentemilieu" = ps: with ps; [ twentemilieu ];
"twilio" = ps: with ps; [ aiohttp-cors twilio ];
"twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
"twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
"twinkly" = ps: with ps; [ ]; # missing inputs: twinkly-client
"twitch" = ps: with ps; [ python-twitch-client ];
- "twitter" = ps: with ps; [ ]; # missing inputs: TwitterAPI
+ "twitter" = ps: with ps; [ twitterapi ];
"ubus" = ps: with ps; [ ];
"ue_smart_radio" = ps: with ps; [ ];
"uk_transport" = ps: with ps; [ ];
@@ -896,7 +896,7 @@
"vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp
"velbus" = ps: with ps; [ python-velbus ];
"velux" = ps: with ps; [ pyvlx ];
- "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch
+ "venstar" = ps: with ps; [ venstarcolortouch ];
"vera" = ps: with ps; [ pyvera ];
"verisure" = ps: with ps; [ jsonpath vsure ];
"versasense" = ps: with ps; [ ]; # missing inputs: pyversasense
diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix
index 11e213f013..fd8b1202fd 100644
--- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
- version = "0.17.15";
+ version = "0.17.311";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
- sha256 = "1pp5pnnmy8m0jvpxrldshcx71dl5g16dqvnnzaqhvs4cjhpgq8fw";
+ sha256 = "sha256-hYOjKWtClhiU3rXzcPW7rkVqSNhA02bpONMcZ1s1ZYE=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/servers/mpd/default.nix b/third_party/nixpkgs/pkgs/servers/mpd/default.nix
index b34f620749..9af9ddd66e 100644
--- a/third_party/nixpkgs/pkgs/servers/mpd/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mpd/default.nix
@@ -114,13 +114,13 @@ let
in stdenv.mkDerivation rec {
pname = "mpd";
- version = "0.22.4";
+ version = "0.22.5";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${version}";
- sha256 = "sha256-CVi+fcmFMJMv7X4okALlVsxqsuUsirHgQT61IHdrBNE=";
+ sha256 = "sha256-CKNw3K/z5UrTIp9ryWq7UaTz768AigaoCIcoJ4iW1j4=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/servers/rippled/default.nix b/third_party/nixpkgs/pkgs/servers/rippled/default.nix
index 22223f2a27..cd19c77cab 100644
--- a/third_party/nixpkgs/pkgs/servers/rippled/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/rippled/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchgit, fetchurl, runCommand, git, cmake, pkg-config
+{ lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config
, openssl, zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8, libnsl }:
let
diff --git a/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix b/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix
index 8da0213a2a..e02d386126 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix
@@ -5,13 +5,13 @@
pythonPackages.buildPythonApplication rec {
pname = "patroni";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchFromGitHub {
owner = "zalando";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-IlRltJrEMrRiwVVMYQywb0MqwEoL8MX3do2GlHXjuPc=";
+ sha256 = "048g211njwmgl2v7nx6x5x82b4bbp35n234z7ah10aybm3yrxnc7";
};
# cdiff renamed to ydiff; remove when patroni source reflects this.
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index d10907805a..bb918f1608 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "timescaledb";
- version = "2.0.1";
+ version = "2.0.2";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "timescale";
repo = "timescaledb";
rev = "refs/tags/${version}";
- sha256 = "105zc5m3zvnrqr8409qdbycb4yp7znxmna76ri1m2djkdp5rh4q1";
+ sha256 = "sha256-qJErkKNK90tdshSyGe4fjI2JI2OUCdBz9RrYUy85QMo=";
};
# -DWARNINGS_AS_ERRORS=OFF to be removed once https://github.com/timescale/timescaledb/issues/2770 is fixed in upstream
diff --git a/third_party/nixpkgs/pkgs/servers/teleport/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/default.nix
index 100b021d9c..8650ff108e 100644
--- a/third_party/nixpkgs/pkgs/servers/teleport/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/teleport/default.nix
@@ -41,21 +41,29 @@ buildGoPackage rec {
popd
'';
- dontStrip = true;
+ # Reduce closure size for client machines
+ outputs = [ "out" "client" ];
+
+ buildTargets = [ "full" ];
+
+ postInstall = ''
+ install -Dm755 -t $client/bin $out/bin/tsh
+ '';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/tsh version | grep ${version} > /dev/null
+ $client/bin/tsh version | grep ${version} > /dev/null
$out/bin/tctl version | grep ${version} > /dev/null
$out/bin/teleport version | grep ${version} > /dev/null
'';
- meta = {
+ meta = with lib; {
description = "A SSH CA management suite";
homepage = "https://gravitational.com/teleport/";
- license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ sigma tomberek ];
- platforms = lib.platforms.unix;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ sigma tomberek freezeboy ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix
index e170aae737..7fa7f2305e 100644
--- a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix
@@ -16,8 +16,8 @@ let
allowUnfree = config.allowUnfree or false
|| builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";
- whitelist = config.whitelistedLicenses or [];
- blacklist = config.blacklistedLicenses or [];
+ allowlist = config.allowlistedLicenses or config.whitelistedLicenses or [];
+ blocklist = config.blocklistedLicenses or config.blacklistedLicenses or [];
onlyLicenses = list:
lib.lists.all (license:
@@ -27,19 +27,19 @@ let
) list;
areLicenseListsValid =
- if lib.mutuallyExclusive whitelist blacklist then
- assert onlyLicenses whitelist; assert onlyLicenses blacklist; true
+ if lib.mutuallyExclusive allowlist blocklist then
+ assert onlyLicenses allowlist; assert onlyLicenses blocklist; true
else
- throw "whitelistedLicenses and blacklistedLicenses are not mutually exclusive.";
+ throw "allowlistedLicenses and blocklistedLicenses are not mutually exclusive.";
hasLicense = attrs:
attrs ? meta.license;
- hasWhitelistedLicense = assert areLicenseListsValid; attrs:
- hasLicense attrs && lib.lists.any (l: builtins.elem l whitelist) (lib.lists.toList attrs.meta.license);
+ hasAllowlistedLicense = assert areLicenseListsValid; attrs:
+ hasLicense attrs && lib.lists.any (l: builtins.elem l allowlist) (lib.lists.toList attrs.meta.license);
- hasBlacklistedLicense = assert areLicenseListsValid; attrs:
- hasLicense attrs && lib.lists.any (l: builtins.elem l blacklist) (lib.lists.toList attrs.meta.license);
+ hasBlocklistedLicense = assert areLicenseListsValid; attrs:
+ hasLicense attrs && lib.lists.any (l: builtins.elem l blocklist) (lib.lists.toList attrs.meta.license);
allowBroken = config.allowBroken or false
|| builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
@@ -91,10 +91,10 @@ let
pos_str = meta: meta.position or "«unknown-file»";
remediation = {
- unfree = remediate_whitelist "Unfree" remediate_unfree_predicate;
- broken = remediate_whitelist "Broken" (x: "");
- unsupported = remediate_whitelist "UnsupportedSystem" (x: "");
- blacklisted = x: "";
+ unfree = remediate_allowlist "Unfree" remediate_unfree_predicate;
+ broken = remediate_allowlist "Broken" (x: "");
+ unsupported = remediate_allowlist "UnsupportedSystem" (x: "");
+ blocklisted = x: "";
insecure = remediate_insecure;
broken-outputs = remediateOutputsToInstall;
unknown-meta = x: "";
@@ -112,14 +112,14 @@ let
remediate_unfree_predicate = attrs:
''
- Alternatively you can configure a predicate to whitelist specific packages:
+ Alternatively you can configure a predicate to allow specific packages:
{ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"${lib.getName attrs}"
];
}
'';
- remediate_whitelist = allow_attr: rebuild_amendment: attrs:
+ remediate_allowlist = allow_attr: rebuild_amendment: attrs:
''
a) To temporarily allow ${remediation_phrase allow_attr}, you can use an environment variable
for a single invocation of the nix tools.
@@ -141,7 +141,7 @@ let
Known issues:
'' + (lib.concatStrings (map (issue: " - ${issue}\n") attrs.meta.knownVulnerabilities)) + ''
- You can install it anyway by whitelisting this package, using the
+ You can install it anyway by allowing this package, using the
following methods:
a) To temporarily allow all insecure packages, you can use an environment
@@ -268,7 +268,7 @@ let
#
# Return { valid: Bool } and additionally
# { reason: String; errormsg: String } if it is not valid, where
- # reason is one of "unfree", "blacklisted", "broken", "insecure", ...
+ # reason is one of "unfree", "blocklisted", "broken", "insecure", ...
# Along with a boolean flag for each reason
checkValidity = attrs:
{
@@ -277,10 +277,10 @@ let
unsupported = hasUnsupportedPlatform attrs;
insecure = isMarkedInsecure attrs;
}
- // (if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then
+ // (if hasDeniedUnfreeLicense attrs && !(hasAllowlistedLicense attrs) then
{ valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; }
- else if hasBlacklistedLicense attrs then
- { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; }
+ else if hasBlocklistedLicense attrs then
+ { valid = false; reason = "blocklisted"; errormsg = "has a blocklisted license (‘${showLicense attrs.meta.license}’)"; }
else if !allowBroken && attrs.meta.broken or false then
{ valid = false; reason = "broken"; errormsg = "is marked as broken"; }
else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then
diff --git a/third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
index 30d74c14ce..e661af0f94 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "amazon-ecr-credential-helper";
- version = "0.4.0";
+ version = "0.5.0";
goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "awslabs";
repo = "amazon-ecr-credential-helper";
rev = "v${version}";
- sha256 = "1whwxjzlyzyvrf2mzbd7my2kdz5fdbr79g18g9h4xrg8xyzk1k5q";
+ sha256 = "sha256-GmGse+N7QeG2sAjCumGkUAWu/KfhnMltzeh+s8o+tiw=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix
index 12f63e627e..53855b6d28 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonApplication
, fetchFromGitHub
-, pkgs
, boto3
}:
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
index defb46b444..a347021496 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
@@ -4,7 +4,6 @@
, groff
, less
}:
-
let
py = python3.override {
packageOverrides = self: super: {
@@ -26,21 +25,20 @@ let
};
};
-in with py.pkgs; buildPythonApplication rec {
+in
+with py.pkgs; buildPythonApplication rec {
pname = "awscli";
- version = "1.19.5"; # N.B: if you change this, change botocore to a matching version too
+ version = "1.19.12"; # N.B: if you change this, change botocore to a matching version too
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-SwYL2ViwazP2MDZbW9cRThvg6jVOMlkfsbpY6QDsjQY=";
+ sha256 = "sha256-Tj9+UtYSL5yls7AxV7shABcOMhS12VXlpDNdxz8Ns5w=";
};
# https://github.com/aws/aws-cli/issues/4837
- # https://github.com/aws/aws-cli/pull/5887
postPatch = ''
substituteInPlace setup.py \
- --replace "docutils>=0.10,<0.16" "docutils>=0.10" \
- --replace "PyYAML>=3.10,<5.4" "PyYAML>=3.10"
+ --replace "docutils>=0.10,<0.16" "docutils>=0.10"
'';
# No tests included
diff --git a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
index 6db3e80d3f..9460144998 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "clair";
- version = "4.0.1";
+ version = "4.0.2";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-FJqUYQDDOuO0EcZ8+el/MUcJJzWL7vgGhEFo7v4HpOw=";
+ sha256 = "sha256-uGvcr7TG/NCi0YoYZnQU11zOxXDhFTnCmLQVxOqmXLY=";
};
vendorSha256 = "sha256-CO4U8uSQeHXLPj5PH/SsOI/LjT2Rs/mBHsvNTudx72I=";
diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
index 1478aa8c1e..df4211ad03 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
- version = "2021.01.25";
+ version = "2021.02.21";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
- sha256 = "1c2jx03ssm9yyv6rgr5wfv88ivfgdgq3889yaghjyvllm3nv9380";
+ sha256 = "10fa2g8vsz0y7kb0wxnz857r2gd9b0b278j0a5ipjaa7cjd0gi1b";
};
# There is also a file called "makefile" which seems to be preferred by the standard build phase
diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix
index d531b22738..5f22ffa960 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix
@@ -1,7 +1,6 @@
{ stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll
, pythonPackages, imagemagick, gobject-introspection, gst_all_1
, runtimeShell
-, fetchpatch
, unstableGitUpdater
# Attributes needed for tests of the external plugins
diff --git a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix
index 63808d4851..c619a69c11 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
+{ lib, stdenv, fetchurl, bash, btrfs-progs, openssh, perl, perlPackages
, util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper }:
stdenv.mkDerivation rec {
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix
index d820e5e68e..e9248fface 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "gcsfuse";
- version = "0.32.0";
+ version = "0.33.0";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
- sha256 = "09k7479gd9rlzmxhcvc1b3ajy8frzd6881vnlvk3z9818n4aq7qc";
+ sha256 = "sha256-BZOKZMSUpMSoxmgk/S2MOJfKeYSuqw9YdS3v+Jy/kaU=";
};
goPackagePath = "github.com/googlecloudplatform/gcsfuse";
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix
index 368f62f219..6da9b9c92a 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mergerfs";
- version = "2.32.2";
+ version = "2.32.3";
src = fetchFromGitHub {
owner = "trapexit";
repo = pname;
rev = version;
- sha256 = "sha256-ybDVBcPkjsW2OxNxUmn5hG/qLEjxF9vqR8pZdb9tIBs=";
+ sha256 = "sha256-loOBMrAtvJAcFdcgwzEEko7TMM07Ocx+1umxjnLB1uY=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix
index de86622126..7449eedb3a 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "gifski";
- version = "1.3.3";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "ImageOptim";
repo = "gifski";
rev = version;
- sha256 = "sha256-dBgDIS6U2iKzyo5nO0NOD488zfEbaZJH7luJN6khrnc=";
+ sha256 = "sha256-Cm/w0bwDMu5REsQpkwMBgnROxpI+nMQwC16dY/VdOFU=";
};
- cargoSha256 = "sha256-/i5ZBCWFlhoheHsCI5f9yJ7sa6l/DB4AJckq5orinwI=";
+ cargoSha256 = "sha256-fy8apB1UbpBAnp8mFnL7rNj/GSSUkNz/trqsVrAfFfI=";
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
index 0daeaa794c..1b76cec554 100644
--- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
+++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
@@ -1,5 +1,4 @@
{ lib, stdenv
-, fetchurl
, fetchFromGitHub
, cmake
, extra-cmake-modules
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
index 6184ea3654..560393b319 100644
--- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
+++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-lua";
- version = "5.0.2";
+ version = "5.0.3";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-lua";
rev = version;
- sha256 = "sha256-lFlHn2q/kpq1EIKKhYVdJofXqtOHnpLz7PoWuNAhmhE=";
+ sha256 = "sha256-46s3F3NHGuef0wPhYiPocms0jv5Vo+cVRd5FzlfjMZY=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
index 8e5254b75c..f8601a64e2 100644
--- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
+++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-rime";
- version = "5.0.3";
+ version = "5.0.4";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-rime";
rev = version;
- sha256 = "sha256-mPNZ/B5bpxua+E1T+oz9v2QKAzGraA2cfT8oJacC35U=";
+ sha256 = "sha256-WB+bWvJxL2yywictNN8Zy0OYxiCRErQGL2dGH4zQPp8=";
};
cmakeFlags = [
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
index 4feae0d4ac..5e42016ec7 100644
--- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
+++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-table-other";
- version = "5.0.2";
+ version = "5.0.3";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-table-other";
rev = version;
- sha256 = "sha256-P+KaUmjAHe1CZ5rNMQAxwKSW5ZMVgQcwkgdlungXTLM=";
+ sha256 = "sha256-jJTFAOrBeRBoUn0mqqkX0z1zQnDOh7otMHDPmjuZbWw=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile b/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile
new file mode 100644
index 0000000000..be47216200
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile
@@ -0,0 +1,37 @@
+source 'https://rubygems.org'
+gemspec
+
+
+group :development, :test do
+ #gem 'anystyle-data', github: 'inukshuk/anystyle-data'
+ #gem 'wapiti', github: 'inukshuk/wapiti-ruby'
+ gem 'bibtex-ruby'
+ gem 'rake'
+ gem 'rspec', '~>3.0'
+ gem 'language_detector', github: 'feedbackmine/language_detector'
+ gem 'unicode-scripts'
+ gem 'edtf'
+ gem 'citeproc'
+ gem 'unicode_utils' if RUBY_VERSION < '2.4'
+end
+
+group :coverage do
+ gem 'simplecov', require: false
+ gem 'coveralls', require: false if ENV['CI']
+end
+
+group :debug do
+ gem 'byebug', require: false
+end
+
+group :profile do
+ gem 'ruby-prof', require: false
+ gem 'gnuplot', require: false
+end
+
+group :extra do
+ gem 'lmdb'
+ gem 'redis'
+ gem 'redis-namespace'
+ gem 'yard'
+end
diff --git a/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile.lock
new file mode 100644
index 0000000000..8d28ef8089
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile.lock
@@ -0,0 +1,99 @@
+GIT
+ remote: https://github.com/feedbackmine/language_detector.git
+ revision: 89102790194150b3a8110ce691f9989b8ce70f8d
+ specs:
+ language_detector (0.1.2)
+
+PATH
+ remote: .
+ specs:
+ anystyle (1.3.10)
+ anystyle-data (~> 1.2)
+ bibtex-ruby (~> 5.0)
+ gli (~> 2.17)
+ namae (~> 1.0)
+ wapiti (~> 1.0, >= 1.0.2)
+
+GEM
+ remote: https://rubygems.org/
+ specs:
+ activesupport (6.0.3.2)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (>= 0.7, < 2)
+ minitest (~> 5.1)
+ tzinfo (~> 1.1)
+ zeitwerk (~> 2.2, >= 2.2.2)
+ anystyle-data (1.2.0)
+ bibtex-ruby (5.1.4)
+ latex-decode (~> 0.0)
+ builder (3.2.4)
+ byebug (11.1.3)
+ citeproc (1.0.10)
+ namae (~> 1.0)
+ concurrent-ruby (1.1.7)
+ diff-lcs (1.4.4)
+ docile (1.3.2)
+ edtf (3.0.5)
+ activesupport (>= 3.0, < 7.0)
+ gli (2.19.2)
+ gnuplot (2.6.2)
+ i18n (1.8.5)
+ concurrent-ruby (~> 1.0)
+ latex-decode (0.3.1)
+ lmdb (0.5.3)
+ minitest (5.14.1)
+ namae (1.0.1)
+ rake (13.0.1)
+ redis (4.2.1)
+ redis-namespace (1.8.0)
+ redis (>= 3.0.4)
+ rspec (3.9.0)
+ rspec-core (~> 3.9.0)
+ rspec-expectations (~> 3.9.0)
+ rspec-mocks (~> 3.9.0)
+ rspec-core (3.9.2)
+ rspec-support (~> 3.9.3)
+ rspec-expectations (3.9.2)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.9.0)
+ rspec-mocks (3.9.1)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.9.0)
+ rspec-support (3.9.3)
+ ruby-prof (1.4.1)
+ simplecov (0.19.0)
+ docile (~> 1.1)
+ simplecov-html (~> 0.11)
+ simplecov-html (0.12.2)
+ thread_safe (0.3.6)
+ tzinfo (1.2.7)
+ thread_safe (~> 0.1)
+ unicode-scripts (1.6.0)
+ wapiti (1.0.7)
+ builder (~> 3.2)
+ yard (0.9.25)
+ zeitwerk (2.4.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ anystyle!
+ bibtex-ruby
+ byebug
+ citeproc
+ edtf
+ gnuplot
+ language_detector!
+ lmdb
+ rake
+ redis
+ redis-namespace
+ rspec (~> 3.0)
+ ruby-prof
+ simplecov
+ unicode-scripts
+ yard
+
+BUNDLED WITH
+ 2.1.4
diff --git a/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/anystyle.gemspec b/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/anystyle.gemspec
new file mode 100644
index 0000000000..57db427fb0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/anystyle.gemspec
@@ -0,0 +1,52 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+require 'anystyle/version'
+
+Gem::Specification.new do |s|
+ s.name = 'anystyle'
+ s.version = AnyStyle::VERSION.dup
+ s.platform = Gem::Platform::RUBY
+ s.authors = ['Sylvester Keil']
+ s.email = ['http://sylvester.keil.or.at']
+ s.homepage = 'http://anystyle.io'
+ s.summary = 'Smart and fast bibliography parser.'
+ s.description = 'A sophisticated parser for academic reference lists and bibliographies based on machine learning algorithms using conditional random fields.'
+ s.license = 'BSD-2-Clause'
+ s.executables = []
+ s.require_path = 'lib'
+
+ s.required_ruby_version = '>= 2.2'
+
+ s.add_runtime_dependency('bibtex-ruby', '~>5.0')
+ s.add_runtime_dependency('anystyle-data', '~>1.2')
+ s.add_runtime_dependency('gli', '~>2.17')
+ s.add_runtime_dependency('wapiti', '~>1.0', '>=1.0.2')
+ s.add_runtime_dependency('namae', '~>1.0')
+
+ s.files =
+ `git ls-files`.split("\n") - `git ls-files spec`.split("\n") - %w{
+ .coveralls.yml
+ .gitignore
+ .rspec
+ .simplecov
+ .travis.yml
+ Gemfile
+ Rakefile
+ appveyor.yml
+ anystyle.gemspec
+ res/core.xml
+ }
+
+ s.rdoc_options = %w{
+ --line-numbers
+ --inline-source
+ --title "AnyStyle"
+ --main README.md
+ }
+ s.extra_rdoc_files = %w{README.md LICENSE}
+
+end
+
+# vim: syntax=ruby
diff --git a/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/default.nix
new file mode 100644
index 0000000000..7a437cafc2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildRubyGem
+, bundlerEnv
+, ruby
+, poppler_utils
+}:
+let
+ deps = bundlerEnv rec {
+ name = "anystyle-cli-${version}";
+ source.sha256 = lib.fakeSha256;
+ version = "1.3.1";
+ inherit ruby;
+ gemdir = ./.;
+ gemset = lib.recursiveUpdate (import ./gemset.nix) {
+ anystyle.source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1w79zcia60nnnyrmyvpd10pmxrpk5c7lj9gmmblhwi8x5mfq9k0n";
+ type = "gem";
+ };
+ };
+ };
+in
+buildRubyGem rec {
+ inherit ruby;
+ gemName = "anystyle-cli";
+ pname = gemName;
+ version = "1.3.1";
+ source.sha256 = "1a3ifwxwqkp5dnfk9r8qq8kgfb8k1pl7jjdghbb8ixbxz9ac7awy";
+
+ propagatedBuildInputs = [ deps ];
+
+ preFixup = ''
+ wrapProgram $out/bin/anystyle --prefix PATH ${poppler_utils}/bin
+ '';
+
+ meta = with lib; {
+ description = "Command line interface to the AnyStyle Parser and Finder";
+ homepage = "https://anystyle.io/";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ shamilton ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/gemset.nix b/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/gemset.nix
new file mode 100644
index 0000000000..46444760b7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/anystyle-cli/gemset.nix
@@ -0,0 +1,1570 @@
+{
+ activesupport = {
+ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk";
+ type = "gem";
+ };
+ version = "6.0.3.2";
+ };
+ anystyle = {
+ dependencies = ["anystyle-data" "bibtex-ruby" "gli" "namae" "wapiti"];
+ groups = ["default"];
+ platforms = [{
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ version = "1.8";
+ } {
+ engine = "rbx";
+ version = "1.9";
+ } {
+ engine = "rbx";
+ version = "2.0";
+ } {
+ engine = "rbx";
+ version = "2.1";
+ } {
+ engine = "rbx";
+ version = "2.2";
+ } {
+ engine = "rbx";
+ version = "2.3";
+ } {
+ engine = "rbx";
+ version = "2.4";
+ } {
+ engine = "rbx";
+ version = "2.5";
+ } {
+ engine = "rbx";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ }];
+ source = {
+ path = ./.;
+ type = "path";
+ };
+ version = "1.3.10";
+ };
+ anystyle-data = {
+ groups = ["default"];
+ platforms = [{
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ version = "1.8";
+ } {
+ engine = "rbx";
+ version = "1.9";
+ } {
+ engine = "rbx";
+ version = "2.0";
+ } {
+ engine = "rbx";
+ version = "2.1";
+ } {
+ engine = "rbx";
+ version = "2.2";
+ } {
+ engine = "rbx";
+ version = "2.3";
+ } {
+ engine = "rbx";
+ version = "2.4";
+ } {
+ engine = "rbx";
+ version = "2.5";
+ } {
+ engine = "rbx";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ }];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ry6836mq48d85hjcfp7xiw0yk3ivpiwjvmdwv5jag30ijfyaccy";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ bibtex-ruby = {
+ dependencies = ["latex-decode"];
+ groups = ["default" "development" "test"];
+ platforms = [{
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ version = "1.8";
+ } {
+ engine = "rbx";
+ version = "1.9";
+ } {
+ engine = "rbx";
+ version = "2.0";
+ } {
+ engine = "rbx";
+ version = "2.1";
+ } {
+ engine = "rbx";
+ version = "2.2";
+ } {
+ engine = "rbx";
+ version = "2.3";
+ } {
+ engine = "rbx";
+ version = "2.4";
+ } {
+ engine = "rbx";
+ version = "2.5";
+ } {
+ engine = "rbx";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ }];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00zwmmmjrbrxhajdvn1d4rnv2qw00arcj021cwyx3hl6dsv22l2w";
+ type = "gem";
+ };
+ version = "5.1.4";
+ };
+ builder = {
+ groups = ["default"];
+ platforms = [{
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ version = "1.8";
+ } {
+ engine = "rbx";
+ version = "1.9";
+ } {
+ engine = "rbx";
+ version = "2.0";
+ } {
+ engine = "rbx";
+ version = "2.1";
+ } {
+ engine = "rbx";
+ version = "2.2";
+ } {
+ engine = "rbx";
+ version = "2.3";
+ } {
+ engine = "rbx";
+ version = "2.4";
+ } {
+ engine = "rbx";
+ version = "2.5";
+ } {
+ engine = "rbx";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ }];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
+ type = "gem";
+ };
+ version = "3.2.4";
+ };
+ byebug = {
+ groups = ["debug"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194";
+ type = "gem";
+ };
+ version = "11.1.3";
+ };
+ citeproc = {
+ dependencies = ["namae"];
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13vl5sjmksk5a8kjcqnjxh7kn9gn1n4f9p1rvqfgsfhs54p0m6l2";
+ type = "gem";
+ };
+ version = "1.0.10";
+ };
+ concurrent-ruby = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
+ type = "gem";
+ };
+ version = "1.1.7";
+ };
+ diff-lcs = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz";
+ type = "gem";
+ };
+ version = "1.4.4";
+ };
+ docile = {
+ groups = ["coverage" "default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif";
+ type = "gem";
+ };
+ version = "1.3.2";
+ };
+ edtf = {
+ dependencies = ["activesupport"];
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xknzamagsx68iq7zdiswr077sxirig77yggbcsw51m8365ajzpc";
+ type = "gem";
+ };
+ version = "3.0.5";
+ };
+ gli = {
+ groups = ["default"];
+ platforms = [{
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ version = "1.8";
+ } {
+ engine = "rbx";
+ version = "1.9";
+ } {
+ engine = "rbx";
+ version = "2.0";
+ } {
+ engine = "rbx";
+ version = "2.1";
+ } {
+ engine = "rbx";
+ version = "2.2";
+ } {
+ engine = "rbx";
+ version = "2.3";
+ } {
+ engine = "rbx";
+ version = "2.4";
+ } {
+ engine = "rbx";
+ version = "2.5";
+ } {
+ engine = "rbx";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ }];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0q598mvl20isn3ja1ya0p72svmqwx3m6fjp5slnv0b2c5mh0ahvv";
+ type = "gem";
+ };
+ version = "2.19.2";
+ };
+ gnuplot = {
+ groups = ["profile"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1cvb84lahhy6qxkkgg0pfk9b85qrb1by2p3jlpqgczl6am58vhnj";
+ type = "gem";
+ };
+ version = "2.6.2";
+ };
+ i18n = {
+ dependencies = ["concurrent-ruby"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
+ type = "gem";
+ };
+ version = "1.8.5";
+ };
+ language_detector = {
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ fetchSubmodules = false;
+ rev = "89102790194150b3a8110ce691f9989b8ce70f8d";
+ sha256 = "0wxs9i0wqmwysrz1c1i85i4f670m217y12rj5slcmd1y4ylsmvyi";
+ type = "git";
+ url = "https://github.com/feedbackmine/language_detector.git";
+ };
+ version = "0.1.2";
+ };
+ latex-decode = {
+ groups = ["default" "development" "test"];
+ platforms = [{
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ version = "1.8";
+ } {
+ engine = "rbx";
+ version = "1.9";
+ } {
+ engine = "rbx";
+ version = "2.0";
+ } {
+ engine = "rbx";
+ version = "2.1";
+ } {
+ engine = "rbx";
+ version = "2.2";
+ } {
+ engine = "rbx";
+ version = "2.3";
+ } {
+ engine = "rbx";
+ version = "2.4";
+ } {
+ engine = "rbx";
+ version = "2.5";
+ } {
+ engine = "rbx";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ }];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0dqanr69as05vdyp9gx9737w3g44rhyk7x96bh9x01fnf1yalyzd";
+ type = "gem";
+ };
+ version = "0.3.1";
+ };
+ lmdb = {
+ groups = ["extra"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qk2ycgyyk052dvbgik35mr4n9im4k1j6v7anbjqhx52y5f07sfg";
+ type = "gem";
+ };
+ version = "0.5.3";
+ };
+ minitest = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g";
+ type = "gem";
+ };
+ version = "5.14.1";
+ };
+ namae = {
+ groups = ["default" "development" "test"];
+ platforms = [{
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ version = "1.8";
+ } {
+ engine = "rbx";
+ version = "1.9";
+ } {
+ engine = "rbx";
+ version = "2.0";
+ } {
+ engine = "rbx";
+ version = "2.1";
+ } {
+ engine = "rbx";
+ version = "2.2";
+ } {
+ engine = "rbx";
+ version = "2.3";
+ } {
+ engine = "rbx";
+ version = "2.4";
+ } {
+ engine = "rbx";
+ version = "2.5";
+ } {
+ engine = "rbx";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ }];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00w0dgvmdy8lw2b5q9zvhqd5k98a192vdmka96qngi9cvnsh5snw";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ rake = {
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
+ type = "gem";
+ };
+ version = "13.0.1";
+ };
+ redis = {
+ groups = ["extra"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19hm66kw5vx1lmlh8bj7rxlddyj0vfp11ajw9njhrmn8173d0vb5";
+ type = "gem";
+ };
+ version = "4.2.1";
+ };
+ redis-namespace = {
+ dependencies = ["redis"];
+ groups = ["extra"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05i6s898z5w31z385cba1683pgg5nnmj4m686cbravg7j4pgbcgv";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
+ rspec = {
+ dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h";
+ type = "gem";
+ };
+ version = "3.9.0";
+ };
+ rspec-core = {
+ dependencies = ["rspec-support"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xndkv5cz763wh30x7hdqw6k7zs8xfh0f86amra9agwn44pcqs0y";
+ type = "gem";
+ };
+ version = "3.9.2";
+ };
+ rspec-expectations = {
+ dependencies = ["diff-lcs" "rspec-support"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bxkv25qmy39jqrdx35bfgw00g24qkssail9jlljm7hywbqvr9bb";
+ type = "gem";
+ };
+ version = "3.9.2";
+ };
+ rspec-mocks = {
+ dependencies = ["diff-lcs" "rspec-support"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr";
+ type = "gem";
+ };
+ version = "3.9.1";
+ };
+ rspec-support = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0dandh2fy1dfkjk8jf9v4azbbma6968bhh06hddv0yqqm8108jir";
+ type = "gem";
+ };
+ version = "3.9.3";
+ };
+ ruby-prof = {
+ groups = ["profile"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12cd91m08ih0imfpy4k87618hd4mhyz291a6bx2hcskza4nf6d27";
+ type = "gem";
+ };
+ version = "1.4.1";
+ };
+ simplecov = {
+ dependencies = ["docile" "simplecov-html"];
+ groups = ["coverage"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1b082xrklq6k755cc3rzpnfdjv5338rlky9him36jasw8s9q68mr";
+ type = "gem";
+ };
+ version = "0.19.0";
+ };
+ simplecov-html = {
+ groups = ["coverage" "default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1v7b4mf7njw8kv4ghl4q7mwz3q0flbld7v8blp4m4m3n3aq11bn9";
+ type = "gem";
+ };
+ version = "0.12.2";
+ };
+ thread_safe = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+ type = "gem";
+ };
+ version = "0.3.6";
+ };
+ tzinfo = {
+ dependencies = ["thread_safe"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
+ type = "gem";
+ };
+ version = "1.2.7";
+ };
+ unicode-scripts = {
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04xfy4f61xf7qnbfa68aqscmyxk7wx3swn571cijsfqalhz8swjg";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ wapiti = {
+ dependencies = ["builder"];
+ groups = ["default"];
+ platforms = [{
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.8";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "1.9";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.0";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.1";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.2";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.3";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.4";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.5";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "maglev";
+ version = "2.6";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ } {
+ engine = "rbx";
+ version = "1.8";
+ } {
+ engine = "rbx";
+ version = "1.9";
+ } {
+ engine = "rbx";
+ version = "2.0";
+ } {
+ engine = "rbx";
+ version = "2.1";
+ } {
+ engine = "rbx";
+ version = "2.2";
+ } {
+ engine = "rbx";
+ version = "2.3";
+ } {
+ engine = "rbx";
+ version = "2.4";
+ } {
+ engine = "rbx";
+ version = "2.5";
+ } {
+ engine = "rbx";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.8";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "1.9";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.0";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.1";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.2";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.3";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.4";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.5";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ } {
+ engine = "ruby";
+ version = "2.6";
+ }];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1aw2l759cfmii9a67pn8pswip11v08nabkzm825mrmxa6r91izqs";
+ type = "gem";
+ };
+ version = "1.0.7";
+ };
+ yard = {
+ groups = ["extra"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "126m49mvh4lbvlvrprq7xj2vjixbq3xqr8dwr089vadvs0rkn4rd";
+ type = "gem";
+ };
+ version = "0.9.25";
+ };
+ zeitwerk = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k";
+ type = "gem";
+ };
+ version = "2.4.0";
+ };
+}
+
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix
index 1d8bd38c1e..735508fed2 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bdf2sfd";
- version = "1.1.5";
+ version = "1.1.6";
src = fetchFromGitHub {
owner = "fcambus";
repo = pname;
rev = version;
- sha256 = "1bpadw25barzmmsz9bkrsj3iwbgf945zqfakbgq1yscfb85bfgsp";
+ sha256 = "sha256-f3IdTk1GEo1GlbiJMCpqwheNJrndm7aCojA+GuKMTao=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix
index b8dc950773..3ecb201468 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }:
-let version = "0.2.5"; in
+let version = "0.2.6"; in
rustPlatform.buildRustPackage {
pname = "dijo";
inherit version;
@@ -8,9 +8,9 @@ rustPlatform.buildRustPackage {
owner = "NerdyPepper";
repo = "dijo";
rev = "v${version}";
- sha256 = "sha256-DdK9qdF+rFtAhemPwMpiZrtUdgD0iFqjgiZ3Yp/vLAI=";
+ sha256 = "sha256-fdPl+3NjgVE2MRopzeN/bxbVP6HaTnyJTGFWsLhlRoQ=";
};
- cargoSha256 = "sha256-bdSXyxiHwGtdyce2YyPKq+3RfZIL425RvwRfKi59RVI=";
+ cargoSha256 = "sha256-45YfZWncT7hNiOhlAatpdFdxgBaF83sih67B/DPNHcs=";
meta = with lib; {
description = "Scriptable, curses-based, digital habit tracker";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix
index b808d88888..f0bb6905b4 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
- version = "2.11.0";
+ version = "2.11.1";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
- sha256 = "sha256-c+3zB0bxohQQsOjcTLHgRQamJfm7iUdz79t8q8wAFL8=";
+ sha256 = "sha256-pjFApZQJqw0fJmJteO7VZWRLogV3rO5XDagZd1MliZg=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
'';
};
- cargoSha256 = "sha256-ORkj6T9O/NKuaILm5NFGePYxKMaCAAydascelaEvYVw=";
+ cargoSha256 = "sha256-xsTScRAu0SF1xtjUwBtNJUNIItoR0jjEd2CuSmmeh9c=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix
index aa9f175e90..a504efbf1e 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,18 +2,21 @@
stdenv.mkDerivation rec {
pname = "fluent-bit";
- version = "1.6.8";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${version}";
- sha256 = "1k8ghz8xwy7v4y4r4xc690ig7qmn0mkvynplwn66j44fgdpg0v1s";
+ sha256 = "1xzbsnij0xsgd5j11frkf35w8rkr55hq2yl7myaxrgzh686a8law";
};
nativeBuildInputs = [ cmake flex bison ];
- patches = [ ./fix-luajit-darwin.patch ];
+ patches = lib.optionals stdenv.isDarwin [ ./fix-luajit-darwin.patch ];
+
+ # _FORTIFY_SOURCE requires compiling with optimization (-O)
+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-O";
postPatch = ''
substituteInPlace src/CMakeLists.txt \
diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
index 6ad09f4207..b5fc2d0d2b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
- version = "0.155.2";
+ version = "0.157.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-YbB5mJNfGei72brV1br1dvbxrbWkqnsbuA5/o+fD0Fc=";
+ sha256 = "sha256-wUlAllWBGJBZ98lbf2pOfW3a31r74py5Zh7uszkRYqA=";
};
- vendorSha256 = "sha256-d6l+d59DZDVCMhdjwRz7BKcxGXl1L2kdFCk82NS2XmA=";
+ vendorSha256 = "sha256-8SOUFlbwGwRuOB50V9eXE9KQWGiSexTZct6Rux6Stuw=";
buildFlagsArray = [
"-ldflags="
diff --git a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock
index 3bd4573031..81d5b763ca 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.14.2)
- html-proofer (3.18.5)
+ html-proofer (3.18.6)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogumbo (~> 2.0)
@@ -15,13 +15,15 @@ GEM
typhoeus (~> 1.3)
yell (~> 2.0)
mercenary (0.4.0)
- mini_portile2 (2.4.0)
- nokogiri (1.10.10)
- mini_portile2 (~> 2.4.0)
+ mini_portile2 (2.5.0)
+ nokogiri (1.11.1)
+ mini_portile2 (~> 2.5.0)
+ racc (~> 1.4)
nokogumbo (2.0.4)
nokogiri (~> 1.8, >= 1.8.4)
parallel (1.20.1)
public_suffix (4.0.6)
+ racc (1.5.2)
rainbow (3.0.0)
typhoeus (1.4.0)
ethon (>= 0.9.0)
diff --git a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix
index 92ce4b8bf8..b0571be30a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix
@@ -37,10 +37,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bz0041fizdmggc5k9an4s3qk6diyybn2agcia2wr96vymfb2qjh";
+ sha256 = "0x8yq7hiv5wd44a0d0xhrqkjgaz3i1zjr2p6c0i7fbhq1wi8zy07";
type = "gem";
};
- version = "3.18.5";
+ version = "3.18.6";
};
mercenary = {
groups = ["default"];
@@ -57,21 +57,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+ sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
type = "gem";
};
- version = "2.4.0";
+ version = "2.5.0";
};
nokogiri = {
- dependencies = ["mini_portile2"];
+ dependencies = ["mini_portile2" "racc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
+ sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
type = "gem";
};
- version = "1.10.10";
+ version = "1.11.1";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -104,6 +104,16 @@
};
version = "4.0.6";
};
+ racc = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
+ type = "gem";
+ };
+ version = "1.5.2";
+ };
rainbow = {
groups = ["default"];
platforms = [];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix
index dc29aad2a5..125f8f35ac 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix
@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "memtest86-efi";
- version = "8.3";
+ version = "8.4";
src = fetchzip {
# TODO: We're using the previous version of memtest86 because the
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
# binaries that we make sure to version, then we could probably keep up
# with the latest versions released by the company.
url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip";
- sha256 = "0aldz7rvnfnzb4h447q10k9c9p5ghwzdyn7f6g5lrxiv5vxf3x96";
+ sha256 = "sha256-jh4FKCYZbOQhRv6B7N8Hmw6RQCQvbBGaGFTMLwM1nk8=";
stripRoot = false;
};
@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
];
installPhase = ''
+ runHook preInstall
+
# memtest86 is distributed as a bootable USB image. It contains the actual
# memtest86 EFI app.
#
@@ -50,6 +52,8 @@ stdenv.mkDerivation rec {
')
mkdir $out
mcopy -vsi $IMG@@$ESP_OFFSET ::'/EFI/BOOT/*' $out/
+
+ runHook postInstall
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix
index 04f1c5ec33..a943f94a18 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pspg";
- version = "4.0.1";
+ version = "4.2.1";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = version;
- sha256 = "sha256-YQrANrCd0nFdn98LfHH/Ishm+fDb12cUAkxlwtZ1ng8=";
+ sha256 = "sha256-r6qD7KyuBj67c+nhaRLHP5B46JV8VP9MKCloqYLua+Q=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix
index 0443deae07..70a9595785 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix
@@ -16,7 +16,14 @@ stdenv.mkDerivation rec {
"--enable-colors256"
];
- patches = lib.optional stdenv.hostPlatform.isMusl
+ patches = [
+ (fetchpatch {
+ # Fixes denial of services in encoding.c, remove > 4.8.0
+ name = "CVE-2021-26937.patch";
+ url = "https://salsa.debian.org/debian/screen/-/raw/master/debian/patches/99_CVE-2021-26937.patch";
+ sha256 = "05f3p1c7s83nccwkhmavjzgaysxnvq41c7jffs31ra65kcpabqy0";
+ })
+ ] ++ lib.optional stdenv.hostPlatform.isMusl
(fetchpatch {
url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff";
sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix
index 014fdad13d..6dc47e3172 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
- version = "6.5.2";
+ version = "6.6.0";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-7tgYVxZ4E6qi/HLgfC0ZreHuXgtd3JMg4ENQL50YWr4=";
+ sha256 = "sha256-YMg5HWDvBsYJZCxYrQuQqU4xLY8DORKYkK319pryA5I=";
};
- cargoSha256 = "sha256-xxJfNFegvtHJno7o54Rqai9DvvffrkxTFci673Yq/NI=";
+ cargoSha256 = "sha256-G6ToQzPxuKpe1YQ4nLDJLjb3qx8D3VpuigXfdf7RHCQ=";
buildInputs = lib.optional stdenv.isDarwin Foundation;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix
index 64ae387e1a..79be68c8d5 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "z-lua";
- version = "1.8.11";
+ version = "1.8.12";
src = fetchFromGitHub {
owner = "skywind3000";
repo = "z.lua";
rev = version;
- sha256 = "sha256-k3Q4Fc2T7ElZb98+DVodC7zMHv5yfdwOIkSk0k04WCo=";
+ sha256 = "sha256-q4hJ6QAR8cXjXM2e5Et1/DzyEw9L0120sgpTtqGG5wQ=";
};
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/argus-clients/default.nix b/third_party/nixpkgs/pkgs/tools/networking/argus-clients/default.nix
index ead19b1792..cd935a5f5d 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/argus-clients/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/argus-clients/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, pkg-config, perl }:
+{ lib, stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, pkg-config, perl, libtirpc, libnsl }:
stdenv.mkDerivation rec {
pname = "argus-clients";
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1c9vj6ma00gqq9h92fg71sxcsjzz912166sdg90ahvnmvmh3l1rj";
};
- patchPhase = ''
+ NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
+
+ postPatch = ''
for file in ./examples/*/*.pl; do
substituteInPlace $file \
--subst-var-by PERLBIN ${perl}/bin/perl
@@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-perl=${perl}/bin/perl" ];
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ];
+ buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex libnsl ];
meta = with lib; {
description = "Clients for ARGUS";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix
index 480a64127c..681f6002ca 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "findomain";
- version = "3.0.1";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "Edu4rdSHL";
repo = pname;
rev = version;
- sha256 = "sha256-eM3XTZ/Y0Kk5bdC+xskS/btGEVrC50342YBYJdXAlDg=";
+ sha256 = "sha256-mZJyxbxMIw3jr7ASzYKEfZFh4GS6ZfGKsRkzOtUCYOA=";
};
- cargoSha256 = "sha256-U3WXb6qGGshaWJ3GIC+c3W9Y8Cz0O23J7mVojCwitlk=";
+ cargoSha256 = "sha256-JIyv21u+r2CpgsiW5O7Fy4CWXpkW4jRDrH0CSY2CgiU=";
nativeBuildInputs = [ installShellFiles perl ];
buildInputs = lib.optional stdenv.isDarwin Security;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix b/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix
index 59315c4bf4..f6263f187b 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "isync";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchurl {
url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz";
- sha256 = "0pkqvsdmi85xrhzzc7mz87vdvvvp01lf8akhfdnmsdlks8zbzy44";
+ sha256 = "0l01880fcyqn6xq9n8236ha5n2a3wl5g8rmv22z8nv5hgfsxndhd";
};
nativeBuildInputs = [ pkg-config perl ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix b/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix
index 7ce5e0ccbf..a805fe7e9e 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "keepalived";
- version = "2.1.5";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "acassen";
repo = "keepalived";
rev = "v${version}";
- sha256 = "0zdh3g491mlc0x4g8q09vq62a7pb8n13a39jnfdgrm9k29khn0sj";
+ sha256 = "sha256-Cupi5arScECKmHCBcC0Cmm/64JhidMyNUB75YmGMJag=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix
index 1e401deaa2..5cfb61d7fb 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix
@@ -13,11 +13,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "wireguard-tools";
- version = "1.0.20200827";
+ version = "1.0.20210223";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz";
- sha256 = "1d8rs1g6zy3kz327cc3hzkk5a44278x9p32gxasz6i94bq0b2bs3";
+ sha256 = "sha256-YlqviVEYrGYZAJtUg2zAU8AzsQotxguljltC3N2ruUc=";
};
outputs = [ "out" "man" ];
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
index 9ab08007ec..50eb8d1a47 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
@@ -22,7 +22,7 @@ common =
, stateDir
, confDir
, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
- , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
+ , withAWS ? !enableStatic && !stdenv.hostPlatform.isMusl && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
, enableStatic ? stdenv.hostPlatform.isStatic
, name, suffix ? "", src
, patches ? [ ]
diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix
index c208b44bfd..9f6a65962f 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix
@@ -13,7 +13,7 @@
buildGoModule rec {
pname = "gopass";
- version = "1.12.0";
+ version = "1.12.1";
nativeBuildInputs = [ installShellFiles makeWrapper ];
@@ -21,10 +21,10 @@ buildGoModule rec {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
- sha256 = "0y3dcikw6gl436mhza5j0b3lm49jzl590a9ry53rkmzrv2lqx9w6";
+ sha256 = "0ickzq2swhabxqcg32n1i99bam6ip7c0mhhncgvmw332w6pzgvlb";
};
- vendorSha256 = "09lbkm7c361c2s87qi1wpfsqgpp3r862wcn98dzdg5j6pvpgwbag";
+ vendorSha256 = "0i0dhipp1gdn0xdl4bpi13ksxf7dc9biz9riapm988bldcr5s1kr";
subPackages = [ "." ];
@@ -41,6 +41,7 @@ buildGoModule rec {
);
postInstall = ''
+ HOME=$TMPDIR
for shell in bash fish zsh; do
$out/bin/gopass completion $shell > gopass.$shell
installShellCompletion gopass.$shell
diff --git a/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix
index 80e6e25518..4e9b24818b 100644
--- a/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kbs2";
- version = "0.2.5";
+ version = "0.2.6";
src = fetchFromGitHub {
owner = "woodruffw";
repo = pname;
rev = "v${version}";
- sha256 = "1jilsczz22fyqbgz43gl5ilz62gfqsahfk30gayj7q5bx9k35m4w";
+ sha256 = "sha256-PtXTC0VufUR5kle9C5KhCHHEQtQZvTTU1Q/cRMCB1g0=";
};
- cargoSha256 = "1gvvmfavaq29p40p5mq1phpp2a1nw04dz4975pzm1b6z89p0jlzl";
+ cargoSha256 = "sha256-S2czYglyHRkRN3Dq5reXFOaB1i/oIHXTY8Ile+Twvzo=";
nativeBuildInputs = [ installShellFiles ]
++ lib.optionals stdenv.isLinux [ python3 ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/libtpms/default.nix b/third_party/nixpkgs/pkgs/tools/security/libtpms/default.nix
new file mode 100644
index 0000000000..71966a934d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/libtpms/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config, autoreconfHook
+, openssl, perl
+, tpm2Support ? false
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libtpms";
+ version = "0.7.4";
+
+ src = fetchFromGitHub {
+ owner = "stefanberger";
+ repo = "libtpms";
+ rev = "v${version}";
+ sha256 = "sha256-nZSBD3WshlZHVMBFmDBBdFkhBjNgtASfg6+lYOOAhZ8=";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ perl # needed for pod2man
+ ];
+ buildInputs = [ openssl ];
+
+ outputs = [ "out" "lib" "man" "dev" ];
+
+ enableParallelBuilding = true;
+
+ configureFlags = [
+ "--with-openssl"
+ ] ++ lib.optionals tpm2Support [
+ "--with-tpm2" # TPM2 support is flagged experimental by upstream
+ ];
+
+ meta = with lib; {
+ description = "The libtpms library provides software emulation of a Trusted Platform Module (TPM 1.2 and TPM 2.0)";
+ homepage = "https://github.com/stefanberger/libtpms";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.baloo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/import.nix b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/import.nix
index 0fd14901d0..11b4eecd14 100644
--- a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/import.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/import.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }:
let
pythonEnv = pythonPackages.python.withPackages (p: [
diff --git a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix
index 57a92ef4b9..e2f1ab7cdb 100644
--- a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "saml2aws";
- version = "2.27.1";
+ version = "2.28.0";
src = fetchFromGitHub {
owner = "Versent";
repo = "saml2aws";
rev = "v${version}";
- sha256 = "1ffq7jh14cj45wn5rx9awh5k8hqbfwm4fjz0a0rq22yqfwbbkkj2";
+ sha256 = "sha256-2t1MytLjAxhVVsWyMYcQZ9c+ox+X2OszG5mLAv8c7xE=";
};
runVend = true;
- vendorSha256 = "1w7vnpv36lhxpaljdhslbckkr7p81nzc91a0503wk8nrrc4ljsyy";
+ vendorSha256 = "sha256-8Kox01iyWhv/Fp7jHPeNXxc/K2TT1WPyWFieHZkqLho=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix
index 2fdc42e528..a7ef677759 100644
--- a/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "ssh-audit";
- version = "2.3.1";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "jtesta";
repo = pname;
rev = "v${version}";
- sha256 = "1h739r5nv5zkmjyyjwkw8r6d4avddjjxsamc5rffwfxi1kjavpxm";
+ sha256 = "sha256-Xq1q/i43vZAv8BayVOdKuZ3+mJcQQ0x4Kc3WlASE6m8=";
};
checkInputs = with python3Packages; [
diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix
index 487cc44cdd..fc07714b55 100644
--- a/third_party/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ssh-to-pgp";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "Mic92";
repo = "ssh-to-pgp";
rev = version;
- sha256 = "sha256-TDrpnWAez8muysMdmKFBDZfK8CyhGn1VqHB8+zD6jSk=";
+ sha256 = "sha256-5Wg0ItAkAb0zlhzcuDT9o0XIIbG9kqk4mIYb6hSJlsI=";
};
- vendorSha256 = "sha256-ZF/WsmqmGHZIAGTPKJ70UhtmssNhiInEZfzrKxQLw9I=";
+ vendorSha256 = "sha256-OMWiJ1n8ynvIGcmotjuGGsRuAidYgVo5Y5JjrAw8fpc=";
checkInputs = [ gnupg ];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix b/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix
new file mode 100644
index 0000000000..2bd0326d4d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix
@@ -0,0 +1,76 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, libtasn1, openssl, fuse, glib, libseccomp
+, libtpms
+, unixtools, expect, socat
+, gnutls
+, perl
+, python3, python3Packages
+}:
+
+stdenv.mkDerivation rec {
+ pname = "swtpm";
+ version = "0.5.2";
+
+ src = fetchFromGitHub {
+ owner = "stefanberger";
+ repo = "swtpm";
+ rev = "v${version}";
+ sha256 = "sha256-KY5V4z/8I15ePjorgZueNahlD/xvFa3tDarA0tuRxFk=";
+ };
+
+ pythonPath = with python3Packages; requiredPythonModules [
+ setuptools
+ cryptography
+ ];
+
+ patches = [
+ # upstream looks for /usr directory in $prefix to check
+ # whether or not to proceed with installation of python
+ # tools (swtpm_setup utility).
+ ./python-installation.patch
+ ];
+
+ prePatch = ''
+ patchShebangs src/swtpm_setup/setup.py
+ patchShebangs samples/setup.py
+ '';
+
+ nativeBuildInputs = [
+ pkg-config unixtools.netstat expect socat
+ perl # for pod2man
+ autoreconfHook
+ python3
+ ];
+ buildInputs = [
+ libtpms
+ openssl libtasn1 libseccomp
+ fuse glib
+ gnutls
+ python3.pkgs.wrapPython
+ ];
+ propagatedBuildInputs = pythonPath;
+
+ configureFlags = [
+ "--with-cuse"
+ ];
+
+ postInstall = ''
+ wrapPythonProgramsIn $out/bin "$out $pythonPath"
+ wrapPythonProgramsIn $out/share/swtpm "$out $pythonPath"
+ '';
+
+ enableParallelBuilding = true;
+
+ outputs = [ "out" "man" ];
+
+ meta = with lib; {
+ description = "Libtpms-based TPM emulator";
+ homepage = "https://github.com/stefanberger/swtpm";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.baloo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/swtpm/python-installation.patch b/third_party/nixpkgs/pkgs/tools/security/swtpm/python-installation.patch
new file mode 100644
index 0000000000..d2689f051c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/swtpm/python-installation.patch
@@ -0,0 +1,60 @@
+commit 353794feb596d95e3f8893e39b174c5a89d1013e
+Author: Arthur Gautier
+Date: Wed Feb 17 02:27:40 2021 +0000
+
+ python-install
+
+ Signed-off-by: Arthur Gautier
+
+diff --git a/samples/Makefile.am b/samples/Makefile.am
+index 7d69bf8..1803bb9 100644
+--- a/samples/Makefile.am
++++ b/samples/Makefile.am
+@@ -39,19 +39,9 @@ python-uninstall:
+ $(PIP3) uninstall -y $(PY_PACKAGE_NAME)
+
+ if PYTHON_INSTALLATION
+-install-exec-local: $(PY_PACKAGE)
+- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
+- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \
+- else \
+- $(MAKE) python-install; \
+- fi
++install-exec-local: python-install
+
+-uninstall-local:
+- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
+- echo "Cleanup for distcheck build not implemented" ; \
+- else \
+- $(MAKE) python-uninstall; \
+- fi
++uninstall-local: python-uninstall
+ endif
+
+
+diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am
+index 529eefe..533b1b3 100644
+--- a/src/swtpm_setup/Makefile.am
++++ b/src/swtpm_setup/Makefile.am
+@@ -29,19 +29,9 @@ python-uninstall:
+ $(PIP3) uninstall -y $(PY_PACKAGE_NAME)
+
+ if PYTHON_INSTALLATION
+-install-exec-local: $(PY_PACKAGE)
+- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
+- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \
+- else \
+- $(MAKE) python-install; \
+- fi
++install-exec-local: python-install
+
+-uninstall-local:
+- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
+- echo "Cleanup for distcheck build not implemented" ; \
+- else \
+- $(MAKE) python-uninstall; \
+- fi
++uninstall-local: python-uninstall
+ endif
+
+ # for out-of-tree builds we need to clean up
diff --git a/third_party/nixpkgs/pkgs/tools/system/bpytop/default.nix b/third_party/nixpkgs/pkgs/tools/system/bpytop/default.nix
index 6c0143a34b..efcce36866 100644
--- a/third_party/nixpkgs/pkgs/tools/system/bpytop/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/bpytop/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bpytop";
- version = "1.0.62";
+ version = "1.0.63";
src = fetchFromGitHub {
owner = "aristocratos";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ds+N0z7Vfw7xv+nE8RIfFjel81mJgIo1u1KspOHLxKc=";
+ sha256 = "sha256-5KTqiPqYBDI1KFQ+2WN7QZFL/YSb+MPPWbKzJTUa8Zw=";
};
buildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/system/clinfo/default.nix b/third_party/nixpkgs/pkgs/tools/system/clinfo/default.nix
index dbcbae6eaa..9c5b54f554 100644
--- a/third_party/nixpkgs/pkgs/tools/system/clinfo/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/clinfo/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "clinfo";
- version = "3.0.20.11.20";
+ version = "3.0.21.02.21";
src = fetchFromGitHub {
owner = "Oblomov";
repo = "clinfo";
rev = version;
- sha256 = "052xfkbmgfpalmhfwn0dj5114x2mzwz29y37qqhhsdpaxsz0y422";
+ sha256 = "sha256-0ijfbfv1F6mnt1uFH/A4yOADJoAFrPMa3yAOFJW53ek=";
};
buildInputs = [ ocl-icd opencl-headers ];
diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix
index 1051d48b8a..c26db13300 100644
--- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "gdu";
- version = "4.6.3";
+ version = "4.6.4";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-vz8qqsFc1CETnrqStLyiGZ6w0jy+y5GlwQQgxdyJ5aY=";
+ sha256 = "sha256-d7rUvRHijBoot6OKsKjASNoSbuE7YIGXbRsIRZG7CFQ=";
};
- vendorSha256 = "sha256-kIMd0xzQ+c+jCpX2+qdD/GcFEirR15PMInbEV184EBU=";
+ vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias=";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/dundee/gdu/build.Version=${version}" ];
diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix
index 98fb6e69be..838cdf075b 100644
--- a/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook";
- version = "0.4.6";
+ version = "0.4.7";
src = fetchFromGitHub {
owner = "rust-lang-nursery";
repo = "mdBook";
rev = "v${version}";
- sha256 = "sha256-cS2fME3X8bFmEz6czoL+2ZFbflJP58+lIeC5SVleCNg=";
+ sha256 = "sha256-51S4I1YIbdgXkhuT7KnhJe71nGCQmr9JmuGtp7Bcxqo=";
};
- cargoSha256 = "sha256-iuJyprLp6HofcdH0NgNK2Vl+1FtdAvZPcltPUb5B2XU=";
+ cargoSha256 = "sha256-2kBJcImytsSd7Q0kj1bsP/NXxyy2Pr8gHb8iNf6h3/4=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
diff --git a/third_party/nixpkgs/pkgs/tools/text/podiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/podiff/default.nix
index b44003a9f0..8db0085a70 100644
--- a/third_party/nixpkgs/pkgs/tools/text/podiff/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/podiff/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation {
pname = "podiff";
- version = "1.2";
+ version = "1.3";
src = fetchurl {
- url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.2.tar.gz";
- sha256 = "1l2b4hh53xlx28riigwarzkhxpv1pcz059xj1ka33ccvxc6c20k9";
+ url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.3.tar.gz";
+ sha256 = "sha256-7fpix+GkXsfpRgnkHtk1iXF6ILHri7BtUhNPK6sDQFA=";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix
index 83cb0e4638..5806723a04 100644
--- a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ugrep";
- version = "3.1.0";
+ version = "3.1.7";
src = fetchFromGitHub {
owner = "Genivia";
repo = pname;
rev = "v${version}";
- sha256 = "08pq759f2vvdbig64y3k9kicvgr2d5x8ara7b182dcm3slbpib3l";
+ sha256 = "sha256-nCpU4GBJ/4c/70hgVKfO1995XCyDRLVUeczsqnlkkFM=";
};
buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ];
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix
index 805373e8ee..1040532eb3 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lowdown";
- version = "0.8.1";
+ version = "0.8.2";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
- sha512 = "28kwj053lm3510cq7pg4rqx6linv5zphhm2h6r9icigclfq7j9ybnd7vqbn2v4ay0r8ghac5cjbqab5zy8cjlgllwhwsxg0dnk75x2i";
+ sha512 = "07xy6yjs24zkwrr06ly4ln5czvm3azw6iznx6m8gbrmzblkcp3gz1jcl9wclcyl8bs4xhgmyzkf5k67b95s0jndhyb9ap5zy6ixnias";
};
nativeBuildInputs = [ which ]
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/aws/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/aws/default.nix
index 4766be90a6..d3a5cbf10e 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/aws/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/virtualization/aws/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, perl, curl }:
stdenv.mkDerivation {
- name = "aws-1.75";
+ name = "aws-2019.06.18";
src = fetchurl {
- url = "https://raw.github.com/timkay/aws/2f2ff99f9f5111ea708ae6cd14d20e264748e72b/aws";
- sha256 = "0d5asv73a58yb1bb1jpsw3c7asd62y86z5fwpg4llhjzkx79maj6";
+ url = "https://raw.github.com/timkay/aws/ac68eb5191c52f069b9aa0c9a99808f8a4430833/aws";
+ sha256 = "02bym9wicqpdr7mdim13zw5ssh97xfswzab9q29rsbg7058ddbil";
};
buildInputs = [ perl ];
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix
index 89ea852334..028d05e633 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "shipyard";
- version = "0.2.1";
+ version = "0.2.9";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shipyard-run";
repo = pname;
- sha256 = "sha256-eTwl2tMrhLPeHI0C76Rvm/OOt02OtDtejXYr4N6IWcg=";
+ sha256 = "sha256-S2nH1E20frsJzW2RCn+eJ9ylVdhVbo4wesNwlQll9S4=";
};
vendorSha256 = "sha256-rglpY7A0S56slL+mXFRgaZwS0bF1b9zxxmNYiX6TJzs=";
diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
index 22feb34160..ae22edcd68 100644
--- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
@@ -3068,6 +3068,8 @@ in
anydesk = callPackage ../applications/networking/remote/anydesk { };
+ anystyle-cli = callPackage ../tools/misc/anystyle-cli { };
+
atool = callPackage ../tools/archivers/atool { };
bash_unit = callPackage ../tools/misc/bash_unit { };
@@ -8225,6 +8227,13 @@ in
swec = callPackage ../tools/networking/swec { };
+ swtpm = callPackage ../tools/security/swtpm { };
+ swtpm-tpm2 = swtpm.override {
+ libtpms = libtpms.override {
+ tpm2Support = true;
+ };
+ };
+
svn2git = callPackage ../applications/version-management/git-and-tools/svn2git {
git = gitSVN;
};
@@ -12365,6 +12374,8 @@ in
gputils = callPackage ../development/tools/misc/gputils { };
+ gpuvis = callPackage ../development/tools/misc/gpuvis { };
+
gradleGen = callPackage ../development/tools/build-managers/gradle {
java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731
};
@@ -15592,6 +15603,8 @@ in
libtoxcore_0_1 libtoxcore_0_2;
libtoxcore = libtoxcore_0_2;
+ libtpms = callPackage ../tools/security/libtpms { };
+
libtap = callPackage ../development/libraries/libtap { };
libtgvoip = callPackage ../development/libraries/libtgvoip { };
@@ -20124,6 +20137,7 @@ in
ubootClearfog
ubootGuruplug
ubootJetsonTK1
+ ubootNanoPCT4
ubootNovena
ubootOdroidC2
ubootOdroidXU3
@@ -21471,6 +21485,8 @@ in
bviplus = callPackage ../applications/editors/bviplus { };
+ caerbannog = callPackage ../applications/misc/caerbannog { };
+
cage = callPackage ../applications/window-managers/cage { };
calf = callPackage ../applications/audio/calf {
@@ -21848,6 +21864,8 @@ in
eaglemode = callPackage ../applications/misc/eaglemode { };
+ ebumeter = callPackage ../applications/audio/ebumeter { };
+
echoip = callPackage ../servers/echoip { };
eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse {
@@ -21931,27 +21949,9 @@ in
};
emacsPackagesFor = emacs: import ./emacs-packages.nix {
- inherit lib newScope stdenv pkgs;
- inherit fetchFromGitHub fetchurl;
- inherit emacs texinfo makeWrapper runCommand writeText;
- inherit (xorg) lndir;
-
- trivialBuild = callPackage ../build-support/emacs/trivial.nix {
- inherit emacs;
- };
-
- melpaBuild = callPackage ../build-support/emacs/melpa.nix {
- inherit emacs;
- };
-
- external = {
- inherit (haskellPackages)
- ghc-mod structured-haskell-mode Agda hindent;
- inherit
- autoconf automake editorconfig-core-c git libffi libpng pkg-config
- poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages
- libtool zeromq openssl ott;
- };
+ inherit (lib) makeScope makeOverridable;
+ inherit emacs;
+ pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set
};
inherit (gnome3) empathy;
@@ -23519,6 +23519,8 @@ in
ltc-tools = callPackage ../applications/audio/ltc-tools { };
+ lscolors = callPackage ../applications/misc/lscolors { };
+
lumail = callPackage ../applications/networking/mailreaders/lumail {
lua = lua5_1;
};
@@ -26132,6 +26134,10 @@ in
xdotool = callPackage ../tools/X11/xdotool { };
+ xed-editor = callPackage ../applications/editors/xed-editor {
+ xapps = cinnamon.xapps;
+ };
+
xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {});
xen = xenPackages.xen-vanilla;
@@ -26234,6 +26240,13 @@ in
xpra = callPackage ../tools/X11/xpra { };
libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
+
+ xplayer = callPackage ../applications/video/xplayer {
+ inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad;
+ inherit (cinnamon) xapps;
+ };
+ libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { };
+
xrectsel = callPackage ../tools/X11/xrectsel { };
xrestop = callPackage ../tools/X11/xrestop { };
diff --git a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix b/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
index 329fb57258..67f4d116df 100644
--- a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
@@ -21,58 +21,42 @@
(package-initialize)
*/
-## FOR CONTRIBUTORS
-#
-# When adding a new package here please note that
-# * please use `elpaBuild` for pre-built package.el packages and
-# `melpaBuild` or `trivialBuild` if the package must actually
-# be built from the source.
-# * lib.licenses are `with`ed on top of the file here
-# * both trivialBuild and melpaBuild will automatically derive a
-# `meta` with `platforms` and `homepage` set to something you are
-# unlikely to want to override for most packages
-
-{ lib, newScope, stdenv, fetchurl, fetchFromGitHub, runCommand, writeText
-
-, emacs, texinfo, lndir, makeWrapper
-, trivialBuild
-, melpaBuild
-
-, external
-, pkgs
-}:
+{ pkgs', makeScope, makeOverridable, emacs }:
let
- mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
- inherit lib stdenv texinfo writeText;
- };
-
- # Contains both melpa stable & unstable
- melpaGeneric = import ../applications/editors/emacs-modes/melpa-packages.nix {
- inherit external lib pkgs;
- };
- mkMelpaStablePackages = melpaGeneric "stable";
- mkMelpaPackages = melpaGeneric "unstable";
-
- mkOrgPackages = import ../applications/editors/emacs-modes/org-packages.nix {
+ mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs-modes/elpa-packages.nix {
+ inherit (pkgs) stdenv texinfo writeText;
inherit lib;
};
- emacsWithPackages = import ../build-support/emacs/wrapper.nix {
- inherit lib lndir makeWrapper runCommand;
+ # Contains both melpa stable & unstable
+ melpaGeneric = { pkgs, lib }: import ../applications/editors/emacs-modes/melpa-packages.nix {
+ inherit lib pkgs;
};
- mkManualPackages = import ../applications/editors/emacs-modes/manual-packages.nix {
- inherit external lib pkgs;
+ mkOrgPackages = { lib }: import ../applications/editors/emacs-modes/org-packages.nix {
+ inherit lib;
};
-in lib.makeScope newScope (self: lib.makeOverridable ({
- elpaPackages ? mkElpaPackages self
- , melpaStablePackages ? mkMelpaStablePackages self
- , melpaPackages ? mkMelpaPackages self
- , orgPackages ? mkOrgPackages self
- , manualPackages ? mkManualPackages self
+ mkManualPackages = { pkgs, lib }: import ../applications/editors/emacs-modes/manual-packages.nix {
+ inherit lib pkgs;
+ };
+
+ emacsWithPackages = { pkgs, lib }: import ../build-support/emacs/wrapper.nix {
+ inherit (pkgs) makeWrapper runCommand;
+ inherit (pkgs.xorg) lndir;
+ inherit lib;
+ };
+
+in makeScope pkgs'.newScope (self: makeOverridable ({
+ pkgs ? pkgs'
+ , lib ? pkgs.lib
+ , elpaPackages ? mkElpaPackages { inherit pkgs lib; } self
+ , melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self
+ , melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self
+ , orgPackages ? mkOrgPackages { inherit lib; } self
+ , manualPackages ? mkManualPackages { inherit pkgs lib; } self
}: ({}
// elpaPackages // { inherit elpaPackages; }
// melpaStablePackages // { inherit melpaStablePackages; }
@@ -80,8 +64,27 @@ in lib.makeScope newScope (self: lib.makeOverridable ({
// orgPackages // { inherit orgPackages; }
// manualPackages // { inherit manualPackages; }
// {
- inherit emacs melpaBuild trivialBuild;
- emacsWithPackages = emacsWithPackages self;
- withPackages = emacsWithPackages self;
+
+ inherit emacs;
+
+ trivialBuild = pkgs.callPackage ../build-support/emacs/trivial.nix {
+ inherit (self) emacs;
+ };
+
+ melpaBuild = pkgs.callPackage ../build-support/emacs/melpa.nix {
+ inherit (self) emacs;
+ };
+
+ emacsWithPackages = emacsWithPackages { inherit pkgs lib; } self;
+ withPackages = emacsWithPackages { inherit pkgs lib; } self;
+
+ }// {
+
+ # Package specific priority overrides goes here
+
+ # Telega uploads packages incompatible with stable tdlib to melpa
+ # Prefer the one from melpa stable
+ inherit (melpaStablePackages) telega;
+
})
) {})
diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
index 4ae605e1d3..e9c24fd9db 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
@@ -2483,6 +2483,8 @@ in {
futures = callPackage ../development/python-modules/futures { };
+ fuzzyfinder = callPackage ../development/python-modules/fuzzyfinder { };
+
fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { };
fx2 = callPackage ../development/python-modules/fx2 { };
@@ -3393,6 +3395,8 @@ in {
jsonpath_rw = callPackage ../development/python-modules/jsonpath_rw { };
+ jsonpath-ng = callPackage ../development/python-modules/jsonpath-ng { };
+
jsonpickle = callPackage ../development/python-modules/jsonpickle { };
jsonpointer = callPackage ../development/python-modules/jsonpointer { };
@@ -6011,6 +6015,8 @@ in {
pysma = callPackage ../development/python-modules/pysma { };
+ pysmappee = callPackage ../development/python-modules/pysmappee { };
+
pysmb = callPackage ../development/python-modules/pysmb { };
pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkg-config; };
@@ -7880,8 +7886,6 @@ in {
tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { };
- tiros = callPackage ../development/python-modules/tiros { };
-
tissue = callPackage ../development/python-modules/tissue { };
titlecase = callPackage ../development/python-modules/titlecase { };
@@ -8015,6 +8019,8 @@ in {
tweepy = callPackage ../development/python-modules/tweepy { };
+ twentemilieu = callPackage ../development/python-modules/twentemilieu { };
+
twiggy = callPackage ../development/python-modules/twiggy { };
twilio = callPackage ../development/python-modules/twilio { };
@@ -8041,6 +8047,8 @@ in {
twitter-common-options = callPackage ../development/python-modules/twitter-common-options { };
+ twitterapi = callPackage ../development/python-modules/twitterapi { };
+
twofish = callPackage ../development/python-modules/twofish { };
txaio = callPackage ../development/python-modules/txaio { };
@@ -8220,6 +8228,8 @@ in {
vega_datasets = callPackage ../development/python-modules/vega_datasets { };
+ venstarcolortouch = callPackage ../development/python-modules/venstarcolortouch { };
+
venusian = callPackage ../development/python-modules/venusian { };
verboselogs = callPackage ../development/python-modules/verboselogs { };